From 6e9a5df03e47670e3bfdf790d53df3bc5e4cbd19 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 28 Sep 2022 22:59:32 +0530 Subject: [PATCH 1/4] common: make chain name mandatory in fromGethGenesis --- packages/common/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts index 92488e707d..71da22c3cb 100644 --- a/packages/common/src/types.ts +++ b/packages/common/src/types.ts @@ -115,7 +115,7 @@ export interface CustomCommonOpts extends BaseOpts { } export interface GethConfigOpts { - chain?: string + chain: string hardfork?: string | Hardfork genesisHash?: Buffer } From fe51cb30282553d1b2578a1652aa33404e6d4ae5 Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 28 Sep 2022 23:02:23 +0530 Subject: [PATCH 2/4] improve comment --- packages/common/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts index dd1569eb79..fd9e5b713f 100644 --- a/packages/common/src/common.ts +++ b/packages/common/src/common.ts @@ -157,7 +157,7 @@ export class Common extends EventEmitter { /** * Static method to load and set common from a geth genesis json * @param genesisJson json of geth configuration - * @param { chain, genesisHash, hardfork } to futher configure the common instance + * @param { chain, genesisHash, hardfork } to futher configure the common instance, mandatory option: `chain` representing custom chain name` * @returns Common */ static fromGethGenesis( From 271db5c1505dd95b9a1de931360f2d0deebaf26b Mon Sep 17 00:00:00 2001 From: harkamal Date: Wed, 28 Sep 2022 23:54:06 +0530 Subject: [PATCH 3/4] change startegy to just pass name custom --- packages/common/src/common.ts | 2 +- packages/common/src/types.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts index fd9e5b713f..173cd433cd 100644 --- a/packages/common/src/common.ts +++ b/packages/common/src/common.ts @@ -166,7 +166,7 @@ export class Common extends EventEmitter { ): Common { const genesisParams = parseGethGenesis(genesisJson, chain) const common = new Common({ - chain: genesisParams.name, + chain: genesisParams.name ?? 'custom', customChains: [genesisParams], hardfork, }) diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts index 71da22c3cb..92488e707d 100644 --- a/packages/common/src/types.ts +++ b/packages/common/src/types.ts @@ -115,7 +115,7 @@ export interface CustomCommonOpts extends BaseOpts { } export interface GethConfigOpts { - chain: string + chain?: string hardfork?: string | Hardfork genesisHash?: Buffer } From a2c0f3d73335212c73575f7778c468aa092e94ee Mon Sep 17 00:00:00 2001 From: harkamal Date: Thu, 29 Sep 2022 00:48:21 +0530 Subject: [PATCH 4/4] undo comment --- packages/common/src/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts index 173cd433cd..fc0a5f2590 100644 --- a/packages/common/src/common.ts +++ b/packages/common/src/common.ts @@ -157,7 +157,7 @@ export class Common extends EventEmitter { /** * Static method to load and set common from a geth genesis json * @param genesisJson json of geth configuration - * @param { chain, genesisHash, hardfork } to futher configure the common instance, mandatory option: `chain` representing custom chain name` + * @param { chain, genesisHash, hardfork } to futher configure the common instance * @returns Common */ static fromGethGenesis(