homogenise chainID

ten-protocol · Jul 16, 2024 · 01fcd09 · 01fcd09
1 parent 5fbb101
commit 01fcd09
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/integration/constants.go b/integration/constants.go
@@ -35,7 +35,6 @@ const (
 const (
 	EthereumChainID = 1337
 	TenChainID      = 443
-	GethChainID     = 32382
 )
 
 const (

diff --git a/integration/eth2network/build_number.txt b/integration/eth2network/build_number.txt
@@ -1 +1 @@
-4
+5
diff --git a/integration/eth2network/genesis-init.json b/integration/eth2network/genesis-init.json
@@ -1,6 +1,6 @@
 {
   "config": {
-    "chainId": 32382,
+    "chainId": 1337,
     "homesteadBlock": 0,
     "daoForkSupport": true,
     "eip150Block": 0,

diff --git a/integration/eth2network/genesis.json b/integration/eth2network/genesis.json
@@ -1,6 +1,6 @@
 {
 	"config": {
-		"chainId": 32382,
+		"chainId": 1337,
 		"homesteadBlock": 0,
 		"daoForkSupport": true,
 		"eip150Block": 0,
@@ -15,13 +15,13 @@
 		"londonBlock": 0,
 		"arrowGlacierBlock": 0,
 		"grayGlacierBlock": 0,
-		"shanghaiTime": 1721059895,
-		"cancunTime": 1721059895,
+		"shanghaiTime": 1721122208,
+		"cancunTime": 1721122208,
 		"terminalTotalDifficulty": 0,
 		"terminalTotalDifficultyPassed": true
 	},
 	"nonce": "0x0",
-	"timestamp": "0x66954a37",
+	"timestamp": "0x66963da0",
 	"extraData": "0x0000000000000000000000000000000000000000000000000000000000000000123463a4b065722e99115d6c222f267d9cabb5240000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 	"gasLimit": "0x1c9c380",
 	"difficulty": "0x1",

diff --git a/integration/eth2network/pos_eth2_network_test.go b/integration/eth2network/pos_eth2_network_test.go
@@ -46,7 +46,7 @@ func TestStartPosEth2Network(t *testing.T) {
 		_startPort+integration.DefaultGethWSPortOffset,
 		_startPort+integration.DefaultGethNetworkPortOffset, // HTTP
 		_startPort+integration.DefaultPrysmP2PPortOffset,    // RPC
-		integration.GethChainID,
+		integration.EthereumChainID,
 		6*time.Minute,
 	)
 
@@ -57,7 +57,7 @@ func TestStartPosEth2Network(t *testing.T) {
 
 	// test input configurations
 	t.Run("areConfigsUphold", func(t *testing.T) {
-		areConfigsUphold(t, gethcommon.HexToAddress(integration.GethNodeAddress), integration.GethChainID)
+		areConfigsUphold(t, gethcommon.HexToAddress(integration.GethNodeAddress), integration.EthereumChainID)
 	})
 
 	// test number of nodes
@@ -67,7 +67,7 @@ func TestStartPosEth2Network(t *testing.T) {
 
 	minerWallet := wallet.NewInMemoryWalletFromConfig(
 		integration.GethNodePK,
-		integration.GethChainID,
+		integration.EthereumChainID,
 		gethlog.New())
 
 	t.Run("txsAreMinted", func(t *testing.T) {

diff --git a/integration/eth2network/start-pos-network.sh b/integration/eth2network/start-pos-network.sh
@@ -4,7 +4,7 @@
 GETH_HTTP_PORT=8545
 GETH_WS_PORT=8546
 BEACON_RPC_PORT=4000
-CHAIN_ID=32382
+CHAIN_ID=1337
 BUILD_DIR="./build"
 BASE_PATH="./"
 GETH_BINARY="./geth"
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ const ( @@
     const (
     	EthereumChainID = 1337
     	TenChainID      = 443
-    	GethChainID     = 32382
     )
     const (
@@ Expand Down @@