Merge pull request #75 from testinprod-io/pcw109550/fix-deposit-tx-rl…

…p-encode Handle Deposit Transaction RLP encoding
testinprod-io · Jun 27, 2023 · 8d59181 · 8d59181
2 parents bbdccba + 10522a5
commit 8d59181
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 0 deletions.
diff --git a/core/types/block.go b/core/types/block.go
@@ -973,6 +973,8 @@ func (bb Body) payloadSize() (payloadSize int, txsLen, unclesLen, withdrawalsLen
 			txLen = t.EncodingSize()
 		case *DynamicFeeTransaction:
 			txLen = t.EncodingSize()
+		case *DepositTx:
+			txLen = t.EncodingSize()
 		}
 		if txLen >= 56 {
 			txsLen += bitsToBytes(bits.Len(uint(txLen)))
@@ -1044,6 +1046,10 @@ func (bb Body) EncodeRLP(w io.Writer) error {
 			if err := t.EncodeRLP(w); err != nil {
 				return err
 			}
+		case *DepositTx:
+			if err := t.EncodeRLP(w); err != nil {
+				return err
+			}
 		}
 	}
 	// encode Uncles

diff --git a/core/types/block_test.go b/core/types/block_test.go
@@ -276,6 +276,107 @@ func makeBenchBlock() *Block {
 	return NewBlock(header, txs, uncles, receipts, nil /* withdrawals */)
 }
 
+func TestCanEncodeAndDecodeBodyTransactions(t *testing.T) {
+	// Create legacy tx.
+	to := libcommon.HexToAddress("095e7baea6a6c7c4c2dfeb977efac326af552d87")
+	ten := new(uint256.Int).SetUint64(10)
+	var tx1 Transaction = &LegacyTx{
+		CommonTx: CommonTx{
+			Nonce: 0,
+			To:    &to,
+			Value: ten,
+			Gas:   50000,
+			Data:  []byte{98, 10, 7},
+		},
+		GasPrice: ten,
+	}
+	chainID, _ := uint256.FromBig(big.NewInt(1))
+	// Create ACL tx.
+	addr := libcommon.HexToAddress("0x0000000000000000000000000000000000000001")
+	accesses := types2.AccessList{types2.AccessTuple{
+		Address: addr,
+		StorageKeys: []libcommon.Hash{
+			{0},
+		},
+	}}
+	var tx2 Transaction = &AccessListTx{
+		ChainID: chainID,
+		LegacyTx: LegacyTx{
+			CommonTx: CommonTx{
+				Nonce: 0,
+				To:    &to,
+				Gas:   123457,
+				Data:  []byte{10, 20, 30},
+			},
+			GasPrice: ten,
+		},
+		AccessList: accesses,
+	}
+	sig2 := common.Hex2Bytes("3dbacc8d0259f2508625e97fdfc57cd85fdd16e5821bc2c10bdd1a52649e8335476e10695b183a87b0aa292a7f4b78ef0c3fbe62aa2c42c84e1d9c3da159ef1401")
+	tx2, _ = tx2.WithSignature(*LatestSignerForChainID(big.NewInt(1)), sig2)
+	// Create DynamicFeeTransaction tx.
+	feeCap, _ := uint256.FromBig(big.NewInt(2))
+	var tx3 Transaction = &DynamicFeeTransaction{
+		CommonTx: CommonTx{
+			ChainID: u256.Num1,
+			Nonce:   0,
+			To:      &to,
+			Gas:     123457,
+			Data:    []byte{40, 50, 60},
+		},
+		FeeCap:     feeCap,
+		Tip:        u256.Num0,
+		AccessList: accesses,
+	}
+	tx3, _ = tx3.WithSignature(*LatestSignerForChainID(big.NewInt(1)), common.Hex2Bytes("fe38ca4e44a30002ac54af7cf922a6ac2ba11b7d22f548e8ecb3f51f41cb31b06de6a5cbae13c0c856e33acf021b51819636cfc009d39eafb9f606d546e305a800"))
+	// Create Deposit tx.
+	sourceHash := libcommon.HexToHash("0x89c99d90b79719238d2645c7642f2c9295246e80775b38cfd162b696817fbd50")
+	var tx4 Transaction = &DepositTx{
+		SourceHash:          sourceHash,
+		From:                to,
+		To:                  &addr,
+		Mint:                new(uint256.Int).SetUint64(10),
+		Value:               new(uint256.Int).SetUint64(100),
+		Gas:                 1337,
+		IsSystemTransaction: true,
+		Data:                []byte{70, 80, 90},
+	}
+	body := &Body{
+		Transactions: []Transaction{
+			tx1, tx2, tx3, tx4,
+		},
+		Uncles:      []*Header{},
+		Withdrawals: []*Withdrawal{},
+	}
+	writer := bytes.NewBuffer(nil)
+	err := body.EncodeRLP(writer)
+	if err != nil {
+		t.Fatal(err)
+	}
+	rlpBytes := common.CopyBytes(writer.Bytes())
+	writer.Reset()
+	writer.WriteString(hexutility.Encode(rlpBytes))
+
+	var resultBody Body
+	fromHex := common.CopyBytes(common.FromHex(writer.String()))
+	bodyReader := bytes.NewReader(fromHex)
+	stream := rlp.NewStream(bodyReader, 0)
+
+	err = resultBody.DecodeRLP(stream)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(resultBody.Transactions) != len(body.Transactions) {
+		t.Fatalf("expected there to be %d transaction once decoded", len(body.Transactions))
+	}
+
+	for i := 0; i < len(body.Transactions); i++ {
+		assert.Equal(t, resultBody.Transactions[i], body.Transactions[i])
+	}
+
+}
+
 func TestCanEncodeAndDecodeRawBody(t *testing.T) {
 	body := &RawBody{
 		Uncles: []*Header{

diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go
@@ -208,6 +208,8 @@ func (tp TransactionsPacket) EncodeRLP(w io.Writer) error {
 			txLen = t.EncodingSize()
 		case *types.DynamicFeeTransaction:
 			txLen = t.EncodingSize()
+		case *types.DepositTx:
+			txLen = t.EncodingSize()
 		}
 		if txLen >= 56 {
 			txsLen += (bits.Len(uint(txLen)) + 7) / 8
@@ -237,6 +239,10 @@ func (tp TransactionsPacket) EncodeRLP(w io.Writer) error {
 			if err := t.EncodeRLP(w); err != nil {
 				return err
 			}
+		case *types.DepositTx:
+			if err := t.EncodeRLP(w); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -523,6 +529,8 @@ func (ptp PooledTransactionsPacket) EncodeRLP(w io.Writer) error {
 			txLen = t.EncodingSize()
 		case *types.DynamicFeeTransaction:
 			txLen = t.EncodingSize()
+		case *types.DepositTx:
+			txLen = t.EncodingSize()
 		}
 		if txLen >= 56 {
 			txsLen += (bits.Len(uint(txLen)) + 7) / 8
@@ -552,6 +560,10 @@ func (ptp PooledTransactionsPacket) EncodeRLP(w io.Writer) error {
 			if err := t.EncodeRLP(w); err != nil {
 				return err
 			}
+		case *types.DepositTx:
+			if err := t.EncodeRLP(w); err != nil {
+				return err
+			}
 		}
 	}
 	return nil
@@ -597,6 +609,8 @@ func (ptp66 PooledTransactionsPacket66) EncodeRLP(w io.Writer) error {
 			txLen = t.EncodingSize()
 		case *types.DynamicFeeTransaction:
 			txLen = t.EncodingSize()
+		case *types.DepositTx:
+			txLen = t.EncodingSize()
 		}
 		if txLen >= 56 {
 			txsLen += (bits.Len(uint(txLen)) + 7) / 8
@@ -643,6 +657,10 @@ func (ptp66 PooledTransactionsPacket66) EncodeRLP(w io.Writer) error {
 			if err := t.EncodeRLP(w); err != nil {
 				return err
 			}
+		case *types.DepositTx:
+			if err := t.EncodeRLP(w); err != nil {
+				return err
+			}
 		}
 	}
 	return nil