test for conversion

chain/types/ethtypes/eth_transactions.go

@@ -3,6 +3,7 @@ package ethtypes
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	mathbig "math/big"
 
@@ -92,6 +93,9 @@ func (tx *EthTx) GasPremium() (EthBigInt, error) {
 }
 
 func EthTransactionFromSignedFilecoinMessage(smsg *types.SignedMessage) (EthTransaction, error) {
+	if smsg == nil {
+		return nil, errors.New("signed message is nil")
+	}
 	// Validate the sender's address format.
 	if !IsEthAddress(smsg.Message.From) {
 		return nil, fmt.Errorf("sender must be an eth account, was %s", smsg.Message.From)

chain/types/ethtypes/eth_transactions_test.go

@@ -1 +1,167 @@
 package ethtypes
+
+import (
+	"testing"
+
+	"github.com/test-go/testify/require"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/big"
+	builtintypes "github.com/filecoin-project/go-state-types/builtin"
+	"github.com/filecoin-project/go-state-types/crypto"
+
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+func TestEthTransactionFromSignedFilecoinMessage(t *testing.T) {
+	eip1559sig := make([]byte, 65)
+	eip1559sig[0] = 1
+
+	legacySig := make([]byte, 66)
+	legacySig[0] = 1
+	legacySig[65] = 27
+
+	pubKeyHex := "0x04cfecc0520d906cbfea387759246e89d85e2998843e56ad1c41de247ce10b3e4c453aa73c8de13c178d94461b6fa3f8b6f74406ce43d2fbab6992d0b283394242"
+	pubk := mustDecodeHex(pubKeyHex)
+	addrHash, err := EthAddressFromPubKey(pubk)
+	require.NoError(t, err)
+	from, err := address.NewDelegatedAddress(builtintypes.EthereumAddressManagerActorID, addrHash)
+	require.NoError(t, err)
+
+	fromEth, err := EthAddressFromFilecoinAddress(from)
+	require.NoError(t, err)
+
+	to, err := address.NewIDAddress(1)
+	require.NoError(t, err)
+
+	toEth, err := EthAddressFromFilecoinAddress(to)
+	require.NoError(t, err)
+
+	tcs := map[string]struct {
+		msg          *types.SignedMessage
+		expectedErr  string
+		validateFunc func(t *testing.T, smsg *types.SignedMessage, tx EthTransaction)
+	}{
+		"empty": {
+			expectedErr: "signed message is nil",
+		},
+		"invalid-signature": {
+			msg: &types.SignedMessage{
+				Message: types.Message{
+					To:     builtintypes.EthereumAddressManagerActorAddr,
+					From:   from,
+					Method: builtintypes.MethodsEAM.CreateExternal,
+				},
+				Signature: crypto.Signature{
+					Type: crypto.SigTypeDelegated,
+					Data: []byte{1},
+				},
+			},
+			expectedErr: "unsupported signature length",
+		},
+		"valid-eip1559": {
+			msg: &types.SignedMessage{
+				Message: types.Message{
+					From:       from,
+					To:         to,
+					Value:      big.NewInt(10),
+					GasFeeCap:  big.NewInt(11),
+					GasPremium: big.NewInt(12),
+					GasLimit:   13,
+					Nonce:      14,
+					Method:     builtintypes.MethodsEVM.InvokeContract,
+				},
+				Signature: crypto.Signature{
+					Type: crypto.SigTypeDelegated,
+					Data: eip1559sig,
+				},
+			},
+			validateFunc: func(t *testing.T, smsg *types.SignedMessage, tx EthTransaction) {
+				eip1559tx := tx.(*Eth1559TxArgs)
+				require.Equal(t, big.NewInt(10), eip1559tx.Value)
+				require.Equal(t, big.NewInt(11), eip1559tx.MaxFeePerGas)
+				require.Equal(t, big.NewInt(12), eip1559tx.MaxPriorityFeePerGas)
+				require.EqualValues(t, uint64(13), eip1559tx.GasLimit)
+				require.EqualValues(t, uint64(14), eip1559tx.Nonce)
+				require.EqualValues(t, toEth, *eip1559tx.To)
+				require.EqualValues(t, 314, eip1559tx.ChainID)
+				require.Empty(t, eip1559tx.Input)
+
+				ethTx, err := tx.ToEthTx(smsg)
+				require.NoError(t, err)
+				require.EqualValues(t, 314, ethTx.ChainID)
+				require.EqualValues(t, 14, ethTx.Nonce)
+				hash, err := eip1559tx.TxHash()
+				require.NoError(t, err)
+				require.EqualValues(t, hash, ethTx.Hash)
+				require.EqualValues(t, fromEth, ethTx.From)
+				require.EqualValues(t, toEth, *ethTx.To)
+				require.EqualValues(t, big.NewInt(10), ethTx.Value)
+				require.EqualValues(t, 13, ethTx.Gas)
+				require.EqualValues(t, big.NewInt(11), *ethTx.MaxFeePerGas)
+				require.EqualValues(t, big.NewInt(12), *ethTx.MaxPriorityFeePerGas)
+				require.Nil(t, ethTx.GasPrice)
+				require.Empty(t, ethTx.AccessList)
+			},
+		},
+		"valid-legacy": {
+			msg: &types.SignedMessage{
+				Message: types.Message{
+					From:       from,
+					To:         to,
+					Value:      big.NewInt(10),
+					GasFeeCap:  big.NewInt(11),
+					GasPremium: big.NewInt(12),
+					GasLimit:   13,
+					Nonce:      14,
+					Method:     builtintypes.MethodsEVM.InvokeContract,
+				},
+				Signature: crypto.Signature{
+					Type: crypto.SigTypeDelegated,
+					Data: legacySig,
+				},
+			},
+			validateFunc: func(t *testing.T, smsg *types.SignedMessage, tx EthTransaction) {
+				legacyTx := tx.(*EthLegacyHomesteadTxArgs)
+				require.Equal(t, big.NewInt(10), legacyTx.Value)
+				require.EqualValues(t, uint64(13), legacyTx.GasLimit)
+				require.EqualValues(t, uint64(14), legacyTx.Nonce)
+				require.EqualValues(t, toEth, *legacyTx.To)
+				require.EqualValues(t, big.NewInt(11), legacyTx.GasPrice)
+				require.Empty(t, legacyTx.Input)
+
+				ethTx, err := tx.ToEthTx(smsg)
+				require.NoError(t, err)
+				require.EqualValues(t, 0, ethTx.ChainID)
+				require.EqualValues(t, 14, ethTx.Nonce)
+				hash, err := legacyTx.TxHash()
+				require.NoError(t, err)
+				require.EqualValues(t, big.NewInt(11), *ethTx.GasPrice)
+				require.EqualValues(t, hash, ethTx.Hash)
+				require.EqualValues(t, fromEth, ethTx.From)
+				require.EqualValues(t, toEth, *ethTx.To)
+				require.EqualValues(t, big.NewInt(10), ethTx.Value)
+				require.EqualValues(t, 13, ethTx.Gas)
+				require.Nil(t, ethTx.MaxFeePerGas)
+				require.Nil(t, ethTx.MaxPriorityFeePerGas)
+				require.Empty(t, ethTx.AccessList)
+				require.EqualValues(t, big.NewInt(27), ethTx.V)
+			},
+		},
+	}
+
+	for name, tc := range tcs {
+		t.Run(name, func(t *testing.T) {
+			tx, err := EthTransactionFromSignedFilecoinMessage(tc.msg)
+			if tc.expectedErr != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tc.expectedErr)
+			} else {
+				require.NoError(t, err)
+			}
+			if tc.validateFunc != nil {
+				tc.validateFunc(t, tc.msg, tx)
+			}
+		})
+	}
+}

go.mod

@@ -141,6 +141,7 @@ require (
 	github.com/samber/lo v1.39.0
 	github.com/stretchr/testify v1.9.0
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+	github.com/test-go/testify v1.1.4
 	github.com/triplewz/poseidon v0.0.0-20230828015038-79d8165c88ed
 	github.com/urfave/cli/v2 v2.25.5
 	github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba