Skip to content

Commit e30687c

Browse files
chore(taiko-client): cleanup the Ontake fork decompression method (#19528)
1 parent 0c4bd86 commit e30687c

File tree

5 files changed

+4
-27
lines changed

5 files changed

+4
-27
lines changed

packages/taiko-client/driver/chain_syncer/event/blocks_inserter/pacaya.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func (i *BlocksInserterPacaya) insertPreconfBlockFromExecutionPayload(
367367
}
368368

369369
// Decompress the transactions list.
370-
decompressedTxs, err := utils.DecompressPacaya(executableData.Transactions[0])
370+
decompressedTxs, err := utils.Decompress(executableData.Transactions[0])
371371
if err != nil {
372372
return nil, fmt.Errorf("failed to decompress transactions list bytes: %w", err)
373373
}

packages/taiko-client/driver/preconf_blocks/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ func (s *PreconfBlockAPIServer) ValidateExecutionPayload(payload *eth.ExecutionP
708708
}
709709

710710
var txs types.Transactions
711-
b, err := utils.DecompressPacaya(payload.Transactions[0])
711+
b, err := utils.Decompress(payload.Transactions[0])
712712
if err != nil {
713713
return fmt.Errorf("invalid zlib bytes for transactions: %w", err)
714714
}

packages/taiko-client/driver/txlist_decompressor/txlist_decompressor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (v *TxListDecompressor) tryDecompress(
6060
)
6161

6262
// Decompress the transaction list bytes.
63-
if txListBytes, err = utils.DecompressPacaya(txListBytes); err != nil {
63+
if txListBytes, err = utils.Decompress(txListBytes); err != nil {
6464
log.Info("Failed to decompress tx list bytes", "error", err)
6565
return types.Transactions{}
6666
}

packages/taiko-client/pkg/utils/util_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ func TestEncodeDecodeBytes(t *testing.T) {
2222
require.Nil(t, err)
2323

2424
require.Equal(t, b, decompressed)
25-
26-
decompressed, err = utils.DecompressPacaya(compressed)
27-
require.Nil(t, err)
28-
29-
require.Equal(t, b, decompressed)
3025
}
3126

3227
func TestGWeiToWei(t *testing.T) {

packages/taiko-client/pkg/utils/utils.go

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,32 +104,14 @@ func Compress(txList []byte) ([]byte, error) {
104104
return b.Bytes(), nil
105105
}
106106

107-
// Decompress decompresses the given txList bytes using zlib.
107+
// Decompress decompresses the given txList bytes using zlib, it checks the ErrUnexpectedEOF error.
108108
func Decompress(compressedTxList []byte) ([]byte, error) {
109109
r, err := zlib.NewReader(bytes.NewBuffer(compressedTxList))
110110
if err != nil {
111111
return nil, err
112112
}
113113
defer r.Close()
114114

115-
b, err := io.ReadAll(r)
116-
if err != nil {
117-
if !errors.Is(err, io.EOF) && !errors.Is(err, io.ErrUnexpectedEOF) {
118-
return nil, err
119-
}
120-
}
121-
122-
return b, nil
123-
}
124-
125-
// DecompressPacaya decompresses the given txList bytes using zlib, it checks the ErrUnexpectedEOF error.
126-
func DecompressPacaya(compressedTxList []byte) ([]byte, error) {
127-
r, err := zlib.NewReader(bytes.NewBuffer(compressedTxList))
128-
if err != nil {
129-
return nil, err
130-
}
131-
defer r.Close()
132-
133115
b, err := io.ReadAll(r)
134116
if err != nil {
135117
if !errors.Is(err, io.EOF) {

0 commit comments

Comments
 (0)