stashing

ten-protocol · Jul 1, 2024 · 815e8fa · 815e8fa
1 parent b4a218b
commit 815e8fa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 63 deletions.
diff --git a/integration/eth2network/eth2_binaries.go b/integration/eth2network/eth2_binaries.go
@@ -17,8 +17,8 @@ import (
 )
 
 const (
-	_gethVersion  = "1.14.0"
-	_prysmVersion = "v5.0.4"
+	_gethVersion  = "1.14.2"
+	_prysmVersion = "v5.0.3"
 )
 
 var (

diff --git a/integration/eth2network/eth2_configs.go b/integration/eth2network/eth2_configs.go
@@ -43,13 +43,20 @@ CAPELLA_FORK_EPOCH: 0
 CAPELLA_FORK_VERSION: 0x20000092
 MAX_WITHDRAWALS_PER_PAYLOAD: 16
 
-DENEB_FORK_EPOCH: 0
+# Deneb
 DENEB_FORK_VERSION: 0x20000093
+DENEB_FORK_EPOCH: 0
+
+# Electra, but disabled
+ELECTRA_FORK_VERSION: 0x20000094
+ELECTRA_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
-SECONDS_PER_SLOT: 12
+SECONDS_PER_SLOT: 3
 SLOTS_PER_EPOCH: 6
 
+DEPOSIT_NETWORK_ID: 48815
+
 # Deposit contract
 DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242
 `
@@ -71,15 +78,14 @@ const _baseGenesis = `{
 		"londonBlock": 0,
 		"arrowGlacierBlock": 0,
 		"grayGlacierBlock": 0,
-        "shanghaiTime": 1696000704,
-        "cancunTime": 1707305664,
-		"ethash": {},
-		"terminalTotalDifficulty": 50,
+        "shanghaiTime": 0,
+        "cancunTime": 0,
+		"terminalTotalDifficulty": 0,
 		"terminalTotalDifficultyPassed": true
 	},
-	"nonce": "0x1234",
+	"nonce": "0x0",
 	"timestamp": "0x0",
-	"gasLimit": "1673487293",
+	"gasLimit": "0x1c9c380",
 	"difficulty": "0x1",
 	"mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
 	"coinbase": "0x0000000000000000000000000000000000000000",

diff --git a/integration/eth2network/eth2_network.go b/integration/eth2network/eth2_network.go
@@ -398,19 +398,23 @@ func (n *Impl) gethStartNode(executionPort, networkPort, httpPort, wsPort int, d
 		"--http",
 		"--http.addr", "0.0.0.0",
 		"--http.port", fmt.Sprintf("%d", httpPort),
-		"--http.api", "admin,miner,engine,personal,eth,net,web3,debug",
+		"--http.api", "admin,eth,net,web3,debug,txpool",
+		"--http.corsdomain", "*",
+		"--http.vhosts", "*",
 		"--mine",
-		"--miner.etherbase", minerAddress,
 		"--ws",
+		"--ws.api", "admin,eth,net,web3,debug,txpool",
 		"--ws.addr", "0.0.0.0",
 		"--ws.origins", "*",
-		"--ws.port", fmt.Sprintf("%d", wsPort),
-		"--ws.api", "admin,miner,engine,personal,eth,net,web3,debug",
-		"--authrpc.addr", "0.0.0.0",
-		"--authrpc.port", fmt.Sprintf("%d", executionPort),
-		"--authrpc.jwtsecret", path.Join(dataDirPath, "geth", "jwtsecret"),
+		//"--ws.port", fmt.Sprintf("%d", wsPort),
+		//"--authrpc.addr", "0.0.0.0",
+		//"--authrpc.port", fmt.Sprintf("%d", executionPort),
+		//"--authrpc.jwtsecret", path.Join(dataDirPath, "geth", "jwtsecret"),
 		"--port", fmt.Sprintf("%d", networkPort),
 		"--networkid", fmt.Sprintf("%d", n.chainID),
+		"--gcmode", "archive",
+		"--history.transactions", "0",
+		"--history.state", "0",
 		"--syncmode", "full", // sync mode to download and test all blocks and txs
 		"--allow-insecure-unlock", // allows to use personal accounts over http/ws
 		"--nodiscover",            // don't try and discover peers
@@ -456,54 +460,17 @@ func (n *Impl) prysmStartBeaconNode(gethAuthRPCPort, rpcPort, p2pPort int, nodeD
 		"--chain-config-file", n.prysmConfigPath,
 		"--contract-deployment-block", "0",
 		"--chain-id", fmt.Sprintf("%d", n.chainID),
+		"--rpc-host", "0.0.0.0",
+		"--grpc-gateway-host", "0.0.0.0",
 		"--accept-terms-of-use",
 		"--jwt-secret", path.Join(nodeDataDir, "geth", "jwtsecret"),
 		//"--suggested-fee-recipient", n.preFundedMinerPKs["n0"]
 		"--minimum-peers-per-subnet", "0",
 		"--enable-debug-rpc-endpoints",
 		"--execution-endpoint", fmt.Sprintf("http://127.0.0.1:%d", gethAuthRPCPort),
-
-		//"--rpc-port", fmt.Sprintf("%d", rpcPort),
-		//"--p2p-udp-port", fmt.Sprintf("%d", p2pPort),
-		//"--min-sync-peers", fmt.Sprintf("%d", len(n.dataDirs)-1),
-		//"--minimum-peers-per-subnet", fmt.Sprintf("%d", min(len(n.dataDirs)-1, 2)),
-		//"--interop-num-validators", fmt.Sprintf("%d", len(n.dataDirs)),
-		//"--config-file", n.prysmConfigPath,
-		//"--grpc-gateway-corsdomain", "*",
-		//"--grpc-gateway-port", fmt.Sprintf("%d", rpcPort+10),
-		//"--execution-endpoint", fmt.Sprintf("http://127.0.0.1:%d", gethAuthRPCPort),
-		//"--contract-deployment-block", "0",
-		//"--verbosity", "trace",
-		//"--enable-debug-rpc-endpoints",
 		"--force-clear-db",
 		"--verbosity", "trace",
 	}
-	//args := []string{
-	//	"--datadir", path.Join(nodeDataDir, "prysm", "beacondata"),
-	//	"--interop-eth1data-votes",
-	//	"--accept-terms-of-use",
-	//	"--no-discovery",
-	//	"--rpc-port", fmt.Sprintf("%d", rpcPort),
-	//	"--p2p-udp-port", fmt.Sprintf("%d", p2pPort),
-	//	"--min-sync-peers", "0",
-	//	"--minimum-peers-per-subnet", "0",
-	//	//"--min-sync-peers", fmt.Sprintf("%d", len(n.dataDirs)-1),
-	//	//"--minimum-peers-per-subnet", fmt.Sprintf("%d", min(len(n.dataDirs)-1, 2)),
-	//	"--interop-num-validators", fmt.Sprintf("%d", len(n.dataDirs)),
-	//	"--genesis-state", n.prysmGenesisPath,
-	//	"--chain-config-file", n.prysmConfigPath,
-	//	"--config-file", n.prysmConfigPath,
-	//	"--contract-deployment-block", "0",
-	//	"--chain-id", fmt.Sprintf("%d", n.chainID),
-	//	"--grpc-gateway-corsdomain", "*",
-	//	"--grpc-gateway-port", fmt.Sprintf("%d", rpcPort+10),
-	//	"--execution-endpoint", fmt.Sprintf("http://127.0.0.1:%d", gethAuthRPCPort),
-	//	"--jwt-secret", path.Join(nodeDataDir, "geth", "jwtsecret"),
-	//	"--contract-deployment-block", "0",
-	//	"--verbosity", "trace",
-	//	"--enable-debug-rpc-endpoints",
-	//	"--force-clear-db",
-	//}
 
 	fmt.Printf("prysmStartBeaconNode: %s %s\n", n.prysmBeaconBinaryPath, strings.Join(args, " "))
 	cmd := exec.Command(n.prysmBeaconBinaryPath, args...) //nolint
@@ -519,15 +486,9 @@ func (n *Impl) prysmStartValidator(beaconHTTPPort int, nodeDataDir string) (*exe
 		"--datadir", path.Join(nodeDataDir, "prysm", "validator"),
 		"--accept-terms-of-use",
 		"--interop-num-validators", fmt.Sprintf("%d", len(n.dataDirs)),
+		"--interop-start-index", "0",
 		"--chain-config-file", n.prysmConfigPath,
 		"--verbosity", "trace",
-		//"--force-clear-db",
-
-		//"--beacon-rpc-provider", fmt.Sprintf("127.0.0.1:%d", beaconHTTPPort),
-		//"--interop-start-index", "0",
-		//"--config-file", n.prysmConfigPath,
-		//"--suggested-fee-recipient", "0x52FfeB84540173B15eEC5a486FdB5c769F50400a", // random address to avoid a continuous warning
-		//"--disable-account-metrics",
 	}
 
 	fmt.Printf("prysmStartValidator: %s %s\n", n.prysmValidatorBinaryPath, strings.Join(args, " "))