Merge branch 'verkle/verify-proof' of https://github.com/ethereumjs/e…

…thereumjs-monorepo into verkle/verify-proof
ethereumjs · May 17, 2024 · c592469 · c592469
2 parents a3c7bd4 + 2793134
commit c592469
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts
@@ -544,6 +544,8 @@ export class Config {
     this.statelessVerkle = options.statelessVerkle ?? true
     this.startExecution = options.startExecution ?? false
     this.ignoreStatelessInvalidExecs = options.ignoreStatelessInvalidExecs ?? false
+
+    this.metrics = options.prometheusMetrics
     this.initialVerkleStateRoot = options.initialVerkleStateRoot ?? new Uint8Array()
 
     // Start it off as synchronized if this is configured to mine or as single node

diff --git a/packages/evm/src/opcodes/functions.ts b/packages/evm/src/opcodes/functions.ts
@@ -1157,9 +1157,16 @@ export const handlers: Map<number, OpHandler> = new Map([
       }
 
       const expectedAddress = new Address(setLengthLeft(bigIntToBytes(authority), 20).slice(-20))
-      const accountNonce = (
-        (await runState.stateManager.getAccount(expectedAddress)) ?? new Account()
-      ).nonce
+      const account = (await runState.stateManager.getAccount(expectedAddress)) ?? new Account()
+
+      if (account.isContract()) {
+        // EXTCODESIZE > 0
+        runState.stack.push(BIGINT_0)
+        runState.auth = undefined
+        return
+      }
+
+      const accountNonce = account.nonce
 
       const invokedAddress = setLengthLeft(runState.interpreter._env.address.bytes, 32)
       const chainId = setLengthLeft(bigIntToBytes(runState.interpreter.getChainId()), 32)