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>
261 lines
6.1 KiB
Go
261 lines
6.1 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/ipfs/go-cid"
|
|
"github.com/urfave/cli/v2"
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner"
|
|
|
|
"github.com/filecoin-project/lotus/chain/store"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
lcli "github.com/filecoin-project/lotus/cli"
|
|
"github.com/filecoin-project/lotus/node/repo"
|
|
)
|
|
|
|
var diffCmd = &cli.Command{
|
|
Name: "diff",
|
|
Usage: "diff state objects",
|
|
Subcommands: []*cli.Command{
|
|
diffStateTrees,
|
|
diffMinerStates,
|
|
},
|
|
}
|
|
|
|
var diffMinerStates = &cli.Command{
|
|
Name: "miner-states",
|
|
Usage: "diff two miner-states",
|
|
ArgsUsage: "<stateCidA> <stateCidB>",
|
|
Flags: []cli.Flag{
|
|
&cli.StringFlag{
|
|
Name: "repo",
|
|
Value: "~/.lotus",
|
|
},
|
|
},
|
|
Action: func(cctx *cli.Context) error {
|
|
ctx := context.TODO()
|
|
|
|
if cctx.NArg() != 2 {
|
|
return lcli.IncorrectNumArgs(cctx)
|
|
}
|
|
|
|
stCidA, err := cid.Decode(cctx.Args().First())
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse input: %w", err)
|
|
}
|
|
|
|
stCidB, err := cid.Decode(cctx.Args().Get(1))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse input: %w", err)
|
|
}
|
|
|
|
fsrepo, err := repo.NewFS(cctx.String("repo"))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
lkrepo, err := fsrepo.Lock(repo.FullNode)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer lkrepo.Close() //nolint:errcheck
|
|
|
|
bs, err := lkrepo.Blockstore(ctx, repo.UniversalBlockstore)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to open blockstore: %w", err)
|
|
}
|
|
|
|
defer func() {
|
|
if c, ok := bs.(io.Closer); ok {
|
|
if err := c.Close(); err != nil {
|
|
log.Warnf("failed to close blockstore: %s", err)
|
|
}
|
|
}
|
|
}()
|
|
|
|
actorStore := store.ActorStore(ctx, bs)
|
|
|
|
var minerStA miner9.State
|
|
if err = actorStore.Get(ctx, stCidA, &minerStA); err != nil {
|
|
return err
|
|
}
|
|
|
|
var minerStB miner9.State
|
|
if err = actorStore.Get(ctx, stCidB, &minerStB); err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Println(minerStA.Deadlines)
|
|
fmt.Println(minerStB.Deadlines)
|
|
|
|
minerDeadlinesA, err := minerStA.LoadDeadlines(actorStore)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
minerDeadlinesB, err := minerStB.LoadDeadlines(actorStore)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for i, dACid := range minerDeadlinesA.Due {
|
|
dBCid := minerDeadlinesB.Due[i]
|
|
if dACid != dBCid {
|
|
fmt.Println("Difference at index ", i, dACid, " != ", dBCid)
|
|
dA, err := minerDeadlinesA.LoadDeadline(actorStore, uint64(i))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
dB, err := minerDeadlinesB.LoadDeadline(actorStore, uint64(i))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if dA.SectorsSnapshot != dB.SectorsSnapshot {
|
|
fmt.Println("They differ at Sectors snapshot ", dA.SectorsSnapshot, " != ", dB.SectorsSnapshot)
|
|
|
|
sectorsSnapshotA, err := miner9.LoadSectors(actorStore, dA.SectorsSnapshot)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
sectorsSnapshotB, err := miner9.LoadSectors(actorStore, dB.SectorsSnapshot)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if sectorsSnapshotA.Length() != sectorsSnapshotB.Length() {
|
|
fmt.Println("sector snapshots have different lengts!")
|
|
}
|
|
|
|
var infoA miner9.SectorOnChainInfo
|
|
err = sectorsSnapshotA.ForEach(&infoA, func(i int64) error {
|
|
infoB, ok, err := sectorsSnapshotB.Get(abi.SectorNumber(i))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !ok {
|
|
fmt.Println(i, "isn't found in infoB!!")
|
|
}
|
|
|
|
if !infoA.DealWeight.Equals(infoB.DealWeight) {
|
|
fmt.Println("Deal Weights differ! ", infoA.DealWeight, infoB.DealWeight)
|
|
}
|
|
|
|
if !infoA.VerifiedDealWeight.Equals(infoB.VerifiedDealWeight) {
|
|
fmt.Println("Verified Deal Weights differ! ", infoA.VerifiedDealWeight, infoB.VerifiedDealWeight)
|
|
}
|
|
|
|
infoStrA := fmt.Sprint(infoA)
|
|
infoStrB := fmt.Sprint(*infoB)
|
|
if infoStrA != infoStrB {
|
|
fmt.Println(infoStrA)
|
|
fmt.Println(infoStrB)
|
|
}
|
|
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
},
|
|
}
|
|
|
|
var diffStateTrees = &cli.Command{
|
|
Name: "state-trees",
|
|
Usage: "diff two state-trees",
|
|
ArgsUsage: "<state-tree-a> <state-tree-b>",
|
|
Action: func(cctx *cli.Context) error {
|
|
api, closer, err := lcli.GetFullNodeAPI(cctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer closer()
|
|
ctx := lcli.ReqContext(cctx)
|
|
|
|
if cctx.NArg() != 2 {
|
|
return lcli.IncorrectNumArgs(cctx)
|
|
}
|
|
|
|
argA := cctx.Args().Get(0)
|
|
rootA, err := cid.Parse(argA)
|
|
if err != nil {
|
|
return xerrors.Errorf("first state-tree root (%q) is not a CID: %w", argA, err)
|
|
}
|
|
argB := cctx.Args().Get(1)
|
|
rootB, err := cid.Parse(argB)
|
|
if err != nil {
|
|
return xerrors.Errorf("second state-tree root (%q) is not a CID: %w", argB, err)
|
|
}
|
|
|
|
if rootA == rootB {
|
|
fmt.Println("state trees do not differ")
|
|
return nil
|
|
}
|
|
|
|
changedB, err := api.StateChangedActors(ctx, rootA, rootB)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
changedA, err := api.StateChangedActors(ctx, rootB, rootA)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
diff := func(stateA, stateB types.Actor) {
|
|
if stateB.Code != stateA.Code {
|
|
fmt.Printf(" code: %s != %s\n", stateA.Code, stateB.Code)
|
|
}
|
|
if stateB.Head != stateA.Head {
|
|
fmt.Printf(" state: %s != %s\n", stateA.Head, stateB.Head)
|
|
}
|
|
if stateB.Nonce != stateA.Nonce {
|
|
fmt.Printf(" nonce: %d != %d\n", stateA.Nonce, stateB.Nonce)
|
|
}
|
|
if !stateB.Balance.Equals(stateA.Balance) {
|
|
fmt.Printf(" balance: %s != %s\n", stateA.Balance, stateB.Balance)
|
|
}
|
|
}
|
|
|
|
fmt.Printf("state differences between %s (first) and %s (second):\n\n", rootA, rootB)
|
|
for addr, stateA := range changedA {
|
|
fmt.Println(addr)
|
|
stateB, ok := changedB[addr]
|
|
if ok {
|
|
diff(stateA, stateB)
|
|
continue
|
|
} else {
|
|
fmt.Printf(" actor does not exist in second state-tree (%s)\n", rootB)
|
|
}
|
|
fmt.Println()
|
|
delete(changedB, addr)
|
|
}
|
|
for addr, stateB := range changedB {
|
|
fmt.Println(addr)
|
|
stateA, ok := changedA[addr]
|
|
if ok {
|
|
diff(stateA, stateB)
|
|
continue
|
|
} else {
|
|
fmt.Printf(" actor does not exist in first state-tree (%s)\n", rootA)
|
|
}
|
|
fmt.Println()
|
|
}
|
|
return nil
|
|
},
|
|
}
|