Merge pull request #5730 from filecoin-project/dev/v1.10.0

Dev/v1.10.0
filecoin-project · Feb 17, 2023 · e79e137 · e79e137
2 parents 21ce8a9 + d94a3e0
commit e79e137
Show file tree

Hide file tree

Showing 52 changed files with 408 additions and 3,710 deletions.
diff --git a/app/node/builder.go b/app/node/builder.go
@@ -21,7 +21,6 @@ import (
 	"github.com/filecoin-project/venus/app/submodule/market"
 	"github.com/filecoin-project/venus/app/submodule/mining"
 	"github.com/filecoin-project/venus/app/submodule/mpool"
-	"github.com/filecoin-project/venus/app/submodule/multisig"
 	"github.com/filecoin-project/venus/app/submodule/paych"
 	"github.com/filecoin-project/venus/app/submodule/storagenetworking"
 	"github.com/filecoin-project/venus/app/submodule/syncer"
@@ -150,8 +149,6 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 	}
 	nd.mining = mining.NewMiningModule(nd.syncer.Stmgr, (*builder)(b), nd.chain, nd.blockstore, nd.network, nd.syncer, *nd.wallet)
 
-	nd.multiSig = multisig.NewMultiSigSubmodule(nd.chain.API(), nd.mpool.API(), nd.chain.ChainReader)
-
 	mgrps := &paychmgr.ManagerParams{
 		MPoolAPI:     nd.mpool.API(),
 		ChainInfoAPI: nd.chain.API(),

diff --git a/app/node/env.go b/app/node/env.go
@@ -6,7 +6,6 @@ import (
 	cmds "github.com/ipfs/go-ipfs-cmds"
 
 	"github.com/filecoin-project/venus/app/submodule/storagenetworking"
-	v0api "github.com/filecoin-project/venus/venus-shared/api/chain/v0"
 	v1api "github.com/filecoin-project/venus/venus-shared/api/chain/v1"
 )
 
@@ -23,11 +22,10 @@ type Env struct {
 	MingingAPI           v1api.IMining
 	MessagePoolAPI       v1api.IMessagePool
 
-	MultiSigAPI v0api.IMultiSig
-	MarketAPI   v1api.IMarket
-	PaychAPI    v1api.IPaychan
-	CommonAPI   v1api.ICommon
-	EthAPI      v1api.IETH
+	MarketAPI v1api.IMarket
+	PaychAPI  v1api.IPaychan
+	CommonAPI v1api.ICommon
+	EthAPI    v1api.IETH
 }
 
 var _ cmds.Environment = (*Env)(nil)

diff --git a/app/node/node.go b/app/node/node.go
@@ -21,8 +21,6 @@ import (
 	"github.com/filecoin-project/venus/app/submodule/market"
 	"github.com/filecoin-project/venus/app/submodule/mining"
 	"github.com/filecoin-project/venus/app/submodule/mpool"
-	"github.com/filecoin-project/venus/app/submodule/multisig"
-	apiwrapper "github.com/filecoin-project/venus/app/submodule/multisig/v0api"
 	network2 "github.com/filecoin-project/venus/app/submodule/network"
 	"github.com/filecoin-project/venus/app/submodule/paych"
 	"github.com/filecoin-project/venus/app/submodule/storagenetworking"
@@ -87,7 +85,6 @@ type Node struct {
 	// Supporting services
 	//
 	wallet            *wallet.WalletSubmodule
-	multiSig          *multisig.MultiSigSubmodule
 	mpool             *mpool.MessagePoolSubmodule
 	storageNetworking *storagenetworking.StorageNetworkingSubmodule
 
@@ -124,10 +121,6 @@ func (node *Node) Wallet() *wallet.WalletSubmodule {
 	return node.wallet
 }
 
-func (node *Node) MultiSig() *multisig.MultiSigSubmodule {
-	return node.multiSig
-}
-
 func (node *Node) Network() *network2.NetworkSubmodule {
 	return node.network
 }
@@ -370,7 +363,6 @@ func (node *Node) createServerEnv(ctx context.Context) *Env {
 		MessagePoolAPI:       node.mpool.API(),
 		PaychAPI:             node.paychan.API(),
 		MarketAPI:            node.market.API(),
-		MultiSigAPI:          &apiwrapper.WrapperV1IMultiSig{IMultiSig: node.multiSig.API(), IMessagePool: node.mpool.API()},
 		CommonAPI:            node.common,
 		EthAPI:               node.eth.API(),
 	}