Skip to content

Commit

Permalink
feat(taiko-client): update bindings && fix tests (#17680)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtaikocha authored Jun 26, 2024
1 parent 3c95477 commit 10b95e1
Show file tree
Hide file tree
Showing 20 changed files with 529 additions and 213 deletions.
2 changes: 1 addition & 1 deletion packages/taiko-client/bindings/.githead
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6c82da0998363d65e5ad672dfb6601a31479ffbe
3c95477a284ac94c7e3ce85c9cefdadc1aaacd06
147 changes: 146 additions & 1 deletion packages/taiko-client/bindings/gen_lib_proposing.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

292 changes: 291 additions & 1 deletion packages/taiko-client/bindings/gen_taiko_l1.go

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ func (s *BlobSyncerTestSuite) initProposer() {
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
ProverSetAddress: common.HexToAddress(os.Getenv("PROVER_SET_ADDRESS")),
},
L1ProposerPrivKey: l1ProposerPrivKey,
L2SuggestedFeeRecipient: common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
Expand All @@ -234,7 +233,7 @@ func (s *BlobSyncerTestSuite) initProposer() {
TxSendTimeout: txmgr.DefaultBatcherFlagValues.TxSendTimeout,
TxNotInMempoolTimeout: txmgr.DefaultBatcherFlagValues.TxNotInMempoolTimeout,
},
}))
}, nil))

s.p = prop
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func (s *ChainSyncerTestSuite) SetupTest() {
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
ProverSetAddress: common.HexToAddress(os.Getenv("PROVER_SET_ADDRESS")),
},
L1ProposerPrivKey: l1ProposerPrivKey,
L2SuggestedFeeRecipient: common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
Expand Down Expand Up @@ -86,7 +85,7 @@ func (s *ChainSyncerTestSuite) SetupTest() {
TxSendTimeout: txmgr.DefaultBatcherFlagValues.TxSendTimeout,
TxNotInMempoolTimeout: txmgr.DefaultBatcherFlagValues.TxNotInMempoolTimeout,
},
}))
}, nil))

s.p = prop
}
Expand Down
3 changes: 1 addition & 2 deletions packages/taiko-client/driver/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ func (s *DriverTestSuite) InitProposer() {
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
TaikoL2Address: common.HexToAddress(os.Getenv("TAIKO_L2_ADDRESS")),
TaikoTokenAddress: common.HexToAddress(os.Getenv("TAIKO_TOKEN_ADDRESS")),
ProverSetAddress: common.HexToAddress(os.Getenv("PROVER_SET_ADDRESS")),
},
L1ProposerPrivKey: l1ProposerPrivKey,
L2SuggestedFeeRecipient: common.HexToAddress(os.Getenv("L2_SUGGESTED_FEE_RECIPIENT")),
Expand All @@ -330,7 +329,7 @@ func (s *DriverTestSuite) InitProposer() {
TxSendTimeout: txmgr.DefaultBatcherFlagValues.TxSendTimeout,
TxNotInMempoolTimeout: txmgr.DefaultBatcherFlagValues.TxNotInMempoolTimeout,
},
}))
}, nil))
s.p = p
}

Expand Down
4 changes: 2 additions & 2 deletions packages/taiko-client/integration_test/l1_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export TAIKO_TOKEN=0x0000000000000000000000000000000000000000
export SHARED_ADDRESS_MANAGER=0x0000000000000000000000000000000000000000
export PROPOSER=0x0000000000000000000000000000000000000000
export PROPOSER_ONE=0x0000000000000000000000000000000000000000
export NUM_MIN_MAJORITY_GUARDIANS=7
export NUM_MIN_MINORITY_GUARDIANS=2
export NUM_MIN_MAJORITY_GUARDIANS=6
export NUM_MIN_MINORITY_GUARDIANS=1

GUARDIAN_PROVERS_ADDRESSES_LIST=(
"0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
Expand Down
4 changes: 1 addition & 3 deletions packages/taiko-client/integration_test/test_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ export TIMELOCK_CONTROLLER=$(echo "$DEPLOYMENT_JSON" | jq '.timelock_controller'
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 PROVER_SET_ADDRESS=$(echo "$DEPLOYMENT_JSON" | jq '.prover_set' | sed 's/\"//g')
export L1_CONTRACT_OWNER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
export L1_SECURITY_COUNCIL_PRIVATE_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97
export L1_PROPOSER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
export L2_SUGGESTED_FEE_RECIPIENT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
export L1_PROVER_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
export L1_PROVER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
export TREASURY=0x1670010000000000000000000000000000010001
export VERBOSITY=3

Expand All @@ -33,7 +32,6 @@ 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
PROVER_SET_ADDRESS=$PROVER_SET_ADDRESS
TIMELOCK_CONTROLLER=$TIMELOCK_CONTROLLER
ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS=$ROLLUP_ADDRESS_MANAGER_CONTRACT_ADDRESS
GUARDIAN_PROVER_CONTRACT_ADDRESS=$GUARDIAN_PROVER_CONTRACT_ADDRESS
Expand Down
1 change: 0 additions & 1 deletion packages/taiko-client/internal/testutils/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ func (s *ClientTestSuite) NewTestProverServer(
MinTaikoTokenBalance: common.Big1,
MaxExpiry: 24 * time.Hour,
TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")),
ProverSetAddress: common.HexToAddress(os.Getenv("PROVER_SET_ADDRESS")),
RPC: s.RPCClient,
ProtocolConfigs: &protocolConfig,
LivenessBond: protocolConfig.LivenessBond,
Expand Down
Loading

0 comments on commit 10b95e1

Please sign in to comment.