Add custom keccak256 usage to EVM keccak256 opcode

ethereumjs · Dec 18, 2023 · 159abd1 · 159abd1
1 parent 3c3c85f
commit 159abd1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/common/test/customCrypto.spec.ts b/packages/common/test/customCrypto.spec.ts
@@ -18,6 +18,9 @@ describe('[Common]: Custom Crypto', () => {
     let msg = 'Should initialize with custom keccak256 function and use properly (main constructor)'
     assert.deepEqual(c.customCrypto.keccak256!(value), new Uint8Array([2, 1]), msg)
 
+    msg = 'Should still work on a copied instance'
+    assert.deepEqual(c.copy().customCrypto.keccak256!(value), new Uint8Array([2, 1]), msg)
+
     const customChainParams = { name: 'custom', chainId: 123, networkId: 678 }
     c = Common.custom(customChainParams, { customCrypto })
     msg = 'Should initialize with custom keccak256 function and use properly (custom() constructor)'

diff --git a/packages/evm/src/opcodes/functions.ts b/packages/evm/src/opcodes/functions.ts
@@ -399,13 +399,13 @@ export const handlers: Map<number, OpHandler> = new Map([
   // 0x20: KECCAK256
   [
     0x20,
-    function (runState) {
+    function (runState, common) {
       const [offset, length] = runState.stack.popN(2)
       let data = new Uint8Array(0)
       if (length !== BIGINT_0) {
         data = runState.memory.read(Number(offset), Number(length))
       }
-      const r = BigInt(bytesToHex(keccak256(data)))
+      const r = BigInt(bytesToHex((common.customCrypto.keccak256 ?? keccak256)(data)))
       runState.stack.push(r)
     },
   ],