Merge pull request #10072 from filecoin-project/feat/ethmod-rpc

config: Fevm.EnableEthPRC

documentation/en/default-lotus-config.toml

@@ -344,12 +344,11 @@
 
 
 [Fevm]
-  # EnableEthHashToFilecoinCidMapping enables storing a mapping of eth transaction hashes to filecoin message Cids
-  # You will not be able to look up ethereum transactions by their hash if this is disabled.
+  # EnableEthPRC enables eth_ rpc, and enables storing a mapping of eth transaction hashes to filecoin message Cids.
   #
   # type: bool
-  # env var: LOTUS_FEVM_ENABLEETHHASHTOFILECOINCIDMAPPING
-  #EnableEthHashToFilecoinCidMapping = false
+  # env var: LOTUS_FEVM_ENABLEETHPRC
+  #EnableEthPRC = false
 
   # EthTxHashMappingLifetimeDays the transaction hash lookup database will delete mappings that have been stored for more than x days
   # Set to 0 to keep all mappings

itests/eth_deploy_test.go

@@ -40,9 +40,7 @@ func TestDeployment(t *testing.T) {
 		kit.WithCfgOpt(func(cfg *config.FullNode) error {
 			cfg.ActorEvent.EnableRealTimeFilterAPI = true
 			return nil
-		}),
-		kit.EthTxHashLookup(),
-	)
+		}))
 	ens.InterconnectAll().BeginMining(blockTime)
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)

itests/eth_filter_test.go

@@ -204,7 +204,7 @@ func TestEthNewFilterCatchAll(t *testing.T) {
 	kit.QuietMiningLogs()
 
 	blockTime := 100 * time.Millisecond
-	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.RealTimeFilterAPI(), kit.EthTxHashLookup())
+	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.RealTimeFilterAPI())
 	ens.InterconnectAll().BeginMining(blockTime)
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)

itests/eth_hash_lookup_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/itests/kit"
-	"github.com/filecoin-project/lotus/node/config"
 )
 
 // TestTransactionHashLookup tests to see if lotus correctly stores a mapping from ethereum transaction hash to
