Clean up access to deposit address in common (#3411)

* add test for custom deposit address * Clean up deposit contract address access * Merge remote-tracking branch 'origin/master' into add-depositContractAddress-test * Merge remote-tracking branch 'origin/master' into add-depositContractAddress-test
ethereumjs · May 8, 2024 · 0e06ddf · 0e06ddf
1 parent fe28071
commit 0e06ddf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/common/test/customChains.spec.ts b/packages/common/test/customChains.spec.ts
@@ -29,7 +29,7 @@ describe('[Common]: Custom chains', () => {
       /Missing required/,
       undefined,
       'should throw an exception on missing parameter'
-    ) // eslint-disable-line no-new
+    )
   })
 
   it('custom() -> base functionality', () => {
@@ -146,6 +146,18 @@ describe('[Common]: Custom chains', () => {
       'customChains, chain initialized with custom chain'
     )
 
+    const customChainParams: Partial<ChainConfig> = {
+      name: 'custom',
+      chainId: 123,
+      networkId: 678,
+      depositContractAddress: '0x4242424242424242424242424242424242424242',
+    }
+    const customChainCommon = Common.custom(customChainParams, { hardfork: Hardfork.Byzantium })
+
+    assert.equal(
+      customChainCommon['_chainParams'].depositContractAddress,
+      customChainParams.depositContractAddress
+    )
     c.setChain('testnet')
     assert.equal(c.chainName(), 'testnet', 'customChains, should allow to switch custom chain')
     assert.equal(

diff --git a/packages/vm/src/requests.ts b/packages/vm/src/requests.ts
@@ -30,7 +30,7 @@ export const accumulateRequests = async (
 
   if (common.isActivatedEIP(6110)) {
     const depositContractAddress =
-      Common.getInitializedChains()[vm.common.chainName()]?.depositContractAddress ??
+      vm.common['_chainParams'].depositContractAddress ??
       Common.getInitializedChains().mainnet.depositContractAddress
     if (depositContractAddress === undefined)
       throw new Error('deposit contract address required with EIP 6110')