feat: ETH compatibility in Filecoin : Support Homestead and EIP-155 Ethereum transactions("legacy" transactions) in Filecoin

build/openrpc/full.json

@@ -6543,6 +6543,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -6598,6 +6599,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",
@@ -6738,6 +6743,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -6793,6 +6799,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",
@@ -6925,6 +6935,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -6980,6 +6991,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",
@@ -7129,6 +7144,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -7184,6 +7200,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",

build/openrpc/gateway.json

@@ -3132,6 +3132,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -3187,6 +3188,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",
@@ -3336,6 +3341,7 @@
                             "gas": "0x5",
                             "maxFeePerGas": "0x0",
                             "maxPriorityFeePerGas": "0x0",
+                            "gasPrice": "0x0",
                             "accessList": [
                                 "0x37690cfec6c1bf4c3b9288c7a5d783e98731e90b0a4c177c2a374c7a9427355e"
                             ],
@@ -3391,6 +3397,10 @@
                             "title": "number",
                             "type": "number"
                         },
+                        "gasPrice": {
+                            "additionalProperties": false,
+                            "type": "object"
+                        },
                         "hash": {
                             "items": {
                                 "description": "Number is a number",

chain/consensus/common.go

@@ -29,6 +29,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
+	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/chain/vm"
 	"github.com/filecoin-project/lotus/lib/async"
 	"github.com/filecoin-project/lotus/metrics"
@@ -131,6 +132,18 @@ func CommonBlkChecks(ctx context.Context, sm *stmgr.StateManager, cs *store.Chai
 	}
 }
 
+func IsValidEthTxForSending(nv network.Version, smsg *types.SignedMessage) bool {
+	ethTx, err := ethtypes.EthTransactionFromSignedFilecoinMessage(smsg)
+	if err != nil {
+		return false
+	}
+
+	if nv < network.Version23 && ethTx.Type() != ethtypes.EIP1559TxType {
+		return false
+	}
+	return true
+}
+
 func IsValidForSending(nv network.Version, act *types.Actor) bool {
 	// Before nv18 (Hygge), we only supported built-in account actors as senders.
 	//
@@ -276,6 +289,10 @@ func checkBlockMessages(ctx context.Context, sm *stmgr.StateManager, cs *store.C
 			return xerrors.Errorf("block had invalid signed message at index %d: %w", i, err)
 		}
 
+		if m.Signature.Type == crypto.SigTypeDelegated && !IsValidEthTxForSending(nv, m) {
+			return xerrors.Errorf("network version should be atleast NV23 for sending legacy ETH transactions; but current network version is %d", nv)
+		}
+
 		if err := checkMsg(m); err != nil {
 			return xerrors.Errorf("block had invalid secpk message at index %d: %w", i, err)
 		}

chain/consensus/signatures.go

@@ -18,34 +18,42 @@ import (
 // must be recognized by the registered verifier for the signature type.
 func AuthenticateMessage(msg *types.SignedMessage, signer address.Address) error {
 	var digest []byte
+	signatureType := msg.Signature.Type
+	signatureCopy := msg.Signature
 
-	typ := msg.Signature.Type
-	switch typ {
+	switch signatureType {
 	case crypto.SigTypeDelegated:
-		txArgs, err := ethtypes.EthTxArgsFromUnsignedEthMessage(&msg.Message)
+		signatureCopy.Data = make([]byte, len(msg.Signature.Data))
+		copy(signatureCopy.Data, msg.Signature.Data)
+		ethTx, err := ethtypes.EthTransactionFromSignedFilecoinMessage(msg)
 		if err != nil {
-			return xerrors.Errorf("failed to reconstruct eth transaction: %w", err)
+			return xerrors.Errorf("failed to reconstruct Ethereum transaction: %w", err)
 		}
-		roundTripMsg, err := txArgs.ToUnsignedMessage(msg.Message.From)
+
+		filecoinMsg, err := ethTx.ToUnsignedFilecoinMessage(msg.Message.From)
 		if err != nil {
-			return xerrors.Errorf("failed to reconstruct filecoin msg: %w", err)
+			return xerrors.Errorf("failed to reconstruct Filecoin message: %w", err)
 		}
 
-		if !msg.Message.Equals(roundTripMsg) {
-			return xerrors.New("ethereum tx failed to roundtrip")
+		if !msg.Message.Equals(filecoinMsg) {
+			return xerrors.New("Ethereum transaction roundtrip mismatch")
 		}
 
-		rlpEncodedMsg, err := txArgs.ToRlpUnsignedMsg()
+		rlpEncodedMsg, err := ethTx.ToRlpUnsignedMsg()
 		if err != nil {
-			return xerrors.Errorf("failed to repack eth rlp message: %w", err)
+			return xerrors.Errorf("failed to encode RLP message: %w", err)
 		}
 		digest = rlpEncodedMsg
+		signatureCopy.Data, err = ethTx.ToVerifiableSignature(signatureCopy.Data)
+		if err != nil {
+			return xerrors.Errorf("failed to verify signature: %w", err)
+		}
 	default:
 		digest = msg.Message.Cid().Bytes()
 	}
 
-	if err := sigs.Verify(&msg.Signature, signer, digest); err != nil {
-		return xerrors.Errorf("message %s has invalid signature (type %d): %w", msg.Cid(), typ, err)
+	if err := sigs.Verify(&signatureCopy, signer, digest); err != nil {
+		return xerrors.Errorf("invalid signature for message %s (type %d): %w", msg.Cid(), signatureType, err)
 	}
 	return nil
 }

chain/messagepool/messagepool.go

@@ -887,6 +887,11 @@ func (mp *MessagePool) addTs(ctx context.Context, m *types.SignedMessage, curTs
 	nv := mp.api.StateNetworkVersion(ctx, epoch)
 
 	// TODO: I'm not thrilled about depending on filcns here, but I prefer this to duplicating logic
+
+	if m.Signature.Type == crypto.SigTypeDelegated && !consensus.IsValidEthTxForSending(nv, m) {
+		return false, xerrors.Errorf("network version should be atleast NV23 for sending legacy ETH transactions; but current network version is %d", nv)
+	}
+
 	if !consensus.IsValidForSending(nv, senderAct) {
 		return false, xerrors.Errorf("sender actor %s is not a valid top-level sender", m.Message.From)
 	}

chain/messagesigner/messagesigner.go

@@ -196,7 +196,7 @@ func (ms *MessageSigner) dstoreKey(addr address.Address) datastore.Key {
 
 func SigningBytes(msg *types.Message, sigType address.Protocol) ([]byte, error) {
 	if sigType == address.Delegated {
-		txArgs, err := ethtypes.EthTxArgsFromUnsignedEthMessage(msg)
+		txArgs, err := ethtypes.Eth1559TxArgsFromUnsignedFilecoinMessage(msg)
 		if err != nil {
 			return nil, xerrors.Errorf("failed to reconstruct eth transaction: %w", err)
 		}