diff --git a/integration/integration_test.go b/integration/integration_test.go index 19764610..4515ac26 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -9,7 +9,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -147,10 +146,10 @@ var _ = Describe("Basic integration test", func() { Expect(gethReceipt).To(Equal(ipldReceipt)) - rlpGeth, err := rlp.EncodeToBytes(gethReceipt) + rlpGeth, err := gethReceipt.MarshalBinary() Expect(err).ToNot(HaveOccurred()) - rlpIpld, err := rlp.EncodeToBytes(ipldReceipt) + rlpIpld, err := ipldReceipt.MarshalBinary() Expect(err).ToNot(HaveOccurred()) Expect(rlpGeth).To(Equal(rlpIpld)) diff --git a/pkg/eth/api.go b/pkg/eth/api.go index 3c4fd6ec..3d5129fa 100644 --- a/pkg/eth/api.go +++ b/pkg/eth/api.go @@ -467,7 +467,7 @@ func (pea *PublicEthAPI) GetRawTransactionByHash(ctx context.Context, hash commo // Retrieve a finalized transaction, or a pooled otherwise tx, _, _, _, err := pea.B.GetTransaction(ctx, hash) if tx != nil && err == nil { - return rlp.EncodeToBytes(tx) + return tx.MarshalBinary() } if pea.config.ProxyOnError { var tx hexutil.Bytes diff --git a/pkg/eth/api_test/api_test.go b/pkg/eth/api_test/api_test.go index 25de1b37..8db8a0b5 100644 --- a/pkg/eth/api_test/api_test.go +++ b/pkg/eth/api_test/api_test.go @@ -28,7 +28,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth/filters" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" "github.com/ethereum/go-ethereum/statediff/indexer/ipld" @@ -136,9 +135,9 @@ var ( expectedTransaction2 = eth.NewRPCTransaction(test_helpers.MockTransactions[1], test_helpers.MockBlock.Hash(), test_helpers.MockBlock.NumberU64(), 1, test_helpers.MockBlock.BaseFee()) expectedTransaction3 = eth.NewRPCTransaction(test_helpers.MockTransactions[2], test_helpers.MockBlock.Hash(), test_helpers.MockBlock.NumberU64(), 2, test_helpers.MockBlock.BaseFee()) expectedLondonTransaction = eth.NewRPCTransaction(test_helpers.MockLondonTransactions[0], test_helpers.MockLondonBlock.Hash(), test_helpers.MockLondonBlock.NumberU64(), 0, test_helpers.MockLondonBlock.BaseFee()) - expectRawTx, _ = rlp.EncodeToBytes(test_helpers.MockTransactions[0]) - expectRawTx2, _ = rlp.EncodeToBytes(test_helpers.MockTransactions[1]) - expectRawTx3, _ = rlp.EncodeToBytes(test_helpers.MockTransactions[2]) + expectRawTx, _ = test_helpers.MockTransactions[0].MarshalBinary() + expectRawTx2, _ = test_helpers.MockTransactions[1].MarshalBinary() + expectRawTx3, _ = test_helpers.MockTransactions[2].MarshalBinary() expectedReceipt = map[string]interface{}{ "blockHash": blockHash, "blockNumber": hexutil.Uint64(uint64(number.Int64())), diff --git a/pkg/eth/backend_utils.go b/pkg/eth/backend_utils.go index 789faa22..6965b6dd 100644 --- a/pkg/eth/backend_utils.go +++ b/pkg/eth/backend_utils.go @@ -275,7 +275,7 @@ func newRPCRawTransactionFromBlockIndex(b *types.Block, index uint64) hexutil.By if index >= uint64(len(txs)) { return nil } - blob, _ := rlp.EncodeToBytes(txs[index]) + blob, _ := txs[index].MarshalBinary() return blob }