feat(taiko-client): changes based on Pacaya fork

packages/taiko-client/bindings/encoding/input.go

@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/log"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/metadata"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 // ABI arguments marshaling components.
@@ -323,47 +323,47 @@ var (
 func init() {
 	var err error
 
-	if TaikoL1ABI, err = bindings.TaikoL1ClientMetaData.GetAbi(); err != nil {
+	if TaikoL1ABI, err = ontakeBindings.TaikoL1ClientMetaData.GetAbi(); err != nil {
 		log.Crit("Get TaikoL1 ABI error", "error", err)
 	}
 
-	if TaikoL2ABI, err = bindings.TaikoL2ClientMetaData.GetAbi(); err != nil {
+	if TaikoL2ABI, err = ontakeBindings.TaikoL2ClientMetaData.GetAbi(); err != nil {
 		log.Crit("Get TaikoL2 ABI error", "error", err)
 	}
 
-	if TaikoTokenABI, err = bindings.TaikoTokenMetaData.GetAbi(); err != nil {
+	if TaikoTokenABI, err = ontakeBindings.TaikoTokenMetaData.GetAbi(); err != nil {
 		log.Crit("Get TaikoToken ABI error", "error", err)
 	}
 
-	if GuardianProverABI, err = bindings.GuardianProverMetaData.GetAbi(); err != nil {
+	if GuardianProverABI, err = ontakeBindings.GuardianProverMetaData.GetAbi(); err != nil {
 		log.Crit("Get GuardianProver ABI error", "error", err)
 	}
 
-	if LibProposingABI, err = bindings.LibProposingMetaData.GetAbi(); err != nil {
+	if LibProposingABI, err = ontakeBindings.LibProposingMetaData.GetAbi(); err != nil {
 		log.Crit("Get LibProposing ABI error", "error", err)
 	}
 
-	if LibProvingABI, err = bindings.LibProvingMetaData.GetAbi(); err != nil {
+	if LibProvingABI, err = ontakeBindings.LibProvingMetaData.GetAbi(); err != nil {
 		log.Crit("Get LibProving ABI error", "error", err)
 	}
 
-	if LibUtilsABI, err = bindings.LibUtilsMetaData.GetAbi(); err != nil {
+	if LibUtilsABI, err = ontakeBindings.LibUtilsMetaData.GetAbi(); err != nil {
 		log.Crit("Get LibUtils ABI error", "error", err)
 	}
 
-	if LibVerifyingABI, err = bindings.LibVerifyingMetaData.GetAbi(); err != nil {
+	if LibVerifyingABI, err = ontakeBindings.LibVerifyingMetaData.GetAbi(); err != nil {
 		log.Crit("Get LibVerifying ABI error", "error", err)
 	}
 
-	if SGXVerifierABI, err = bindings.SgxVerifierMetaData.GetAbi(); err != nil {
+	if SGXVerifierABI, err = ontakeBindings.SgxVerifierMetaData.GetAbi(); err != nil {
 		log.Crit("Get SGXVerifier ABI error", err)
 	}
 
-	if GuardianVerifierABI, err = bindings.GuardianVerifierMetaData.GetAbi(); err != nil {
+	if GuardianVerifierABI, err = ontakeBindings.GuardianVerifierMetaData.GetAbi(); err != nil {
 		log.Crit("Get GuardianVerifier ABI error", "error", err)
 	}
 
-	if ProverSetABI, err = bindings.ProverSetMetaData.GetAbi(); err != nil {
+	if ProverSetABI, err = ontakeBindings.ProverSetMetaData.GetAbi(); err != nil {
 		log.Crit("Get ProverSet ABI error", "error", err)
 	}
 
@@ -402,8 +402,8 @@ func EncodeBlockParamsOntake(params *BlockParamsV2) ([]byte, error) {
 // EncodeProveBlockInput performs the solidity `abi.encode` for the given TaikoL1.proveBlock input.
 func EncodeProveBlockInput(
 	meta metadata.TaikoBlockMetaData,
-	transition *bindings.TaikoDataTransition,
-	tierProof *bindings.TaikoDataTierProof,
+	transition *ontakeBindings.TaikoDataTransition,
+	tierProof *ontakeBindings.TaikoDataTierProof,
 ) ([]byte, error) {
 	var (
 		b   []byte
@@ -433,7 +433,7 @@ func EncodeProveBlockInput(
 // EncodeProveBlocksInput performs the solidity `abi.encode` for the given TaikoL1.proveBlocks input.
 func EncodeProveBlocksInput(
 	metas []metadata.TaikoBlockMetaData,
-	transitions []bindings.TaikoDataTransition,
+	transitions []ontakeBindings.TaikoDataTransition,
 ) ([][]byte, error) {
 	if len(metas) != len(transitions) {
 		return nil, fmt.Errorf("both arrays of TaikoBlockMetaData and TaikoDataTransition must be equal in length")
@@ -456,7 +456,7 @@ func EncodeProveBlocksInput(
 
 // EncodeProveBlocksBatchProof performs the solidity `abi.encode` for the given TaikoL1.proveBlocks batchProof.
 func EncodeProveBlocksBatchProof(
-	tierProof *bindings.TaikoDataTierProof,
+	tierProof *ontakeBindings.TaikoDataTierProof,
 ) ([]byte, error) {
 	input, err := proveBlocksBatchProofArgs.Pack(
 		tierProof,

packages/taiko-client/bindings/encoding/input_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 func TestUnpackTxListBytes(t *testing.T) {
@@ -33,7 +33,7 @@ func TestUnpackTxListBytes(t *testing.T) {
 	chainID, err := cli.ChainID(context.Background())
 	require.Nil(t, err)
 
-	taikoL1, err := bindings.NewTaikoL1Client(
+	taikoL1, err := ontakeBindings.NewTaikoL1Client(
 		common.HexToAddress(os.Getenv("TAIKO_L1")),
 		cli,
 	)

packages/taiko-client/bindings/encoding/struct.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 // Tier IDs defined in protocol.
@@ -82,13 +82,13 @@ func ToExecutableData(header *types.Header) *engine.ExecutableData {
 	return executableData
 }
 
-// TransitionProvedEventToV2 converts a *bindings.TaikoL1ClientTransitionProved
-// to *bindings.TaikoL1ClientTransitionProvedV2.
+// TransitionProvedEventToV2 converts a *ontakeBindings.TaikoL1ClientTransitionProved
+// to *ontakeBindings.TaikoL1ClientTransitionProvedV2.
 func TransitionProvedEventToV2(
-	e *bindings.TaikoL1ClientTransitionProved,
+	e *ontakeBindings.TaikoL1ClientTransitionProved,
 	proposedIn uint64,
-) *bindings.TaikoL1ClientTransitionProvedV2 {
-	return &bindings.TaikoL1ClientTransitionProvedV2{
+) *ontakeBindings.TaikoL1ClientTransitionProvedV2 {
+	return &ontakeBindings.TaikoL1ClientTransitionProvedV2{
 		BlockId:      e.BlockId,
 		Tran:         e.Tran,
 		Prover:       e.Prover,
@@ -99,13 +99,13 @@ func TransitionProvedEventToV2(
 	}
 }
 
-// TransitionContestedEventToV2 converts a *bindings.TaikoL1ClientTransitionContested
-// to *bindings.TaikoL1ClientTransitionContestedV2.
+// TransitionContestedEventToV2 converts a *ontakeBindings.TaikoL1ClientTransitionContested
+// to *ontakeBindings.TaikoL1ClientTransitionContestedV2.
 func TransitionContestedEventToV2(
-	e *bindings.TaikoL1ClientTransitionContested,
+	e *ontakeBindings.TaikoL1ClientTransitionContested,
 	proposedIn uint64,
-) *bindings.TaikoL1ClientTransitionContestedV2 {
-	return &bindings.TaikoL1ClientTransitionContestedV2{
+) *ontakeBindings.TaikoL1ClientTransitionContestedV2 {
+	return &ontakeBindings.TaikoL1ClientTransitionContestedV2{
 		BlockId:     e.BlockId,
 		Tran:        e.Tran,
 		Contester:   e.Contester,
@@ -116,9 +116,9 @@ func TransitionContestedEventToV2(
 	}
 }
 
-// BlockVerifiedEventToV2 converts a *bindings.TaikoL1ClientBlockVerified to *bindings.TaikoL1ClientBlockVerifiedV2.
-func BlockVerifiedEventToV2(e *bindings.TaikoL1ClientBlockVerified) *bindings.TaikoL1ClientBlockVerifiedV2 {
-	return &bindings.TaikoL1ClientBlockVerifiedV2{
+// BlockVerifiedEventToV2 converts a *ontakeBindings.TaikoL1ClientBlockVerified to *ontakeBindings.TaikoL1ClientBlockVerifiedV2.
+func BlockVerifiedEventToV2(e *ontakeBindings.TaikoL1ClientBlockVerified) *ontakeBindings.TaikoL1ClientBlockVerifiedV2 {
+	return &ontakeBindings.TaikoL1ClientBlockVerifiedV2{
 		BlockId:   e.BlockId,
 		Prover:    e.Prover,
 		BlockHash: e.BlockHash,
@@ -127,9 +127,9 @@ func BlockVerifiedEventToV2(e *bindings.TaikoL1ClientBlockVerified) *bindings.Ta
 	}
 }
 
-// BlockVerifiedEventToV2 converts a *bindings.TaikoDataBlock to *bindings.TaikoDataBlockV2.
-func TaikoDataBlockToV2(b *bindings.TaikoDataBlock) *bindings.TaikoDataBlockV2 {
-	return &bindings.TaikoDataBlockV2{
+// BlockVerifiedEventToV2 converts a *ontakeBindings.TaikoDataBlock to *ontakeBindings.TaikoDataBlockV2.
+func TaikoDataBlockToV2(b *ontakeBindings.TaikoDataBlock) *ontakeBindings.TaikoDataBlockV2 {
+	return &ontakeBindings.TaikoDataBlockV2{
 		MetaHash:             b.MetaHash,
 		AssignedProver:       b.AssignedProver,
 		LivenessBond:         b.LivenessBond,

packages/taiko-client/bindings/metadata/interface.go

@@ -5,10 +5,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
-// struct BlockM
 // TaikoBlockMetaData defines all the metadata of a Taiko block.
 type TaikoBlockMetaData interface {
 	GetAnchorBlockHash() common.Hash
@@ -31,7 +30,7 @@ type TaikoBlockMetaData interface {
 	GetBlobTxListOffset() uint32
 	GetBlobTxListLength() uint32
 	GetBlobIndex() uint8
-	GetBaseFeeConfig() *bindings.LibSharedDataBaseFeeConfig
+	GetBaseFeeConfig() *ontakeBindings.LibSharedDataBaseFeeConfig
 	GetRawBlockHeight() *big.Int
 	GetRawBlockHash() common.Hash
 	GetTxIndex() uint

packages/taiko-client/bindings/metadata/metadata_legacy.go

@@ -6,23 +6,23 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 // Ensure TaikoDataBlockMetadataLegacy implements TaikoBlockMetaData.
 var _ TaikoBlockMetaData = (*TaikoDataBlockMetadataLegacy)(nil)
 
 // TaikoDataBlockMetadataLegacy is the metadata of a legacy Taiko block.
 type TaikoDataBlockMetadataLegacy struct {
-	bindings.TaikoDataBlockMetadata
+	ontakeBindings.TaikoDataBlockMetadata
 	types.Log
 	assignedProver common.Address
 	livenessBond   *big.Int
 }
 
 // NewTaikoDataBlockMetadataLegacy creates a new instance of TaikoDataBlockMetadataLegacy
 // from the TaikoL1.BlockProposed event.
-func NewTaikoDataBlockMetadataLegacy(e *bindings.TaikoL1ClientBlockProposed) *TaikoDataBlockMetadataLegacy {
+func NewTaikoDataBlockMetadataLegacy(e *ontakeBindings.TaikoL1ClientBlockProposed) *TaikoDataBlockMetadataLegacy {
 	return &TaikoDataBlockMetadataLegacy{
 		TaikoDataBlockMetadata: e.Meta,
 		Log:                    e.Raw,
@@ -133,8 +133,8 @@ func (m *TaikoDataBlockMetadataLegacy) GetBlobIndex() uint8 {
 }
 
 // GetBaseFeeConfig returns the L2 block basefee configs.
-func (m *TaikoDataBlockMetadataLegacy) GetBaseFeeConfig() *bindings.LibSharedDataBaseFeeConfig {
-	return &bindings.LibSharedDataBaseFeeConfig{}
+func (m *TaikoDataBlockMetadataLegacy) GetBaseFeeConfig() *ontakeBindings.LibSharedDataBaseFeeConfig {
+	return &ontakeBindings.LibSharedDataBaseFeeConfig{}
 }
 
 // GetRawBlockHeight returns the raw L1 block height.
@@ -163,6 +163,6 @@ func (m *TaikoDataBlockMetadataLegacy) IsOntakeBlock() bool {
 }
 
 // InnerMetadata returns the inner metadata.
-func (m *TaikoDataBlockMetadataLegacy) InnerMetadata() *bindings.TaikoDataBlockMetadata {
+func (m *TaikoDataBlockMetadataLegacy) InnerMetadata() *ontakeBindings.TaikoDataBlockMetadata {
 	return &m.TaikoDataBlockMetadata
 }

packages/taiko-client/bindings/metadata/metadata_ontake.go

@@ -6,21 +6,21 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 
-	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings"
+	ontakeBindings "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 // Ensure TaikoDataBlockMetadataOntake implements TaikoBlockMetaData.
 var _ TaikoBlockMetaData = (*TaikoDataBlockMetadataOntake)(nil)
 
 // TaikoDataBlockMetadataOntake is the metadata of an ontake Taiko block.
 type TaikoDataBlockMetadataOntake struct {
-	bindings.TaikoDataBlockMetadataV2
+	ontakeBindings.TaikoDataBlockMetadataV2
 	types.Log
 }
 
 // NewTaikoDataBlockMetadataOntake creates a new instance of TaikoDataBlockMetadataOntake
 // from the TaikoL1.BlockProposedV2 event.
-func NewTaikoDataBlockMetadataOntake(e *bindings.TaikoL1ClientBlockProposedV2) *TaikoDataBlockMetadataOntake {
+func NewTaikoDataBlockMetadataOntake(e *ontakeBindings.TaikoL1ClientBlockProposedV2) *TaikoDataBlockMetadataOntake {
 	return &TaikoDataBlockMetadataOntake{
 		TaikoDataBlockMetadataV2: e.Meta,
 		Log:                      e.Raw,
@@ -129,7 +129,7 @@ func (m *TaikoDataBlockMetadataOntake) GetBlobIndex() uint8 {
 }
 
 // GetBaseFeeConfig returns the L2 block basefee configs.
-func (m *TaikoDataBlockMetadataOntake) GetBaseFeeConfig() *bindings.LibSharedDataBaseFeeConfig {
+func (m *TaikoDataBlockMetadataOntake) GetBaseFeeConfig() *ontakeBindings.LibSharedDataBaseFeeConfig {
 	return &m.BaseFeeConfig
 }
 
@@ -159,6 +159,6 @@ func (m *TaikoDataBlockMetadataOntake) IsOntakeBlock() bool {
 }
 
 // InnerMetadata returns the inner metadata.
-func (m *TaikoDataBlockMetadataOntake) InnerMetadata() *bindings.TaikoDataBlockMetadataV2 {
+func (m *TaikoDataBlockMetadataOntake) InnerMetadata() *ontakeBindings.TaikoDataBlockMetadataV2 {
 	return &m.TaikoDataBlockMetadataV2
 }