feat: integrate nv18

Makefile

@@ -61,7 +61,7 @@ bundle-gen:
 	cd venus-devtool && go run ./bundle-gen/*.go  --dst ./../venus-shared/actors/builtin_actors_gen.go
 
 state-type-gen:
-	cd venus-devtool && go run ./state-type-gen/*.go --dst ./../venus-shared/types/state_types_gen.go
+	cd venus-devtool && go run ./state-type-gen/*.go --dst ./../venus-shared/types
 
 api-gen:
 	find ./venus-shared/api/ -name 'client_gen.go' -delete

app/node/builder.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/filecoin-project/venus-auth/jwtclient"
 	"github.com/filecoin-project/venus/app/submodule/dagservice"
+	"github.com/filecoin-project/venus/app/submodule/eth"
 	"github.com/filecoin-project/venus/app/submodule/network"
 
 	logging "github.com/ipfs/go-log"
@@ -165,6 +166,14 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 	blockDelay := b.repo.Config().NetworkParams.BlockDelay
 	nd.common = common.NewCommonModule(nd.chain, nd.network, blockDelay)
 
+	sqlitePath, err := b.repo.SqlitePath()
+	if err != nil {
+		return nil, err
+	}
+	if nd.eth, err = eth.NewEthSubModule(ctx, b.repo.Config(), nd.chain, nd.mpool, sqlitePath); err != nil {
+		return nil, err
+	}
+
 	apiBuilder := NewBuilder()
 	apiBuilder.NameSpace("Filecoin")
 
@@ -181,6 +190,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 		nd.paychan,
 		nd.market,
 		nd.common,
+		nd.eth,
 	)
 
 	if err != nil {

app/node/env.go

@@ -27,6 +27,7 @@ type Env struct {
 	MarketAPI   v1api.IMarket
 	PaychAPI    v1api.IPaychan
 	CommonAPI   v1api.ICommon
+	EthAPI      v1api.IETH
 }
 
 var _ cmds.Environment = (*Env)(nil)

app/node/init.go

@@ -4,12 +4,12 @@ import (
 	"context"
 
 	"github.com/filecoin-project/venus/pkg/repo/fskeystore"
+	"github.com/filecoin-project/venus/pkg/wallet/key"
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 	acrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/pkg/errors"
 
-	"github.com/filecoin-project/venus/pkg/crypto"
 	"github.com/filecoin-project/venus/pkg/genesis"
 	"github.com/filecoin-project/venus/pkg/repo"
 )
@@ -18,14 +18,14 @@ const defaultPeerKeyBits = 2048
 
 // initCfg contains configuration for initializing a node's repo.
 type initCfg struct {
-	initImports []*crypto.KeyInfo
+	initImports []*key.KeyInfo
 }
 
 // InitOpt is an option for initialization of a node's repo.
 type InitOpt func(*initCfg)
 
 // ImportKeyOpt imports the provided key during initialization.
-func ImportKeyOpt(ki *crypto.KeyInfo) InitOpt {
+func ImportKeyOpt(ki *key.KeyInfo) InitOpt {
 	return func(opts *initCfg) {
 		opts.initImports = append(opts.initImports, ki)
 	}

app/node/node.go

@@ -17,6 +17,7 @@ import (
 	"github.com/filecoin-project/venus/app/submodule/common"
 	configModule "github.com/filecoin-project/venus/app/submodule/config"
 	"github.com/filecoin-project/venus/app/submodule/dagservice"
+	"github.com/filecoin-project/venus/app/submodule/eth"
 	"github.com/filecoin-project/venus/app/submodule/market"
 	"github.com/filecoin-project/venus/app/submodule/mining"
 	"github.com/filecoin-project/venus/app/submodule/mpool"
@@ -30,8 +31,9 @@ import (
 	"github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/clock"
 	"github.com/filecoin-project/venus/pkg/config"
-	_ "github.com/filecoin-project/venus/pkg/crypto/bls"  // enable bls signatures
-	_ "github.com/filecoin-project/venus/pkg/crypto/secp" // enable secp signatures
+	_ "github.com/filecoin-project/venus/pkg/crypto/bls"       // enable bls signatures
+	_ "github.com/filecoin-project/venus/pkg/crypto/delegated" // enable delegated signatures
+	_ "github.com/filecoin-project/venus/pkg/crypto/secp"      // enable secp signatures
 	"github.com/filecoin-project/venus/pkg/metrics"
 	"github.com/filecoin-project/venus/pkg/repo"
 	cmds "github.com/ipfs/go-ipfs-cmds"
@@ -95,6 +97,8 @@ type Node struct {
 
 	common *common.CommonModule
 
+	eth *eth.EthSubModule
+
 	//
 	// Jsonrpc
 	//
@@ -190,11 +194,21 @@ func (node *Node) Start(ctx context.Context) error {
 		return err
 	}
 
+	if err := node.eth.Start(ctx); err != nil {
+		return fmt.Errorf("failed to start eth module %v", err)
+	}
+
 	return nil
 }
 
 // Stop initiates the shutdown of the node.
 func (node *Node) Stop(ctx context.Context) {
+	// stop eth submodule
+	log.Infof("closing eth ...")
+	if err := node.eth.Close(ctx); err != nil {
+		log.Warnf("error closing eth: %s", err)
+	}
+
 	// stop mpool submodule
 	log.Infof("shutting down mpool...")
 	node.mpool.Stop(ctx)
@@ -358,6 +372,7 @@ func (node *Node) createServerEnv(ctx context.Context) *Env {
 		MarketAPI:            node.market.API(),
 		MultiSigAPI:          &apiwrapper.WrapperV1IMultiSig{IMultiSig: node.multiSig.API(), IMessagePool: node.mpool.API()},
 		CommonAPI:            node.common,
+		EthAPI:               node.eth.API(),
 	}
 
 	return &env

app/node/rpc.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 
 	"github.com/filecoin-project/go-jsonrpc"
+	"github.com/filecoin-project/venus/app/submodule/eth"
 	v0api "github.com/filecoin-project/venus/venus-shared/api/chain/v0"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 	"github.com/filecoin-project/venus/venus-shared/api/permission"
@@ -38,17 +39,29 @@ func (builder *RPCBuilder) AddServices(services ...RPCService) error {
 	return nil
 }
 
-func (builder *RPCBuilder) AddService(service RPCService) error {
-	methodName := "V0API"
+var ethSubModuleTyp = reflect.TypeOf(&eth.EthSubModule{}).Elem()
+
+func skipV0API(in interface{}) bool {
+	inT := reflect.TypeOf(in)
+	if inT.Kind() == reflect.Pointer {
+		inT = inT.Elem()
+	}
 
+	return inT.AssignableTo(ethSubModuleTyp)
+}
+
+func (builder *RPCBuilder) AddV0API(service RPCService) error {
+	methodName := "V0API"
 	serviceV := reflect.ValueOf(service)
 	apiMethod := serviceV.MethodByName(methodName)
 	if !apiMethod.IsValid() {
-		return errors.New("expect API function")
+		if skipV0API(service) {
+			return nil
+		}
+		return errors.New("expect V0API function")
 	}
 
 	apiImpls := apiMethod.Call([]reflect.Value{})
-
 	for _, apiImpl := range apiImpls {
 		rt := reflect.TypeOf(apiImpl)
 		rv := reflect.ValueOf(apiImpl)
@@ -65,15 +78,18 @@ func (builder *RPCBuilder) AddService(service RPCService) error {
 		}
 	}
 
-	methodName = "API"
-	serviceV = reflect.ValueOf(service)
-	apiMethod = serviceV.MethodByName(methodName)
+	return nil
+}
+
+func (builder *RPCBuilder) AddAPI(service RPCService) error {
+	methodName := "API"
+	serviceV := reflect.ValueOf(service)
+	apiMethod := serviceV.MethodByName(methodName)
 	if !apiMethod.IsValid() {
 		return errors.New("expect API function")
 	}
 
-	apiImpls = apiMethod.Call([]reflect.Value{})
-
+	apiImpls := apiMethod.Call([]reflect.Value{})
 	for _, apiImpl := range apiImpls {
 		rt := reflect.TypeOf(apiImpl)
 		rv := reflect.ValueOf(apiImpl)
@@ -92,13 +108,24 @@ func (builder *RPCBuilder) AddService(service RPCService) error {
 	return nil
 }
 
+func (builder *RPCBuilder) AddService(service RPCService) error {
+	err := builder.AddV0API(service)
+	if err != nil {
+		return err
+	}
+
+	return builder.AddAPI(service)
+}
+
 func (builder *RPCBuilder) Build(version string, limiter *ratelimit.RateLimiter) *jsonrpc.RPCServer {
+	var server *jsonrpc.RPCServer
 	serverOptions := make([]jsonrpc.ServerOption, 0)
 	serverOptions = append(serverOptions, jsonrpc.WithProxyBind(jsonrpc.PBMethod))
 
-	server := jsonrpc.NewServer(serverOptions...)
 	switch version {
 	case "v0":
+		server = jsonrpc.NewServer(serverOptions...)
+
 		var fullNodeV0 v0api.FullNodeStruct
 		for _, apiStruct := range builder.v0APIStruct {
 			permission.PermissionProxy(apiStruct, &fullNodeV0)
@@ -114,6 +141,9 @@ func (builder *RPCBuilder) Build(version string, limiter *ratelimit.RateLimiter)
 			server.Register(nameSpace, &fullNodeV0)
 		}
 	case "v1":
+		serverOptions = append(serverOptions, jsonrpc.WithReverseClient[v1api.EthSubscriberMethods](v1api.MethodNamespace))
+		server = jsonrpc.NewServer(serverOptions...)
+
 		var fullNode v1api.FullNodeStruct
 		for _, apiStruct := range builder.v1APIStruct {
 			permission.PermissionProxy(apiStruct, &fullNode)
@@ -131,6 +161,43 @@ func (builder *RPCBuilder) Build(version string, limiter *ratelimit.RateLimiter)
 	default:
 		panic("invalid version: " + version)
 	}
+	aliasETHAPI(server)
 
 	return server
 }
+
+func aliasETHAPI(rpcServer *jsonrpc.RPCServer) {
+	// TODO: use reflect to automatically register all the eth aliases
+	rpcServer.AliasMethod("eth_accounts", "Filecoin.EthAccounts")
+	rpcServer.AliasMethod("eth_blockNumber", "Filecoin.EthBlockNumber")
+	rpcServer.AliasMethod("eth_getBlockTransactionCountByNumber", "Filecoin.EthGetBlockTransactionCountByNumber")
+	rpcServer.AliasMethod("eth_getBlockTransactionCountByHash", "Filecoin.EthGetBlockTransactionCountByHash")
+
+	rpcServer.AliasMethod("eth_getBlockByHash", "Filecoin.EthGetBlockByHash")
+	rpcServer.AliasMethod("eth_getBlockByNumber", "Filecoin.EthGetBlockByNumber")
+	rpcServer.AliasMethod("eth_getTransactionByHash", "Filecoin.EthGetTransactionByHash")
+	rpcServer.AliasMethod("eth_getTransactionHashByCid", "Filecoin.EthGetTransactionHashByCid")
+	rpcServer.AliasMethod("eth_getMessageCidByTransactionHash", "Filecoin.EthGetMessageCidByTransactionHash")
+	rpcServer.AliasMethod("eth_getTransactionCount", "Filecoin.EthGetTransactionCount")
+	rpcServer.AliasMethod("eth_getTransactionReceipt", "Filecoin.EthGetTransactionReceipt")
+	rpcServer.AliasMethod("eth_getTransactionByBlockHashAndIndex", "Filecoin.EthGetTransactionByBlockHashAndIndex")
+	rpcServer.AliasMethod("eth_getTransactionByBlockNumberAndIndex", "Filecoin.EthGetTransactionByBlockNumberAndIndex")
+
+	rpcServer.AliasMethod("eth_getCode", "Filecoin.EthGetCode")
+	rpcServer.AliasMethod("eth_getStorageAt", "Filecoin.EthGetStorageAt")
+	rpcServer.AliasMethod("eth_getBalance", "Filecoin.EthGetBalance")
+	rpcServer.AliasMethod("eth_chainId", "Filecoin.EthChainId")
+	rpcServer.AliasMethod("eth_feeHistory", "Filecoin.EthFeeHistory")
+	rpcServer.AliasMethod("eth_protocolVersion", "Filecoin.EthProtocolVersion")
+	rpcServer.AliasMethod("eth_maxPriorityFeePerGas", "Filecoin.EthMaxPriorityFeePerGas")
+	rpcServer.AliasMethod("eth_gasPrice", "Filecoin.EthGasPrice")
+	rpcServer.AliasMethod("eth_sendRawTransaction", "Filecoin.EthSendRawTransaction")
+
+	rpcServer.AliasMethod("net_version", "Filecoin.NetVersion")
+	rpcServer.AliasMethod("net_listening", "Filecoin.NetListening")
+
+	rpcServer.AliasMethod("web3_clientVersion", "Filecoin.Web3ClientVersion")
+
+	rpcServer.AliasMethod("eth_estimateGas", "Filecoin.EthEstimateGas")
+	rpcServer.AliasMethod("eth_call", "Filecoin.EthCall")
+}

app/node/test/builder.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/filecoin-project/venus/pkg/wallet"
-
 	"github.com/stretchr/testify/require"
 
 	"github.com/filecoin-project/venus/app/node"
@@ -52,7 +50,7 @@ func NewNodeBuilder(tb testing.TB) *NodeBuilder {
 			}),
 		},
 		builderOpts: []node.BuilderOpt{
-			node.SetWalletPassword(wallet.TestPassword),
+			node.SetWalletPassword([]byte("test-password")),
 		},
 		tb: tb,
 	}

app/submodule/chain/account_api.go

@@ -27,5 +27,5 @@ func (accountAPI *accountAPI) StateAccountKey(ctx context.Context, addr address.
 	if err != nil {
 		return address.Undef, fmt.Errorf("loading tipset %s: %w", tsk, err)
 	}
-	return accountAPI.chain.Stmgr.ResolveToKeyAddress(ctx, addr, ts)
+	return accountAPI.chain.Stmgr.ResolveToDeterministicAddress(ctx, addr, ts)
 }

app/submodule/chain/chain_submodule.go

@@ -74,7 +74,7 @@ func NewChainSubmodule(ctx context.Context,
 	}
 	faultChecker := consensusfault.NewFaultChecker(chainStore, fork)
 	syscalls := vmsupport.NewSyscalls(faultChecker, config.Verifier())
-	processor := consensus.NewDefaultProcessor(syscalls, circulatiingSupplyCalculator)
+	processor := consensus.NewDefaultProcessor(syscalls, circulatiingSupplyCalculator, chainStore, config.Repo().Config().NetworkParams)
 
 	waiter := chain.NewWaiter(chainStore, messageStore, config.Repo().Datastore(), cbor.NewCborStore(config.Repo().Datastore()))