Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

Commit

Permalink
update bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
RogerLamTd committed Oct 17, 2023
1 parent baada48 commit 94a10fb
Show file tree
Hide file tree
Showing 38 changed files with 49 additions and 46 deletions.
7 changes: 4 additions & 3 deletions bindings/encoding/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
taikol1 "github.com/taikoxyz/taiko-client/bindings/taikol1"
taikol2 "github.com/taikoxyz/taiko-client/bindings/taikol2"
)

// ABI arguments marshaling components.
Expand Down Expand Up @@ -120,11 +121,11 @@ var (
func init() {
var err error

if TaikoL1ABI, err = bindings.TaikoL1ClientMetaData.GetAbi(); err != nil {
if TaikoL1ABI, err = taikol1.TaikoL1ClientMetaData.GetAbi(); err != nil {
log.Crit("Get TaikoL1 ABI error", "error", err)
}

if TaikoL2ABI, err = bindings.TaikoL2ClientMetaData.GetAbi(); err != nil {
if TaikoL2ABI, err = taikol2.TaikoL2ClientMetaData.GetAbi(); err != nil {
log.Crit("Get TaikoL2 ABI error", "error", err)
}
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion driver/chain_syncer/calldata/syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
anchorTxConstructor "github.com/taikoxyz/taiko-client/driver/anchor_tx_constructor"
"github.com/taikoxyz/taiko-client/driver/chain_syncer/beaconsync"
"github.com/taikoxyz/taiko-client/driver/state"
Expand Down
2 changes: 1 addition & 1 deletion driver/chain_syncer/calldata/syncer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/driver/chain_syncer/beaconsync"
"github.com/taikoxyz/taiko-client/driver/state"
"github.com/taikoxyz/taiko-client/proposer"
Expand Down
2 changes: 1 addition & 1 deletion driver/state/l1_current.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
eventIterator "github.com/taikoxyz/taiko-client/pkg/chain_iterator/event_iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion driver/state/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/metrics"
"github.com/taikoxyz/taiko-client/pkg/rpc"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/core/types"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
chainIterator "github.com/taikoxyz/taiko-client/pkg/chain_iterator"
"github.com/taikoxyz/taiko-client/pkg/rpc"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/core/types"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
chainIterator "github.com/taikoxyz/taiko-client/pkg/chain_iterator"
"github.com/taikoxyz/taiko-client/pkg/rpc"
)
Expand Down
18 changes: 10 additions & 8 deletions pkg/rpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethclient/gethclient"
"github.com/ethereum/go-ethereum/rpc"
"github.com/taikoxyz/taiko-client/bindings"
taikol1 "github.com/taikoxyz/taiko-client/bindings/taikol1"
taikol2 "github.com/taikoxyz/taiko-client/bindings/taikol2"
taikotoken "github.com/taikoxyz/taiko-client/bindings/taikotoken"
)

const (
Expand All @@ -32,9 +34,9 @@ type Client struct {
// Geth Engine API clients
L2Engine *EngineClient
// Protocol contracts clients
TaikoL1 *bindings.TaikoL1Client
TaikoL2 *bindings.TaikoL2Client
TaikoToken *bindings.TaikoToken
TaikoL1 *taikol1.TaikoL1Client
TaikoL2 *taikol2.TaikoL2Client
TaikoToken *taikotoken.TaikoToken
// Chain IDs
L1ChainID *big.Int
L2ChainID *big.Int
Expand Down Expand Up @@ -89,19 +91,19 @@ func NewClient(ctx context.Context, cfg *ClientConfig) (*Client, error) {
l2RPC = NewEthClientWithDefaultTimeout(l2EthClient)
}

taikoL1, err := bindings.NewTaikoL1Client(cfg.TaikoL1Address, l1RPC)
taikoL1, err := taikol1.NewTaikoL1Client(cfg.TaikoL1Address, l1RPC)
if err != nil {
return nil, err
}

taikoL2, err := bindings.NewTaikoL2Client(cfg.TaikoL2Address, l2RPC)
taikoL2, err := taikol2.NewTaikoL2Client(cfg.TaikoL2Address, l2RPC)
if err != nil {
return nil, err
}

var taikoToken *bindings.TaikoToken
var taikoToken *taikotoken.TaikoToken
if cfg.TaikoTokenAddress.Hex() != ZeroAddress.Hex() {
taikoToken, err = bindings.NewTaikoToken(cfg.TaikoTokenAddress, l1RPC)
taikoToken, err = taikotoken.NewTaikoToken(cfg.TaikoTokenAddress, l1RPC)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/methods.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient/gethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/subscription.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

// SubscribeEvent creates a event subscription, will retry if the established subscription failed.
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/subscription_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
"github.com/stretchr/testify/require"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

func TestSubscribeEvent(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/ethereum/go-ethereum/ethclient/gethclient"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion proposer/proposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/metrics"
"github.com/taikoxyz/taiko-client/pkg/rpc"
selector "github.com/taikoxyz/taiko-client/proposer/prover_selector"
Expand Down
2 changes: 1 addition & 1 deletion proposer/proposer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/testutils"
)

Expand Down
2 changes: 1 addition & 1 deletion proposer/prover_selector/eth_fee_eoa_selector.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/go-resty/resty/v2"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/pkg/rpc"
"github.com/taikoxyz/taiko-client/prover/server"
)
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/dummy_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math/big"

"github.com/ethereum/go-ethereum/core/types"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

// OptimisticProofProducer always returns a dummy proof.
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/guardian_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

// GuardianProofProducer always returns an optimistic (dummy) proof.
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/optimistic_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

// OptimisticProofProducer always returns an optimistic (dummy) proof.
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/optimistic_producer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/require"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

func TestRequestProof(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/proof_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/sgx_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

// SGXProofProducer generates a SGX proof for the given block.
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/zkevm_rpcd_producer.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/metrics"
)

Expand Down
2 changes: 1 addition & 1 deletion prover/proof_producer/zkevm_rpcd_producer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/require"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
)

func TestNewZkevmRpcdProducer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/evidence/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/pkg/rpc"
anchorTxValidator "github.com/taikoxyz/taiko-client/prover/anchor_tx_validator"
proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package submitter
import (
"context"

"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
)

Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/proof_contester.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/pkg/rpc"
proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
"github.com/taikoxyz/taiko-client/prover/proof_submitter/evidence"
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/proof_submitter.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/metrics"
"github.com/taikoxyz/taiko-client/pkg/rpc"
anchorTxValidator "github.com/taikoxyz/taiko-client/prover/anchor_tx_validator"
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/proof_submitter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/driver/chain_syncer/beaconsync"
"github.com/taikoxyz/taiko-client/driver/chain_syncer/calldata"
"github.com/taikoxyz/taiko-client/driver/state"
Expand Down
2 changes: 1 addition & 1 deletion prover/proof_submitter/transaction/sender_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
proofProducer "github.com/taikoxyz/taiko-client/prover/proof_producer"
"github.com/taikoxyz/taiko-client/testutils"
)
Expand Down
2 changes: 1 addition & 1 deletion prover/prover.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/metrics"
eventIterator "github.com/taikoxyz/taiko-client/pkg/chain_iterator/event_iterator"
"github.com/taikoxyz/taiko-client/pkg/rpc"
Expand Down
2 changes: 1 addition & 1 deletion prover/prover_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
"github.com/taikoxyz/taiko-client/bindings/encoding"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
"github.com/taikoxyz/taiko-client/driver"
"github.com/taikoxyz/taiko-client/pkg/jwt"
"github.com/taikoxyz/taiko-client/proposer"
Expand Down
8 changes: 4 additions & 4 deletions scripts/gen_bindings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ echo ""

cat ${TAIKO_MONO_DIR}/packages/protocol/out/TaikoL1.sol/TaikoL1.json |
jq .abi |
${ABIGEN_BIN} --abi - --type TaikoL1Client --pkg bindings --out $DIR/../bindings/gen_taiko_l1.go
${ABIGEN_BIN} --abi - --type TaikoL1Client --pkg bindings --out $DIR/../bindings/taikol1/gen_taiko_l1.go

cat ${TAIKO_MONO_DIR}/packages/protocol/out/TaikoL2.sol/TaikoL2.json |
jq .abi |
${ABIGEN_BIN} --abi - --type TaikoL2Client --pkg bindings --out $DIR/../bindings/gen_taiko_l2.go
${ABIGEN_BIN} --abi - --type TaikoL2Client --pkg bindings --out $DIR/../bindings/taikol2/gen_taiko_l2.go

cat ${TAIKO_MONO_DIR}/packages/protocol/out/TaikoToken.sol/TaikoToken.json |
jq .abi |
${ABIGEN_BIN} --abi - --type TaikoToken --pkg bindings --out $DIR/../bindings/gen_taiko_token.go
${ABIGEN_BIN} --abi - --type TaikoToken --pkg bindings --out $DIR/../bindings/taikotoken/gen_taiko_token.go

cat ${TAIKO_MONO_DIR}/packages/protocol/out/AddressManager.sol/AddressManager.json |
jq .abi |
${ABIGEN_BIN} --abi - --type AddressManager --pkg bindings --out $DIR/../bindings/gen_address_manager.go
${ABIGEN_BIN} --abi - --type AddressManager --pkg bindings --out $DIR/../bindings/addressmanager/gen_address_manager.go

git -C ${TAIKO_MONO_DIR} log --format="%H" -n 1 >./bindings/.githead

Expand Down
2 changes: 1 addition & 1 deletion testutils/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/ethereum/go-ethereum/rlp"
"github.com/go-resty/resty/v2"
"github.com/phayes/freeport"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/taikol1"
capacity "github.com/taikoxyz/taiko-client/prover/capacity_manager"
"github.com/taikoxyz/taiko-client/prover/server"
)
Expand Down
2 changes: 1 addition & 1 deletion testutils/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/suite"
"github.com/taikoxyz/taiko-client/bindings"
bindings "github.com/taikoxyz/taiko-client/bindings/addressmanager"
"github.com/taikoxyz/taiko-client/pkg/jwt"
"github.com/taikoxyz/taiko-client/pkg/rpc"
capacity "github.com/taikoxyz/taiko-client/prover/capacity_manager"
Expand Down

0 comments on commit 94a10fb

Please sign in to comment.