@@ -29,7 +28,6 @@ func TestTransactionHashLookup(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -112,86 +110,6 @@ func TestTransactionHashLookup(t *testing.T) {
 	require.Equal(t, uint64(*chainTx.TransactionIndex), uint64(0)) // only transaction
 }
 
-// TestTransactionHashLookupNoDb tests to see if looking up eth transactions by hash breaks without the lookup table
-func TestTransactionHashLookupNoDb(t *testing.T) {
-	kit.QuietMiningLogs()
-
-	blocktime := 1 * time.Second
-	client, _, ens := kit.EnsembleMinimal(
-		t,
-		kit.MockProofs(),
-		kit.ThroughRPC(),
-		kit.WithCfgOpt(func(cfg *config.FullNode) error {
-			cfg.Fevm.EnableEthHashToFilecoinCidMapping = false
-			return nil
-		}),
-	)
-	ens.InterconnectAll().BeginMining(blocktime)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-
-	// install contract
-	contractHex, err := os.ReadFile("./contracts/SimpleCoin.hex")
-	require.NoError(t, err)
-
-	contract, err := hex.DecodeString(string(contractHex))
-	require.NoError(t, err)
-
-	// create a new Ethereum account
-	key, ethAddr, deployer := client.EVM().NewAccount()
-
-	// send some funds to the f410 address
-	kit.SendFunds(ctx, t, client, deployer, types.FromFil(10))
-
-	gaslimit, err := client.EthEstimateGas(ctx, ethtypes.EthCall{
-		From: &ethAddr,
-		Data: contract,
-	})
-	require.NoError(t, err)
-
-	maxPriorityFeePerGas, err := client.EthMaxPriorityFeePerGas(ctx)
-	require.NoError(t, err)
-
-	// now deploy a contract from the embryo, and validate it went well
-	tx := ethtypes.EthTxArgs{
-		ChainID:              build.Eip155ChainId,
-		Value:                big.Zero(),
-		Nonce:                0,
-		MaxFeePerGas:         types.NanoFil,
-		MaxPriorityFeePerGas: big.Int(maxPriorityFeePerGas),
-		GasLimit:             int(gaslimit),
-		Input:                contract,
-		V:                    big.Zero(),
-		R:                    big.Zero(),
-		S:                    big.Zero(),
-	}
-
-	client.EVM().SignTransaction(&tx, key.PrivateKey)
-
-	rawTxHash, err := tx.TxHash()
-	require.NoError(t, err)
-
-	hash := client.EVM().SubmitTransaction(ctx, &tx)
-	require.Equal(t, rawTxHash, hash)
-
-	// We shouldn't be able to find the tx
-	mpoolTx, err := client.EthGetTransactionByHash(ctx, &hash)
-	require.NoError(t, err)
-	require.Nil(t, mpoolTx)
-
-	// Wait for message to land on chain, we can't know exactly when because we can't find it.
-	time.Sleep(20 * blocktime)
-	receipt, err := client.EthGetTransactionReceipt(ctx, hash)
-	require.NoError(t, err)
-	require.Nil(t, receipt)
-
-	// We still shouldn't be able to find the tx
-	chainTx, err := client.EthGetTransactionByHash(ctx, &hash)
-	require.NoError(t, err)
-	require.Nil(t, chainTx)
-}
-
 // TestTransactionHashLookupBlsFilecoinMessage tests to see if lotus can find a BLS Filecoin Message using the transaction hash
 func TestTransactionHashLookupBlsFilecoinMessage(t *testing.T) {
 	kit.QuietMiningLogs()
@@ -201,7 +119,6 @@ func TestTransactionHashLookupBlsFilecoinMessage(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -271,7 +188,6 @@ func TestTransactionHashLookupSecpFilecoinMessage(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -348,7 +264,6 @@ func TestTransactionHashLookupNonexistentMessage(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -379,7 +294,6 @@ func TestEthGetMessageCidByTransactionHashEthTx(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -476,7 +390,6 @@ func TestEthGetMessageCidByTransactionHashSecp(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 
@@ -547,7 +460,6 @@ func TestEthGetMessageCidByTransactionHashBLS(t *testing.T) {
 		t,
 		kit.MockProofs(),
 		kit.ThroughRPC(),
-		kit.EthTxHashLookup(),
 	)
 	ens.InterconnectAll().BeginMining(blocktime)
 

itests/eth_transactions_test.go

@@ -21,7 +21,7 @@ import (
 
 func TestValueTransferValidSignature(t *testing.T) {
 	blockTime := 100 * time.Millisecond
-	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.EthTxHashLookup())
+	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC())
 
 	ens.InterconnectAll().BeginMining(blockTime)
 
@@ -106,7 +106,7 @@ func TestLegacyTransaction(t *testing.T) {
 func TestContractDeploymentValidSignature(t *testing.T) {
 
 	blockTime := 100 * time.Millisecond
-	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.EthTxHashLookup())
+	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC())
 
 	ens.InterconnectAll().BeginMining(blockTime)
 
@@ -167,7 +167,7 @@ func TestContractDeploymentValidSignature(t *testing.T) {
 
 func TestContractInvocation(t *testing.T) {
 	blockTime := 100 * time.Millisecond
-	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.EthTxHashLookup())
+	client, _, ens := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC())
 
 	ens.InterconnectAll().BeginMining(blockTime)
 

itests/fevm_test.go

@@ -132,3 +132,10 @@ func TestFEVMDelegateCall(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, result, expectedResultActor)
 }
+
+func TestEVMRpcDisable(t *testing.T) {
+	client, _, _ := kit.EnsembleMinimal(t, kit.MockProofs(), kit.ThroughRPC(), kit.DisableEthRPC())
+
+	_, err := client.EthBlockNumber(context.Background())
+	require.ErrorContains(t, err, "module disabled, enable with Fevm.EnableEthPRC")
+}

itests/kit/node_opts.go

@@ -58,6 +58,15 @@ var DefaultNodeOpts = nodeOpts{
 	sectors:    DefaultPresealsPerBootstrapMiner,
 	sectorSize: abi.SectorSize(2 << 10), // 2KiB.
 
+	cfgOpts: []CfgOption{
+		func(cfg *config.FullNode) error {
+			// test defaults
+
+			cfg.Fevm.EnableEthPRC = true
+			return nil
+		},
+	},
+
 	workerTasks:      []sealtasks.TaskType{sealtasks.TTFetch, sealtasks.TTCommit1, sealtasks.TTFinalize, sealtasks.TTFinalizeUnsealed},
 	workerStorageOpt: func(store paths.Store) paths.Store { return store },
 }
@@ -297,9 +306,9 @@ func HistoricFilterAPI(dbpath string) NodeOpt {
 	})
 }
 
-func EthTxHashLookup() NodeOpt {
+func DisableEthRPC() NodeOpt {
 	return WithCfgOpt(func(cfg *config.FullNode) error {
-		cfg.Fevm.EnableEthHashToFilecoinCidMapping = true
+		cfg.Fevm.EnableEthPRC = false
 		return nil
 	})
 }

node/builder_chain.go

@@ -261,7 +261,8 @@ func ConfigFullNode(c interface{}) Option {
 		// in lite-mode Eth event api is provided by gateway
 		ApplyIf(isFullNode, Override(new(full.EthEventAPI), modules.EthEventAPI(cfg.ActorEvent))),
 
-		Override(new(full.EthModuleAPI), modules.EthModuleAPI(cfg.Fevm)),
+		If(cfg.Fevm.EnableEthPRC, Override(new(full.EthModuleAPI), modules.EthModuleAPI(cfg.Fevm))),
+		If(!cfg.Fevm.EnableEthPRC, Override(new(full.EthModuleAPI), &full.EthModuleDummy{})),
 	)
 }
 

node/config/def.go

@@ -108,8 +108,8 @@ func DefaultFullNode() *FullNode {
 			MaxFilterHeightRange:    2880, // conservative limit of one day
 		},
 		Fevm: FevmConfig{
-			EnableEthHashToFilecoinCidMapping: false,
-			EthTxHashMappingLifetimeDays:      0,
+			EnableEthPRC:                 false,
+			EthTxHashMappingLifetimeDays: 0,
 		},
 	}
 }

node/config/types.go

@@ -695,9 +695,9 @@ type ActorEventConfig struct {
 }
 
 type FevmConfig struct {
-	// EnableEthHashToFilecoinCidMapping enables storing a mapping of eth transaction hashes to filecoin message Cids
-	// You will not be able to look up ethereum transactions by their hash if this is disabled.
-	EnableEthHashToFilecoinCidMapping bool
+	// EnableEthPRC enables eth_ rpc, and enables storing a mapping of eth transaction hashes to filecoin message Cids.
+	EnableEthPRC bool
+
 	// EthTxHashMappingLifetimeDays the transaction hash lookup database will delete mappings that have been stored for more than x days
 	// Set to 0 to keep all mappings
 	EthTxHashMappingLifetimeDays int