Merge branch 'master' into sbansal/nonce-coordination-and-consensus-for-chain-nodes

api/api_storage.go

@@ -314,6 +314,11 @@ type StorageMiner interface {
 	CheckProvable(ctx context.Context, pp abi.RegisteredPoStProof, sectors []storiface.SectorRef, expensive bool) (map[abi.SectorNumber]string, error) //perm:admin
 
 	ComputeProof(ctx context.Context, ssi []builtin.ExtendedSectorInfo, rand abi.PoStRandomness, poStEpoch abi.ChainEpoch, nv abinetwork.Version) ([]builtin.PoStProof, error) //perm:read
+
+	// RecoverFault can be used to declare recoveries manually. It sends messages
+	// to the miner actor with details of recovered sectors and returns the CID of messages. It honors the
+	// maxPartitionsPerRecoveryMessage from the config
+	RecoverFault(ctx context.Context, sectors []abi.SectorNumber) ([]cid.Cid, error) //perm:admin
 }
 
 var _ storiface.WorkerReturn = *new(StorageMiner)

api/api_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package api
 
 import (

api/proxy_gen.go

@@ -775,6 +775,8 @@ type StorageMinerStruct struct {
 
 		PledgeSector func(p0 context.Context) (abi.SectorID, error) `perm:"write"`
 
+		RecoverFault func(p0 context.Context, p1 []abi.SectorNumber) ([]cid.Cid, error) `perm:"admin"`
+
 		ReturnAddPiece func(p0 context.Context, p1 storiface.CallID, p2 abi.PieceInfo, p3 *storiface.CallError) error `perm:"admin"`
 
 		ReturnDataCid func(p0 context.Context, p1 storiface.CallID, p2 abi.PieceInfo, p3 *storiface.CallError) error `perm:"admin"`
@@ -4644,6 +4646,17 @@ func (s *StorageMinerStub) PledgeSector(p0 context.Context) (abi.SectorID, error
 	return *new(abi.SectorID), ErrNotSupported
 }
 
+func (s *StorageMinerStruct) RecoverFault(p0 context.Context, p1 []abi.SectorNumber) ([]cid.Cid, error) {
+	if s.Internal.RecoverFault == nil {
+		return *new([]cid.Cid), ErrNotSupported
+	}
+	return s.Internal.RecoverFault(p0, p1)
+}
+
+func (s *StorageMinerStub) RecoverFault(p0 context.Context, p1 []abi.SectorNumber) ([]cid.Cid, error) {
+	return *new([]cid.Cid), ErrNotSupported
+}
+
 func (s *StorageMinerStruct) ReturnAddPiece(p0 context.Context, p1 storiface.CallID, p2 abi.PieceInfo, p3 *storiface.CallError) error {
 	if s.Internal.ReturnAddPiece == nil {
 		return ErrNotSupported

api/proxy_util_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package api
 
 import (

blockstore/badger/blockstore_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package badgerbs
 
 import (

blockstore/badger/blockstore_test_suite.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package badgerbs
 
 import (

blockstore/splitstore/markset_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package splitstore
 
 import (

blockstore/splitstore/splitstore_compact.go

@@ -519,6 +519,7 @@ func (s *SplitStore) applyProtectors() error {
 // - At this point we are ready to begin purging:
 //   - We sort cold objects heaviest first, so as to never delete the consituents of a DAG before the DAG itself (which would leave dangling references)
 //   - We delete in small batches taking a lock; each batch is checked again for marks, from the concurrent transactional mark, so as to never delete anything live
+//
 // - We then end the transaction and compact/gc the hotstore.
 func (s *SplitStore) compact(curTs *types.TipSet) {
 	log.Info("waiting for active views to complete")

blockstore/splitstore/splitstore_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package splitstore
 
 import (

blockstore/timed_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package blockstore
 
 import (

blockstore/union.go

@@ -12,10 +12,9 @@ type unionBlockstore []Blockstore
 
 // Union returns an unioned blockstore.
 //
-// * Reads return from the first blockstore that has the value, querying in the
+//   - Reads return from the first blockstore that has the value, querying in the
-//   supplied order.
+//     supplied order.
-// * Writes (puts and deletes) are broadcast to all stores.
+//   - Writes (puts and deletes) are broadcast to all stores.
-//
 func Union(stores ...Blockstore) Blockstore {
 	return unionBlockstore(stores)
 }

blockstore/union_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package blockstore
 
 import (

build/openrpc_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package build
 
 import (

build/params_testground.go

@@ -5,7 +5,6 @@
 //
 // Its purpose is to unlock various degrees of flexibility and parametrization
 // when writing Testground plans for Lotus.
-//
 package build
 
 import (

chain/actors/adt/diff_adt.go

@@ -26,7 +26,7 @@ type AdtArrayDiff interface {
 // - All values that exist in preArr and not in curArr are passed to AdtArrayDiff.Remove()
 // - All values that exist in curArr nnd not in prevArr are passed to adtArrayDiff.Add()
 // - All values that exist in preArr and in curArr are passed to AdtArrayDiff.Modify()
-//  - It is the responsibility of AdtArrayDiff.Modify() to determine if the values it was passed have been modified.
+//   - It is the responsibility of AdtArrayDiff.Modify() to determine if the values it was passed have been modified.
 func DiffAdtArray(preArr, curArr Array, out AdtArrayDiff) error {
 	notNew := make(map[int64]struct{}, curArr.Length())
 	prevVal := new(typegen.Deferred)

chain/actors/adt/diff_adt_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package adt
 
 import (

chain/actors/aerrors/error_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package aerrors_test
 
 import (

chain/actors/policy/policy_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package policy
 
 import (

chain/beacon/drand/drand_test.go

@@ -1,5 +1,5 @@
-//stm: ignore
+// stm: ignore
-//Only tests external library behavior, therefore it should not be annotated
+// Only tests external library behavior, therefore it should not be annotated
 package drand
 
 import (

chain/events/events_called.go

@@ -23,7 +23,8 @@ type triggerID = uint64
 type msgH = abi.ChainEpoch
 
 // triggerH is the block height at which the listener will be notified about the
-//  message (msgH+confidence)
+//
+//	message (msgH+confidence)
 type triggerH = abi.ChainEpoch
 
 type eventData interface{}
@@ -39,7 +40,8 @@ type EventHandler func(ctx context.Context, data eventData, prevTs, ts *types.Ti
 //
 // If `done` is true, timeout won't be triggered
 // If `more` is false, no messages will be sent to EventHandler (RevertHandler
-//  may still be called)
+//
+//	may still be called)
 type CheckFunc func(ctx context.Context, ts *types.TipSet) (done bool, more bool, err error)
 
 // Keep track of information for an event handler
@@ -375,31 +377,31 @@ type StateMatchFunc func(oldTs, newTs *types.TipSet) (bool, StateChange, error)
 // StateChanged registers a callback which is triggered when a specified state
 // change occurs or a timeout is reached.
 //
-// * `CheckFunc` callback is invoked immediately with a recent tipset, it
+//   - `CheckFunc` callback is invoked immediately with a recent tipset, it
-//    returns two booleans - `done`, and `more`.
+//     returns two booleans - `done`, and `more`.
 //
-//   * `done` should be true when some on-chain state change we are waiting
+//   - `done` should be true when some on-chain state change we are waiting
 //     for has happened. When `done` is set to true, timeout trigger is disabled.
 //
-//   * `more` should be false when we don't want to receive new notifications
+//   - `more` should be false when we don't want to receive new notifications
 //     through StateChangeHandler. Note that notifications may still be delivered to
 //     RevertHandler
 //
-// * `StateChangeHandler` is called when the specified state change was observed
+//   - `StateChangeHandler` is called when the specified state change was observed
-//    on-chain, and a confidence threshold was reached, or the specified `timeout`
+//     on-chain, and a confidence threshold was reached, or the specified `timeout`
-//    height was reached with no state change observed. When this callback is
+//     height was reached with no state change observed. When this callback is
-//    invoked on a timeout, `oldTs` and `states are set to nil.
+//     invoked on a timeout, `oldTs` and `states are set to nil.
-//    This callback returns a boolean specifying whether further notifications
+//     This callback returns a boolean specifying whether further notifications
-//    should be sent, like `more` return param from `CheckFunc` above.
+//     should be sent, like `more` return param from `CheckFunc` above.
 //
-// * `RevertHandler` is called after apply handler, when we drop the tipset
+//   - `RevertHandler` is called after apply handler, when we drop the tipset
-//    containing the message. The tipset passed as the argument is the tipset
+//     containing the message. The tipset passed as the argument is the tipset
-//    that is being dropped. Note that the event dropped may be re-applied
+//     that is being dropped. Note that the event dropped may be re-applied
-//    in a different tipset in small amount of time.
+//     in a different tipset in small amount of time.
 //
-// * `StateMatchFunc` is called against each tipset state. If there is a match,
+//   - `StateMatchFunc` is called against each tipset state. If there is a match,
-//   the state change is queued up until the confidence interval has elapsed (and
+//     the state change is queued up until the confidence interval has elapsed (and
-//   `StateChangeHandler` is called)
+//     `StateChangeHandler` is called)
 func (we *watcherEvents) StateChanged(check CheckFunc, scHnd StateChangeHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, mf StateMatchFunc) error {
 	hnd := func(ctx context.Context, data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
 		states, ok := data.(StateChange)
@@ -503,33 +505,34 @@ type MsgHandler func(msg *types.Message, rec *types.MessageReceipt, ts *types.Ti
 type MsgMatchFunc func(msg *types.Message) (matched bool, err error)
 
 // Called registers a callback which is triggered when a specified method is
-//  called on an actor, or a timeout is reached.
 //
-// * `CheckFunc` callback is invoked immediately with a recent tipset, it
+//		called on an actor, or a timeout is reached.
-//    returns two booleans - `done`, and `more`.
 //
-//   * `done` should be true when some on-chain action we are waiting for has
+//	  - `CheckFunc` callback is invoked immediately with a recent tipset, it
-//     happened. When `done` is set to true, timeout trigger is disabled.
+//	    returns two booleans - `done`, and `more`.
 //
-//   * `more` should be false when we don't want to receive new notifications
+//	  - `done` should be true when some on-chain action we are waiting for has
-//     through MsgHandler. Note that notifications may still be delivered to
+//	    happened. When `done` is set to true, timeout trigger is disabled.
-//     RevertHandler
 //
-// * `MsgHandler` is called when the specified event was observed on-chain,
+//	  - `more` should be false when we don't want to receive new notifications
-//    and a confidence threshold was reached, or the specified `timeout` height
+//	    through MsgHandler. Note that notifications may still be delivered to
-//    was reached with no events observed. When this callback is invoked on a
+//	    RevertHandler
-//    timeout, `msg` is set to nil. This callback returns a boolean specifying
-//    whether further notifications should be sent, like `more` return param
-//    from `CheckFunc` above.
 //
-// * `RevertHandler` is called after apply handler, when we drop the tipset
+//	  - `MsgHandler` is called when the specified event was observed on-chain,
-//    containing the message. The tipset passed as the argument is the tipset
+//	    and a confidence threshold was reached, or the specified `timeout` height
-//    that is being dropped. Note that the message dropped may be re-applied
+//	    was reached with no events observed. When this callback is invoked on a
-//    in a different tipset in small amount of time.
+//	    timeout, `msg` is set to nil. This callback returns a boolean specifying
+//	    whether further notifications should be sent, like `more` return param
+//	    from `CheckFunc` above.
 //
-// * `MsgMatchFunc` is called against each message. If there is a match, the
+//	  - `RevertHandler` is called after apply handler, when we drop the tipset
-//   message is queued up until the confidence interval has elapsed (and
+//	    containing the message. The tipset passed as the argument is the tipset
-//   `MsgHandler` is called)
+//	    that is being dropped. Note that the message dropped may be re-applied
+//	    in a different tipset in small amount of time.
+//
+//	  - `MsgMatchFunc` is called against each message. If there is a match, the
+//	    message is queued up until the confidence interval has elapsed (and
+//	    `MsgHandler` is called)
 func (me *messageEvents) Called(ctx context.Context, check CheckFunc, msgHnd MsgHandler, rev RevertHandler, confidence int, timeout abi.ChainEpoch, mf MsgMatchFunc) error {
 	hnd := func(ctx context.Context, data eventData, prevTs, ts *types.TipSet, height abi.ChainEpoch) (bool, error) {
 		msg, ok := data.(*types.Message)

chain/events/events_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package events
 
 import (

chain/events/state/predicates_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package state
 
 import (

chain/events/tscache_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package events
 
 import (

chain/exchange/doc.go

@@ -10,8 +10,8 @@
 // A client can also pass options, encoded as a 64-bit bitfield. Lotus supports
 // two options at the moment:
 //
-//  - include block contents
+//   - include block contents
-//  - include block messages
+//   - include block messages
 //
 // The response will include a status code, an optional message, and the
 // response payload in case of success. The payload is a slice of serialized

chain/exchange/protocol.go

@@ -21,11 +21,12 @@ const (
 )
 
 // FIXME: Bumped from original 800 to this to accommodate `syncFork()`
-//  use of `GetBlocks()`. It seems the expectation of that API is to
+//
-//  fetch any amount of blocks leaving it to the internal logic here
+//	use of `GetBlocks()`. It seems the expectation of that API is to
-//  to partition and reassemble the requests if they go above the maximum.
+//	fetch any amount of blocks leaving it to the internal logic here
-//  (Also as a consequence of this temporarily removing the `const`
+//	to partition and reassemble the requests if they go above the maximum.
-//   qualifier to avoid "const initializer [...] is not a constant" error.)
+//	(Also as a consequence of this temporarily removing the `const`
+//	 qualifier to avoid "const initializer [...] is not a constant" error.)
 var MaxRequestLength = uint64(build.ForkLengthThreshold)
 
 const (
@@ -147,11 +148,12 @@ type BSTipSet struct {
 // `BlsIncludes`/`SecpkIncludes` matches `Bls`/`Secpk` messages
 // to blocks in the tipsets with the format:
 // `BlsIncludes[BI][MI]`
-//  * BI: block index in the tipset.
+//   - BI: block index in the tipset.
-//  * MI: message index in `Bls` list
+//   - MI: message index in `Bls` list
 //
 // FIXME: The logic to decompress this structure should belong
-//  to itself, not to the consumer.
+//
+//	to itself, not to the consumer.
 type CompactedMessages struct {
 	Bls         []*types.Message
 	BlsIncludes [][]uint64

chain/gen/gen_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package gen
 
 import (

chain/market/fundmanager_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package market
 
 import (

chain/messagepool/block_proba_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagepool
 
 import (

chain/messagepool/check_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagepool
 
 import (

chain/messagepool/messagepool.go

@@ -1056,9 +1056,9 @@ func (mp *MessagePool) getStateBalance(ctx context.Context, addr address.Address
 
 // this method is provided for the gateway to push messages.
 // differences from Push:
-//  - strict checks are enabled
+//   - strict checks are enabled
-//  - extra strict add checks are used when adding the messages to the msgSet
+//   - extra strict add checks are used when adding the messages to the msgSet
-//    that means: no nonce gaps, at most 10 pending messages for the actor
+//     that means: no nonce gaps, at most 10 pending messages for the actor
 func (mp *MessagePool) PushUntrusted(ctx context.Context, m *types.SignedMessage) (cid.Cid, error) {
 	err := mp.checkMessage(m)
 	if err != nil {

chain/messagepool/messagepool_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagepool
 
 import (

chain/messagepool/repub_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagepool
 
 import (

chain/messagepool/selection_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagepool
 
 import (

chain/messagesigner/messagesigner_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package messagesigner
 
 import (

chain/rand/rand_test.go

@@ -1,4 +1,4 @@
-//stm:#unit
+// stm:#unit
 package rand_test
 
 import (

chain/state/statetree_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package state
 
 import (

chain/stmgr/call.go

@@ -30,9 +30,9 @@ var ErrExpensiveFork = errors.New("refusing explicit call due to state fork at e
 // tipset's parent. In the presence of null blocks, the height at which the message is invoked may
 // be less than the specified tipset.
 //
-// - If no tipset is specified, the first tipset without an expensive migration is used.
+//   - If no tipset is specified, the first tipset without an expensive migration is used.
-// - If executing a message at a given tipset would trigger an expensive migration, the call will
+//   - If executing a message at a given tipset would trigger an expensive migration, the call will
-//   fail with ErrExpensiveFork.
+//     fail with ErrExpensiveFork.
 func (sm *StateManager) Call(ctx context.Context, msg *types.Message, ts *types.TipSet) (*api.InvocResult, error) {
 	ctx, span := trace.StartSpan(ctx, "statemanager.Call")
 	defer span.End()

chain/stmgr/forks.go

@@ -36,12 +36,12 @@ type MigrationCache interface {
 
 // MigrationFunc is a migration function run at every upgrade.
 //
-// - The cache is a per-upgrade cache, pre-populated by pre-migrations.
+//   - The cache is a per-upgrade cache, pre-populated by pre-migrations.
-// - The oldState is the state produced by the upgrade epoch.
+//   - The oldState is the state produced by the upgrade epoch.
-// - The returned newState is the new state that will be used by the next epoch.
+//   - The returned newState is the new state that will be used by the next epoch.
-// - The height is the upgrade epoch height (already executed).
+//   - The height is the upgrade epoch height (already executed).
-// - The tipset is the first non-null tipset after the upgrade height (the tipset in
+//   - The tipset is the first non-null tipset after the upgrade height (the tipset in
-//   which the upgrade is executed). Do not assume that ts.Height() is the upgrade height.
+//     which the upgrade is executed). Do not assume that ts.Height() is the upgrade height.
 //
 // NOTE: In StateCompute and CallWithGas, the passed tipset is actually the tipset _before_ the
 // upgrade. The tipset should really only be used for referencing the "current chain".

chain/stmgr/forks_test.go

@@ -1,4 +1,4 @@
-//stm: #integration
+// stm: #integration
 package stmgr_test
 
 import (

chain/stmgr/searchwait_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package stmgr_test
 
 import (

chain/store/checkpoint_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package store_test
 
 import (

chain/store/coalescer.go

@@ -9,12 +9,17 @@ import (
 
 // WrapHeadChangeCoalescer wraps a ReorgNotifee with a head change coalescer.
 // minDelay is the minimum coalesce delay; when a head change is first received, the coalescer will
-//  wait for that long to coalesce more head changes.
+//
+//	wait for that long to coalesce more head changes.
+//
 // maxDelay is the maximum coalesce delay; the coalescer will not delay delivery of a head change
-//  more than that.
+//
+//	more than that.
+//
 // mergeInterval is the interval that triggers additional coalesce delay; if the last head change was
-//  within the merge interval when the coalesce timer fires, then the coalesce time is extended
+//
-//  by min delay and up to max delay total.
+//	within the merge interval when the coalesce timer fires, then the coalesce time is extended
+//	by min delay and up to max delay total.
 func WrapHeadChangeCoalescer(fn ReorgNotifee, minDelay, maxDelay, mergeInterval time.Duration) ReorgNotifee {
 	c := NewHeadChangeCoalescer(fn, minDelay, maxDelay, mergeInterval)
 	return c.HeadChange

chain/store/coalescer_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package store
 
 import (

chain/store/index_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package store_test
 
 import (

chain/store/store.go

@@ -93,8 +93,8 @@ type WeightFunc func(ctx context.Context, stateBs bstore.Blockstore, ts *types.T
 // store).
 //
 // To alleviate disk access, the ChainStore has two ARC caches:
-//   1. a tipset cache
+//  1. a tipset cache
-//   2. a block => messages references cache.
+//  2. a block => messages references cache.
 type ChainStore struct {
 	chainBlockstore bstore.Blockstore
 	stateBlockstore bstore.Blockstore
@@ -453,8 +453,9 @@ func (cs *ChainStore) MaybeTakeHeavierTipSet(ctx context.Context, ts *types.TipS
 // The "fast forward" case is covered in this logic as a valid fork of length 0.
 //
 // FIXME: We may want to replace some of the logic in `syncFork()` with this.
-//  `syncFork()` counts the length on both sides of the fork at the moment (we
+//
-//  need to settle on that) but here we just enforce it on the `synced` side.
+//	`syncFork()` counts the length on both sides of the fork at the moment (we
+//	need to settle on that) but here we just enforce it on the `synced` side.
 func (cs *ChainStore) exceedsForkLength(ctx context.Context, synced, external *types.TipSet) (bool, error) {
 	if synced == nil || external == nil {
 		// FIXME: If `cs.heaviest` is nil we should just bypass the entire

chain/store/store_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package store_test
 
 import (

chain/sub/incoming.go

@@ -159,9 +159,12 @@ func FetchSignedMessagesByCids(
 }
 
 // Fetch `cids` from the block service, apply `cb` on each of them. Used
-//  by the fetch message functions above.
+//
+//	by the fetch message functions above.
+//
 // We check that each block is received only once and we do not received
-//  blocks we did not request.
+//
+//	blocks we did not request.
 func fetchCids(
 	ctx context.Context,
 	bserv bserv.BlockGetter,

chain/sub/incoming_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package sub
 
 import (

chain/sync.go

@@ -60,16 +60,16 @@ var (
 // Syncer is in charge of running the chain synchronization logic. As such, it
 // is tasked with these functions, amongst others:
 //
-//  * Fast-forwards the chain as it learns of new TipSets from the network via
+//   - Fast-forwards the chain as it learns of new TipSets from the network via
-//    the SyncManager.
+//     the SyncManager.
-//  * Applies the fork choice rule to select the correct side when confronted
+//   - Applies the fork choice rule to select the correct side when confronted
-//    with a fork in the network.
+//     with a fork in the network.
-//  * Requests block headers and messages from other peers when not available
+//   - Requests block headers and messages from other peers when not available
-//    in our BlockStore.
+//     in our BlockStore.
-//  * Tracks blocks marked as bad in a cache.
+//   - Tracks blocks marked as bad in a cache.
-//  * Keeps the BlockStore and ChainStore consistent with our view of the world,
+//   - Keeps the BlockStore and ChainStore consistent with our view of the world,
-//    the latter of which in turn informs other components when a reorg has been
+//     the latter of which in turn informs other components when a reorg has been
-//    committed.
+//     committed.
 //
 // The Syncer does not run workers itself. It's mainly concerned with
 // ensuring a consistent state of chain consensus. The reactive and network-
@@ -671,9 +671,9 @@ func extractSyncState(ctx context.Context) *SyncerState {
 //  2. Check the consistency of beacon entries in the from tipset. We check
 //     total equality of the BeaconEntries in each block.
 //  3. Traverse the chain backwards, for each tipset:
-//  	3a. Load it from the chainstore; if found, it move on to its parent.
+//     3a. Load it from the chainstore; if found, it move on to its parent.
-//      3b. Query our peers via client in batches, requesting up to a
+//     3b. Query our peers via client in batches, requesting up to a
-//      maximum of 500 tipsets every time.
+//     maximum of 500 tipsets every time.
 //
 // Once we've concluded, if we find a mismatching tipset at the height where the
 // anchor tipset should be, we are facing a fork, and we invoke Syncer#syncFork
@@ -1171,7 +1171,7 @@ func persistMessages(ctx context.Context, bs bstore.Blockstore, bst *exchange.Co
 //     else we must drop part of our chain to connect to the peer's head
 //     (referred to as "forking").
 //
-//	2. StagePersistHeaders: now that we've collected the missing headers,
+//  2. StagePersistHeaders: now that we've collected the missing headers,
 //     augmented by those on the other side of a fork, we persist them to the
 //     BlockStore.
 //

chain/sync_manager_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package chain
 
 import (

chain/sync_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package chain_test
 
 import (

chain/types/bigint_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/blockheader_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/electionproof_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/fil_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/message_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/signature_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/tipset.go

@@ -99,11 +99,11 @@ func tipsetSortFunc(blks []*BlockHeader) func(i, j int) bool {
 }
 
 // Checks:
-// * A tipset is composed of at least one block. (Because of our variable
+//   - A tipset is composed of at least one block. (Because of our variable
-//   number of blocks per tipset, determined by randomness, we do not impose
+//     number of blocks per tipset, determined by randomness, we do not impose
-//   an upper limit.)
+//     an upper limit.)
-// * All blocks have the same height.
+//   - All blocks have the same height.
-// * All blocks have the same parents (same number of them and matching CIDs).
+//   - All blocks have the same parents (same number of them and matching CIDs).
 func NewTipSet(blks []*BlockHeader) (*TipSet, error) {
 	if len(blks) == 0 {
 		return nil, xerrors.Errorf("NewTipSet called with zero length array of blocks")

chain/types/tipset_key_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types/types_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package types
 
 import (

chain/types_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package chain
 
 import (

chain/vectors/vectors_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package vectors
 
 import (

chain/vm/burn_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package vm
 
 import (

chain/vm/gas_v0_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package vm
 
 import (

chain/vm/invoker_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package vm
 
 import (

chain/vm/runtime_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package vm
 
 import (

chain/wallet/multi_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package wallet
 
 import (

chain/wallet/wallet_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package wallet
 
 import (

cli/chain_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cli/cmd.go

@@ -69,6 +69,7 @@ var CommonCommands = []*cli.Command{
 var Commands = []*cli.Command{
 	WithCategory("basic", sendCmd),
 	WithCategory("basic", walletCmd),
+	WithCategory("basic", infoCmd),
 	WithCategory("basic", clientCmd),
 	WithCategory("basic", multisigCmd),
 	WithCategory("basic", filplusCmd),

cli/info.go

@@ -0,0 +1,230 @@
+package cli
+
+import (
+	"context"
+	"fmt"
+	"math"
+	"os"
+	"sort"
+	"strings"
+	"text/tabwriter"
+	"time"
+
+	"github.com/dustin/go-humanize"
+	"github.com/fatih/color"
+	"github.com/urfave/cli/v2"
+
+	"github.com/filecoin-project/go-fil-markets/storagemarket"
+	"github.com/filecoin-project/go-state-types/big"
+
+	"github.com/filecoin-project/lotus/api/v1api"
+	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+var infoCmd = &cli.Command{
+	Name:   "info",
+	Usage:  "Print node info",
+	Action: infoCmdAct,
+}
+
+func infoCmdAct(cctx *cli.Context) error {
+	fullapi, acloser, err := GetFullNodeAPIV1(cctx)
+	if err != nil {
+		return err
+	}
+	defer acloser()
+	ctx := ReqContext(cctx)
+
+	network, err := fullapi.StateGetNetworkParams(ctx)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Network: %s\n", network.NetworkName)
+	fmt.Print("Chain: ")
+	err = SyncBasefeeCheck(ctx, fullapi)
+	if err != nil {
+		return err
+	}
+
+	status, err := fullapi.NodeStatus(ctx, true)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf(" [epoch %s]\n", color.MagentaString(("%d"), status.SyncStatus.Epoch))
+	fmt.Printf("Peers to: [publish messages %d] [publish blocks %d]\n", status.PeerStatus.PeersToPublishMsgs, status.PeerStatus.PeersToPublishBlocks)
+
+	//Chain health calculated as percentage: amount of blocks in last finality / very healthy amount of blocks in a finality (900 epochs * 5 blocks per tipset)
+	health := (100 * (900 * status.ChainStatus.BlocksPerTipsetLastFinality) / (900 * 5))
+	switch {
+	case health > 85:
+		fmt.Printf("Chain health: %.f%% [%s]\n", health, color.GreenString("healthy"))
+	case health < 85:
+		fmt.Printf("Chain health: %.f%% [%s]\n", health, color.RedString("unhealthy"))
+	}
+
+	fmt.Println()
+
+	addr, err := fullapi.WalletDefaultAddress(ctx)
+	if err == nil {
+		fmt.Printf("Default address: \n")
+		balance, err := fullapi.WalletBalance(ctx, addr)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("      %s [%s]\n", addr.String(), types.FIL(balance).Short())
+	} else {
+		fmt.Printf("Default address: address not set\n")
+	}
+	fmt.Println()
+
+	addrs, err := fullapi.WalletList(ctx)
+	if err != nil {
+		return err
+	}
+
+	totalBalance := big.Zero()
+	for _, addr := range addrs {
+		totbal, err := fullapi.WalletBalance(ctx, addr)
+		if err != nil {
+			return err
+		}
+		totalBalance = big.Add(totalBalance, totbal)
+	}
+
+	switch {
+	case len(addrs) <= 1:
+		fmt.Printf("Wallet: %v address\n", len(addrs))
+	case len(addrs) > 1:
+		fmt.Printf("Wallet: %v addresses\n", len(addrs))
+	}
+	fmt.Printf("      Total balance: %s\n", types.FIL(totalBalance).Short())
+
+	mbLockedSum := big.Zero()
+	mbAvailableSum := big.Zero()
+	for _, addr := range addrs {
+		mbal, err := fullapi.StateMarketBalance(ctx, addr, types.EmptyTSK)
+		if err != nil {
+			if strings.Contains(err.Error(), "actor not found") {
+				continue
+			} else {
+				return err
+			}
+		}
+		mbLockedSum = big.Add(mbLockedSum, mbal.Locked)
+		mbAvailableSum = big.Add(mbAvailableSum, mbal.Escrow)
+	}
+
+	fmt.Printf("      Market locked: %s\n", types.FIL(mbLockedSum).Short())
+	fmt.Printf("      Market available: %s\n", types.FIL(mbAvailableSum).Short())
+
+	fmt.Println()
+
+	chs, err := fullapi.PaychList(ctx)
+	if err != nil {
+		return err
+	}
+
+	switch {
+	case len(chs) <= 1:
+		fmt.Printf("Payment Channels: %v channel\n", len(chs))
+	case len(chs) > 1:
+		fmt.Printf("Payment Channels: %v channels\n", len(chs))
+	}
+	fmt.Println()
+
+	localDeals, err := fullapi.ClientListDeals(ctx)
+	if err != nil {
+		return err
+	}
+
+	var totalSize uint64
+	byState := map[storagemarket.StorageDealStatus][]uint64{}
+	for _, deal := range localDeals {
+		totalSize += deal.Size
+		byState[deal.State] = append(byState[deal.State], deal.Size)
+	}
+
+	fmt.Printf("Deals: %d, %s\n", len(localDeals), types.SizeStr(types.NewInt(totalSize)))
+
+	type stateStat struct {
+		state storagemarket.StorageDealStatus
+		count int
+		bytes uint64
+	}
+
+	stateStats := make([]stateStat, 0, len(byState))
+	for state, deals := range byState {
+		if state == storagemarket.StorageDealActive {
+			state = math.MaxUint64 // for sort
+		}
+
+		st := stateStat{
+			state: state,
+			count: len(deals),
+		}
+		for _, b := range deals {
+			st.bytes += b
+		}
+
+		stateStats = append(stateStats, st)
+	}
+
+	sort.Slice(stateStats, func(i, j int) bool {
+		return int64(stateStats[i].state) < int64(stateStats[j].state)
+	})
+
+	for _, st := range stateStats {
+		if st.state == math.MaxUint64 {
+			st.state = storagemarket.StorageDealActive
+		}
+		fmt.Printf("      %s: %d deals, %s\n", storagemarket.DealStates[st.state], st.count, types.SizeStr(types.NewInt(st.bytes)))
+	}
+
+	fmt.Println()
+
+	tw := tabwriter.NewWriter(os.Stdout, 6, 6, 2, ' ', 0)
+
+	s, err := fullapi.NetBandwidthStats(ctx)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Bandwidth:\n")
+	fmt.Fprintf(tw, "\tTotalIn\tTotalOut\tRateIn\tRateOut\n")
+	fmt.Fprintf(tw, "\t%s\t%s\t%s/s\t%s/s\n", humanize.Bytes(uint64(s.TotalIn)), humanize.Bytes(uint64(s.TotalOut)), humanize.Bytes(uint64(s.RateIn)), humanize.Bytes(uint64(s.RateOut)))
+	return tw.Flush()
+
+}
+
+func SyncBasefeeCheck(ctx context.Context, fullapi v1api.FullNode) error {
+	head, err := fullapi.ChainHead(ctx)
+	if err != nil {
+		return err
+	}
+
+	switch {
+	case time.Now().Unix()-int64(head.MinTimestamp()) < int64(build.BlockDelaySecs*3/2): // within 1.5 epochs
+		fmt.Printf("[%s]", color.GreenString("sync ok"))
+	case time.Now().Unix()-int64(head.MinTimestamp()) < int64(build.BlockDelaySecs*5): // within 5 epochs
+		fmt.Printf("[%s]", color.YellowString("sync slow (%s behind)", time.Now().Sub(time.Unix(int64(head.MinTimestamp()), 0)).Truncate(time.Second)))
+	default:
+		fmt.Printf("[%s]", color.RedString("sync behind! (%s behind)", time.Now().Sub(time.Unix(int64(head.MinTimestamp()), 0)).Truncate(time.Second)))
+	}
+	basefee := head.MinTicketBlock().ParentBaseFee
+	gasCol := []color.Attribute{color.FgBlue}
+	switch {
+	case basefee.GreaterThan(big.NewInt(7000_000_000)): // 7 nFIL
+		gasCol = []color.Attribute{color.BgRed, color.FgBlack}
+	case basefee.GreaterThan(big.NewInt(3000_000_000)): // 3 nFIL
+		gasCol = []color.Attribute{color.FgRed}
+	case basefee.GreaterThan(big.NewInt(750_000_000)): // 750 uFIL
+		gasCol = []color.Attribute{color.FgYellow}
+	case basefee.GreaterThan(big.NewInt(100_000_000)): // 100 uFIL
+		gasCol = []color.Attribute{color.FgGreen}
+	}
+	fmt.Printf(" [basefee %s]", color.New(gasCol...).Sprint(types.FIL(basefee).Short()))
+	return nil
+}

cli/mpool_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cli/send.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"encoding/hex"
 	"fmt"
+	"strings"
 
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
@@ -152,6 +153,9 @@ var sendCmd = &cli.Command{
 
 		sm, err := InteractiveSend(ctx, cctx, srv, proto)
 		if err != nil {
+			if strings.Contains(err.Error(), "no current EF") {
+				return xerrors.Errorf("transaction rejected on ledger: %w", err)
+			}
 			return err
 		}
 

cli/send_test.go

@@ -1,5 +1,5 @@
-//stm: ignore
+// stm: ignore
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cli/services_send_test.go

@@ -1,5 +1,5 @@
-//stm: ignore
+// stm: ignore
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cli/sync_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cli/wallet_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package cli
 
 import (

cmd/lotus-bench/stats_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package main
 
 import (

cmd/lotus-fountain/rate_limiter_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package main
 
 import (

cmd/lotus-health/main_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package main
 
 import (

cmd/lotus-miner/actor.go

@@ -55,6 +55,10 @@ var actorSetAddrsCmd = &cli.Command{
 	Aliases: []string{"set-addrs"},
 	Usage:   "set addresses that your miner can be publicly dialed on",
 	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "from",
+			Usage: "optionally specify the account to send the message from",
+		},
 		&cli.Int64Flag{
 			Name:  "gas-limit",
 			Usage: "set gas limit",
@@ -117,6 +121,25 @@ var actorSetAddrsCmd = &cli.Command{
 			return err
 		}
 
+		fromAddr := minfo.Worker
+		if from := cctx.String("from"); from != "" {
+			addr, err := address.NewFromString(from)
+			if err != nil {
+				return err
+			}
+
+			fromAddr = addr
+		}
+
+		fromId, err := api.StateLookupID(ctx, fromAddr, types.EmptyTSK)
+		if err != nil {
+			return err
+		}
+
+		if !isController(minfo, fromId) {
+			return xerrors.Errorf("sender isn't a controller of miner: %s", fromId)
+		}
+
 		params, err := actors.SerializeParams(&miner.ChangeMultiaddrsParams{NewMultiaddrs: addrs})
 		if err != nil {
 			return err
@@ -126,7 +149,7 @@ var actorSetAddrsCmd = &cli.Command{
 
 		smsg, err := api.MpoolPushMessage(ctx, &types.Message{
 			To:       maddr,
-			From:     minfo.Worker,
+			From:     fromId,
 			Value:    types.NewInt(0),
 			GasLimit: gasLimit,
 			Method:   builtin.MethodsMiner.ChangeMultiaddrs,

cmd/lotus-miner/actor_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package main
 
 import (

cmd/lotus-miner/allinfo_test.go

@@ -1,4 +1,4 @@
-//stm: #integration
+// stm: #integration
 package main
 
 import (

cmd/lotus-miner/info.go

@@ -25,7 +25,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/api/v0api"
+	"github.com/filecoin-project/lotus/api/v1api"
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
@@ -70,7 +70,7 @@ func infoCmdAct(cctx *cli.Context) error {
 	}
 	defer closer()
 
-	fullapi, acloser, err := lcli.GetFullNodeAPI(cctx)
+	fullapi, acloser, err := lcli.GetFullNodeAPIV1(cctx)
 	if err != nil {
 		return err
 	}
@@ -94,34 +94,11 @@ func infoCmdAct(cctx *cli.Context) error {
 
 	fmt.Print("Chain: ")
 
-	head, err := fullapi.ChainHead(ctx)
+	err = lcli.SyncBasefeeCheck(ctx, fullapi)
 	if err != nil {
 		return err
 	}
 
-	switch {
-	case time.Now().Unix()-int64(head.MinTimestamp()) < int64(build.BlockDelaySecs*3/2): // within 1.5 epochs
-		fmt.Printf("[%s]", color.GreenString("sync ok"))
-	case time.Now().Unix()-int64(head.MinTimestamp()) < int64(build.BlockDelaySecs*5): // within 5 epochs
-		fmt.Printf("[%s]", color.YellowString("sync slow (%s behind)", time.Now().Sub(time.Unix(int64(head.MinTimestamp()), 0)).Truncate(time.Second)))
-	default:
-		fmt.Printf("[%s]", color.RedString("sync behind! (%s behind)", time.Now().Sub(time.Unix(int64(head.MinTimestamp()), 0)).Truncate(time.Second)))
-	}
-
-	basefee := head.MinTicketBlock().ParentBaseFee
-	gasCol := []color.Attribute{color.FgBlue}
-	switch {
-	case basefee.GreaterThan(big.NewInt(7000_000_000)): // 7 nFIL
-		gasCol = []color.Attribute{color.BgRed, color.FgBlack}
-	case basefee.GreaterThan(big.NewInt(3000_000_000)): // 3 nFIL
-		gasCol = []color.Attribute{color.FgRed}
-	case basefee.GreaterThan(big.NewInt(750_000_000)): // 750 uFIL
-		gasCol = []color.Attribute{color.FgYellow}
-	case basefee.GreaterThan(big.NewInt(100_000_000)): // 100 uFIL
-		gasCol = []color.Attribute{color.FgGreen}
-	}
-	fmt.Printf(" [basefee %s]", color.New(gasCol...).Sprint(types.FIL(basefee).Short()))
-
 	fmt.Println()
 
 	alerts, err := minerApi.LogAlerts(ctx)
@@ -152,7 +129,7 @@ func infoCmdAct(cctx *cli.Context) error {
 	return nil
 }
 
-func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v0api.FullNode, nodeApi api.StorageMiner) error {
+func handleMiningInfo(ctx context.Context, cctx *cli.Context, fullapi v1api.FullNode, nodeApi api.StorageMiner) error {
 	maddr, err := getActorAddress(ctx, cctx)
 	if err != nil {
 		return err
@@ -615,7 +592,7 @@ func colorTokenAmount(format string, amount abi.TokenAmount) {
 	}
 }
 
-func producedBlocks(ctx context.Context, count int, maddr address.Address, napi v0api.FullNode) error {
+func producedBlocks(ctx context.Context, count int, maddr address.Address, napi v1api.FullNode) error {
 	var err error
 	head, err := napi.ChainHead(ctx)
 	if err != nil {

cmd/lotus-miner/proving.go

@@ -7,10 +7,12 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"sync"
 	"text/tabwriter"
 	"time"
 
 	"github.com/fatih/color"
+	"github.com/ipfs/go-cid"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
@@ -19,6 +21,7 @@ import (
 	"github.com/filecoin-project/go-state-types/abi"
 
 	"github.com/filecoin-project/lotus/blockstore"
+	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -37,6 +40,7 @@ var provingCmd = &cli.Command{
 		provingCheckProvableCmd,
 		workersCmd(false),
 		provingComputeCmd,
+		provingRecoverFaultsCmd,
 	},
 }
 
@@ -644,3 +648,82 @@ It will not send any messages to the chain.`,
 		return nil
 	},
 }
+
+var provingRecoverFaultsCmd = &cli.Command{
+	Name:      "recover-faults",
+	Usage:     "Manually recovers faulty sectors on chain",
+	ArgsUsage: "<faulty sectors>",
+	Flags: []cli.Flag{
+		&cli.IntFlag{
+			Name:  "confidence",
+			Usage: "number of block confirmations to wait for",
+			Value: int(build.MessageConfidence),
+		},
+	},
+	Action: func(cctx *cli.Context) error {
+		if cctx.Args().Len() < 1 {
+			return xerrors.Errorf("must pass at least 1 sector number")
+		}
+
+		arglist := cctx.Args().Slice()
+		var sectors []abi.SectorNumber
+		for _, v := range arglist {
+			s, err := strconv.ParseUint(v, 10, 64)
+			if err != nil {
+				return xerrors.Errorf("failed to convert sectors, please check the arguments: %w", err)
+			}
+			sectors = append(sectors, abi.SectorNumber(s))
+		}
+
+		nodeApi, closer, err := lcli.GetStorageMinerAPI(cctx)
+		if err != nil {
+			return err
+		}
+		defer closer()
+
+		api, acloser, err := lcli.GetFullNodeAPI(cctx)
+		if err != nil {
+			return err
+		}
+		defer acloser()
+
+		ctx := lcli.ReqContext(cctx)
+
+		msgs, err := nodeApi.RecoverFault(ctx, sectors)
+		if err != nil {
+			return err
+		}
+
+		// wait for msgs to get mined into a block
+		var wg sync.WaitGroup
+		wg.Add(len(msgs))
+		results := make(chan error, len(msgs))
+		for _, msg := range msgs {
+			go func(m cid.Cid) {
+				defer wg.Done()
+				wait, err := api.StateWaitMsg(ctx, m, uint64(cctx.Int("confidence")))
+				if err != nil {
+					results <- xerrors.Errorf("Timeout waiting for message to land on chain %s", wait.Message)
+					return
+				}
+
+				if wait.Receipt.ExitCode != 0 {
+					results <- xerrors.Errorf("Failed to execute message %s: %w", wait.Message, wait.Receipt.ExitCode.Error())
+					return
+				}
+				results <- nil
+				return
+			}(msg)
+		}
+
+		wg.Wait()
+		close(results)
+
+		for v := range results {
+			if v != nil {
+				fmt.Println("Failed to execute the message %w", v)
+			}
+		}
+		return nil
+	},
+}

cmd/lotus-sim/simulation/stages/commit_queue_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package stages
 
 import (

cmd/lotus-sim/simulation/stages/funding_stage.go

@@ -55,10 +55,10 @@ func (fs *FundingStage) Fund(bb *blockbuilder.BlockBuilder, target address.Addre
 
 // sendAndFund "packs" the given message, funding the actor if necessary. It:
 //
-// 1. Tries to send the given message.
+//  1. Tries to send the given message.
-// 2. If that fails, it checks to see if the exit code was ErrInsufficientFunds.
+//  2. If that fails, it checks to see if the exit code was ErrInsufficientFunds.
-// 3. If so, it sends 1K FIL from the "burnt funds actor" (because we need to send it from
+//  3. If so, it sends 1K FIL from the "burnt funds actor" (because we need to send it from
-//    somewhere) and re-tries the message.0
+//     somewhere) and re-tries the message.0
 func (fs *FundingStage) SendAndFund(bb *blockbuilder.BlockBuilder, msg *types.Message) (res *types.MessageReceipt, err error) {
 	for i := 0; i < 10; i++ {
 		res, err = bb.PushMessage(msg)

cmd/lotus-sim/simulation/step.go

@@ -28,10 +28,10 @@ func (sim *Simulation) Step(ctx context.Context) (*types.TipSet, error) {
 
 // popNextMessages generates/picks a set of messages to be included in the next block.
 //
-// - This function is destructive and should only be called once per epoch.
+//   - This function is destructive and should only be called once per epoch.
-// - This function does not store anything in the repo.
+//   - This function does not store anything in the repo.
-// - This function handles all gas estimation. The returned messages should all fit in a single
+//   - This function handles all gas estimation. The returned messages should all fit in a single
-//   block.
+//     block.
 func (sim *Simulation) popNextMessages(ctx context.Context) ([]*types.Message, error) {
 	parentTs := sim.head
 

cmd/tvx/codenames_test.go

@@ -1,4 +1,4 @@
-//stm: #unit
+// stm: #unit
 package main
 
 import (

conformance/chaos/actor.go

@@ -146,10 +146,10 @@ type CallerValidationArgs struct {
 
 // CallerValidation violates VM call validation constraints.
 //
-//  CallerValidationBranchNone performs no validation.
+//	CallerValidationBranchNone performs no validation.
-//  CallerValidationBranchTwice validates twice.
+//	CallerValidationBranchTwice validates twice.
-//  CallerValidationBranchIsAddress validates caller against CallerValidationArgs.Addrs.
+//	CallerValidationBranchIsAddress validates caller against CallerValidationArgs.Addrs.
-//  CallerValidationBranchIsType validates caller against CallerValidationArgs.Types.
+//	CallerValidationBranchIsType validates caller against CallerValidationArgs.Types.
 func (a Actor) CallerValidation(rt runtime2.Runtime, args *CallerValidationArgs) *abi.EmptyValue {
 	switch args.Branch {
 	case CallerValidationBranchNone:

conformance/chaos/actor_test.go

@@ -1,4 +1,4 @@
-//stm: #chaos
+// stm: #chaos
 package chaos
 
 import (

conformance/corpus_test.go

@@ -1,4 +1,4 @@
-//stm: ignore
+// stm: ignore
 // This file does not test any behaviors by itself; rather, it runs other test files
 // Therefore, this file should not be annotated.
 package conformance

conformance/driver.go

@@ -276,7 +276,8 @@ func (d *Driver) ExecuteMessage(bs blockstore.Blockstore, params ExecuteMessageP
 // messages that originate from secp256k senders, leaving all
 // others untouched.
 // TODO: generate a signature in the DSL so that it's encoded in
-//  the test vector.
+//
+//	the test vector.
 func toChainMsg(msg *types.Message) (ret types.ChainMsg) {
 	ret = msg
 	if msg.From.Protocol() == address.SECP256K1 {

documentation/en/api-v0-methods-miner.md

@@ -106,6 +106,8 @@
   * [PiecesListPieces](#PiecesListPieces)
 * [Pledge](#Pledge)
   * [PledgeSector](#PledgeSector)
+* [Recover](#Recover)
+  * [RecoverFault](#RecoverFault)
 * [Return](#Return)
   * [ReturnAddPiece](#ReturnAddPiece)
   * [ReturnDataCid](#ReturnDataCid)
@@ -2265,6 +2267,36 @@ Response:
 }
 ```
 
+## Recover
+
+
+### RecoverFault
+RecoverFault can be used to declare recoveries manually. It sends messages
+to the miner actor with details of recovered sectors and returns the CID of messages. It honors the
+maxPartitionsPerRecoveryMessage from the config
+
+
+Perms: admin
+
+Inputs:
+```json
+[
+  [
+    123,
+    124
+  ]
+]
+```
+
+Response:
+```json
+[
+  {
+    "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
+  }
+]
+```
+
 ## Return
 
 
@@ -4397,26 +4429,26 @@ Response:
           },
           "seal/v0/datacid": {
             "0": {
-              "MinMemory": 2048,
+              "MinMemory": 4294967296,
-              "MaxMemory": 2048,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
-              "BaseMinMemory": 2048,
+              "BaseMinMemory": 1073741824,
               "MaxConcurrent": 0
             },
             "1": {
-              "MinMemory": 8388608,
+              "MinMemory": 4294967296,
-              "MaxMemory": 8388608,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
-              "BaseMinMemory": 8388608,
+              "BaseMinMemory": 1073741824,
               "MaxConcurrent": 0
             },
             "2": {
-              "MinMemory": 1073741824,
+              "MinMemory": 4294967296,
-              "MaxMemory": 1073741824,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
@@ -4433,8 +4465,8 @@ Response:
               "MaxConcurrent": 0
             },
             "4": {
-              "MinMemory": 8589934592,
+              "MinMemory": 4294967296,
-              "MaxMemory": 8589934592,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
@@ -4442,26 +4474,26 @@ Response:
               "MaxConcurrent": 0
             },
             "5": {
-              "MinMemory": 2048,
+              "MinMemory": 4294967296,
-              "MaxMemory": 2048,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
-              "BaseMinMemory": 2048,
+              "BaseMinMemory": 1073741824,
               "MaxConcurrent": 0
             },
             "6": {
-              "MinMemory": 8388608,
+              "MinMemory": 4294967296,
-              "MaxMemory": 8388608,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
-              "BaseMinMemory": 8388608,
+              "BaseMinMemory": 1073741824,
               "MaxConcurrent": 0
             },
             "7": {
-              "MinMemory": 1073741824,
+              "MinMemory": 4294967296,
-              "MaxMemory": 1073741824,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,
@@ -4478,8 +4510,8 @@ Response:
               "MaxConcurrent": 0
             },
             "9": {
-              "MinMemory": 8589934592,
+              "MinMemory": 4294967296,
-              "MaxMemory": 8589934592,
+              "MaxMemory": 4294967296,
               "GPUUtilization": 0,
               "MaxParallelism": 1,
               "MaxParallelismGPU": 0,

documentation/en/api-v0-methods-worker.md

@@ -579,26 +579,26 @@ Response:
       },
       "seal/v0/datacid": {
         "0": {
-          "MinMemory": 2048,
+          "MinMemory": 4294967296,
-          "MaxMemory": 2048,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
-          "BaseMinMemory": 2048,
+          "BaseMinMemory": 1073741824,
           "MaxConcurrent": 0
         },
         "1": {
-          "MinMemory": 8388608,
+          "MinMemory": 4294967296,
-          "MaxMemory": 8388608,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
-          "BaseMinMemory": 8388608,
+          "BaseMinMemory": 1073741824,
           "MaxConcurrent": 0
         },
         "2": {
-          "MinMemory": 1073741824,
+          "MinMemory": 4294967296,
-          "MaxMemory": 1073741824,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
@@ -615,8 +615,8 @@ Response:
           "MaxConcurrent": 0
         },
         "4": {
-          "MinMemory": 8589934592,
+          "MinMemory": 4294967296,
-          "MaxMemory": 8589934592,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
@@ -624,26 +624,26 @@ Response:
           "MaxConcurrent": 0
         },
         "5": {
-          "MinMemory": 2048,
+          "MinMemory": 4294967296,
-          "MaxMemory": 2048,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
-          "BaseMinMemory": 2048,
+          "BaseMinMemory": 1073741824,
           "MaxConcurrent": 0
         },
         "6": {
-          "MinMemory": 8388608,
+          "MinMemory": 4294967296,
-          "MaxMemory": 8388608,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
-          "BaseMinMemory": 8388608,
+          "BaseMinMemory": 1073741824,
           "MaxConcurrent": 0
         },
         "7": {
-          "MinMemory": 1073741824,
+          "MinMemory": 4294967296,
-          "MaxMemory": 1073741824,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,
@@ -660,8 +660,8 @@ Response:
           "MaxConcurrent": 0
         },
         "9": {
-          "MinMemory": 8589934592,
+          "MinMemory": 4294967296,
-          "MaxMemory": 8589934592,
+          "MaxMemory": 4294967296,
           "GPUUtilization": 0,
           "MaxParallelism": 1,
           "MaxParallelismGPU": 0,

documentation/en/cli-lotus-miner.md

@@ -2093,14 +2093,15 @@ USAGE:
    lotus-miner proving command [command options] [arguments...]
 
 COMMANDS:
-   info       View current state information
+   info            View current state information
-   deadlines  View the current proving period deadlines information
+   deadlines       View the current proving period deadlines information
-   deadline   View the current proving period deadline information by its index
+   deadline        View the current proving period deadline information by its index
-   faults     View the currently known proving faulty sectors information
+   faults          View the currently known proving faulty sectors information
-   check      Check sectors provable
+   check           Check sectors provable
-   workers    list workers
+   workers         list workers
-   compute    Compute simulated proving tasks
+   compute         Compute simulated proving tasks
-   help, h    Shows a list of commands or help for one command
+   recover-faults  Manually recovers faulty sectors on chain
+   help, h         Shows a list of commands or help for one command
 
 OPTIONS:
    --help, -h  show help (default: false)
@@ -2210,6 +2211,19 @@ OPTIONS:
 ```
 ```
 
+### lotus-miner proving recover-faults
+```
+NAME:
+   lotus-miner proving recover-faults - Manually recovers faulty sectors on chain
+
+USAGE:
+   lotus-miner proving recover-faults [command options] <faulty sectors>
+
+OPTIONS:
+   --confidence value  number of block confirmations to wait for (default: 5)
+   
+```
+
 ## lotus-miner storage
 ```
 NAME: