Fix signature of typed transactions (#197)

* Fix signature of typed transactions

* Add Changelog entry

Author: ferranbt

CHANGELOG.md

@@ -1,6 +1,7 @@
 
 # 0.1.2 (Unreleased)
 
+- Fix signing of typed transactions [[GH-197](https://github.com/umbracle/ethgo/issues/197)]
 - Fix. Use `ethgo.BlockNumber` input to make `Call` in contract [[GH-194](https://github.com/umbracle/ethgo/issues/194)]
 - Add `testcases` for contract signature and transaction signing [[GH-193](https://github.com/umbracle/ethgo/issues/193)]
 - Add `eth_feeHistory` rpc endpoint [[GH-192](https://github.com/umbracle/ethgo/issues/192)]

structs.go

@@ -228,8 +228,8 @@ func (t *Transaction) Copy() *Transaction {
 }
 
 type AccessEntry struct {
-	Address Address
-	Storage []Hash
+	Address Address `json:"address"`
+	Storage []Hash  `json:"storageKeys"`
 }
 
 type AccessList []AccessEntry

testcases/transaction_test.go

@@ -81,8 +81,6 @@ func TestTransactions(t *testing.T) {
 }
 
 func TestTypedTransactions(t *testing.T) {
-	t.Skip()
-
 	var transactions []struct {
 		Name           string         `json:"name"`
 		AccountAddress ethgo.Address  `json:"address"`
@@ -91,62 +89,68 @@ func TestTypedTransactions(t *testing.T) {
 
 		Tx struct {
 			Type                 ethgo.TransactionType
-			Data                 *ethgo.ArgBytes `json:"data,omitempty"`
-			GasLimit             *ethgo.ArgBig   `json:"gasLimit,omitempty"`
-			MaxPriorityFeePerGas *ethgo.ArgBig   `json:"maxPriorityFeePerGas,omitempty"`
-			MaxFeePerGas         *ethgo.ArgBig   `json:"maxFeePerGas,omitempty"`
-			Nonce                uint64          `json:"nonce,omitempty"`
-			To                   *ethgo.Address  `json:"to,omitempty"`
-			Value                *ethgo.ArgBig   `json:"value,omitempty"`
-			GasPrice             *ethgo.ArgBig   `json:"gasPrice,omitempty"`
-			ChainID              uint64          `json:"chainId,omitempty"`
+			Data                 *ethgo.ArgBytes  `json:"data,omitempty"`
+			GasLimit             *ethgo.ArgBig    `json:"gasLimit,omitempty"`
+			MaxPriorityFeePerGas *ethgo.ArgBig    `json:"maxPriorityFeePerGas,omitempty"`
+			MaxFeePerGas         *ethgo.ArgBig    `json:"maxFeePerGas,omitempty"`
+			Nonce                uint64           `json:"nonce,omitempty"`
+			To                   *ethgo.Address   `json:"to,omitempty"`
+			Value                *ethgo.ArgBig    `json:"value,omitempty"`
+			GasPrice             *ethgo.ArgBig    `json:"gasPrice,omitempty"`
+			ChainID              uint64           `json:"chainId,omitempty"`
+			AccessList           ethgo.AccessList `json:"accessList,omitempty"`
 		}
 	}
 	ReadTestCase(t, "typed-transactions", &transactions)
 
 	for _, c := range transactions {
-		key, err := wallet.NewWalletFromPrivKey(c.Key)
-		assert.NoError(t, err)
-		assert.Equal(t, key.Address(), c.AccountAddress)
-
-		txn := &ethgo.Transaction{
-			ChainID:              big.NewInt(0),
-			Type:                 c.Tx.Type,
-			MaxPriorityFeePerGas: (*big.Int)(c.Tx.MaxPriorityFeePerGas),
-			MaxFeePerGas:         (*big.Int)(c.Tx.MaxFeePerGas),
-		}
-		if c.Tx.Data != nil {
-			txn.Input = *c.Tx.Data
-		}
-		if c.Tx.Value != nil {
-			txn.Value = (*big.Int)(c.Tx.Value)
-		}
-		if c.Tx.To != nil {
-			txn.To = c.Tx.To
-		}
-		if c.Tx.GasLimit != nil {
-			gasLimit, isUint64 := getUint64FromBigInt(c.Tx.GasLimit)
-			if !isUint64 {
-				return
+		t.Run(c.Name, func(t *testing.T) {
+			key, err := wallet.NewWalletFromPrivKey(c.Key)
+			assert.NoError(t, err)
+			assert.Equal(t, key.Address(), c.AccountAddress)
+
+			chainID := big.NewInt(int64(c.Tx.ChainID))
+
+			txn := &ethgo.Transaction{
+				ChainID:              chainID,
+				Type:                 c.Tx.Type,
+				MaxPriorityFeePerGas: (*big.Int)(c.Tx.MaxPriorityFeePerGas),
+				MaxFeePerGas:         (*big.Int)(c.Tx.MaxFeePerGas),
+				AccessList:           c.Tx.AccessList,
 			}
-			txn.Gas = gasLimit
-		}
-		txn.Nonce = c.Tx.Nonce
-		if c.Tx.GasPrice != nil {
-			gasPrice, isUint64 := getUint64FromBigInt(c.Tx.GasPrice)
-			if !isUint64 {
-				return
+			if c.Tx.Data != nil {
+				txn.Input = *c.Tx.Data
+			}
+			if c.Tx.Value != nil {
+				txn.Value = (*big.Int)(c.Tx.Value)
+			}
+			if c.Tx.To != nil {
+				txn.To = c.Tx.To
+			}
+			if c.Tx.GasLimit != nil {
+				gasLimit, isUint64 := getUint64FromBigInt(c.Tx.GasLimit)
+				if !isUint64 {
+					return
+				}
+				txn.Gas = gasLimit
+			}
+			txn.Nonce = c.Tx.Nonce
+			if c.Tx.GasPrice != nil {
+				gasPrice, isUint64 := getUint64FromBigInt(c.Tx.GasPrice)
+				if !isUint64 {
+					return
+				}
+				txn.GasPrice = gasPrice
 			}
-			txn.GasPrice = gasPrice
-		}
 
-		signer := wallet.NewEIP155Signer(0)
-		signedTxn, err := signer.SignTx(txn, key)
-		assert.NoError(t, err)
+			signer := wallet.NewEIP155Signer(chainID.Uint64())
+			signedTxn, err := signer.SignTx(txn, key)
+			assert.NoError(t, err)
 
-		txnRaw, err := signedTxn.MarshalRLPTo(nil)
-		assert.NoError(t, err)
+			txnRaw, err := signedTxn.MarshalRLPTo(nil)
+			assert.NoError(t, err)
 
-		t.Log(txnRaw)
+			assert.Equal(t, txnRaw, c.Signed.Bytes())
+		})
 	}
 }

wallet/signer.go

@@ -58,7 +58,10 @@ func (e *EIP1155Signer) SignTx(tx *ethgo.Transaction, key ethgo.Key) (*ethgo.Tra
 		return nil, err
 	}
 
-	vv := uint64(sig[64]) + 35 + e.chainID*2
+	vv := uint64(sig[64])
+	if tx.Type == 0 {
+		vv = vv + 35 + e.chainID*2
+	}
 
 	tx.R = trimBytesZeros(sig[:32])
 	tx.S = trimBytesZeros(sig[32:64])
@@ -70,8 +73,23 @@ func signHash(tx *ethgo.Transaction, chainID uint64) []byte {
 	a := fastrlp.DefaultArenaPool.Get()
 
 	v := a.NewArray()
+
+	if tx.Type != 0 {
+		// either dynamic and access type
+		v.Set(a.NewBigInt(tx.ChainID))
+	}
+
 	v.Set(a.NewUint(tx.Nonce))
-	v.Set(a.NewUint(tx.GasPrice))
+
+	if tx.Type == ethgo.TransactionDynamicFee {
+		// dynamic fee uses
+		v.Set(a.NewBigInt(tx.MaxPriorityFeePerGas))
+		v.Set(a.NewBigInt(tx.MaxFeePerGas))
+	} else {
+		// legacy and access type use gas price
+		v.Set(a.NewUint(tx.GasPrice))
+	}
+
 	v.Set(a.NewUint(tx.Gas))
 	if tx.To == nil {
 		v.Set(a.NewNull())
@@ -81,14 +99,32 @@ func signHash(tx *ethgo.Transaction, chainID uint64) []byte {
 	v.Set(a.NewBigInt(tx.Value))
 	v.Set(a.NewCopyBytes(tx.Input))
 
+	if tx.Type != 0 {
+		// either dynamic and access type
+		accessList, err := tx.AccessList.MarshalRLPWith(a)
+		if err != nil {
+			panic(err)
+		}
+		v.Set(accessList)
+	}
+
 	// EIP155
-	if chainID != 0 {
+	if chainID != 0 && tx.Type == 0 {
 		v.Set(a.NewUint(chainID))
 		v.Set(a.NewUint(0))
 		v.Set(a.NewUint(0))
 	}
 
-	hash := ethgo.Keccak256(v.MarshalTo(nil))
+	dst := v.MarshalTo(nil)
+
+	// append the tx type byte
+	if tx.Type == ethgo.TransactionAccessList {
+		dst = append([]byte{0x1}, dst...)
+	} else if tx.Type == ethgo.TransactionDynamicFee {
+		dst = append([]byte{0x2}, dst...)
+	}
+
+	hash := ethgo.Keccak256(dst)
 	fastrlp.DefaultArenaPool.Put(a)
 	return hash
 }