From 10f04e2379bc69853d14e4b15e86e5449364c710 Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Thu, 15 Aug 2024 14:44:42 +0800
Subject: [PATCH 1/4] taiko-client use default env

---
 .../bindings/encoding/input_test.go           |  4 +-
 .../driver/chain_syncer/blob/syncer_test.go   | 14 ++---
 .../driver/chain_syncer/chain_syncer_test.go  | 12 ++--
 packages/taiko-client/driver/config_test.go   | 14 ++---
 packages/taiko-client/driver/driver_test.go   | 24 ++++----
 .../integration_test/deploy_l1_contract.sh    |  2 +-
 .../integration_test/entrypoint.sh            | 21 ++++---
 .../taiko-client/integration_test/l1_env.sh   |  4 +-
 .../taiko-client/integration_test/test_env.sh | 34 ++++++-----
 .../internal/docker/docker_env.sh             | 20 +++----
 .../taiko-client/internal/testutils/suite.go  | 28 +++++-----
 packages/taiko-client/pkg/rpc/client_test.go  | 24 ++++----
 packages/taiko-client/pkg/rpc/dial_test.go    |  4 +-
 packages/taiko-client/proposer/config_test.go | 10 ++--
 .../taiko-client/proposer/proposer_test.go    | 14 ++---
 .../transaction_builder/common_test.go        |  8 +--
 .../anchor_tx_validator_test.go               |  2 +-
 packages/taiko-client/prover/config_test.go   | 14 ++---
 .../event_handler/transition_proved_test.go   | 24 ++++----
 .../proof_submitter/proof_submitter_test.go   | 26 ++++-----
 .../transaction/sender_test.go                |  8 +--
 packages/taiko-client/prover/prover_test.go   | 56 +++++++++----------
 22 files changed, 182 insertions(+), 185 deletions(-)

diff --git a/packages/taiko-client/bindings/encoding/input_test.go b/packages/taiko-client/bindings/encoding/input_test.go
index fcb3842cc7..6d7f0ba9ea 100644
--- a/packages/taiko-client/bindings/encoding/input_test.go
+++ b/packages/taiko-client/bindings/encoding/input_test.go
@@ -27,14 +27,14 @@ func TestUnpackTxListBytes(t *testing.T) {
 	)
 	require.ErrorContains(t, err, "no method with id")
 
-	cli, err := ethclient.Dial(os.Getenv("L1_NODE_WS_ENDPOINT"))
+	cli, err := ethclient.Dial(os.Getenv("L1_WS"))
 	require.Nil(t, err)
 
 	chainID, err := cli.ChainID(context.Background())
 	require.Nil(t, err)
 
 	taikoL1, err := bindings.NewTaikoL1Client(
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		cli,
 	)
 	require.Nil(t, err)
diff --git a/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go b/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
index 643e7862f1..200a3d6ada 100644
--- a/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
+++ b/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
@@ -189,20 +189,20 @@ func (s *BlobSyncerTestSuite) initProposer() {
 
 	s.Nil(prop.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
 		ProposeInterval:            1024 * time.Hour,
 		MaxProposedTxListsPerEpoch: 1,
 		TxmgrConfigs: &txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProposerPrivKey)),
diff --git a/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go b/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
index fc6e1018c6..c461bec0f0 100644
--- a/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
+++ b/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
@@ -53,11 +53,11 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 
 	s.Nil(prop.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -65,7 +65,7 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 		MaxProposedTxListsPerEpoch: 1,
 		ExtraData:                  "test",
 		TxmgrConfigs: &txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProposerPrivKey)),
