feat(taiko-client): update BlockParamsV2 struct (#17893)

taikoxyz · Aug 8, 2024 · a1043a8 · a1043a8
1 parent 6972dea
commit a1043a8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/packages/taiko-client/bindings/encoding/custom_error.go b/packages/taiko-client/bindings/encoding/custom_error.go
@@ -89,6 +89,12 @@ func getErrorData(err error) string {
 			return errData
 		}
 	}
+
+	// Anvil node custom errors with reasons, example:
+	// execution reverted: custom error 1a83d90e:, reason: 0x1a83d90e"
+	if strings.Contains(err.Error(), "custom error") && strings.Contains(err.Error(), "reason") {
+		return "0x" + err.Error()[len(err.Error())-8:len(err.Error())]
+	}
 	// Anvil node custom errors, example:
 	// "execution reverted: custom error 712eb087:"
 	if strings.Contains(err.Error(), "custom error") {

diff --git a/packages/taiko-client/bindings/encoding/input.go b/packages/taiko-client/bindings/encoding/input.go
@@ -226,10 +226,6 @@ var (
 			Name: "coinbase",
 			Type: "address",
 		},
-		{
-			Name: "extraData",
-			Type: "bytes32",
-		},
 		{
 			Name: "parentMetaHash",
 			Type: "bytes32",

diff --git a/packages/taiko-client/bindings/encoding/struct.go b/packages/taiko-client/bindings/encoding/struct.go
@@ -46,7 +46,6 @@ type BlockParams struct {
 // BlockParamsV2 should be same with TaikoData.BlockParamsV2.
 type BlockParamsV2 struct {
 	Coinbase         common.Address
-	ExtraData        [32]byte
 	ParentMetaHash   [32]byte
 	AnchorBlockId    uint64
 	Timestamp        uint64

diff --git a/packages/taiko-client/proposer/transaction_builder/blob.go b/packages/taiko-client/proposer/transaction_builder/blob.go
@@ -129,7 +129,6 @@ func (b *BlobTransactionBuilder) Build(
 
 		if encodedParams, err = encoding.EncodeBlockParamsOntake(&encoding.BlockParamsV2{
 			Coinbase:         b.l2SuggestedFeeRecipient,
-			ExtraData:        rpc.StringToBytes32(b.extraData),
 			ParentMetaHash:   parentMetaHash,
 			AnchorBlockId:    0,
 			Timestamp:        0,

diff --git a/packages/taiko-client/proposer/transaction_builder/calldata.go b/packages/taiko-client/proposer/transaction_builder/calldata.go
@@ -113,7 +113,6 @@ func (b *CalldataTransactionBuilder) Build(
 
 		if encodedParams, err = encoding.EncodeBlockParamsOntake(&encoding.BlockParamsV2{
 			Coinbase:       b.l2SuggestedFeeRecipient,
-			ExtraData:      rpc.StringToBytes32(b.extraData),
 			ParentMetaHash: parentMetaHash,
 			AnchorBlockId:  0,
 			Timestamp:      0,