From af6e398b1e4d9c329e8727c07831a15f92b81e88 Mon Sep 17 00:00:00 2001 From: jsvisa Date: Fri, 5 Apr 2024 17:58:58 +0800 Subject: [PATCH 1/3] chore(chain): json marsharl ChainName to chainName Signed-off-by: jsvisa --- erigon-lib/chain/chain_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go index cab6b90cac9..9c59f7934ee 100644 --- a/erigon-lib/chain/chain_config.go +++ b/erigon-lib/chain/chain_config.go @@ -32,7 +32,7 @@ import ( // that any network, identified by its genesis block, can have its own // set of configuration options. type Config struct { - ChainName string + ChainName string `json:"chainName"` ChainID *big.Int `json:"chainId"` // chainId identifies the current chain and is used for replay protection Consensus ConsensusName `json:"consensus,omitempty"` // aura, ethash or clique From d6a9d3d856b17b9e72701ef41eb8d2cd09d101fb Mon Sep 17 00:00:00 2001 From: jsvisa Date: Fri, 5 Apr 2024 18:00:16 +0800 Subject: [PATCH 2/3] chore(chain): add comment Signed-off-by: jsvisa --- erigon-lib/chain/chain_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go index 9c59f7934ee..b02068b123f 100644 --- a/erigon-lib/chain/chain_config.go +++ b/erigon-lib/chain/chain_config.go @@ -32,8 +32,8 @@ import ( // that any network, identified by its genesis block, can have its own // set of configuration options. type Config struct { - ChainName string `json:"chainName"` - ChainID *big.Int `json:"chainId"` // chainId identifies the current chain and is used for replay protection + ChainName string `json:"chainName"` // chain name, eg: mainnet, sepolia, bor-mainnet + ChainID *big.Int `json:"chainId"` // chainId identifies the current chain and is used for replay protection Consensus ConsensusName `json:"consensus,omitempty"` // aura, ethash or clique From 8b00ba5c6655b7de3c8db498e11f289fdca58f9d Mon Sep 17 00:00:00 2001 From: jsvisa Date: Thu, 25 Apr 2024 22:23:28 +0800 Subject: [PATCH 3/3] chore(params): ChainName -> chainName for all json Signed-off-by: jsvisa --- params/chainspecs/amoy.json | 2 +- params/chainspecs/bor-devnet.json | 2 +- params/chainspecs/bor-mainnet.json | 2 +- params/chainspecs/chiado.json | 2 +- params/chainspecs/gnosis.json | 2 +- params/chainspecs/goerli.json | 2 +- params/chainspecs/mainnet.json | 2 +- params/chainspecs/mumbai.json | 2 +- params/chainspecs/sepolia.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/params/chainspecs/amoy.json b/params/chainspecs/amoy.json index b88260781b7..b753f752858 100644 --- a/params/chainspecs/amoy.json +++ b/params/chainspecs/amoy.json @@ -1,5 +1,5 @@ { - "ChainName": "amoy", + "chainName": "amoy", "chainId": 80002, "consensus": "bor", "homesteadBlock": 0, diff --git a/params/chainspecs/bor-devnet.json b/params/chainspecs/bor-devnet.json index a032cd8a96a..3cbdb93a2a0 100644 --- a/params/chainspecs/bor-devnet.json +++ b/params/chainspecs/bor-devnet.json @@ -1,5 +1,5 @@ { - "ChainName": "bor-devnet", + "chainName": "bor-devnet", "chainId": 1337, "consensus": "bor", "homesteadBlock": 0, diff --git a/params/chainspecs/bor-mainnet.json b/params/chainspecs/bor-mainnet.json index ec487e571e5..8bbfccffc6e 100644 --- a/params/chainspecs/bor-mainnet.json +++ b/params/chainspecs/bor-mainnet.json @@ -1,5 +1,5 @@ { - "ChainName": "bor-mainnet", + "chainName": "bor-mainnet", "chainId": 137, "consensus": "bor", "homesteadBlock": 0, diff --git a/params/chainspecs/chiado.json b/params/chainspecs/chiado.json index 7ed187fc4d4..72b7a99682a 100644 --- a/params/chainspecs/chiado.json +++ b/params/chainspecs/chiado.json @@ -1,5 +1,5 @@ { - "ChainName": "chiado", + "chainName": "chiado", "chainId": 10200, "consensus": "aura", "homesteadBlock": 0, diff --git a/params/chainspecs/gnosis.json b/params/chainspecs/gnosis.json index 8a4756514d5..834ed7e6dfd 100644 --- a/params/chainspecs/gnosis.json +++ b/params/chainspecs/gnosis.json @@ -1,5 +1,5 @@ { - "ChainName": "gnosis", + "chainName": "gnosis", "chainId": 100, "consensus": "aura", "homesteadBlock": 0, diff --git a/params/chainspecs/goerli.json b/params/chainspecs/goerli.json index b419c2c2ad2..f8839fb6cd1 100644 --- a/params/chainspecs/goerli.json +++ b/params/chainspecs/goerli.json @@ -1,5 +1,5 @@ { - "ChainName": "goerli", + "chainName": "goerli", "chainId": 5, "consensus": "clique", "homesteadBlock": 0, diff --git a/params/chainspecs/mainnet.json b/params/chainspecs/mainnet.json index 91ef377d35d..7d73ec6470b 100644 --- a/params/chainspecs/mainnet.json +++ b/params/chainspecs/mainnet.json @@ -1,5 +1,5 @@ { - "ChainName": "mainnet", + "chainName": "mainnet", "chainId": 1, "consensus": "ethash", "homesteadBlock": 1150000, diff --git a/params/chainspecs/mumbai.json b/params/chainspecs/mumbai.json index 0222a381bfb..6da0a68c4c5 100644 --- a/params/chainspecs/mumbai.json +++ b/params/chainspecs/mumbai.json @@ -1,5 +1,5 @@ { - "ChainName": "mumbai", + "chainName": "mumbai", "chainId": 80001, "consensus": "bor", "homesteadBlock": 0, diff --git a/params/chainspecs/sepolia.json b/params/chainspecs/sepolia.json index c328e70b6e0..e5ffd230325 100644 --- a/params/chainspecs/sepolia.json +++ b/params/chainspecs/sepolia.json @@ -1,5 +1,5 @@ { - "ChainName": "sepolia", + "chainName": "sepolia", "chainId": 11155111, "consensus": "ethash", "homesteadBlock": 0,