diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz index 055c13754..49354faee 100644 Binary files a/build/openrpc/full.json.gz and b/build/openrpc/full.json.gz differ diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz index 5d32e910d..cf0f7777f 100644 Binary files a/build/openrpc/miner.json.gz and b/build/openrpc/miner.json.gz differ diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz index fa6f28aff..13b0c1e15 100644 Binary files a/build/openrpc/worker.json.gz and b/build/openrpc/worker.json.gz differ diff --git a/chain/messagepool/messagepool.go b/chain/messagepool/messagepool.go index 2201b5d83..0180d1abf 100644 --- a/chain/messagepool/messagepool.go +++ b/chain/messagepool/messagepool.go @@ -11,7 +11,6 @@ import ( "sync" "time" - "github.com/davecgh/go-spew/spew" "github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/crypto" @@ -970,8 +969,6 @@ func (mp *MessagePool) getNonceLocked(ctx context.Context, addr address.Address, } func (mp *MessagePool) getStateNonce(addr address.Address, ts *types.TipSet) (uint64, error) { - spew.Dump(addr) - act, err := mp.api.GetActorAfter(addr, ts) if err != nil { return 0, err diff --git a/documentation/en/api-v0-methods-miner.md b/documentation/en/api-v0-methods-miner.md index 53d485815..92912fb4f 100644 --- a/documentation/en/api-v0-methods-miner.md +++ b/documentation/en/api-v0-methods-miner.md @@ -98,6 +98,7 @@ * [SealingAbort](#SealingAbort) * [SealingSchedDiag](#SealingSchedDiag) * [Sector](#Sector) + * [SectorAddPieceToAny](#SectorAddPieceToAny) * [SectorCommitFlush](#SectorCommitFlush) * [SectorCommitPending](#SectorCommitPending) * [SectorGetExpectedSealDuration](#SectorGetExpectedSealDuration) @@ -118,6 +119,7 @@ * [SectorsRefs](#SectorsRefs) * [SectorsStatus](#SectorsStatus) * [SectorsSummary](#SectorsSummary) + * [SectorsUnsealPiece](#SectorsUnsealPiece) * [SectorsUpdate](#SectorsUpdate) * [Storage](#Storage) * [StorageAddLocal](#StorageAddLocal) @@ -1560,6 +1562,54 @@ Response: `{}` ## Sector +### SectorAddPieceToAny +Add piece to an open sector. If no sectors with enough space are open, +either a new sector will be created, or this call will block until more +sectors can be created. + + +Perms: admin + +Inputs: +```json +[ + 1024, + {}, + { + "PublishCid": null, + "DealID": 5432, + "DealProposal": { + "PieceCID": { + "/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4" + }, + "PieceSize": 1032, + "VerifiedDeal": true, + "Client": "f01234", + "Provider": "f01234", + "Label": "string value", + "StartEpoch": 10101, + "EndEpoch": 10101, + "StoragePricePerEpoch": "0", + "ProviderCollateral": "0", + "ClientCollateral": "0" + }, + "DealSchedule": { + "StartEpoch": 10101, + "EndEpoch": 10101 + }, + "KeepUnsealed": true + } +] +``` + +Response: +```json +{ + "Sector": 9, + "Offset": 1032 +} +``` + ### SectorCommitFlush SectorCommitFlush immediately sends a Commit message with sectors aggregated for Commit. Returns null if message wasn't sent @@ -1860,6 +1910,30 @@ Response: } ``` +### SectorsUnsealPiece + + +Perms: admin + +Inputs: +```json +[ + { + "ID": { + "Miner": 1000, + "Number": 9 + }, + "ProofType": 8 + }, + 1040384, + 1024, + null, + null +] +``` + +Response: `{}` + ### SectorsUpdate diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md index b4b245514..d594b9473 100644 --- a/documentation/en/cli-lotus-miner.md +++ b/documentation/en/cli-lotus-miner.md @@ -57,6 +57,7 @@ USAGE: COMMANDS: restore Initialize a lotus miner repo from a backup + service Initialize a lotus miner sub-service help, h Shows a list of commands or help for one command OPTIONS: @@ -93,6 +94,25 @@ OPTIONS: ``` +### lotus-miner init service +``` +NAME: + lotus-miner init service - Initialize a lotus miner sub-service + +USAGE: + lotus-miner init service [command options] [backupFile] + +OPTIONS: + --config value config file (config.toml) + --storage-config value storage paths config (storage.json) + --nosync don't check full-node sync status (default: false) + --enable-market enable market module (default: false) + --api-sealer value sealer API info (lotus-miner auth api-info --perm=admin) + --api-sector-index value sector Index API info (lotus-miner auth api-info --perm=admin) + --help, -h show help (default: false) + +``` + ## lotus-miner run ``` NAME: diff --git a/node/builder_miner.go b/node/builder_miner.go index 3a0c86814..3165da0e2 100644 --- a/node/builder_miner.go +++ b/node/builder_miner.go @@ -127,7 +127,6 @@ func ConfigStorageMiner(c interface{}) Option { Override(new(sectorstorage.PieceProvider), sectorstorage.NewPieceProvider), // Markets (retrieval) - Override(new(retrievalmarket.RetrievalProviderNode), retrievaladapter.NewRetrievalProviderNode), Override(new(rmnet.RetrievalMarketNetwork), modules.RetrievalNetwork), Override(new(retrievalmarket.RetrievalProvider), modules.RetrievalProvider),