limit code size EIP170

apps/blockchain/lib/blockchain/contract/create_contract.ex

@@ -127,24 +127,29 @@ defmodule Blockchain.Contract.CreateContract do
     contract_creation_cost = creation_cost(output)
     insufficient_gas = remaining_gas < contract_creation_cost
 
-    if insufficient_gas && EVM.Configuration.fail_contract_creation_lack_of_gas?(params.config) do
-      {:error, {params.state, 0, SubState.empty()}}
-    else
-      resultant_gas =
-        if insufficient_gas do
-          remaining_gas
-        else
-          remaining_gas - contract_creation_cost
-        end
-
-      resultant_state =
-        if insufficient_gas do
-          state_after_init
-        else
-          Account.put_code(state_after_init, address, output)
-        end
-
-      {:ok, {resultant_state, resultant_gas, accrued_sub_state}}
+    cond do
+      insufficient_gas && EVM.Configuration.fail_contract_creation_lack_of_gas?(params.config) ->
+        {:error, {params.state, 0, SubState.empty()}}
+
+      EVM.Configuration.limit_contract_code_size?(params.config, byte_size(output)) ->
+        {:error, {params.state, 0, SubState.empty()}}
+
+      true ->
+        resultant_gas =
+          if insufficient_gas do
+            remaining_gas
+          else
+            remaining_gas - contract_creation_cost
+          end
+
+        resultant_state =
+          if insufficient_gas do
+            state_after_init
+          else
+            Account.put_code(state_after_init, address, output)
+          end
+
+        {:ok, {resultant_state, resultant_gas, accrued_sub_state}}
     end
   end
 

apps/blockchain/test/blockchain/state_test.exs

@@ -206,7 +206,6 @@ defmodule Blockchain.StateTest do
       "stCreateTest/CREATE_ContractSSTOREDuringInit",
       "stCreateTest/CREATE_AcreateB_BSuicide_BStore",
       "stCodeSizeLimit/codesizeValid",
-      "stCodeSizeLimit/codesizeOOGInvalidSize",
       "stCodeSizeLimit/codesizeInit",
       "stCallCreateCallCodeTest/createNameRegistratorPerTxs",
       "stCallCodes/callcodeDynamicCode",

apps/blockchain/test/blockchain_test.exs

@@ -24,7 +24,6 @@ defmodule BlockchainTest do
       "GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1_d0g0v0.json",
       "GeneralStateTests/stCallCodes/callcodeDynamicCode_d0g0v0.json",
       "GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0.json",
-      "GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0.json",
       "GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0.json",
       "GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore_d0g0v0.json",
       "GeneralStateTests/stCreateTest/CREATE_ContractSSTOREDuringInit_d0g0v0.json",

apps/evm/lib/evm/configuration.ex

@@ -48,4 +48,8 @@ defprotocol EVM.Configuration do
   # EIP160
   @spec exp_byte_cost(t) :: integer()
   def exp_byte_cost(t)
+
+  # EIP170
+  @spec limit_contract_code_size?(t, integer) :: boolean()
+  def limit_contract_code_size?(t, size \\ 0)
 end

apps/evm/lib/evm/configuration/eip150.ex

@@ -54,4 +54,8 @@ defimpl EVM.Configuration, for: EVM.Configuration.EIP150 do
 
   @spec exp_byte_cost(Configuration.t()) :: integer()
   def exp_byte_cost(config), do: Configuration.exp_byte_cost(config.fallback_config)
+
+  @spec limit_contract_code_size?(Configuration.t(), integer()) :: boolean()
+  def limit_contract_code_size?(config, _),
+    do: Configuration.limit_contract_code_size?(config.fallback_config)
 end

apps/evm/lib/evm/configuration/eip158.ex

@@ -1,6 +1,7 @@
 defmodule EVM.Configuration.EIP158 do
   defstruct fallback_config: EVM.Configuration.EIP150.new(),
-            exp_byte_cost: 50
+            exp_byte_cost: 50,
+            code_size_limit: 24_577
 
   def new do
     %__MODULE__{}
@@ -46,4 +47,7 @@ defimpl EVM.Configuration, for: EVM.Configuration.EIP158 do
 
   @spec exp_byte_cost(Configuration.t()) :: integer()
   def exp_byte_cost(config), do: config.exp_byte_cost
+
+  @spec limit_contract_code_size?(Configuration.t(), integer()) :: boolean()
+  def limit_contract_code_size?(config, size), do: size >= config.code_size_limit
 end

apps/evm/lib/evm/configuration/frontier.ex

@@ -9,7 +9,8 @@ defmodule EVM.Configuration.Frontier do
             call_cost: 40,
             selfdestruct_cost: 0,
             fail_nested_operation: true,
-            exp_byte_cost: 10
+            exp_byte_cost: 10,
+            limit_contract_code_size: false
 
   def new do
     %__MODULE__{}
@@ -51,4 +52,7 @@ defimpl EVM.Configuration, for: EVM.Configuration.Frontier do
 
   @spec exp_byte_cost(Configuration.t()) :: integer()
   def exp_byte_cost(config), do: config.exp_byte_cost
+
+  @spec limit_contract_code_size?(Configuration.t(), integer()) :: boolean()
+  def limit_contract_code_size?(config, _), do: config.limit_contract_code_size
 end

apps/evm/lib/evm/configuration/homestead.ex

@@ -44,4 +44,7 @@ defimpl EVM.Configuration, for: EVM.Configuration.Homestead do
 
   @spec exp_byte_cost(Configuration.t()) :: integer()
   def exp_byte_cost(config), do: config.fallback_config.exp_byte_cost
+
+  @spec limit_contract_code_size?(Configuration.t(), integer()) :: boolean()
+  def limit_contract_code_size?(config, _), do: config.fallback_config.limit_contract_code_size
 end