From 34c5298c79bab2d898fa3745c63e7c45dfb350b2 Mon Sep 17 00:00:00 2001 From: maskpp Date: Fri, 2 Feb 2024 17:05:10 +0800 Subject: [PATCH] update docker --- integration_test/test_env.sh | 3 +++ internal/docker/docker-compose.yml | 5 +++++ internal/docker/docker_env.sh | 2 +- internal/docker/execution/genesis.json | 6 +++--- internal/testutils/suite.go | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/integration_test/test_env.sh b/integration_test/test_env.sh index 0a3d038b6..05d6dd6be 100755 --- a/integration_test/test_env.sh +++ b/integration_test/test_env.sh @@ -23,7 +23,9 @@ export L1_PROVER_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a841 export TREASURY=0x1670010000000000000000000000000000010001 # show the integration test environment variables. +echo echo "TAIKO_MONO_DIR=$TAIKO_MONO_DIR" +echo "L1_BEACON_HTTP_ENDPOINT: $L1_BEACON_HTTP_ENDPOINT" echo "L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT" echo "L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT" echo "L2_EXECUTION_ENGINE_HTTP_ENDPOINT=$L2_EXECUTION_ENGINE_HTTP_ENDPOINT" @@ -43,3 +45,4 @@ echo "L1_PROPOSER_PRIVATE_KEY=$L1_PROPOSER_PRIVATE_KEY" echo "L1_PROVER_PRIVATE_KEY=$L1_PROVER_PRIVATE_KEY" echo "TREASURY=$TREASURY" echo "JWT_SECRET=$JWT_SECRET" +echo diff --git a/internal/docker/docker-compose.yml b/internal/docker/docker-compose.yml index f06bdabf7..2460834d6 100644 --- a/internal/docker/docker-compose.yml +++ b/internal/docker/docker-compose.yml @@ -88,10 +88,14 @@ services: - --http.api=eth,net,web3 - --http.addr=0.0.0.0 - --http.corsdomain=* + - --http.api + - admin,debug,eth,net,web3,txpool,miner,evm - --ws - --ws.api=eth,net,web3 - --ws.addr=0.0.0.0 - --ws.origins=* + - --ws.api + - admin,debug,eth,net,web3,txpool,miner,evm - --authrpc.vhosts=* - --authrpc.addr=0.0.0.0 - --authrpc.jwtsecret=/execution/jwtsecret @@ -101,6 +105,7 @@ services: - --password=/execution/geth_password.txt - --nodiscover - --syncmode=full + - --gcmode=archive ports: - "8545" - "8546" diff --git a/internal/docker/docker_env.sh b/internal/docker/docker_env.sh index 693d5815b..db4cd2b13 100755 --- a/internal/docker/docker_env.sh +++ b/internal/docker/docker_env.sh @@ -23,7 +23,7 @@ export L1_NODE_WS_ENDPOINT=ws://localhost:$(docker port geth | grep '0.0.0.0' | export L2_EXECUTION_ENGINE_HTTP_ENDPOINT=http://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==1 {print $2}') export L2_EXECUTION_ENGINE_WS_ENDPOINT=ws://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==2 {print $2}') export L2_EXECUTION_ENGINE_AUTH_ENDPOINT=http://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==3 {print $2}') -export JWT_SECRET=$DIR/nodes/jwt.hex +export JWT_SECRET=$DIR/taikogeth/jwt.hex echo echo -e "L1_NODE PORTS: \n$(docker port geth)" diff --git a/internal/docker/execution/genesis.json b/internal/docker/execution/genesis.json index eb358b22b..5cad1929f 100644 --- a/internal/docker/execution/genesis.json +++ b/internal/docker/execution/genesis.json @@ -15,13 +15,13 @@ "londonBlock": 0, "arrowGlacierBlock": 0, "grayGlacierBlock": 0, - "shanghaiTime": 1706862043, - "cancunTime": 1706862043, + "shanghaiTime": 1706864028, + "cancunTime": 1706864028, "terminalTotalDifficulty": 0, "terminalTotalDifficultyPassed": true }, "nonce": "0x0", - "timestamp": "0x65bca5db", + "timestamp": "0x65bcad9c", "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000123463a4b065722e99115d6c222f267d9cabb5240000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "gasLimit": "0x1c9c380", "difficulty": "0x1", diff --git a/internal/testutils/suite.go b/internal/testutils/suite.go index 2322d7d8d..7f74c8c24 100644 --- a/internal/testutils/suite.go +++ b/internal/testutils/suite.go @@ -36,7 +36,7 @@ func (s *ClientTestSuite) SetupTest() { glogger := log.NewGlogHandler(log.NewTerminalHandlerWithLevel(os.Stdout, log.LevelInfo, true)) log.SetDefault(log.NewLogger(glogger)) - testAddrPrivKey, err := crypto.ToECDSA(common.Hex2Bytes(os.Getenv("L1_PROPOSER_PRIVATE_KEY"))) + testAddrPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROPOSER_PRIVATE_KEY"))) s.Nil(err) s.TestAddrPrivKey = testAddrPrivKey