test: Update calldata test with ontake checks

NethermindEth · Oct 31, 2024 · a2a0d63 · a2a0d63
1 parent cfbc3e7
commit a2a0d63
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/packages/taiko-client/proposer/transaction_builder/calldata.go b/packages/taiko-client/proposer/transaction_builder/calldata.go
@@ -71,7 +71,6 @@ func (b *CalldataTransactionBuilder) BuildLegacy(
 	// If the current proposer wants to include the parent meta hash, then fetch it from the protocol.
 	var (
 		parentMetaHash = [32]byte{}
-		err            error
 	)
 	if includeParentMetaHash {
 		if parentMetaHash, err = getParentMetaHash(

diff --git a/packages/taiko-client/proposer/transaction_builder/calldata_test.go b/packages/taiko-client/proposer/transaction_builder/calldata_test.go
@@ -2,13 +2,29 @@ package builder
 
 import (
 	"context"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc"
 )
 
 func (s *TransactionBuilderTestSuite) TestBuildCalldata() {
-	tx, err := s.calldataTxBuilder.BuildLegacy(context.Background(), false, []byte{1})
+	state, err := rpc.GetProtocolStateVariables(s.RPCClient.TaikoL1, &bind.CallOpts{Context: context.Background()})
 	s.Nil(err)
-	s.Nil(tx.Blobs)
 
-	_, err = s.calldataTxBuilder.BuildOntake(context.Background(), [][]byte{{1}, {2}})
-	s.Error(err, "ontake transaction builder is not supported before ontake fork")
+	if s.chainConfig.IsOntake(new(big.Int).SetUint64(state.B.NumBlocks)) {
+		tx, err := s.calldataTxBuilder.BuildOntake(context.Background(), [][]byte{{1}, {2}})
+		s.Nil(err)
+		s.Nil(tx.Blobs)
+
+		_, err = s.calldataTxBuilder.BuildLegacy(context.Background(), false, []byte{1})
+		s.Error(err, "legacy transaction builder is not supported after ontake fork")
+	} else {
+		tx, err := s.calldataTxBuilder.BuildLegacy(context.Background(), false, []byte{1})
+		s.Nil(err)
+		s.Nil(tx.Blobs)
+
+		_, err = s.calldataTxBuilder.BuildOntake(context.Background(), [][]byte{{1}, {2}})
+		s.Error(err, "ontake transaction builder is not supported before ontake fork")
+	}
 }
diff --git a/packages/taiko-client/proposer/transaction_builder/common_test.go b/packages/taiko-client/proposer/transaction_builder/common_test.go
@@ -19,6 +19,7 @@ type TransactionBuilderTestSuite struct {
 	testutils.ClientTestSuite
 	calldataTxBuilder *CalldataTransactionBuilder
 	blobTxBuiler      *BlobTransactionBuilder
+	chainConfig       *config.ChainConfig
 }
 
 func (s *TransactionBuilderTestSuite) SetupTest() {
@@ -50,6 +51,7 @@ func (s *TransactionBuilderTestSuite) SetupTest() {
 		"test",
 		chainConfig,
 	)
+	s.chainConfig = chainConfig
 }
 
 func (s *TransactionBuilderTestSuite) TestGetParentMetaHash() {