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>
285 lines
9.4 KiB
Go
285 lines
9.4 KiB
Go
package itests
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
"github.com/filecoin-project/go-state-types/big"
|
|
"github.com/filecoin-project/go-state-types/builtin"
|
|
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
|
|
migration "github.com/filecoin-project/go-state-types/builtin/v9/migration/test"
|
|
verifregst "github.com/filecoin-project/go-state-types/builtin/v9/verifreg"
|
|
"github.com/filecoin-project/go-state-types/crypto"
|
|
|
|
"github.com/filecoin-project/lotus/api"
|
|
"github.com/filecoin-project/lotus/build"
|
|
"github.com/filecoin-project/lotus/chain/actors"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/verifreg"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
"github.com/filecoin-project/lotus/chain/wallet/key"
|
|
"github.com/filecoin-project/lotus/itests/kit"
|
|
"github.com/filecoin-project/lotus/node/impl"
|
|
)
|
|
|
|
func TestNoRemoveDatacapFromVerifreg(t *testing.T) {
|
|
ctx := context.Background()
|
|
|
|
kit.QuietMiningLogs()
|
|
|
|
rootKey, err := key.GenerateKey(types.KTSecp256k1)
|
|
require.NoError(t, err)
|
|
|
|
verifier1Key, err := key.GenerateKey(types.KTSecp256k1)
|
|
require.NoError(t, err)
|
|
|
|
verifier2Key, err := key.GenerateKey(types.KTSecp256k1)
|
|
require.NoError(t, err)
|
|
|
|
verifiedClientKey, err := key.GenerateKey(types.KTBLS)
|
|
require.NoError(t, err)
|
|
|
|
bal, err := types.ParseFIL("100fil")
|
|
require.NoError(t, err)
|
|
|
|
testClient, testMiner, ens := kit.EnsembleMinimal(t, kit.MockProofs(),
|
|
kit.RootVerifier(rootKey, abi.NewTokenAmount(bal.Int64())),
|
|
kit.Account(verifier1Key, abi.NewTokenAmount(bal.Int64())),
|
|
kit.Account(verifier2Key, abi.NewTokenAmount(bal.Int64())),
|
|
kit.Account(verifiedClientKey, abi.NewTokenAmount(bal.Int64())))
|
|
|
|
ens.InterconnectAll().BeginMining(10 * time.Millisecond)
|
|
|
|
clientApi := testClient.FullNode.(*impl.FullNodeAPI)
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
defer cancel()
|
|
|
|
// Before the upgrade, we need to:
|
|
// Setup a verified client
|
|
// Publish (but NOT activate) a verified storage deal from that clien
|
|
|
|
// get VRH
|
|
//stm: @CHAIN_STATE_VERIFIED_REGISTRY_ROOT_KEY_001
|
|
vrh, err := clientApi.StateVerifiedRegistryRootKey(ctx, types.TipSetKey{})
|
|
fmt.Println(vrh.String())
|
|
require.NoError(t, err)
|
|
|
|
// import the root key.
|
|
rootAddr, err := clientApi.WalletImport(ctx, &rootKey.KeyInfo)
|
|
require.NoError(t, err)
|
|
|
|
// import the verifier's key.
|
|
verifier1Addr, err := clientApi.WalletImport(ctx, &verifier1Key.KeyInfo)
|
|
require.NoError(t, err)
|
|
|
|
verifier1IDAddr, err := clientApi.StateLookupID(ctx, verifier1Addr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
|
|
verifier2Addr, err := clientApi.WalletImport(ctx, &verifier2Key.KeyInfo)
|
|
require.NoError(t, err)
|
|
|
|
verifier2IDAddr, err := clientApi.StateLookupID(ctx, verifier2Addr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
|
|
// import the verified client's key.
|
|
verifiedClientAddr, err := clientApi.WalletImport(ctx, &verifiedClientKey.KeyInfo)
|
|
require.NoError(t, err)
|
|
|
|
verifiedClientIDAddr, err := clientApi.StateLookupID(ctx, verifiedClientAddr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
|
|
params, err := actors.SerializeParams(&verifregst.AddVerifierParams{Address: verifier1Addr, Allowance: big.NewInt(100000000000)})
|
|
require.NoError(t, err)
|
|
|
|
msg := &types.Message{
|
|
From: rootAddr,
|
|
To: verifreg.Address,
|
|
Method: verifreg.Methods.AddVerifier,
|
|
Params: params,
|
|
Value: big.Zero(),
|
|
}
|
|
|
|
sm, err := clientApi.MpoolPushMessage(ctx, msg, nil)
|
|
require.NoError(t, err, "AddVerifier failed")
|
|
|
|
//stm: @CHAIN_STATE_WAIT_MSG_001
|
|
res, err := clientApi.StateWaitMsg(ctx, sm.Cid(), 1, api.LookbackNoLimit, true)
|
|
require.NoError(t, err)
|
|
require.True(t, res.Receipt.ExitCode.IsSuccess())
|
|
|
|
params, err = actors.SerializeParams(&verifregst.AddVerifierParams{Address: verifier2Addr, Allowance: big.NewInt(100000000000)})
|
|
require.NoError(t, err)
|
|
|
|
msg = &types.Message{
|
|
From: rootAddr,
|
|
To: verifreg.Address,
|
|
Method: verifreg.Methods.AddVerifier,
|
|
Params: params,
|
|
Value: big.Zero(),
|
|
}
|
|
|
|
sm, err = clientApi.MpoolPushMessage(ctx, msg, nil)
|
|
require.NoError(t, err, "AddVerifier failed")
|
|
|
|
//stm: @CHAIN_STATE_WAIT_MSG_001
|
|
res, err = clientApi.StateWaitMsg(ctx, sm.Cid(), 1, api.LookbackNoLimit, true)
|
|
require.NoError(t, err)
|
|
require.True(t, res.Receipt.ExitCode.IsSuccess())
|
|
|
|
// assign datacap to a client
|
|
datacapToAssign := big.NewInt(10000)
|
|
|
|
params, err = actors.SerializeParams(&verifregst.AddVerifiedClientParams{Address: verifiedClientAddr, Allowance: datacapToAssign})
|
|
require.NoError(t, err)
|
|
|
|
msg = &types.Message{
|
|
From: verifier1Addr,
|
|
To: verifreg.Address,
|
|
Method: verifreg.Methods.AddVerifiedClient,
|
|
Params: params,
|
|
Value: big.Zero(),
|
|
}
|
|
|
|
sm, err = clientApi.MpoolPushMessage(ctx, msg, nil)
|
|
require.NoError(t, err)
|
|
|
|
//stm: @CHAIN_STATE_WAIT_MSG_001
|
|
res, err = clientApi.StateWaitMsg(ctx, sm.Cid(), 1, api.LookbackNoLimit, true)
|
|
require.NoError(t, err)
|
|
require.True(t, res.Receipt.ExitCode.IsSuccess())
|
|
|
|
// check datacap balance
|
|
//stm: @CHAIN_STATE_VERIFIED_CLIENT_STATUS_001
|
|
dc, err := clientApi.StateVerifiedClientStatus(ctx, verifiedClientAddr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
require.Equal(t, *dc, datacapToAssign)
|
|
|
|
// END OF VERIFIED CLIENT BOILERPLATE
|
|
|
|
label, err := markettypes.NewLabelFromString("")
|
|
require.NoError(t, err)
|
|
|
|
dealStartEpoch := abi.ChainEpoch(1000)
|
|
dealProposal := markettypes.DealProposal{
|
|
PieceCID: migration.MakeCID("1", &markettypes.PieceCIDPrefix),
|
|
PieceSize: 1024,
|
|
Client: verifiedClientAddr,
|
|
Provider: testMiner.ActorAddr,
|
|
Label: label,
|
|
StartEpoch: dealStartEpoch,
|
|
EndEpoch: abi.ChainEpoch(1000_000),
|
|
StoragePricePerEpoch: big.Zero(),
|
|
ProviderCollateral: big.Zero(),
|
|
ClientCollateral: big.Zero(),
|
|
VerifiedDeal: true,
|
|
}
|
|
|
|
serializedProposal := new(bytes.Buffer)
|
|
err = dealProposal.MarshalCBOR(serializedProposal)
|
|
require.NoError(t, err)
|
|
|
|
sig, err := clientApi.WalletSign(ctx, verifiedClientAddr, serializedProposal.Bytes())
|
|
|
|
publishDealParams := markettypes.PublishStorageDealsParams{
|
|
Deals: []markettypes.ClientDealProposal{{
|
|
Proposal: dealProposal,
|
|
ClientSignature: crypto.Signature{
|
|
Type: crypto.SigTypeBLS,
|
|
Data: sig.Data,
|
|
},
|
|
}},
|
|
}
|
|
|
|
serializedParams := new(bytes.Buffer)
|
|
require.NoError(t, publishDealParams.MarshalCBOR(serializedParams))
|
|
|
|
m, err := clientApi.MpoolPushMessage(ctx, &types.Message{
|
|
To: builtin.StorageMarketActorAddr,
|
|
From: testMiner.OwnerKey.Address,
|
|
Value: types.FromFil(0),
|
|
Method: builtin.MethodsMarket.PublishStorageDeals,
|
|
Params: serializedParams.Bytes(),
|
|
}, nil)
|
|
require.NoError(t, err)
|
|
|
|
r, err := clientApi.StateWaitMsg(ctx, m.Cid(), 2, api.LookbackNoLimit, true)
|
|
require.NoError(t, err)
|
|
require.True(t, r.Receipt.ExitCode.IsSuccess())
|
|
|
|
ret, err := market.DecodePublishStorageDealsReturn(r.Receipt.Return, build.TestNetworkVersion)
|
|
require.NoError(t, err)
|
|
valid, _, err := ret.IsDealValid(0)
|
|
require.NoError(t, err)
|
|
require.True(t, valid)
|
|
|
|
verifiedClientDcap, err := clientApi.StateVerifiedClientStatus(ctx, verifiedClientIDAddr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
|
|
// The client has already spent datacap equal to the deal's size -- this will be found in the VerifiedRegistryActor
|
|
require.Equal(t, big.Sub(datacapToAssign, big.NewIntUnsigned(uint64(dealProposal.PieceSize))), *verifiedClientDcap)
|
|
|
|
verifregDcapBefore, err := clientApi.StateVerifiedClientStatus(ctx, builtin.VerifiedRegistryActorAddr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
|
|
// Verifreg should now have the datacap for this deal
|
|
require.Equal(t, big.NewIntUnsigned(uint64(dealProposal.PieceSize)), *verifregDcapBefore)
|
|
|
|
// Now let's try to remove datacap from Verifreg
|
|
removeProposal := verifregst.RemoveDataCapProposal{
|
|
VerifiedClient: verifreg.Address,
|
|
DataCapAmount: *verifregDcapBefore,
|
|
RemovalProposalID: verifregst.RmDcProposalID{ProposalID: 0},
|
|
}
|
|
|
|
buf := bytes.Buffer{}
|
|
buf.WriteString(verifregst.SignatureDomainSeparation_RemoveDataCap)
|
|
require.NoError(t, removeProposal.MarshalCBOR(&buf), "failed to marshal proposal")
|
|
|
|
removeProposalSer := buf.Bytes()
|
|
|
|
verifier1Sig, err := clientApi.WalletSign(ctx, verifier1Addr, removeProposalSer)
|
|
require.NoError(t, err, "failed to sign proposal")
|
|
|
|
removeRequest1 := verifregst.RemoveDataCapRequest{
|
|
Verifier: verifier1IDAddr,
|
|
VerifierSignature: *verifier1Sig,
|
|
}
|
|
|
|
verifier2Sig, err := clientApi.WalletSign(ctx, verifier2Addr, removeProposalSer)
|
|
require.NoError(t, err, "failed to sign proposal")
|
|
|
|
removeRequest2 := verifregst.RemoveDataCapRequest{
|
|
Verifier: verifier2IDAddr,
|
|
VerifierSignature: *verifier2Sig,
|
|
}
|
|
|
|
removeDataCapParams := verifregst.RemoveDataCapParams{
|
|
VerifiedClientToRemove: verifreg.Address,
|
|
DataCapAmountToRemove: *verifregDcapBefore,
|
|
VerifierRequest1: removeRequest1,
|
|
VerifierRequest2: removeRequest2,
|
|
}
|
|
|
|
params, aerr := actors.SerializeParams(&removeDataCapParams)
|
|
require.NoError(t, aerr)
|
|
|
|
callResult, err := clientApi.StateCall(ctx, &types.Message{
|
|
From: rootAddr,
|
|
To: verifreg.Address,
|
|
Method: verifreg.Methods.RemoveVerifiedClientDataCap,
|
|
Params: params,
|
|
Value: big.Zero(),
|
|
}, types.EmptyTSK)
|
|
require.False(t, callResult.MsgRct.ExitCode.IsSuccess())
|
|
|
|
verifregDatacapAfter, err := clientApi.StateVerifiedClientStatus(ctx, builtin.VerifiedRegistryActorAddr, types.EmptyTSK)
|
|
require.NoError(t, err)
|
|
require.Equal(t, *verifregDcapBefore, *verifregDatacapAfter) // Verifreg should not have lost datacap
|
|
}
|