diff --git a/packages/taiko-client/driver/config_test.go b/packages/taiko-client/driver/config_test.go
index d6a94b0a0e..f65359467d 100644
--- a/packages/taiko-client/driver/config_test.go
+++ b/packages/taiko-client/driver/config_test.go
@@ -11,13 +11,13 @@ import (
 )
 
 var (
-	l1Endpoint       = os.Getenv("L1_NODE_WS_ENDPOINT")
-	l1BeaconEndpoint = os.Getenv("L1_NODE_HTTP_ENDPOINT")
-	l2Endpoint       = os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT")
-	l2CheckPoint     = os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT")
-	l2EngineEndpoint = os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT")
-	taikoL1          = os.Getenv("TAIKO_L1_ADDRESS")
-	taikoL2          = os.Getenv("TAIKO_L2_ADDRESS")
+	l1Endpoint       = os.Getenv("L1_WS")
+	l1BeaconEndpoint = os.Getenv("L1_HTTP")
+	l2Endpoint       = os.Getenv("L2_WS")
+	l2CheckPoint     = os.Getenv("L2_HTTP")
+	l2EngineEndpoint = os.Getenv("L2_AUTH")
+	taikoL1          = os.Getenv("TAIKO_L1")
+	taikoL2          = os.Getenv("TAIKO_L2")
 )
 
 func (s *DriverTestSuite) TestNewConfigFromCliContext() {
diff --git a/packages/taiko-client/driver/driver_test.go b/packages/taiko-client/driver/driver_test.go
index 22f6346fc1..1c2280e6f8 100644
--- a/packages/taiko-client/driver/driver_test.go
+++ b/packages/taiko-client/driver/driver_test.go
@@ -38,11 +38,11 @@ func (s *DriverTestSuite) SetupTest() {
 	ctx, cancel := context.WithCancel(context.Background())
 	s.Nil(d.InitFromConfig(ctx, &Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:       os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:       os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint: os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			L1Endpoint:       os.Getenv("L1_WS"),
+			L2Endpoint:       os.Getenv("L2_WS"),
+			L2EngineEndpoint: os.Getenv("L2_AUTH"),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -296,20 +296,20 @@ func (s *DriverTestSuite) InitProposer() {
 
 	s.Nil(p.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
 		ProposeInterval:            1024 * time.Hour,
 		MaxProposedTxListsPerEpoch: 1,
 		TxmgrConfigs: &txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProposerPrivKey)),
diff --git a/packages/taiko-client/integration_test/deploy_l1_contract.sh b/packages/taiko-client/integration_test/deploy_l1_contract.sh
index 71e635df46..9bc9e47b11 100755
--- a/packages/taiko-client/integration_test/deploy_l1_contract.sh
+++ b/packages/taiko-client/integration_test/deploy_l1_contract.sh
@@ -7,7 +7,7 @@ source integration_test/l1_env.sh
 
 cd ../protocol &&
   forge script script/DeployOnL1.s.sol:DeployOnL1 \
-    --fork-url "$L1_NODE_HTTP_ENDPOINT" \
+    --fork-url "$L1_HTTP" \
     --broadcast \
     --ffi \
     -vvvvv \
diff --git a/packages/taiko-client/integration_test/entrypoint.sh b/packages/taiko-client/integration_test/entrypoint.sh
index 769a80004b..27ac4d2b43 100755
--- a/packages/taiko-client/integration_test/entrypoint.sh
+++ b/packages/taiko-client/integration_test/entrypoint.sh
@@ -21,18 +21,17 @@ integration_test/deploy_l1_contract.sh
 source integration_test/test_env.sh
 
 # make sure environment variables are set
-check_env "L1_NODE_HTTP_ENDPOINT"
-check_env "L1_NODE_WS_ENDPOINT"
-check_env "L2_EXECUTION_ENGINE_HTTP_ENDPOINT"
-check_env "L2_EXECUTION_ENGINE_WS_ENDPOINT"
-check_env "L2_EXECUTION_ENGINE_AUTH_ENDPOINT"
-check_env "TAIKO_L1_ADDRESS"
-check_env "TAIKO_L2_ADDRESS"
-check_env "TAIKO_TOKEN_ADDRESS"
+check_env "L1_HTTP"
+check_env "L1_WS"
+check_env "L2_HTTP"
+check_env "L2_WS"
+check_env "L2_AUTH"
+check_env "TAIKO_L1"
+check_env "TAIKO_L2"
+check_env "TAIKO_TOKEN"
 check_env "TIMELOCK_CONTROLLER"
-check_env "ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS"
-check_env "GUARDIAN_PROVER_CONTRACT_ADDRESS"
-check_env "GUARDIAN_PROVER_MINORITY_ADDRESS"
+check_env "GUARDIAN_PROVER_CONTRACT"
+check_env "GUARDIAN_PROVER_MINORITY"
 check_env "L1_CONTRACT_OWNER_PRIVATE_KEY"
 check_env "L1_SECURITY_COUNCIL_PRIVATE_KEY"
 check_env "L1_PROPOSER_PRIVATE_KEY"
diff --git a/packages/taiko-client/integration_test/l1_env.sh b/packages/taiko-client/integration_test/l1_env.sh
index f38dcd9806..77b281b36b 100755
--- a/packages/taiko-client/integration_test/l1_env.sh
+++ b/packages/taiko-client/integration_test/l1_env.sh
@@ -3,7 +3,7 @@
 source internal/docker/docker_env.sh
 
 export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-export TAIKO_L2_ADDRESS=0x1670010000000000000000000000000000010001
+export TAIKO_L2=0x1670010000000000000000000000000000010001
 export L2_SIGNAL_SERVICE=0x1670010000000000000000000000000000010005
 export CONTRACT_OWNER=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 export PROVER_SET_ADMIN=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
@@ -40,6 +40,6 @@ export L2_GENESIS_HASH=$(
         -X POST \
         -H "Content-Type: application/json" \
         -d '{"jsonrpc":"2.0","id":0,"method":"eth_getBlockByNumber","params":["0x0", false]}' \
-        $L2_EXECUTION_ENGINE_HTTP_ENDPOINT | jq .result.hash | sed 's/\"//g'
+        $L2_HTTP | jq .result.hash | sed 's/\"//g'
 )
 echo "L2_GENESIS_HASH: $L2_GENESIS_HASH"
diff --git a/packages/taiko-client/integration_test/test_env.sh b/packages/taiko-client/integration_test/test_env.sh
index a612c27998..55989bb8dc 100755
--- a/packages/taiko-client/integration_test/test_env.sh
+++ b/packages/taiko-client/integration_test/test_env.sh
@@ -5,13 +5,12 @@ source scripts/common.sh
 
 # get deployed contract address.
 DEPLOYMENT_JSON=$(cat ../protocol/deployments/deploy_l1.json)
-export TAIKO_L1_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
-export TAIKO_L2_ADDRESS=0x1670010000000000000000000000000000010001
-export TAIKO_TOKEN_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.taiko_token' | sed 's/\"//g')
+export TAIKO_L1=$(echo "$DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
+export TAIKO_L2=0x1670010000000000000000000000000000010001
+export TAIKO_TOKEN=$(echo "$DEPLOYMENT_JSON" | jq '.taiko_token' | sed 's/\"//g')
 export TIMELOCK_CONTROLLER=$(echo "$DEPLOYMENT_JSON" | jq '.timelock_controller' | sed 's/\"//g')
-export ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.rollup_address_manager' | sed 's/\"//g')
-export GUARDIAN_PROVER_CONTRACT_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover' | sed 's/\"//g')
-export GUARDIAN_PROVER_MINORITY_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover_minority' | sed 's/\"//g')
+export GUARDIAN_PROVER_CONTRACT=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover' | sed 's/\"//g')
+export GUARDIAN_PROVER_MINORITY=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover_minority' | sed 's/\"//g')
 export L1_CONTRACT_OWNER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 export L1_SECURITY_COUNCIL_PRIVATE_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97
 export L1_PROPOSER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
@@ -21,21 +20,20 @@ export TREASURY=0x1670010000000000000000000000000000010001
 export VERBOSITY=3
 
 # show the integration test environment variables.
-# L1_BEACON_HTTP_ENDPOINT=$L1_BEACON_HTTP_ENDPOINT
+# L1_BEACON=$L1_BEACON
 echo "RUN_TESTS=true
-L1_NODE_HTTP_ENDPOINT=$L1_NODE_HTTP_ENDPOINT
-L1_NODE_WS_ENDPOINT=$L1_NODE_WS_ENDPOINT
+L1_HTTP=$L1_HTTP
+L1_WS=$L1_WS
 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
+L2_HTTP=$L2_HTTP
+L2_WS=$L2_WS
+L2_AUTH=$L2_EXECUTION_ENGINE_AUTH_ENDPOINT
+TAIKO_L1=$TAIKO_L1_ADDRESS
+TAIKO_L2=$TAIKO_L2_ADDRESS
+TAIKO_TOKEN=$TAIKO_TOKEN_ADDRESS
 TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER
-ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS=$ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS
-GUARDIAN_PROVER_CONTRACT_ADDRESS=$GUARDIAN_PROVER_CONTRACT_ADDRESS
-GUARDIAN_PROVER_MINORITY_ADDRESS=$GUARDIAN_PROVER_MINORITY_ADDRESS
+GUARDIAN_PROVER_CONTRACT=$GUARDIAN_PROVER_CONTRACT_ADDRESS
+GUARDIAN_PROVER_MINORITY=$GUARDIAN_PROVER_MINORITY_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
diff --git a/packages/taiko-client/internal/docker/docker_env.sh b/packages/taiko-client/internal/docker/docker_env.sh
index ccaab9a033..f4e95f5906 100755
--- a/packages/taiko-client/internal/docker/docker_env.sh
+++ b/packages/taiko-client/internal/docker/docker_env.sh
@@ -15,19 +15,19 @@ until cast chain-id --rpc-url "$L2_PROBE_URL" 2> /dev/null; do
 done
 
 L1_NODE_PORT=$(docker port l1_node | grep '0.0.0.0' | awk -F ':' '{print $2}')
-export L1_NODE_HTTP_ENDPOINT=http://localhost:$L1_NODE_PORT
-export L1_NODE_WS_ENDPOINT=ws://localhost:$L1_NODE_PORT
+export L1_HTTP=http://localhost:$L1_NODE_PORT
+export L1_WS=ws://localhost:$L1_NODE_PORT
 
-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 L2_HTTP=http://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==1 {print $2}')
+export L2_WS=ws://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==2 {print $2}')
+export L2_AUTH=http://localhost:$(docker port l2_node | grep "0.0.0.0" | awk -F ':' 'NR==3 {print $2}')
 export JWT_SECRET=$DIR/nodes/jwt.hex
 
 echo -e "L1_NODE PORTS: \n$(docker port l1_node)"
 echo -e "L2_NODE PORTS: \n$(docker port l2_node)"
 
-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"
-echo "L2_EXECUTION_ENGINE_WS_ENDPOINT: $L2_EXECUTION_ENGINE_WS_ENDPOINT"
-echo "L2_EXECUTION_ENGINE_AUTH_ENDPOINT: $L2_EXECUTION_ENGINE_AUTH_ENDPOINT"
+echo "L1_HTTP: $L1_HTTP"
+echo "L1_WS: $L1_WS"
+echo "L2_HTTP: $L2_HTTP"
+echo "L2_WS: $L2_WS"
+echo "L2_AUTH: $L2_EXECUTION_ENGINE_AUTH_ENDPOINT"
diff --git a/packages/taiko-client/internal/testutils/suite.go b/packages/taiko-client/internal/testutils/suite.go
index 90ac51fbb6..bb6eaf8886 100644
--- a/packages/taiko-client/internal/testutils/suite.go
+++ b/packages/taiko-client/internal/testutils/suite.go
@@ -52,14 +52,14 @@ func (s *ClientTestSuite) SetupTest() {
 	s.NotEmpty(jwtSecret)
 
 	rpcCli, err := rpc.NewClient(context.Background(), &rpc.ClientConfig{
-		L1Endpoint:                    os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2Endpoint:                    os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		TaikoL1Address:                common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:                common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress:             common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
-		GuardianProverMajorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS")),
-		GuardianProverMinorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS")),
-		L2EngineEndpoint:              os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+		L1Endpoint:                    os.Getenv("L1_WS"),
+		L2Endpoint:                    os.Getenv("L2_WS"),
+		TaikoL1Address:                common.HexToAddress(os.Getenv("TAIKO_L1")),
+		TaikoL2Address:                common.HexToAddress(os.Getenv("TAIKO_L2")),
+		TaikoTokenAddress:             common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		GuardianProverMajorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
+		GuardianProverMinorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
+		L2EngineEndpoint:              os.Getenv("L2_AUTH"),
 		JwtSecret:                     string(jwtSecret),
 	})
 	s.Nil(err)
@@ -73,7 +73,7 @@ func (s *ClientTestSuite) SetupTest() {
 	allowance, err := rpcCli.TaikoToken.Allowance(
 		nil,
 		crypto.PubkeyToAddress(l1ProverPrivKey.PublicKey),
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 	)
 	s.Nil(err)
 
@@ -96,14 +96,14 @@ func (s *ClientTestSuite) SetupTest() {
 
 		_, err = rpcCli.TaikoToken.Transfer(
 			opts,
-			common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS")),
+			common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
 			new(big.Int).Div(proverBalance, common.Big2),
 		)
 		s.Nil(err)
 
 		_, err = rpcCli.TaikoToken.Transfer(
 			opts,
-			common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS")),
+			common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
 			new(big.Int).Div(proverBalance, common.Big2),
 		)
 		s.Nil(err)
@@ -122,7 +122,7 @@ func (s *ClientTestSuite) setAllowance(key *ecdsa.PrivateKey) {
 		log.Root(),
 		new(metrics.NoopTxMetrics),
 		txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(key)),
@@ -144,12 +144,12 @@ func (s *ClientTestSuite) setAllowance(key *ecdsa.PrivateKey) {
 
 	var (
 		bigInt            = new(big.Int).Exp(big.NewInt(1_000_000_000), new(big.Int).SetUint64(uint64(decimal)), nil)
-		taikoTokenAddress = common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS"))
+		taikoTokenAddress = common.HexToAddress(os.Getenv("TAIKO_TOKEN"))
 	)
 
 	data, err := encoding.TaikoTokenABI.Pack(
 		"approve",
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		bigInt,
 	)
 	s.Nil(err)
diff --git a/packages/taiko-client/pkg/rpc/client_test.go b/packages/taiko-client/pkg/rpc/client_test.go
index 46b625d2a4..b6ca88c9a4 100644
--- a/packages/taiko-client/pkg/rpc/client_test.go
+++ b/packages/taiko-client/pkg/rpc/client_test.go
@@ -12,12 +12,12 @@ import (
 
 func newTestClient(t *testing.T) *Client {
 	client, err := NewClient(context.Background(), &ClientConfig{
-		L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
-		L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+		L1Endpoint:        os.Getenv("L1_WS"),
+		L2Endpoint:        os.Getenv("L2_WS"),
+		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 		JwtSecret:         os.Getenv("JWT_SECRET"),
 	})
 
@@ -29,12 +29,12 @@ func newTestClient(t *testing.T) *Client {
 
 func newTestClientWithTimeout(t *testing.T) *Client {
 	client, err := NewClient(context.Background(), &ClientConfig{
-		L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
-		L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+		L1Endpoint:        os.Getenv("L1_WS"),
+		L2Endpoint:        os.Getenv("L2_WS"),
+		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 		JwtSecret:         os.Getenv("JWT_SECRET"),
 		Timeout:           5 * time.Second,
 	})
diff --git a/packages/taiko-client/pkg/rpc/dial_test.go b/packages/taiko-client/pkg/rpc/dial_test.go
index c07cfae08b..aeea111769 100644
--- a/packages/taiko-client/pkg/rpc/dial_test.go
+++ b/packages/taiko-client/pkg/rpc/dial_test.go
@@ -21,7 +21,7 @@ func TestDialEngineClientWithBackoff(t *testing.T) {
 
 	client, err := DialEngineClientWithBackoff(
 		context.Background(),
-		os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+		os.Getenv("L2_AUTH"),
 		string(jwtSecret),
 		12*time.Second,
 		10,
@@ -38,7 +38,7 @@ func TestDialEngineClientWithBackoff(t *testing.T) {
 func TestDialClientWithBackoff(t *testing.T) {
 	client, err := DialClientWithBackoff(
 		context.Background(),
-		os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
+		os.Getenv("L2_WS"),
 		12*time.Second,
 		10,
 	)
diff --git a/packages/taiko-client/proposer/config_test.go b/packages/taiko-client/proposer/config_test.go
index 1f03bfbfd0..d7a0888027 100644
--- a/packages/taiko-client/proposer/config_test.go
+++ b/packages/taiko-client/proposer/config_test.go
@@ -14,11 +14,11 @@ import (
 )
 
 var (
-	l1Endpoint      = os.Getenv("L1_NODE_WS_ENDPOINT")
-	l2Endpoint      = os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT")
-	taikoL1         = os.Getenv("TAIKO_L1_ADDRESS")
-	taikoL2         = os.Getenv("TAIKO_L2_ADDRESS")
-	taikoToken      = os.Getenv("TAIKO_TOKEN_ADDRESS")
+	l1Endpoint      = os.Getenv("L1_WS")
+	l2Endpoint      = os.Getenv("L2_HTTP")
+	taikoL1         = os.Getenv("TAIKO_L1")
+	taikoL2         = os.Getenv("TAIKO_L2")
+	taikoToken      = os.Getenv("TAIKO_TOKEN")
 	proposeInterval = "10s"
 	rpcTimeout      = "5s"
 )
diff --git a/packages/taiko-client/proposer/proposer_test.go b/packages/taiko-client/proposer/proposer_test.go
index d9492d3d24..778e9c4ead 100644
--- a/packages/taiko-client/proposer/proposer_test.go
+++ b/packages/taiko-client/proposer/proposer_test.go
@@ -68,13 +68,13 @@ func (s *ProposerTestSuite) SetupTest() {
 
 	s.Nil(p.InitFromConfig(ctx, &Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT"),
-			L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_HTTP"),
+			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -84,7 +84,7 @@ func (s *ProposerTestSuite) SetupTest() {
 		ExtraData:                  "test",
 		ProposeBlockTxGasLimit:     10_000_000,
 		TxmgrConfigs: &txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProposerPrivKey)),
diff --git a/packages/taiko-client/proposer/transaction_builder/common_test.go b/packages/taiko-client/proposer/transaction_builder/common_test.go
index 62f3b52c53..9747eb8ecb 100644
--- a/packages/taiko-client/proposer/transaction_builder/common_test.go
+++ b/packages/taiko-client/proposer/transaction_builder/common_test.go
@@ -33,8 +33,8 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 	s.calldataTxBuilder = NewCalldataTransactionBuilder(
 		s.RPCClient,
 		l1ProposerPrivKey,
-		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L2")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		common.Address{},
 		0,
 		"test",
@@ -43,9 +43,9 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 	s.blobTxBuiler = NewBlobTransactionBuilder(
 		s.RPCClient,
 		l1ProposerPrivKey,
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L2")),
 		10_000_000,
 		"test",
 		chainConfig,
diff --git a/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go b/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
index a98224ade1..6154697ef0 100644
--- a/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
+++ b/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
@@ -21,7 +21,7 @@ type AnchorTxValidatorTestSuite struct {
 func (s *AnchorTxValidatorTestSuite) SetupTest() {
 	s.ClientTestSuite.SetupTest()
 
-	validator, err := New(common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")), s.RPCClient.L2.ChainID, s.RPCClient)
+	validator, err := New(common.HexToAddress(os.Getenv("TAIKO_L2")), s.RPCClient.L2.ChainID, s.RPCClient)
 	s.Nil(err)
 	s.v = validator
 }
diff --git a/packages/taiko-client/prover/config_test.go b/packages/taiko-client/prover/config_test.go
index fa9209c968..90c07e2c21 100644
--- a/packages/taiko-client/prover/config_test.go
+++ b/packages/taiko-client/prover/config_test.go
@@ -14,13 +14,13 @@ import (
 )
 
 var (
-	l1WsEndpoint   = os.Getenv("L1_NODE_WS_ENDPOINT")
-	l2WsEndpoint   = os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT")
-	l2HttpEndpoint = os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT")
+	l1WsEndpoint   = os.Getenv("L1_WS")
+	l2WsEndpoint   = os.Getenv("L2_WS")
+	l2HttpEndpoint = os.Getenv("L2_HTTP")
 	l1NodeVersion  = "1.0.0"
 	l2NodeVersion  = "0.1.0"
-	taikoL1        = os.Getenv("TAIKO_L1_ADDRESS")
-	taikoL2        = os.Getenv("TAIKO_L2_ADDRESS")
+	taikoL1        = os.Getenv("TAIKO_L1")
+	taikoL2        = os.Getenv("TAIKO_L2")
 	allowance      = 10.0
 	rpcTimeout     = 5 * time.Second
 )
@@ -70,8 +70,8 @@ func (s *ProverTestSuite) TestNewConfigFromCliContextGuardianProver() {
 		"--" + flags.TxGasLimit.Name, "100000",
 		"--" + flags.Dummy.Name,
 		"--" + flags.ProverCapacity.Name, "8",
-		"--" + flags.GuardianProverMajority.Name, os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"),
-		"--" + flags.GuardianProverMinority.Name, os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS"),
+		"--" + flags.GuardianProverMajority.Name, os.Getenv("GUARDIAN_PROVER_CONTRACT"),
+		"--" + flags.GuardianProverMinority.Name, os.Getenv("GUARDIAN_PROVER_MINORITY"),
 		"--" + flags.Graffiti.Name, "",
 		"--" + flags.ProveUnassignedBlocks.Name,
 		"--" + flags.MaxProposedIn.Name, "100",
diff --git a/packages/taiko-client/prover/event_handler/transition_proved_test.go b/packages/taiko-client/prover/event_handler/transition_proved_test.go
index ad8448b9e9..b5ce386277 100644
--- a/packages/taiko-client/prover/event_handler/transition_proved_test.go
+++ b/packages/taiko-client/prover/event_handler/transition_proved_test.go
@@ -41,11 +41,11 @@ func (s *EventHandlerTestSuite) SetupTest() {
 	d := new(driver.Driver)
 	s.Nil(d.InitFromConfig(context.Background(), &driver.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:       os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:       os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint: os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			L1Endpoint:       os.Getenv("L1_WS"),
+			L2Endpoint:       os.Getenv("L2_WS"),
+			L2EngineEndpoint: os.Getenv("L2_AUTH"),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -76,20 +76,20 @@ func (s *EventHandlerTestSuite) SetupTest() {
 
 	s.Nil(prop.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
 		ProposeInterval:            1024 * time.Hour,
 		MaxProposedTxListsPerEpoch: 1,
 		TxmgrConfigs: &txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          1,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProposerPrivKey)),
diff --git a/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go b/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
index d85bd51ae0..b9612151fa 100644
--- a/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
+++ b/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
@@ -44,10 +44,10 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 
 	builder := transaction.NewProveBlockTxBuilder(
 		s.RPCClient,
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		common.Address{},
-		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS")),
-		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS")),
+		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
+		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
 	)
 
 	l1ProverPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROVER_PRIVATE_KEY")))
@@ -58,7 +58,7 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 		log.Root(),
 		new(metrics.NoopTxMetrics),
 		txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProverPrivKey)),
@@ -83,7 +83,7 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		rpc.ZeroAddress,
-		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L2")),
 		"test",
 		0,
 		txMgr,
@@ -127,11 +127,11 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 
 	s.Nil(prop.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -150,7 +150,7 @@ func (s *ProofSubmitterTestSuite) TestGetRandomBumpedSubmissionDelay() {
 		log.Root(),
 		new(metrics.NoopTxMetrics),
 		txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProverPrivKey)),
@@ -172,7 +172,7 @@ func (s *ProofSubmitterTestSuite) TestGetRandomBumpedSubmissionDelay() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L2")),
 		"test",
 		0,
 		txMgr,
@@ -192,7 +192,7 @@ func (s *ProofSubmitterTestSuite) TestGetRandomBumpedSubmissionDelay() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L2")),
 		"test",
 		0,
 		txMgr,
diff --git a/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go b/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
index cd30c068a3..7d7df88906 100644
--- a/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
+++ b/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
@@ -32,10 +32,10 @@ func (s *TransactionTestSuite) SetupTest() {
 
 	s.builder = NewProveBlockTxBuilder(
 		s.RPCClient,
-		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		ZeroAddress,
-		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS")),
-		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS")),
+		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
+		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
 	)
 
 	l1ProverPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROVER_PRIVATE_KEY")))
@@ -46,7 +46,7 @@ func (s *TransactionTestSuite) SetupTest() {
 		log.Root(),
 		new(metrics.NoopTxMetrics),
 		txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProverPrivKey)),
diff --git a/packages/taiko-client/prover/prover_test.go b/packages/taiko-client/prover/prover_test.go
index 968b918359..3f186bdb6a 100644
--- a/packages/taiko-client/prover/prover_test.go
+++ b/packages/taiko-client/prover/prover_test.go
@@ -51,7 +51,7 @@ func (s *ProverTestSuite) SetupTest() {
 		log.Root(),
 		&metrics.TxMgrMetrics,
 		txmgr.CLIConfig{
-			L1RPCURL:                  os.Getenv("L1_NODE_WS_ENDPOINT"),
+			L1RPCURL:                  os.Getenv("L1_WS"),
 			NumConfirmations:          0,
 			SafeAbortNonceTooLowCount: txmgr.DefaultBatcherFlagValues.SafeAbortNonceTooLowCount,
 			PrivateKey:                common.Bytes2Hex(crypto.FromECDSA(l1ProverPrivKey)),
@@ -80,11 +80,11 @@ func (s *ProverTestSuite) SetupTest() {
 	d := new(driver.Driver)
 	s.Nil(d.InitFromConfig(context.Background(), &driver.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:       os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:       os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint: os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			L1Endpoint:       os.Getenv("L1_WS"),
+			L2Endpoint:       os.Getenv("L2_WS"),
+			L2EngineEndpoint: os.Getenv("L2_AUTH"),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -98,13 +98,13 @@ func (s *ProverTestSuite) SetupTest() {
 
 	s.Nil(prop.InitFromConfig(context.Background(), &proposer.Config{
 		ClientConfig: &rpc.ClientConfig{
-			L1Endpoint:        os.Getenv("L1_NODE_WS_ENDPOINT"),
-			L2Endpoint:        os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-			L2EngineEndpoint:  os.Getenv("L2_EXECUTION_ENGINE_AUTH_ENDPOINT"),
+			L1Endpoint:        os.Getenv("L1_WS"),
+			L2Endpoint:        os.Getenv("L2_WS"),
+			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -128,12 +128,12 @@ func (s *ProverTestSuite) TestInitError() {
 	p := new(Prover)
 
 	s.NotNil(InitFromConfig(ctx, p, &Config{
-		L1WsEndpoint:          os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2WsEndpoint:          os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		L2HttpEndpoint:        os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT"),
-		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+		L1WsEndpoint:          os.Getenv("L1_WS"),
+		L2WsEndpoint:          os.Getenv("L2_WS"),
+		L2HttpEndpoint:        os.Getenv("L2_HTTP"),
+		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1")),
+		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2")),
+		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		L1ProverPrivKey:       l1ProverPrivKey,
 		Dummy:                 true,
 		ProveUnassignedBlocks: true,
@@ -309,9 +309,9 @@ func (s *ProverTestSuite) TestContestWrongBlocks() {
 
 	s.Nil(s.p.transitionContestedHandler.Handle(context.Background(), contestedEvent))
 
-	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"))
+	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT"))
 	s.True(s.p.IsGuardianProver())
-	s.p.cfg.GuardianProverMinorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY_ADDRESS"))
+	s.p.cfg.GuardianProverMinorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY"))
 
 	txBuilder := transaction.NewProveBlockTxBuilder(
 		s.p.rpc,
@@ -347,7 +347,7 @@ func (s *ProverTestSuite) TestContestWrongBlocks() {
 }
 
 func (s *ProverTestSuite) TestSelectSubmitter() {
-	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"))
+	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT"))
 	s.True(s.p.IsGuardianProver())
 	submitter := s.p.selectSubmitter(encoding.TierGuardianMinorityID + 1)
 	s.NotNil(submitter)
@@ -360,7 +360,7 @@ func (s *ProverTestSuite) TestSelectSubmitterNotFound() {
 }
 
 func (s *ProverTestSuite) TestGetSubmitterByTier() {
-	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT_ADDRESS"))
+	s.p.cfg.GuardianProverMajorityAddress = common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT"))
 	s.True(s.p.IsGuardianProver())
 
 	submitter := s.p.getSubmitterByTier(encoding.TierGuardianMajorityID)
@@ -521,12 +521,12 @@ func (s *ProverTestSuite) initProver(
 
 	p := new(Prover)
 	s.Nil(InitFromConfig(ctx, p, &Config{
-		L1WsEndpoint:          os.Getenv("L1_NODE_WS_ENDPOINT"),
-		L2WsEndpoint:          os.Getenv("L2_EXECUTION_ENGINE_WS_ENDPOINT"),
-		L2HttpEndpoint:        os.Getenv("L2_EXECUTION_ENGINE_HTTP_ENDPOINT"),
-		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
-		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
-		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
+		L1WsEndpoint:          os.Getenv("L1_WS"),
+		L2WsEndpoint:          os.Getenv("L2_WS"),
+		L2HttpEndpoint:        os.Getenv("L2_HTTP"),
+		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1")),
+		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2")),
+		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
 		L1ProverPrivKey:       key,
 		Dummy:                 true,
 		ProveUnassignedBlocks: true,

From 658d634f43d96ff8b46a335da6f1ed693ac6a78b Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Thu, 15 Aug 2024 15:17:42 +0800
Subject: [PATCH 2/4] change taiko token name

---
 packages/protocol/script/DeployOnL1.s.sol     |  2 +-
 packages/protocol/script/test_deploy_on_l1.sh |  2 +-
 .../bindings/encoding/input_test.go           |  2 +-
 packages/taiko-client/cmd/flags/common.go     |  6 ++---
 .../driver/chain_syncer/blob/syncer_test.go   |  6 ++---
 .../driver/chain_syncer/chain_syncer_test.go  |  6 ++---
 packages/taiko-client/driver/config_test.go   |  4 ++--
 packages/taiko-client/driver/driver_test.go   | 10 ++++-----
 .../integration_test/entrypoint.sh            |  6 ++---
 .../taiko-client/integration_test/l1_env.sh   |  4 ++--
 .../taiko-client/integration_test/test_env.sh | 12 +++++-----
 .../taiko-client/internal/testutils/suite.go  | 12 +++++-----
 packages/taiko-client/pkg/rpc/client_test.go  | 12 +++++-----
 packages/taiko-client/proposer/config_test.go |  6 ++---
 .../taiko-client/proposer/proposer_test.go    |  6 ++---
 .../transaction_builder/common_test.go        |  8 +++----
 .../anchor_tx_validator_test.go               |  2 +-
 packages/taiko-client/prover/config_test.go   |  4 ++--
 .../event_handler/transition_proved_test.go   | 10 ++++-----
 .../proof_submitter/proof_submitter_test.go   | 14 ++++++------
 .../transaction/sender_test.go                |  2 +-
 packages/taiko-client/prover/prover_test.go   | 22 +++++++++----------
 22 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/packages/protocol/script/DeployOnL1.s.sol b/packages/protocol/script/DeployOnL1.s.sol
index a912b8cf37..c3cfed8cd0 100644
--- a/packages/protocol/script/DeployOnL1.s.sol
+++ b/packages/protocol/script/DeployOnL1.s.sol
@@ -142,7 +142,7 @@ contract DeployOnL1 is DeployCapability {
             });
         }
 
-        address taikoToken = vm.envAddress("TAIKO_TOKEN");
+        address taikoToken = vm.envAddress("TAIKO_TOKEN_ADDRESS");
         if (taikoToken == address(0)) {
             taikoToken = deployProxy({
                 name: "taiko_token",
diff --git a/packages/protocol/script/test_deploy_on_l1.sh b/packages/protocol/script/test_deploy_on_l1.sh
index c4df51742f..59975ae3eb 100755
--- a/packages/protocol/script/test_deploy_on_l1.sh
+++ b/packages/protocol/script/test_deploy_on_l1.sh
@@ -5,7 +5,7 @@ set -e
 
 export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 PROPOSER=0x0000000000000000000000000000000000000000 \
-TAIKO_TOKEN=0x0000000000000000000000000000000000000000 \
+TAIKO_TOKEN_ADDRESS=0x0000000000000000000000000000000000000000 \
 PROPOSER_ONE=0x0000000000000000000000000000000000000000 \
 GUARDIAN_PROVERS="0x1000777700000000000000000000000000000001,0x1000777700000000000000000000000000000002,0x1000777700000000000000000000000000000003,0x1000777700000000000000000000000000000004,0x1000777700000000000000000000000000000005,0x1000777700000000000000000000000000000006,0x1000777700000000000000000000000000000007" \
 TAIKO_L2_ADDRESS=0x1000777700000000000000000000000000000001 \
diff --git a/packages/taiko-client/bindings/encoding/input_test.go b/packages/taiko-client/bindings/encoding/input_test.go
index 6d7f0ba9ea..b23fd2934f 100644
--- a/packages/taiko-client/bindings/encoding/input_test.go
+++ b/packages/taiko-client/bindings/encoding/input_test.go
@@ -34,7 +34,7 @@ func TestUnpackTxListBytes(t *testing.T) {
 	require.Nil(t, err)
 
 	taikoL1, err := bindings.NewTaikoL1Client(
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		cli,
 	)
 	require.Nil(t, err)
diff --git a/packages/taiko-client/cmd/flags/common.go b/packages/taiko-client/cmd/flags/common.go
index c77c89259a..fc37093553 100644
--- a/packages/taiko-client/cmd/flags/common.go
+++ b/packages/taiko-client/cmd/flags/common.go
@@ -67,21 +67,21 @@ var (
 		Usage:    "TaikoL1 contract `address`",
 		Required: true,
 		Category: commonCategory,
-		EnvVars:  []string{"TAIKO_L1"},
+		EnvVars:  []string{"TAIKO_L1_ADDRESS"},
 	}
 	TaikoL2Address = &cli.StringFlag{
 		Name:     "taikoL2",
 		Usage:    "TaikoL2 contract `address`",
 		Required: true,
 		Category: commonCategory,
-		EnvVars:  []string{"TAIKO_L2"},
+		EnvVars:  []string{"TAIKO_L2_ADDRESS"},
 	}
 	TaikoTokenAddress = &cli.StringFlag{
 		Name:     "taikoToken",
 		Usage:    "TaikoToken contract `address`",
 		Required: true,
 		Category: commonCategory,
-		EnvVars:  []string{"TAIKO_TOKEN"},
+		EnvVars:  []string{"TAIKO_TOKEN_ADDRESS"},
 	}
 
 	// Optional flags used by all client software.
diff --git a/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go b/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
index 200a3d6ada..4a15bcc5d1 100644
--- a/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
+++ b/packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
@@ -193,9 +193,9 @@ func (s *BlobSyncerTestSuite) initProposer() {
 			L2Endpoint:        os.Getenv("L2_WS"),
 			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
diff --git a/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go b/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
index 117b2a0b5a..1b6231e9b4 100644
--- a/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
+++ b/packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
@@ -55,9 +55,9 @@ func (s *ChainSyncerTestSuite) SetupTest() {
 		ClientConfig: &rpc.ClientConfig{
 			L1Endpoint:        os.Getenv("L1_WS"),
 			L2Endpoint:        os.Getenv("L2_WS"),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
diff --git a/packages/taiko-client/driver/config_test.go b/packages/taiko-client/driver/config_test.go
index f65359467d..12006d46cc 100644
--- a/packages/taiko-client/driver/config_test.go
+++ b/packages/taiko-client/driver/config_test.go
@@ -16,8 +16,8 @@ var (
 	l2Endpoint       = os.Getenv("L2_WS")
 	l2CheckPoint     = os.Getenv("L2_HTTP")
 	l2EngineEndpoint = os.Getenv("L2_AUTH")
-	taikoL1          = os.Getenv("TAIKO_L1")
-	taikoL2          = os.Getenv("TAIKO_L2")
+	taikoL1          = os.Getenv("TAIKO_L1_ADDRESS")
+	taikoL2          = os.Getenv("TAIKO_L2_ADDRESS")
 )
 
 func (s *DriverTestSuite) TestNewConfigFromCliContext() {
diff --git a/packages/taiko-client/driver/driver_test.go b/packages/taiko-client/driver/driver_test.go
index 1c2280e6f8..8d19c0023a 100644
--- a/packages/taiko-client/driver/driver_test.go
+++ b/packages/taiko-client/driver/driver_test.go
@@ -41,8 +41,8 @@ func (s *DriverTestSuite) SetupTest() {
 			L1Endpoint:       os.Getenv("L1_WS"),
 			L2Endpoint:       os.Getenv("L2_WS"),
 			L2EngineEndpoint: os.Getenv("L2_AUTH"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -300,9 +300,9 @@ func (s *DriverTestSuite) InitProposer() {
 			L2Endpoint:        os.Getenv("L2_WS"),
 			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
diff --git a/packages/taiko-client/integration_test/entrypoint.sh b/packages/taiko-client/integration_test/entrypoint.sh
index 27ac4d2b43..8cb113a886 100755
--- a/packages/taiko-client/integration_test/entrypoint.sh
+++ b/packages/taiko-client/integration_test/entrypoint.sh
@@ -26,9 +26,9 @@ check_env "L1_WS"
 check_env "L2_HTTP"
 check_env "L2_WS"
 check_env "L2_AUTH"
-check_env "TAIKO_L1"
-check_env "TAIKO_L2"
-check_env "TAIKO_TOKEN"
+check_env "TAIKO_L1_ADDRESS"
+check_env "TAIKO_L2_ADDRESS"
+check_env "TAIKO_TOKEN_ADDRESS"
 check_env "TIMELOCK_CONTROLLER"
 check_env "GUARDIAN_PROVER_CONTRACT"
 check_env "GUARDIAN_PROVER_MINORITY"
diff --git a/packages/taiko-client/integration_test/l1_env.sh b/packages/taiko-client/integration_test/l1_env.sh
index 77b281b36b..bc7381dd40 100755
--- a/packages/taiko-client/integration_test/l1_env.sh
+++ b/packages/taiko-client/integration_test/l1_env.sh
@@ -3,7 +3,7 @@
 source internal/docker/docker_env.sh
 
 export PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-export TAIKO_L2=0x1670010000000000000000000000000000010001
+export TAIKO_L2_ADDRESS=0x1670010000000000000000000000000000010001
 export L2_SIGNAL_SERVICE=0x1670010000000000000000000000000000010005
 export CONTRACT_OWNER=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 export PROVER_SET_ADMIN=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
@@ -13,7 +13,7 @@ export TAIKO_TOKEN_SYMBOL="TTKOt"
 export TIER_PROVIDER="devnet"
 export PAUSE_TAIKO_L1="false"
 export PAUSE_BRIDGE="false"
-export TAIKO_TOKEN=0x0000000000000000000000000000000000000000
+export TAIKO_TOKEN_ADDRESS=0x0000000000000000000000000000000000000000
 export SHARED_ADDRESS_MANAGER=0x0000000000000000000000000000000000000000
 export PROPOSER=0x0000000000000000000000000000000000000000
 export PROPOSER_ONE=0x0000000000000000000000000000000000000000
diff --git a/packages/taiko-client/integration_test/test_env.sh b/packages/taiko-client/integration_test/test_env.sh
index 55989bb8dc..dc9e6843ff 100755
--- a/packages/taiko-client/integration_test/test_env.sh
+++ b/packages/taiko-client/integration_test/test_env.sh
@@ -5,9 +5,9 @@ source scripts/common.sh
 
 # get deployed contract address.
 DEPLOYMENT_JSON=$(cat ../protocol/deployments/deploy_l1.json)
-export TAIKO_L1=$(echo "$DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
-export TAIKO_L2=0x1670010000000000000000000000000000010001
-export TAIKO_TOKEN=$(echo "$DEPLOYMENT_JSON" | jq '.taiko_token' | sed 's/\"//g')
+export TAIKO_L1_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.taiko' | sed 's/\"//g')
+export TAIKO_L2_ADDRESS=0x1670010000000000000000000000000000010001
+export TAIKO_TOKEN_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.taiko_token' | sed 's/\"//g')
 export TIMELOCK_CONTROLLER=$(echo "$DEPLOYMENT_JSON" | jq '.timelock_controller' | sed 's/\"//g')
 export GUARDIAN_PROVER_CONTRACT=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover' | sed 's/\"//g')
 export GUARDIAN_PROVER_MINORITY=$(echo "$DEPLOYMENT_JSON" | jq '.guardian_prover_minority' | sed 's/\"//g')
@@ -28,9 +28,9 @@ L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT
 L2_HTTP=$L2_HTTP
 L2_WS=$L2_WS
 L2_AUTH=$L2_EXECUTION_ENGINE_AUTH_ENDPOINT
-TAIKO_L1=$TAIKO_L1_ADDRESS
-TAIKO_L2=$TAIKO_L2_ADDRESS
-TAIKO_TOKEN=$TAIKO_TOKEN_ADDRESS
+TAIKO_L1_ADDRESS=$TAIKO_L1_ADDRESS
+TAIKO_L2_ADDRESS=$TAIKO_L2_ADDRESS
+TAIKO_TOKEN_ADDRESS=$TAIKO_TOKEN_ADDRESS
 TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER
 GUARDIAN_PROVER_CONTRACT=$GUARDIAN_PROVER_CONTRACT_ADDRESS
 GUARDIAN_PROVER_MINORITY=$GUARDIAN_PROVER_MINORITY_ADDRESS
diff --git a/packages/taiko-client/internal/testutils/suite.go b/packages/taiko-client/internal/testutils/suite.go
index bb6eaf8886..b4f8ba0c3c 100644
--- a/packages/taiko-client/internal/testutils/suite.go
+++ b/packages/taiko-client/internal/testutils/suite.go
@@ -54,9 +54,9 @@ func (s *ClientTestSuite) SetupTest() {
 	rpcCli, err := rpc.NewClient(context.Background(), &rpc.ClientConfig{
 		L1Endpoint:                    os.Getenv("L1_WS"),
 		L2Endpoint:                    os.Getenv("L2_WS"),
-		TaikoL1Address:                common.HexToAddress(os.Getenv("TAIKO_L1")),
-		TaikoL2Address:                common.HexToAddress(os.Getenv("TAIKO_L2")),
-		TaikoTokenAddress:             common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		TaikoL1Address:                common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:                common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress:             common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		GuardianProverMajorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
 		GuardianProverMinorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
 		L2EngineEndpoint:              os.Getenv("L2_AUTH"),
@@ -73,7 +73,7 @@ func (s *ClientTestSuite) SetupTest() {
 	allowance, err := rpcCli.TaikoToken.Allowance(
 		nil,
 		crypto.PubkeyToAddress(l1ProverPrivKey.PublicKey),
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 	)
 	s.Nil(err)
 
@@ -144,12 +144,12 @@ func (s *ClientTestSuite) setAllowance(key *ecdsa.PrivateKey) {
 
 	var (
 		bigInt            = new(big.Int).Exp(big.NewInt(1_000_000_000), new(big.Int).SetUint64(uint64(decimal)), nil)
-		taikoTokenAddress = common.HexToAddress(os.Getenv("TAIKO_TOKEN"))
+		taikoTokenAddress = common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS"))
 	)
 
 	data, err := encoding.TaikoTokenABI.Pack(
 		"approve",
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		bigInt,
 	)
 	s.Nil(err)
diff --git a/packages/taiko-client/pkg/rpc/client_test.go b/packages/taiko-client/pkg/rpc/client_test.go
index b6ca88c9a4..0860d02130 100644
--- a/packages/taiko-client/pkg/rpc/client_test.go
+++ b/packages/taiko-client/pkg/rpc/client_test.go
@@ -14,9 +14,9 @@ func newTestClient(t *testing.T) *Client {
 	client, err := NewClient(context.Background(), &ClientConfig{
 		L1Endpoint:        os.Getenv("L1_WS"),
 		L2Endpoint:        os.Getenv("L2_WS"),
-		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 		JwtSecret:         os.Getenv("JWT_SECRET"),
 	})
@@ -31,9 +31,9 @@ func newTestClientWithTimeout(t *testing.T) *Client {
 	client, err := NewClient(context.Background(), &ClientConfig{
 		L1Endpoint:        os.Getenv("L1_WS"),
 		L2Endpoint:        os.Getenv("L2_WS"),
-		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 		JwtSecret:         os.Getenv("JWT_SECRET"),
 		Timeout:           5 * time.Second,
diff --git a/packages/taiko-client/proposer/config_test.go b/packages/taiko-client/proposer/config_test.go
index d7a0888027..d80952083e 100644
--- a/packages/taiko-client/proposer/config_test.go
+++ b/packages/taiko-client/proposer/config_test.go
@@ -16,9 +16,9 @@ import (
 var (
 	l1Endpoint      = os.Getenv("L1_WS")
 	l2Endpoint      = os.Getenv("L2_HTTP")
-	taikoL1         = os.Getenv("TAIKO_L1")
-	taikoL2         = os.Getenv("TAIKO_L2")
-	taikoToken      = os.Getenv("TAIKO_TOKEN")
+	taikoL1         = os.Getenv("TAIKO_L1_ADDRESS")
+	taikoL2         = os.Getenv("TAIKO_L2_ADDRESS")
+	taikoToken      = os.Getenv("TAIKO_TOKEN_ADDRESS")
 	proposeInterval = "10s"
 	rpcTimeout      = "5s"
 )
diff --git a/packages/taiko-client/proposer/proposer_test.go b/packages/taiko-client/proposer/proposer_test.go
index 778e9c4ead..0673e45abc 100644
--- a/packages/taiko-client/proposer/proposer_test.go
+++ b/packages/taiko-client/proposer/proposer_test.go
@@ -72,9 +72,9 @@ func (s *ProposerTestSuite) SetupTest() {
 			L2Endpoint:        os.Getenv("L2_HTTP"),
 			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
diff --git a/packages/taiko-client/proposer/transaction_builder/common_test.go b/packages/taiko-client/proposer/transaction_builder/common_test.go
index 9747eb8ecb..62f3b52c53 100644
--- a/packages/taiko-client/proposer/transaction_builder/common_test.go
+++ b/packages/taiko-client/proposer/transaction_builder/common_test.go
@@ -33,8 +33,8 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 	s.calldataTxBuilder = NewCalldataTransactionBuilder(
 		s.RPCClient,
 		l1ProposerPrivKey,
-		common.HexToAddress(os.Getenv("TAIKO_L2")),
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		common.Address{},
 		0,
 		"test",
@@ -43,9 +43,9 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 	s.blobTxBuiler = NewBlobTransactionBuilder(
 		s.RPCClient,
 		l1ProposerPrivKey,
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2")),
+		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 		10_000_000,
 		"test",
 		chainConfig,
diff --git a/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go b/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
index 6154697ef0..a98224ade1 100644
--- a/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
+++ b/packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
@@ -21,7 +21,7 @@ type AnchorTxValidatorTestSuite struct {
 func (s *AnchorTxValidatorTestSuite) SetupTest() {
 	s.ClientTestSuite.SetupTest()
 
-	validator, err := New(common.HexToAddress(os.Getenv("TAIKO_L2")), s.RPCClient.L2.ChainID, s.RPCClient)
+	validator, err := New(common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")), s.RPCClient.L2.ChainID, s.RPCClient)
 	s.Nil(err)
 	s.v = validator
 }
diff --git a/packages/taiko-client/prover/config_test.go b/packages/taiko-client/prover/config_test.go
index 90c07e2c21..ccb5baa4de 100644
--- a/packages/taiko-client/prover/config_test.go
+++ b/packages/taiko-client/prover/config_test.go
@@ -19,8 +19,8 @@ var (
 	l2HttpEndpoint = os.Getenv("L2_HTTP")
 	l1NodeVersion  = "1.0.0"
 	l2NodeVersion  = "0.1.0"
-	taikoL1        = os.Getenv("TAIKO_L1")
-	taikoL2        = os.Getenv("TAIKO_L2")
+	taikoL1        = os.Getenv("TAIKO_L1_ADDRESS")
+	taikoL2        = os.Getenv("TAIKO_L2_ADDRESS")
 	allowance      = 10.0
 	rpcTimeout     = 5 * time.Second
 )
diff --git a/packages/taiko-client/prover/event_handler/transition_proved_test.go b/packages/taiko-client/prover/event_handler/transition_proved_test.go
index b5ce386277..2b4841a326 100644
--- a/packages/taiko-client/prover/event_handler/transition_proved_test.go
+++ b/packages/taiko-client/prover/event_handler/transition_proved_test.go
@@ -44,8 +44,8 @@ func (s *EventHandlerTestSuite) SetupTest() {
 			L1Endpoint:       os.Getenv("L1_WS"),
 			L2Endpoint:       os.Getenv("L2_WS"),
 			L2EngineEndpoint: os.Getenv("L2_AUTH"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -80,9 +80,9 @@ func (s *EventHandlerTestSuite) SetupTest() {
 			L2Endpoint:        os.Getenv("L2_WS"),
 			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
diff --git a/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go b/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
index b9612151fa..896a93ba6c 100644
--- a/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
+++ b/packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
@@ -44,7 +44,7 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 
 	builder := transaction.NewProveBlockTxBuilder(
 		s.RPCClient,
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		common.Address{},
 		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
 		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
@@ -83,7 +83,7 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		rpc.ZeroAddress,
-		common.HexToAddress(os.Getenv("TAIKO_L2")),
+		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 		"test",
 		0,
 		txMgr,
@@ -129,9 +129,9 @@ func (s *ProofSubmitterTestSuite) SetupTest() {
 		ClientConfig: &rpc.ClientConfig{
 			L1Endpoint:        os.Getenv("L1_WS"),
 			L2Endpoint:        os.Getenv("L2_WS"),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -172,7 +172,7 @@ func (s *ProofSubmitterTestSuite) TestGetRandomBumpedSubmissionDelay() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2")),
+		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 		"test",
 		0,
 		txMgr,
@@ -192,7 +192,7 @@ func (s *ProofSubmitterTestSuite) TestGetRandomBumpedSubmissionDelay() {
 		&producer.OptimisticProofProducer{},
 		s.proofCh,
 		common.Address{},
-		common.HexToAddress(os.Getenv("TAIKO_L2")),
+		common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 		"test",
 		0,
 		txMgr,
diff --git a/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go b/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
index 7d7df88906..ba7856f2a4 100644
--- a/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
+++ b/packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
@@ -32,7 +32,7 @@ func (s *TransactionTestSuite) SetupTest() {
 
 	s.builder = NewProveBlockTxBuilder(
 		s.RPCClient,
-		common.HexToAddress(os.Getenv("TAIKO_L1")),
+		common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
 		ZeroAddress,
 		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
 		common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
diff --git a/packages/taiko-client/prover/prover_test.go b/packages/taiko-client/prover/prover_test.go
index 3f186bdb6a..a72418a86c 100644
--- a/packages/taiko-client/prover/prover_test.go
+++ b/packages/taiko-client/prover/prover_test.go
@@ -83,8 +83,8 @@ func (s *ProverTestSuite) SetupTest() {
 			L1Endpoint:       os.Getenv("L1_WS"),
 			L2Endpoint:       os.Getenv("L2_WS"),
 			L2EngineEndpoint: os.Getenv("L2_AUTH"),
-			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2")),
+			TaikoL1Address:   common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:   common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
 			JwtSecret:        string(jwtSecret),
 		},
 	}))
@@ -102,9 +102,9 @@ func (s *ProverTestSuite) SetupTest() {
 			L2Endpoint:        os.Getenv("L2_WS"),
 			L2EngineEndpoint:  os.Getenv("L2_AUTH"),
 			JwtSecret:         string(jwtSecret),
-			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1")),
-			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2")),
-			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+			TaikoL1Address:    common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+			TaikoL2Address:    common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+			TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		},
 		L1ProposerPrivKey:          l1ProposerPrivKey,
 		L2SuggestedFeeRecipient:    common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
@@ -131,9 +131,9 @@ func (s *ProverTestSuite) TestInitError() {
 		L1WsEndpoint:          os.Getenv("L1_WS"),
 		L2WsEndpoint:          os.Getenv("L2_WS"),
 		L2HttpEndpoint:        os.Getenv("L2_HTTP"),
-		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1")),
-		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2")),
-		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		L1ProverPrivKey:       l1ProverPrivKey,
 		Dummy:                 true,
 		ProveUnassignedBlocks: true,
@@ -524,9 +524,9 @@ func (s *ProverTestSuite) initProver(
 		L1WsEndpoint:          os.Getenv("L1_WS"),
 		L2WsEndpoint:          os.Getenv("L2_WS"),
 		L2HttpEndpoint:        os.Getenv("L2_HTTP"),
-		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1")),
-		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2")),
-		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN")),
+		TaikoL1Address:        common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
+		TaikoL2Address:        common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
+		TaikoTokenAddress:     common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
 		L1ProverPrivKey:       key,
 		Dummy:                 true,
 		ProveUnassignedBlocks: true,

From 2181f6339aeda21e64e4b7d85b2a5610c19c99e1 Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Thu, 15 Aug 2024 15:10:33 +0800
Subject: [PATCH 3/4] chore(taiko-client): update `hive_tests.sh` (#17923)

---
 packages/taiko-client/integration_test/hive_tests.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/taiko-client/integration_test/hive_tests.sh b/packages/taiko-client/integration_test/hive_tests.sh
index 78c27ca9b4..043c401147 100644
--- a/packages/taiko-client/integration_test/hive_tests.sh
+++ b/packages/taiko-client/integration_test/hive_tests.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-if [ "$HIVE_BASE_DIR" == "" ]; then
-  HIVE_BASE_DIR=/tmp/hive
-  rm -rf $HIVE_BASE_DIR
-  git clone git@github.com:taikoxyz/hive.git $HIVE_BASE_DIR
+HIVE_BASE_DIR=${HIVE_BASE_DIR:-/tmp/hive}
+if [ "$HIVE_BASE_DIR" == "/tmp/hive" ]; then
+  rm -rf "$HIVE_BASE_DIR"
+  git clone git@github.com:taikoxyz/hive.git "$HIVE_BASE_DIR"
 fi
 
-go test -v -p=1 ./integration_test -timeout=700s
+export HIVE_BASE_DIR=$HIVE_BASE_DIR && go test -v -p=1 ./integration_test -timeout=700s

From 32fac0e3137c9fb11dfbe6db1d91a04ca04e517c Mon Sep 17 00:00:00 2001
From: maskpp <maskpp266@gmail.com>
Date: Thu, 15 Aug 2024 15:40:06 +0800
Subject: [PATCH 4/4] fix bug

---
 packages/guardian-prover-health-check/.default.env          | 4 ++--
 .../guardian-prover-health-check/cmd/flags/healthcheck.go   | 2 +-
 packages/taiko-client/integration_test/test_env.sh          | 6 +++---
 packages/taiko-client/internal/docker/docker_env.sh         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/guardian-prover-health-check/.default.env b/packages/guardian-prover-health-check/.default.env
index c8b2ee5a5d..92d5960862 100644
--- a/packages/guardian-prover-health-check/.default.env
+++ b/packages/guardian-prover-health-check/.default.env
@@ -7,7 +7,7 @@ DATABASE_HOST=localhost:3306
 DATABASE_MAX_IDLE_CONNS=50
 DATABASE_MAX_OPEN_CONNS=3000
 DATABASE_CONN_MAX_LIFETIME_IN_MS=100000
-GUARDIAN_PROVER_CONTRACT_ADDRESS=0xDf8038e9f4535040D7421A89ead398b3A38366EC
+GUARDIAN_PROVER_CONTRACT=0xDf8038e9f4535040D7421A89ead398b3A38366EC
 L1_RPC_URL=wss://l1ws.internal.taiko.xyz
 L2_RPC_URL=wss://ws.internal.taiko.xyz
-INTERVAL=12s
\ No newline at end of file
+INTERVAL=12s
diff --git a/packages/guardian-prover-health-check/cmd/flags/healthcheck.go b/packages/guardian-prover-health-check/cmd/flags/healthcheck.go
index a0861296d6..caa6ba1d3c 100644
--- a/packages/guardian-prover-health-check/cmd/flags/healthcheck.go
+++ b/packages/guardian-prover-health-check/cmd/flags/healthcheck.go
@@ -12,7 +12,7 @@ var (
 		Name:     "guardianProverContractAddress",
 		Usage:    "Address of the GuardianProver contract",
 		Category: healthCheckCategory,
-		EnvVars:  []string{"GUARDIAN_PROVER_CONTRACT_ADDRESS"},
+		EnvVars:  []string{"GUARDIAN_PROVER_CONTRACT"},
 		Required: true,
 	}
 	L1RPCUrl = &cli.StringFlag{
diff --git a/packages/taiko-client/integration_test/test_env.sh b/packages/taiko-client/integration_test/test_env.sh
index dc9e6843ff..814297474e 100755
--- a/packages/taiko-client/integration_test/test_env.sh
+++ b/packages/taiko-client/integration_test/test_env.sh
@@ -27,13 +27,13 @@ L1_WS=$L1_WS
 L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT
 L2_HTTP=$L2_HTTP
 L2_WS=$L2_WS
-L2_AUTH=$L2_EXECUTION_ENGINE_AUTH_ENDPOINT
+L2_AUTH=$L2_AUTH
 TAIKO_L1_ADDRESS=$TAIKO_L1_ADDRESS
 TAIKO_L2_ADDRESS=$TAIKO_L2_ADDRESS
 TAIKO_TOKEN_ADDRESS=$TAIKO_TOKEN_ADDRESS
 TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER
-GUARDIAN_PROVER_CONTRACT=$GUARDIAN_PROVER_CONTRACT_ADDRESS
-GUARDIAN_PROVER_MINORITY=$GUARDIAN_PROVER_MINORITY_ADDRESS
+GUARDIAN_PROVER_CONTRACT=$GUARDIAN_PROVER_CONTRACT
+GUARDIAN_PROVER_MINORITY=$GUARDIAN_PROVER_MINORITY
 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
diff --git a/packages/taiko-client/internal/docker/docker_env.sh b/packages/taiko-client/internal/docker/docker_env.sh
index f4e95f5906..cb3ad4358c 100755
--- a/packages/taiko-client/internal/docker/docker_env.sh
+++ b/packages/taiko-client/internal/docker/docker_env.sh
@@ -30,4 +30,4 @@ echo "L1_HTTP: $L1_HTTP"
 echo "L1_WS: $L1_WS"
 echo "L2_HTTP: $L2_HTTP"
 echo "L2_WS: $L2_WS"
-echo "L2_AUTH: $L2_EXECUTION_ENGINE_AUTH_ENDPOINT"
+echo "L2_AUTH: $L2_AUTH"