bd10bdf99a
* build: Bump version to v1.17.3-dev * build: set version to v1.18.0-dev * chore: actors: Allow builtin-actors to return a map of methods (#9342) * Allow builtin-actors to return a map of methods * go mod * Fix tests * Fix tests, check carefully please * Delete lotus-pond (#9352) * feat: add StateNetworkVersion to mpool API * chore: refactor: rename NewestNetworkVersion * feat: actors: Integrate datacap actor into lotus (#9348) * Integrate datacap actor * Implement datacap actor in chain/builtin * feat: support typed errors over RPC * chore: deps: update to go-jsonrpc 0.1.8 * remove duplicate import * fix: itest: check for closed connection * chore: refactor: move retry test to API * address magik supernit * Add ability to only have single partition per msg for partitions with recovery sectors * doc gen * Address comments * Return beneficiary info from miner state Info() * Update builtin-actors to dev/20220922-v9 which includes FIP-0045 changes in progress * Integrate verifreg changes to lotus * Setup datacap actor * Update builtin-actors to dev/20220922-v9-1 * Update datacap actor to query datacap instead of verifreg * update gst * update markets * update actors with hamt fix * update gst * Update datacap to parse tokens * Update bundles * datacap and verifreg actors use ID addresses without protocol byte * update builtin-actors to rc1 * update go-fil-markets * Update bundles to rc2 * Integrate the v9 migration * Add api for getting allocation * Add upgrade epoch for butterfly * Tweak PreSeal struct to be infra-friendly * docsgen * More tweaking of PreSeal for genesis * review fixes * Use fake cid for test * add butterfly artifacts for oct 5 upgrade * check datacaps for v8 verifreg match v9 datacap actor * Remove print statements * Update to go-state-types master * Update to go-state-types v0.9.0-rc1 * review fixes * use go-fil-markets v1.24.0-v17 * Add accessors for allocations and claims maps * fix: missing permissions tag * butterfly * update butterfly artifacts * sealing pipeline: Prepare deal assigning logic for FIP-45 * sealing pipeline: Get allocationId with StateApi * use NoAllocationID instead of nil AllocationId * address review * Add datacap actor to registry.go * Add cli for listing allocations and removing expired allocations * Update to go-state-types master * deps: upgrade go-merkledag to 0.8.0 * shark params * Update cli/filplus.go Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * revert change to verifreg util * docsgen-cli * miss the stuff * Update FFI * Update go-state-types to v0.9.0 * Update builtin-actors to v9.0.0 * add calib upgrade epcoh * update the upgrade envvar * kill shark * Remove fvm splash banner from nv17 upgrade * check invariance for pending deals and allocations * check pending verified deal proposal migrated to allocation * Add check for unsealed CID in precommit sectors * Fix counting of allocations in nv17 migration test * make gen * pass state trees as pointers * Add assertion that migrations with & without cache are the same * compare allocation to verified deal proposal * Fix miner state precommit info * fix migration test tool * add changelog * Update to go-state-types v0.9.1 * Integrate builtin-actors v9.0.1 * chore: ver: bump version for rc3 (#9512) * Bump version to 1.18.0-rc3 * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Migration: Use autobatch bs * Fix autobatch Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> * Invoker: Use MethodMeta from go-state-types * Add a second premigration for nv17 * Add more shed tools for migration checking * address review * Lotus release v1.18.0-rc4 * fix: ci: fix app-image build on ci (#9527) * Remove old go version first * Add GO_VERSION file * Use GO_VERSION to set / verify go version * mv GO_VERSION GO_VERSION_MIN * Use GO_VERSION_MIN in Makefile check Co-authored-by: Ian Davis <jungziege@gmail.com> * Update to latest go-state-types for migration fixes * go mod tidy * fix: use api.ErrActorNotFound instead of types.ErrActorNotFound * fix: add fields to ForkUpgradeParams * docs: update actors_version_checklist.md * chore: fix lint * update to go state type v0.9.6 with market migration fix (#9545) * update go-state-types to v-0.9.7 * Add invariant checks to migration * fix invariant check: number of entries in datacap actor should include verifreg * Invariant checks: Only include not-activated deals * test: nv17 migration * Address review * add lotus-shed invariance method * Migration cli takes a stateroot cid and a height * make gen * Update to builtin-actors v9.0.2 * Failing test that shows that notaries can remove datacap from the verifreg actor * Test that should pass when the problem is solved * make gen * Review fixes * statemanager call function will return call information even if call errors * update go-state-types * update builtin-actors * bubble up errors properly from ApplyImplicitMessage * bump to rc5 * set new upgrade heights for calibnet * set new upgrade height for butterfly * tweak calibnet upgrade schedule * clarify changelog note about calibnet * butterfly * update calibnet artifacts * Allow setting local bundles for Debug FVM for av 9+ * fix: autobatch: remove potential deadlock when a block is missing Check the _underlying_ blockstore instead of recursing. Also, drop the lock before we do that. * fix imports * build: set shark mainnet epoch (#9640) * chore: build: Lotus release v1.18.0 (#9641) * Lotus release v1.18.0 * add changelog * address review * changelog improvement Co-authored-by: Jennifer Wang <jiayingw703@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Łukasz Magiera <magik6k@gmail.com> Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com> Co-authored-by: Aayush <arajasek94@gmail.com> Co-authored-by: Geoff Stuart <geoff.vball@gmail.com> Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai> Co-authored-by: simlecode <69969590+simlecode@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org> Co-authored-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Ian Davis <jungziege@gmail.com> Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com> Co-authored-by: Steven Allen <steven@stebalien.com>
154 lines
4.0 KiB
Go
154 lines
4.0 KiB
Go
// stm: #integration
|
|
package dagstore
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"testing"
|
|
|
|
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/filecoin-project/dagstore"
|
|
"github.com/filecoin-project/dagstore/mount"
|
|
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
|
|
"github.com/filecoin-project/go-fil-markets/retrievalmarket/impl/testnodes"
|
|
tut "github.com/filecoin-project/go-fil-markets/shared_testutil"
|
|
"github.com/filecoin-project/go-fil-markets/storagemarket"
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
|
|
|
|
"github.com/filecoin-project/lotus/node/config"
|
|
)
|
|
|
|
func TestShardRegistration(t *testing.T) {
|
|
ps := tut.NewTestPieceStore()
|
|
sa := testnodes.NewTestSectorAccessor()
|
|
|
|
ctx := context.Background()
|
|
cids := tut.GenerateCids(4)
|
|
pieceCidUnsealed := cids[0]
|
|
pieceCidSealed := cids[1]
|
|
pieceCidUnsealed2 := cids[2]
|
|
pieceCidUnsealed3 := cids[3]
|
|
|
|
sealedSector := abi.SectorNumber(1)
|
|
unsealedSector1 := abi.SectorNumber(2)
|
|
unsealedSector2 := abi.SectorNumber(3)
|
|
unsealedSector3 := abi.SectorNumber(4)
|
|
|
|
// ps.ExpectPiece(pieceCidUnsealed, piecestore.PieceInfo{
|
|
// PieceCID: pieceCidUnsealed,
|
|
// Deals: []piecestore.DealInfo{
|
|
// {
|
|
// SectorID: unsealedSector1,
|
|
// },
|
|
// },
|
|
// })
|
|
//
|
|
// ps.ExpectPiece(pieceCidSealed, piecestore.PieceInfo{
|
|
// PieceCID: pieceCidSealed,
|
|
// Deals: []piecestore.DealInfo{
|
|
// {
|
|
// SectorID: sealedSector,
|
|
// },
|
|
// },
|
|
// })
|
|
|
|
deals := []storagemarket.MinerDeal{{
|
|
// Should be registered
|
|
//stm: @MARKET_DAGSTORE_MIGRATE_DEALS_001
|
|
State: storagemarket.StorageDealSealing,
|
|
SectorNumber: unsealedSector1,
|
|
ClientDealProposal: markettypes.ClientDealProposal{
|
|
Proposal: markettypes.DealProposal{
|
|
PieceCID: pieceCidUnsealed,
|
|
},
|
|
},
|
|
}, {
|
|
// Should be registered with lazy registration (because sector is sealed)
|
|
State: storagemarket.StorageDealSealing,
|
|
SectorNumber: sealedSector,
|
|
ClientDealProposal: markettypes.ClientDealProposal{
|
|
Proposal: markettypes.DealProposal{
|
|
PieceCID: pieceCidSealed,
|
|
},
|
|
},
|
|
}, {
|
|
// Should be ignored because deal is no longer active
|
|
//stm: @MARKET_DAGSTORE_MIGRATE_DEALS_003
|
|
State: storagemarket.StorageDealError,
|
|
SectorNumber: unsealedSector2,
|
|
ClientDealProposal: markettypes.ClientDealProposal{
|
|
Proposal: markettypes.DealProposal{
|
|
PieceCID: pieceCidUnsealed2,
|
|
},
|
|
},
|
|
}, {
|
|
// Should be ignored because deal is not yet sealing
|
|
State: storagemarket.StorageDealFundsReserved,
|
|
SectorNumber: unsealedSector3,
|
|
ClientDealProposal: markettypes.ClientDealProposal{
|
|
Proposal: markettypes.DealProposal{
|
|
PieceCID: pieceCidUnsealed3,
|
|
},
|
|
},
|
|
}}
|
|
|
|
cfg := config.DefaultStorageMiner().DAGStore
|
|
cfg.RootDir = t.TempDir()
|
|
|
|
h, err := mocknet.New().GenPeer()
|
|
require.NoError(t, err)
|
|
|
|
mapi := NewMinerAPI(ps, &wrappedSA{sa}, 10, 5)
|
|
dagst, w, err := NewDAGStore(cfg, mapi, h)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, dagst)
|
|
require.NotNil(t, w)
|
|
|
|
err = dagst.Start(context.Background())
|
|
require.NoError(t, err)
|
|
|
|
migrated, err := w.MigrateDeals(ctx, deals)
|
|
require.True(t, migrated)
|
|
require.NoError(t, err)
|
|
|
|
//stm: @MARKET_DAGSTORE_GET_ALL_SHARDS_001
|
|
info := dagst.AllShardsInfo()
|
|
require.Len(t, info, 2)
|
|
for _, i := range info {
|
|
require.Equal(t, dagstore.ShardStateNew, i.ShardState)
|
|
}
|
|
|
|
// Run register shard migration again
|
|
//stm: @MARKET_DAGSTORE_MIGRATE_DEALS_002
|
|
migrated, err = w.MigrateDeals(ctx, deals)
|
|
require.False(t, migrated)
|
|
require.NoError(t, err)
|
|
|
|
// ps.VerifyExpectations(t)
|
|
}
|
|
|
|
type wrappedSA struct {
|
|
retrievalmarket.SectorAccessor
|
|
}
|
|
|
|
func (w *wrappedSA) UnsealSectorAt(ctx context.Context, sectorID abi.SectorNumber, pieceOffset abi.UnpaddedPieceSize, length abi.UnpaddedPieceSize) (mount.Reader, error) {
|
|
r, err := w.UnsealSector(ctx, sectorID, pieceOffset, length)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return struct {
|
|
io.ReadCloser
|
|
io.Seeker
|
|
io.ReaderAt
|
|
}{
|
|
ReadCloser: r,
|
|
Seeker: nil,
|
|
ReaderAt: nil,
|
|
}, err
|
|
}
|
|
|
|
var _ SectorAccessor = &wrappedSA{}
|