Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(taiko-client): keep env vars same with the flag name #17964

Merged
merged 2 commits into from
Aug 22, 2024
Merged

chore(taiko-client): keep env vars same with the flag name #17964

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d6b758
keep env vars same with the flag name
mask-pp Aug 22, 2024
58b71aa
keep env vars same with the flag name
mask-pp Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/guardian-prover-health-check/.default.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=0xDf8038e9f4535040D7421A89ead398b3A38366EC
GUARDIAN_PROVER_CONTRACT_ADDRESS=0xDf8038e9f4535040D7421A89ead398b3A38366EC
L1_RPC_URL=wss://l1ws.internal.taiko.xyz
L2_RPC_URL=wss://ws.internal.taiko.xyz
INTERVAL=12s
2 changes: 1 addition & 1 deletion packages/guardian-prover-health-check/cmd/flags/healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var (
Name: "guardianProverContractAddress",
Usage: "Address of the GuardianProver contract",
Category: healthCheckCategory,
EnvVars: []string{"GUARDIAN_PROVER_CONTRACT"},
EnvVars: []string{"GUARDIAN_PROVER_CONTRACT_ADDRESS"},
Required: true,
}
L1RPCUrl = &cli.StringFlag{
Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/bindings/encoding/input_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestUnpackTxListBytes(t *testing.T) {
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)
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/cmd/flags/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ var (
Usage: "TaikoL1 contract `address`",
Required: true,
Category: commonCategory,
EnvVars: []string{"TAIKO_L1_ADDRESS"},
EnvVars: []string{"TAIKO_L1"},
}
TaikoL2Address = &cli.StringFlag{
Name: "taikoL2",
Usage: "TaikoL2 contract `address`",
Required: true,
Category: commonCategory,
EnvVars: []string{"TAIKO_L2_ADDRESS"},
EnvVars: []string{"TAIKO_L2"},
}
TaikoTokenAddress = &cli.StringFlag{
Name: "taikoToken",
Usage: "TaikoToken contract `address`",
Required: true,
Category: commonCategory,
EnvVars: []string{"TAIKO_TOKEN_ADDRESS"},
EnvVars: []string{"TAIKO_TOKEN"},
}

// Optional flags used by all client software.
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/driver/chain_syncer/blob/syncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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")),
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/driver/chain_syncer/chain_syncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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")),
Expand Down
4 changes: 2 additions & 2 deletions packages/taiko-client/driver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ADDRESS")
taikoL2 = os.Getenv("TAIKO_L2_ADDRESS")
taikoL1 = os.Getenv("TAIKO_L1")
taikoL2 = os.Getenv("TAIKO_L2")
)

func (s *DriverTestSuite) TestNewConfigFromCliContext() {
Expand Down
10 changes: 5 additions & 5 deletions packages/taiko-client/driver/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ADDRESS")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2")),
JwtSecret: string(jwtSecret),
},
}))
Expand Down Expand Up @@ -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_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")),
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/integration_test/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ check_env "L1_WS"
check_env "L2_HTTP"
check_env "L2_WS"
check_env "L2_AUTH"
check_env "TAIKO_L1_ADDRESS"
check_env "TAIKO_L2_ADDRESS"
check_env "TAIKO_TOKEN_ADDRESS"
check_env "TAIKO_L1"
check_env "TAIKO_L2"
check_env "TAIKO_TOKEN"
check_env "TIMELOCK_CONTROLLER"
check_env "GUARDIAN_PROVER_CONTRACT"
check_env "GUARDIAN_PROVER_MINORITY"
Expand Down
12 changes: 6 additions & 6 deletions packages/taiko-client/integration_test/test_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ 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 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')
Expand All @@ -28,9 +28,9 @@ L2_SUGGESTED_FEE_RECIPIENT=$L2_SUGGESTED_FEE_RECIPIENT
L2_HTTP=$L2_HTTP
L2_WS=$L2_WS
L2_AUTH=$L2_AUTH
TAIKO_L1_ADDRESS=$TAIKO_L1_ADDRESS
TAIKO_L2_ADDRESS=$TAIKO_L2_ADDRESS
TAIKO_TOKEN_ADDRESS=$TAIKO_TOKEN_ADDRESS
TAIKO_L1=$TAIKO_L1_ADDRESS
TAIKO_L2=$TAIKO_L2_ADDRESS
TAIKO_TOKEN=$TAIKO_TOKEN_ADDRESS
TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER
GUARDIAN_PROVER_CONTRACT=$GUARDIAN_PROVER_CONTRACT
GUARDIAN_PROVER_MINORITY=$GUARDIAN_PROVER_MINORITY
Expand Down
12 changes: 6 additions & 6 deletions packages/taiko-client/internal/testutils/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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")),
GuardianProverMajorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_CONTRACT")),
GuardianProverMinorityAddress: common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
L2EngineEndpoint: os.Getenv("L2_AUTH"),
Expand All @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions packages/taiko-client/pkg/rpc/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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")),
L2EngineEndpoint: os.Getenv("L2_AUTH"),
JwtSecret: os.Getenv("JWT_SECRET"),
})
Expand All @@ -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_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")),
L2EngineEndpoint: os.Getenv("L2_AUTH"),
JwtSecret: os.Getenv("JWT_SECRET"),
Timeout: 5 * time.Second,
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/proposer/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
var (
l1Endpoint = os.Getenv("L1_WS")
l2Endpoint = os.Getenv("L2_HTTP")
taikoL1 = os.Getenv("TAIKO_L1_ADDRESS")
taikoL2 = os.Getenv("TAIKO_L2_ADDRESS")
taikoToken = os.Getenv("TAIKO_TOKEN_ADDRESS")
taikoL1 = os.Getenv("TAIKO_L1")
taikoL2 = os.Getenv("TAIKO_L2")
taikoToken = os.Getenv("TAIKO_TOKEN")
proposeInterval = "10s"
rpcTimeout = "5s"
)
Expand Down
6 changes: 3 additions & 3 deletions packages/taiko-client/proposer/proposer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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")),
Expand Down
8 changes: 4 additions & 4 deletions packages/taiko-client/proposer/transaction_builder/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/prover/anchor_tx_validator/anchor_tx_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions packages/taiko-client/prover/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ var (
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
)
Expand Down
10 changes: 5 additions & 5 deletions packages/taiko-client/prover/event_handler/transition_proved_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ADDRESS")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2")),
JwtSecret: string(jwtSecret),
},
}))
Expand Down Expand Up @@ -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_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")),
Expand Down
14 changes: 7 additions & 7 deletions packages/taiko-client/prover/proof_submitter/proof_submitter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ 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")),
common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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_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")),
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/prover/proof_submitter/transaction/sender_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ 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")),
common.HexToAddress(os.Getenv("GUARDIAN_PROVER_MINORITY")),
Expand Down
Loading
Loading