common: allow chainId in customChainParams to be BN

ethereumjs · Mar 15, 2021 · 5ebf583 · 5ebf583
1 parent f949427
commit 5ebf583
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -98,9 +98,7 @@ export default class Common extends EventEmitter {
   private static _getChainParams(chain: string | number | BN, customChains?: Chain[]): Chain {
     const initializedChains: any = _getInitializedChains(customChains)
     if (typeof chain === 'number' || BN.isBN(chain)) {
-      if (BN.isBN(chain)) {
-        chain = chain.toNumber()
-      }
+      chain = chain.toString()
 
       if (initializedChains['names'][chain]) {
         const name: string = initializedChains['names'][chain]

diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -1,3 +1,5 @@
+import { BN } from 'ethereumjs-util'
+
 export interface genesisStatesType {
   names: {
     [key: string]: string
@@ -14,8 +16,8 @@ export interface chainsType {
 
 export interface Chain {
   name: string
-  chainId: number
-  networkId: number
+  chainId: number | BN
+  networkId: number | BN
   // TODO: make mandatory in next breaking release
   defaultHardfork?: string
   comment: string

diff --git a/packages/tx/test/eip2930.spec.ts b/packages/tx/test/eip2930.spec.ts
@@ -254,7 +254,7 @@ tape('[AccessListEIP2930Transaction]', function (t) {
 
     const customChainParams = {
       name: 'custom',
-      chainId: parseInt(txData.chainId.toString()),
+      chainId: txData.chainId,
       eips: [2718, 2929, 2930],
     }
     const usedCommon = Common.forCustomChain('mainnet', customChainParams, 'berlin')