From 4399d33470ce85effe46ce6cc8a90d39642e3d61 Mon Sep 17 00:00:00 2001 From: maskpp Date: Sun, 18 Feb 2024 15:22:38 +0800 Subject: [PATCH 1/4] upgrade test scripts --- integration_test/test_env.sh | 44 +++++++++++++++++++----------------- internal/utils/utils.go | 4 ++-- pkg/rpc/tx_blob_test.go | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/integration_test/test_env.sh b/integration_test/test_env.sh index c93b4fbbc..36f2cd721 100755 --- a/integration_test/test_env.sh +++ b/integration_test/test_env.sh @@ -24,24 +24,26 @@ export L1_PROVER_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a841 export TREASURY=0x1670010000000000000000000000000000010001 # show the integration test environment variables. -echo "TAIKO_MONO_DIR=$TAIKO_MONO_DIR" -echo "L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT" -echo "L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT" -echo "L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT" -echo "L2_EXECUTION_ENGINE_HTTP_ENDPOINT=$L2_EXECUTION_ENGINE_HTTP_ENDPOINT" -echo "L2_EXECUTION_ENGINE_WS_ENDPOINT=$L2_EXECUTION_ENGINE_WS_ENDPOINT" -echo "L2_EXECUTION_ENGINE_AUTH_ENDPOINT=$L2_EXECUTION_ENGINE_AUTH_ENDPOINT" -echo "TAIKO_L1_ADDRESS=$TAIKO_L1_ADDRESS" -echo "TAIKO_L2_ADDRESS=$TAIKO_L2_ADDRESS" -echo "TAIKO_TOKEN_ADDRESS=$TAIKO_TOKEN_ADDRESS" -echo "ASSIGNMENT_HOOK_ADDRESS=$ASSIGNMENT_HOOK_ADDRESS" -echo "TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER" -echo "ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS=$ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS" -echo "GUARDIAN_PROVER_CONTRACT_ADDRESS=$GUARDIAN_PROVER_CONTRACT_ADDRESS" -echo "L1_SIGNAL_SERVICE_CONTRACT_ADDRESS=$L1_SIGNAL_SERVICE_CONTRACT_ADDRESS" -echo "L1_CONTRACT_OWNER_PRIVATE_KEY=$L1_CONTRACT_OWNER_PRIVATE_KEY" -echo "L1_SECURITY_COUNCIL_PRIVATE_KEY=$L1_SECURITY_COUNCIL_PRIVATE_KEY" -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 "RUN_TESTS=true +TAIKO_MONO_DIR=$TAIKO_MONO_DIR +L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT +L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT +L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT +L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT +L2_EXECUTION_ENGINE_HTTP_ENDPOINT=$L2_EXECUTION_ENGINE_HTTP_ENDPOINT +L2_EXECUTION_ENGINE_WS_ENDPOINT=$L2_EXECUTION_ENGINE_WS_ENDPOINT +L2_EXECUTION_ENGINE_AUTH_ENDPOINT=$L2_EXECUTION_ENGINE_AUTH_ENDPOINT +TAIKO_L1_ADDRESS=$TAIKO_L1_ADDRESS +TAIKO_L2_ADDRESS=$TAIKO_L2_ADDRESS +TAIKO_TOKEN_ADDRESS=$TAIKO_TOKEN_ADDRESS +ASSIGNMENT_HOOK_ADDRESS=$ASSIGNMENT_HOOK_ADDRESS +TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER +ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS=$ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS +GUARDIAN_PROVER_CONTRACT_ADDRESS=$GUARDIAN_PROVER_CONTRACT_ADDRESS +L1_SIGNAL_SERVICE_CONTRACT_ADDRESS=$L1_SIGNAL_SERVICE_CONTRACT_ADDRESS +L1_CONTRACT_OWNER_PRIVATE_KEY=$L1_CONTRACT_OWNER_PRIVATE_KEY +L1_SECURITY_COUNCIL_PRIVATE_KEY=$L1_SECURITY_COUNCIL_PRIVATE_KEY +L1_PROPOSER_PRIVATE_KEY=$L1_PROPOSER_PRIVATE_KEY +L1_PROVER_PRIVATE_KEY=$L1_PROVER_PRIVATE_KEY +TREASURY=$TREASURY +JWT_SECRET=$JWT_SECRET" > integration_test/.env diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 0df62d6de..12497d7e7 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -23,9 +23,9 @@ func LoadEnv() { if len(path) == 0 { log.Warn("not a taiko-client repo") } - err = godotenv.Load(fmt.Sprintf("%s/taiko-client/.env", path[0])) + err = godotenv.Load(fmt.Sprintf("%s/taiko-client/integration_test/.env", path[0])) if err != nil { - log.Warn("failed to load env", "current path", currentPath, "err", err) + log.Warn("failed to load test env", "current path", currentPath, "err", err) } } diff --git a/pkg/rpc/tx_blob_test.go b/pkg/rpc/tx_blob_test.go index 3a6109206..ab423db53 100644 --- a/pkg/rpc/tx_blob_test.go +++ b/pkg/rpc/tx_blob_test.go @@ -16,7 +16,7 @@ import ( ) func TestBlockTx(t *testing.T) { - t.SkipNow() + //t.SkipNow() // Load environment variables. utils.LoadEnv() From 018e292b3199c3dbf3116df3b402865bad48cedf Mon Sep 17 00:00:00 2001 From: maskpp Date: Sun, 18 Feb 2024 15:24:55 +0800 Subject: [PATCH 2/4] upgrade test scripts --- pkg/rpc/tx_blob_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rpc/tx_blob_test.go b/pkg/rpc/tx_blob_test.go index ab423db53..3a6109206 100644 --- a/pkg/rpc/tx_blob_test.go +++ b/pkg/rpc/tx_blob_test.go @@ -16,7 +16,7 @@ import ( ) func TestBlockTx(t *testing.T) { - //t.SkipNow() + t.SkipNow() // Load environment variables. utils.LoadEnv() From 4b52ab0323b660695dc5571956c203c09ee9352f Mon Sep 17 00:00:00 2001 From: maskpp Date: Sun, 18 Feb 2024 15:55:18 +0800 Subject: [PATCH 3/4] upgrade test scripts --- integration_test/test_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/test_env.sh b/integration_test/test_env.sh index 36f2cd721..e1922d55c 100755 --- a/integration_test/test_env.sh +++ b/integration_test/test_env.sh @@ -26,7 +26,7 @@ export TREASURY=0x1670010000000000000000000000000000010001 # show the integration test environment variables. echo "RUN_TESTS=true TAIKO_MONO_DIR=$TAIKO_MONO_DIR -L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT +# L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT From e95495dd142778e360d3ed383679a029b0a08201 Mon Sep 17 00:00:00 2001 From: maskpp Date: Sun, 18 Feb 2024 16:00:33 +0800 Subject: [PATCH 4/4] upgrade test scripts --- integration_test/test_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_test/test_env.sh b/integration_test/test_env.sh index e1922d55c..aaa5f2d97 100755 --- a/integration_test/test_env.sh +++ b/integration_test/test_env.sh @@ -24,9 +24,9 @@ export L1_PROVER_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a841 export TREASURY=0x1670010000000000000000000000000000010001 # show the integration test environment variables. +# L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT echo "RUN_TESTS=true TAIKO_MONO_DIR=$TAIKO_MONO_DIR -# L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT