evm: better error handling for contract creation errors (ethereumjs#2723)

Co-authored-by: acolytec3 <[email protected]>

Author: jochem-brouwer

packages/evm/src/evm.ts

@@ -612,20 +612,30 @@ export class EVM implements EVMInterface {
       }
     } else {
       if (this._common.gteHardfork(Hardfork.Homestead)) {
-        if (this.DEBUG) {
-          debug(`Not enough gas or code size not allowed (>= Homestead)`)
+        if (!allowedCodeSize) {
+          if (this.DEBUG) {
+            debug(`Code size exceeds maximum code size (>= SpuriousDragon)`)
+          }
+          result = { ...result, ...CodesizeExceedsMaximumError(message.gasLimit) }
+        } else {
+          if (this.DEBUG) {
+            debug(`Contract creation: out of gas`)
+          }
+          result = { ...result, ...OOGResult(message.gasLimit) }
         }
-        result = { ...result, ...CodesizeExceedsMaximumError(message.gasLimit) }
       } else {
         // we are in Frontier
-        if (this.DEBUG) {
-          debug(`Not enough gas or code size not allowed (Frontier)`)
-        }
         if (totalGas - returnFee <= message.gasLimit) {
           // we cannot pay the code deposit fee (but the deposit code actually did run)
+          if (this.DEBUG) {
+            debug(`Not enough gas to pay the code deposit fee (Frontier)`)
+          }
           result = { ...result, ...COOGResult(totalGas - returnFee) }
           CodestoreOOG = true
         } else {
+          if (this.DEBUG) {
+            debug(`Contract creation: out of gas`)
+          }
           result = { ...result, ...OOGResult(message.gasLimit) }
         }
       }

packages/evm/test/runCall.spec.ts

@@ -673,3 +673,55 @@ tape('step event: ensure EVM memory and not internal memory gets reported', asyn
   await evm.runCall(runCallArgs)
   t.ok(verifyMemoryExpanded, 'memory did expand')
 })
+
+tape('ensure code deposit errors are logged correctly (>= Homestead)', async (t) => {
+  const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Berlin })
+  const evm = await EVM.create({
+    common,
+    stateManager: new DefaultStateManager(),
+  })
+
+  // Create a contract which is too large
+  const runCallArgs = {
+    gasLimit: BigInt(10000000),
+    data: hexToBytes('61FFFF6000F3'),
+  }
+
+  const res = await evm.runCall(runCallArgs)
+  t.ok(res.execResult.exceptionError?.error === ERROR.CODESIZE_EXCEEDS_MAXIMUM)
+
+  // Create a contract which goes OOG when creating
+  const runCallArgs2 = {
+    gasLimit: BigInt(100000),
+    data: hexToBytes('62FFFFFF6000F3'),
+  }
+
+  const res2 = await evm.runCall(runCallArgs2)
+  t.ok(res2.execResult.exceptionError?.error === ERROR.OUT_OF_GAS)
+})
+
+tape('ensure code deposit errors are logged correctly (Frontier)', async (t) => {
+  const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Chainstart })
+  const evm = await EVM.create({
+    common,
+    stateManager: new DefaultStateManager(),
+  })
+
+  // Create a contract which cannot pay the code deposit fee
+  const runCallArgs = {
+    gasLimit: BigInt(10000000),
+    data: hexToBytes('61FFFF6000F3'),
+  }
+
+  const res = await evm.runCall(runCallArgs)
+  t.ok(res.execResult.exceptionError?.error === ERROR.CODESTORE_OUT_OF_GAS)
+
+  // Create a contract which goes OOG when creating
+  const runCallArgs2 = {
+    gasLimit: BigInt(100000),
+    data: hexToBytes('62FFFFFF6000F3'),
+  }
+
+  const res2 = await evm.runCall(runCallArgs2)
+  t.ok(res2.execResult.exceptionError?.error === ERROR.OUT_OF_GAS)
+})