diff --git a/bindings/.githead b/bindings/.githead index c20380f54..838ca0905 100644 --- a/bindings/.githead +++ b/bindings/.githead @@ -1 +1 @@ -06710eb41132f7b920d80053ed8b906d90c18bb3 +2d9ab0fa50e4ac58f7c47346a710a32a1006379d diff --git a/bindings/encoding/input.go b/bindings/encoding/input.go index 1df1894f0..69f27fcc5 100644 --- a/bindings/encoding/input.go +++ b/bindings/encoding/input.go @@ -35,7 +35,7 @@ var ( }, { Name: "cacheTxListInfo", - Type: "uint8", + Type: "bool", }, } blockMetadataComponents = []abi.ArgumentMarshaling{ diff --git a/bindings/encoding/struct.go b/bindings/encoding/struct.go index 9e2cda252..301b78158 100644 --- a/bindings/encoding/struct.go +++ b/bindings/encoding/struct.go @@ -48,7 +48,7 @@ type TaikoL1BlockMetadataInput struct { Beneficiary common.Address TxListByteStart *big.Int TxListByteEnd *big.Int - CacheTxListInfo uint8 + CacheTxListInfo bool } // FromGethHeader converts a GETH *types.Header to *BlockHeader. diff --git a/bindings/encoding/struct_test.go b/bindings/encoding/struct_test.go index 1261fe62a..22c40e53e 100644 --- a/bindings/encoding/struct_test.go +++ b/bindings/encoding/struct_test.go @@ -37,7 +37,7 @@ var ( TxListHash: randomHash(), TxListByteStart: common.Big0, TxListByteEnd: common.Big0, - CacheTxListInfo: 0, + CacheTxListInfo: false, } testMeta = bindings.TaikoDataBlockMetadata{ Id: rand.Uint64(), diff --git a/proposer/proposer.go b/proposer/proposer.go index 45b04519e..666535257 100644 --- a/proposer/proposer.go +++ b/proposer/proposer.go @@ -291,7 +291,7 @@ func (p *Proposer) ProposeOp(ctx context.Context) error { TxListHash: crypto.Keccak256Hash(txListBytes), TxListByteStart: common.Big0, TxListByteEnd: new(big.Int).SetUint64(uint64(len(txListBytes))), - CacheTxListInfo: 0, + CacheTxListInfo: false, }, txListBytes, uint(txs.Len()), &txNonce); err != nil { return fmt.Errorf("failed to propose transactions: %w", err) } @@ -402,7 +402,7 @@ func (p *Proposer) ProposeTxList( return nil } if tx, err = p.sendProposeBlockTx(ctx, meta, txListBytes, nonce, isReplacement); err != nil { - log.Warn("Failed to send propose block transaction, retrying", "error", err) + log.Warn("Failed to send propose block transaction, retrying", "error", encoding.TryParsingCustomError(err)) if strings.Contains(err.Error(), txpool.ErrReplaceUnderpriced.Error()) { isReplacement = true } else { @@ -446,7 +446,7 @@ func (p *Proposer) ProposeEmptyBlockOp(ctx context.Context) error { Beneficiary: p.L2SuggestedFeeRecipient(), TxListByteStart: common.Big0, TxListByteEnd: common.Big0, - CacheTxListInfo: 0, + CacheTxListInfo: false, }, []byte{}, 0, nil) } diff --git a/proposer/proposer_test.go b/proposer/proposer_test.go index 0b6010946..ee8bc5bc2 100644 --- a/proposer/proposer_test.go +++ b/proposer/proposer_test.go @@ -161,7 +161,7 @@ func (s *ProposerTestSuite) TestSendProposeBlockTx() { TxListHash: crypto.Keccak256Hash(encoded), TxListByteStart: common.Big0, TxListByteEnd: new(big.Int).SetUint64(uint64(len(encoded))), - CacheTxListInfo: 0, + CacheTxListInfo: false, }, encoded, &nonce, diff --git a/testutils/helper.go b/testutils/helper.go index 30008f6ba..e9afd3e40 100644 --- a/testutils/helper.go +++ b/testutils/helper.go @@ -26,7 +26,7 @@ func ProposeInvalidTxListBytes(s *ClientTestSuite, proposer Proposer) { TxListHash: crypto.Keccak256Hash(invalidTxListBytes), TxListByteStart: common.Big0, TxListByteEnd: new(big.Int).SetUint64(uint64(len(invalidTxListBytes))), - CacheTxListInfo: 0, + CacheTxListInfo: false, }, invalidTxListBytes, 1, nil)) } @@ -59,7 +59,7 @@ func ProposeAndInsertEmptyBlocks( TxListHash: crypto.Keccak256Hash(encoded), TxListByteStart: common.Big0, TxListByteEnd: new(big.Int).SetUint64(uint64(len(encoded))), - CacheTxListInfo: 0, + CacheTxListInfo: false, }, encoded, 0, nil)) ProposeInvalidTxListBytes(s, proposer)