Feat/venus v2 snapdeal (#4664)

* upgrade filecoin-ffi * upgrade github.com/ipfs/go-datastore to v0.5.1 * fix go mod * fix PrivKey Marshal * fix api & api-doc * fix consensus test * fix wallet test Co-authored-by: 一页素书 <[email protected]>
filecoin-project · Jan 4, 2022 · 5e13951 · 5e13951
1 parent f86084b
commit 5e13951
Show file tree

Hide file tree

Showing 137 changed files with 1,829 additions and 1,663 deletions.
diff --git a/app/client/apiface/network.go b/app/client/apiface/network.go
@@ -22,7 +22,7 @@ type INetwork interface {
 	// Rule[perm:read]
 	NetworkFindProvidersAsync(ctx context.Context, key cid.Cid, count int) <-chan peer.AddrInfo
 	// Rule[perm:read]
-	NetworkGetClosestPeers(ctx context.Context, key string) (<-chan peer.ID, error)
+	NetworkGetClosestPeers(ctx context.Context, key string) ([]peer.ID, error)
 	// Rule[perm:read]
 	NetworkFindPeer(ctx context.Context, peerID peer.ID) (peer.AddrInfo, error)
 	// Rule[perm:read]

diff --git a/app/client/apiface/v0api/network.go b/app/client/apiface/v0api/network.go
@@ -21,7 +21,7 @@ type INetwork interface {
 	// Rule[perm:read]
 	NetworkFindProvidersAsync(ctx context.Context, key cid.Cid, count int) <-chan peer.AddrInfo
 	// Rule[perm:admin]
-	NetworkGetClosestPeers(ctx context.Context, key string) (<-chan peer.ID, error)
+	NetworkGetClosestPeers(ctx context.Context, key string) ([]peer.ID, error)
 	// Rule[perm:read]
 	NetworkFindPeer(ctx context.Context, peerID peer.ID) (peer.AddrInfo, error)
 	// Rule[perm:read]

diff --git a/app/client/v0api/full.go b/app/client/v0api/full.go
diff --git a/app/node/builder.go b/app/node/builder.go
@@ -4,14 +4,13 @@ import (
 	"context"
 	"time"
 
-	chain2 "github.com/filecoin-project/venus/pkg/chain"
-	"github.com/filecoin-project/venus/pkg/jwtauth"
-	"github.com/filecoin-project/venus/pkg/util/ffiwrapper/impl"
-	types "github.com/filecoin-project/venus/venus-shared/chain"
-	"github.com/ipfs-force-community/metrics/ratelimit"
 	logging "github.com/ipfs/go-log"
+	"github.com/libp2p/go-libp2p"
+	"github.com/pkg/errors"
 	"golang.org/x/xerrors"
 
+	"github.com/ipfs-force-community/metrics/ratelimit"
+
 	"github.com/filecoin-project/venus/app/submodule/blockstore"
 	"github.com/filecoin-project/venus/app/submodule/chain"
 	config2 "github.com/filecoin-project/venus/app/submodule/config"
@@ -26,13 +25,15 @@ import (
 	"github.com/filecoin-project/venus/app/submodule/storagenetworking"
 	"github.com/filecoin-project/venus/app/submodule/syncer"
 	"github.com/filecoin-project/venus/app/submodule/wallet"
+	chain2 "github.com/filecoin-project/venus/pkg/chain"
 	"github.com/filecoin-project/venus/pkg/clock"
 	"github.com/filecoin-project/venus/pkg/journal"
+	"github.com/filecoin-project/venus/pkg/jwtauth"
 	"github.com/filecoin-project/venus/pkg/paychmgr"
 	"github.com/filecoin-project/venus/pkg/repo"
 	"github.com/filecoin-project/venus/pkg/util/ffiwrapper"
-	"github.com/libp2p/go-libp2p"
-	"github.com/pkg/errors"
+	"github.com/filecoin-project/venus/pkg/util/ffiwrapper/impl"
+	types "github.com/filecoin-project/venus/venus-shared/chain"
 )
 
 // Builder is a helper to aid in the construction of a filecoin node.
@@ -84,7 +85,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 	}
 
 	// fetch genesis block id
-	b.genBlk, err = readGenesisCid(b.repo.ChainDatastore(), b.repo.Datastore())
+	b.genBlk, err = readGenesisCid(ctx, b.repo.ChainDatastore(), b.repo.Datastore())
 	if err != nil {
 		return nil, err
 	}
@@ -143,7 +144,7 @@ func (b *Builder) build(ctx context.Context) (*Node, error) {
 		return nil, errors.Wrap(err, "failed to build node.wallet")
 	}
 
-	nd.mpool, err = mpool.NewMpoolSubmodule((*builder)(b), nd.network, nd.chain, nd.wallet)
+	nd.mpool, err = mpool.NewMpoolSubmodule(ctx, (*builder)(b), nd.network, nd.chain, nd.wallet)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to build node.mpool")
 	}

diff --git a/app/node/helpers.go b/app/node/helpers.go
@@ -2,6 +2,7 @@ package node
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 
 	"github.com/ipfs/go-cid"
@@ -15,8 +16,8 @@ import (
 
 // readGenesisCid is a helper function that queries the provided datastore for
 // an entry with the genesisKey cid, returning if found.
-func readGenesisCid(chainDs datastore.Datastore, bs blockstoreutil.Blockstore) (types.BlockHeader, error) {
-	bb, err := chainDs.Get(chain.GenesisKey)
+func readGenesisCid(ctx context.Context, chainDs datastore.Datastore, bs blockstoreutil.Blockstore) (types.BlockHeader, error) {
+	bb, err := chainDs.Get(ctx, chain.GenesisKey)
 	if err != nil {
 		return types.BlockHeader{}, errors.Wrap(err, "failed to read genesisKey")
 	}
@@ -27,7 +28,7 @@ func readGenesisCid(chainDs datastore.Datastore, bs blockstoreutil.Blockstore) (
 		return types.BlockHeader{}, errors.Wrap(err, "failed to cast genesisCid")
 	}
 
-	blkRawData, err := bs.Get(c)
+	blkRawData, err := bs.Get(ctx, c)
 	if err != nil {
 		return types.BlockHeader{}, errors.Wrap(err, "failed to read genesis block")
 	}

diff --git a/app/node/init.go b/app/node/init.go
@@ -77,19 +77,21 @@ func Init(ctx context.Context, r repo.Repo, gen genesis.InitFunc, opts ...InitOp
 	return nil
 }
 
-func initPeerKey(store fskeystore.Keystore, key acrypto.PrivKey) error {
+func initPeerKey(store fskeystore.Keystore, pk acrypto.PrivKey) error {
 	var err error
-	if key == nil {
-		key, _, err = acrypto.GenerateKeyPair(acrypto.RSA, defaultPeerKeyBits)
+	if pk == nil {
+		pk, _, err = acrypto.GenerateKeyPair(acrypto.RSA, defaultPeerKeyBits)
 		if err != nil {
 			return errors.Wrap(err, "failed to create peer key")
 		}
 	}
-	data, err := key.Bytes()
+
+	kbytes, err := acrypto.MarshalPrivateKey(pk)
 	if err != nil {
 		return err
 	}
-	if err := store.Put("self", data); err != nil {
+
+	if err := store.Put("self", kbytes); err != nil {
 		return errors.Wrap(err, "failed to store private key")
 	}
 	return nil

diff --git a/app/node/node.go b/app/node/node.go
@@ -189,7 +189,7 @@ func (node *Node) Start(ctx context.Context) error {
 		return err
 	}
 
-	err = node.paychan.Start()
+	err = node.paychan.Start(ctx)
 	if err != nil {
 		return err
 	}

diff --git a/app/node/test/node.go b/app/node/test/node.go
@@ -5,25 +5,25 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/filecoin-project/venus/pkg/util/ffiwrapper/impl"
-	types "github.com/filecoin-project/venus/venus-shared/chain"
-
-	"github.com/filecoin-project/go-address"
-	"github.com/filecoin-project/venus/app/node"
-	"github.com/filecoin-project/venus/pkg/util/blockstoreutil"
 	ds "github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	cbor "github.com/ipfs/go-ipld-cbor"
 	"github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"
 
+	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
+
+	"github.com/filecoin-project/venus/app/node"
 	"github.com/filecoin-project/venus/fixtures/fortest"
 	"github.com/filecoin-project/venus/pkg/config"
 	"github.com/filecoin-project/venus/pkg/constants"
+	"github.com/filecoin-project/venus/pkg/util/blockstoreutil"
+	"github.com/filecoin-project/venus/pkg/util/ffiwrapper/impl"
 	"github.com/filecoin-project/venus/pkg/wallet"
 	gengen "github.com/filecoin-project/venus/tools/gengen/util"
+	types "github.com/filecoin-project/venus/venus-shared/chain"
 )
 
 // ChainSeed is a generalized struct for configuring node
@@ -63,15 +63,15 @@ func (cs *ChainSeed) GenesisInitFunc(cst cbor.IpldStore, bs blockstore.Blockstor
 }
 
 // GiveKey gives the given key to the given node
-func (cs *ChainSeed) GiveKey(t *testing.T, nd *node.Node, key int) address.Address {
+func (cs *ChainSeed) GiveKey(ctx context.Context, t *testing.T, nd *node.Node, key int) address.Address {
 	t.Helper()
 	bcks := nd.Wallet().Wallet.Backends(wallet.DSBackendType)
 	require.Len(t, bcks, 1, "expected to get exactly one datastore backend")
 
 	dsb := bcks[0].(*wallet.DSBackend)
-	_ = dsb.SetPassword(wallet.TestPassword)
+	_ = dsb.SetPassword(ctx, wallet.TestPassword)
 	kinfo := cs.info.Keys[key]
-	require.NoError(t, dsb.ImportKey(kinfo))
+	require.NoError(t, dsb.ImportKey(ctx, kinfo))
 
 	addr, err := kinfo.Address()
 	require.NoError(t, err)

diff --git a/app/node/test/setup.go b/app/node/test/setup.go
@@ -47,7 +47,7 @@ func CreateBootstrapMiner(ctx context.Context, t *testing.T, seed *ChainSeed, ch
 		WithBuilderOpt(node.MonkeyPatchSetProofTypeOption(constants.DevRegisteredSealProof)).
 		Build(ctx)
 
-	addr := seed.GiveKey(t, bootstrapMiner, 0)
+	addr := seed.GiveKey(ctx, t, bootstrapMiner, 0)
 	err := bootstrapMiner.ConfigModule().API().ConfigSet(ctx, "walletModule.defaultAddress", addr.String())
 	require.NoError(t, err)
 
@@ -60,7 +60,7 @@ func CreateBootstrapMiner(ctx context.Context, t *testing.T, seed *ChainSeed, ch
 }
 
 func initNodeGenesisMiner(ctx context.Context, t *testing.T, nd *node.Node, seed *ChainSeed, minerIdx int) (address.Address, address.Address, error) {
-	seed.GiveKey(t, nd, minerIdx)
+	seed.GiveKey(ctx, t, nd, minerIdx)
 	miner, owner := seed.GiveMiner(t, nd, 0)
 
 	return miner, owner, nil

diff --git a/app/submodule/blockstore/blockstore_api.go b/app/submodule/blockstore/blockstore_api.go
@@ -22,7 +22,7 @@ type blockstoreAPI struct { //nolint
 }
 
 func (blockstoreAPI *blockstoreAPI) ChainReadObj(ctx context.Context, ocid cid.Cid) ([]byte, error) {
-	blk, err := blockstoreAPI.blockstore.Blockstore.Get(ocid)
+	blk, err := blockstoreAPI.blockstore.Blockstore.Get(ctx, ocid)
 	if err != nil {
 		return nil, xerrors.Errorf("blockstore get: %w", err)
 	}
@@ -31,11 +31,11 @@ func (blockstoreAPI *blockstoreAPI) ChainReadObj(ctx context.Context, ocid cid.C
 }
 
 func (blockstoreAPI *blockstoreAPI) ChainDeleteObj(ctx context.Context, obj cid.Cid) error {
-	return blockstoreAPI.blockstore.Blockstore.DeleteBlock(obj)
+	return blockstoreAPI.blockstore.Blockstore.DeleteBlock(ctx, obj)
 }
 
 func (blockstoreAPI *blockstoreAPI) ChainHasObj(ctx context.Context, obj cid.Cid) (bool, error) {
-	return blockstoreAPI.blockstore.Blockstore.Has(obj)
+	return blockstoreAPI.blockstore.Blockstore.Has(ctx, obj)
 }
 
 func (blockstoreAPI *blockstoreAPI) ChainStatObj(ctx context.Context, obj cid.Cid, base cid.Cid) (apitypes.ObjStat, error) {

diff --git a/app/submodule/chain/account_api.go b/app/submodule/chain/account_api.go
@@ -23,7 +23,7 @@ func NewAccountAPI(chain *ChainSubmodule) v1api.IAccount {
 
 // StateAccountKey returns the public key address of the given ID address
 func (accountAPI *accountAPI) StateAccountKey(ctx context.Context, addr address.Address, tsk types.TipSetKey) (address.Address, error) {
-	ts, err := accountAPI.chain.ChainReader.GetTipSet(tsk)
+	ts, err := accountAPI.chain.ChainReader.GetTipSet(ctx, tsk)
 	if err != nil {
 		return address.Undef, xerrors.Errorf("loading tipset %s: %w", tsk, err)
 	}

diff --git a/app/submodule/chain/apibstore.go b/app/submodule/chain/apibstore.go
@@ -26,40 +26,40 @@ func NewAPIBlockstore(cio ChainIO) blockstore.Blockstore {
 }
 
 // DeleteBlock implements Blockstore.DeleteBlock.
-func (a *apiBStore) DeleteBlock(cid.Cid) error {
+func (a *apiBStore) DeleteBlock(context.Context, cid.Cid) error {
 	return xerrors.New("not supported")
 }
 
 // Has implements Blockstore.Has.
-func (a *apiBStore) Has(c cid.Cid) (bool, error) {
-	return a.api.ChainHasObj(context.TODO(), c)
+func (a *apiBStore) Has(ctx context.Context, c cid.Cid) (bool, error) {
+	return a.api.ChainHasObj(ctx, c)
 }
 
 // Get implements Blockstore.Get.
-func (a *apiBStore) Get(c cid.Cid) (blocks.Block, error) {
-	bb, err := a.api.ChainReadObj(context.TODO(), c)
+func (a *apiBStore) Get(ctx context.Context, c cid.Cid) (blocks.Block, error) {
+	bb, err := a.api.ChainReadObj(ctx, c)
 	if err != nil {
 		return nil, err
 	}
 	return blocks.NewBlockWithCid(bb, c)
 }
 
 // GetSize implements Blockstore.GetSize.
-func (a *apiBStore) GetSize(c cid.Cid) (int, error) {
-	bb, err := a.api.ChainReadObj(context.TODO(), c)
+func (a *apiBStore) GetSize(ctx context.Context, c cid.Cid) (int, error) {
+	bb, err := a.api.ChainReadObj(ctx, c)
 	if err != nil {
 		return 0, err
 	}
 	return len(bb), nil
 }
 
 // Put implements Blockstore.Put.
-func (a *apiBStore) Put(blocks.Block) error {
+func (a *apiBStore) Put(context.Context, blocks.Block) error {
 	return xerrors.New("not supported")
 }
 
 // PutMany implements Blockstore.PutMany.
-func (a *apiBStore) PutMany([]blocks.Block) error {
+func (a *apiBStore) PutMany(context.Context, []blocks.Block) error {
 	return xerrors.New("not supported")
 }