2020-01-10 18:21:46 +00:00
|
|
|
package storageadapter
|
2019-11-04 19:57:54 +00:00
|
|
|
|
|
|
|
// this file implements storagemarket.StorageProviderNode
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-09-11 11:28:09 +00:00
|
|
|
"time"
|
2019-11-04 19:57:54 +00:00
|
|
|
|
2020-03-18 19:43:06 +00:00
|
|
|
"github.com/ipfs/go-cid"
|
|
|
|
logging "github.com/ipfs/go-log/v2"
|
2021-02-02 17:43:49 +00:00
|
|
|
"go.uber.org/fx"
|
2020-03-18 19:43:06 +00:00
|
|
|
"golang.org/x/xerrors"
|
|
|
|
|
2020-03-18 18:37:32 +00:00
|
|
|
"github.com/filecoin-project/go-address"
|
|
|
|
"github.com/filecoin-project/go-fil-markets/shared"
|
|
|
|
"github.com/filecoin-project/go-fil-markets/storagemarket"
|
2020-09-07 03:49:10 +00:00
|
|
|
"github.com/filecoin-project/go-state-types/abi"
|
2022-09-26 16:47:48 +00:00
|
|
|
markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market"
|
2020-09-07 03:49:10 +00:00
|
|
|
"github.com/filecoin-project/go-state-types/crypto"
|
|
|
|
"github.com/filecoin-project/go-state-types/exitcode"
|
2019-11-04 19:57:54 +00:00
|
|
|
|
|
|
|
"github.com/filecoin-project/lotus/api"
|
2021-04-05 17:56:53 +00:00
|
|
|
"github.com/filecoin-project/lotus/api/v1api"
|
2020-01-24 20:19:52 +00:00
|
|
|
"github.com/filecoin-project/lotus/build"
|
2020-09-21 23:01:29 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/market"
|
2023-06-09 18:07:14 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
|
2020-10-02 16:34:50 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/events"
|
2021-08-30 08:42:41 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/events/state"
|
2019-11-04 19:57:54 +00:00
|
|
|
"github.com/filecoin-project/lotus/chain/types"
|
2020-03-03 21:23:06 +00:00
|
|
|
"github.com/filecoin-project/lotus/lib/sigs"
|
2020-01-10 18:21:46 +00:00
|
|
|
"github.com/filecoin-project/lotus/markets/utils"
|
2020-10-02 16:34:50 +00:00
|
|
|
"github.com/filecoin-project/lotus/node/config"
|
2021-02-02 17:43:49 +00:00
|
|
|
"github.com/filecoin-project/lotus/node/modules/helpers"
|
2022-06-14 19:23:17 +00:00
|
|
|
pipeline "github.com/filecoin-project/lotus/storage/pipeline"
|
chore: Merge nv22 into master (#11699)
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* feat: drand: refactor round verification
* feat: sealing: Support nv22 DDO features in the sealing pipeline (#11226)
* Initial work supporting DDO pieces in lotus-miner
* sealing: Update pipeline input to operate on UniversalPiece
* sealing: Update pipeline checks/sealing states to operate on UniversalPiece
* sealing: Make pipeline build with UniversalPiece
* move PieceDealInfo out of api
* make gen
* make sealing pipeline unit tests pass
* fix itest ensemble build
* don't panic in SectorsStatus with deals
* stop linter from complaining about checkPieces
* fix sector import tests
* mod tidy
* sealing: Add logic for (pre)committing DDO sectors
* sealing: state-types with method defs
* DDO non-snap pipeline works(?), DDO Itests
* DDO support in snapdeals pipeline
* make gen
* update actor bundles
* update the gst market fix
* fix: chain: use PreCommitSectorsBatch2 when setting up genesis
* some bug fixes
* integration working changes
* update actor bundles
* Make TestOnboardRawPieceSnap pass
* Appease the linter
* Make deadlines test pass with v12 actors
* Update go-state-types, abstract market DealState
* make gen
* mod tidy, lint fixes
* Fix some more tests
* Bump version in master
Bump version in master
* Make gen
Make gen
* fix sender
* fix: lotus-provider: Fix winning PoSt
* fix: sql Scan cannot write to an object
* Actually show miner-addrs in info-log
Actually show miner-addrs in lotus-provider info-log
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* ddo is now nv22
* make gen
* temp actor bundle with ddo
* use working go-state-types
* gst with v13 market migration
* update bundle, builtin.MethodsMiner.ProveCommitSectors2 -> 3
* actually working v13 migration, v13 migration itest
* Address review
* sealing: Correct DDO snap pledge math
* itests: Mixed ddo itest
* pipeline: Fix sectorWeight
* sealing: convert market deals into PAMs in mixed sectors
* sealing: make market to ddo conversion work
* fix lint
* update gst
* Update actors and GST to lastest integ branch
* commit batcher: Update ProveCommitSectors3Params builder logic
* make gen
* use builtin-actors master
* ddo: address review
* itests: Add commd assertions to ddo tests
* make gen
* gst with fixed types
* config knobs for RequireActivationSuccess
* storage: Drop obsolete flaky tasts
---------
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Phi <orjan.roren@gmail.com>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
* feat: implement FIP-0063
* chore: deps: update to go-multiaddr v0.12.2 (#11602)
* feat: fvm: update the FVM/FFI to v4.1 (#11608) (#11612)
This:
1. Adds nv22 support.
2. Updates the message tracing format.
Co-authored-by: Steven Allen <steven@stebalien.com>
* AggregateProofType nil when doing batch updates
Use latest nv22 go-state-types version with matching update
* Update to v13.0.0-rc.2 bundle
* chore: Upgrade heights and codename
Update upgrade heights
Co-Authored-By: Steven Allen <steven@stebalien.com>
* Update epoch after nv22 DRAND switch
Update epoch after nv22 DRAND switch
* Update Mango codename to Phoneix
Make the codename for the Drand-change inline with Dragon style.
* Add UpgradePhoenixHeight to API params
* set UpgradePhoenixHeight to be one hour after Dragon
* Make gen
Make gen and UpgradePhoenixHeight in butterfly and local devnet to be in line with Calibration and Mainnet
* Update epoch heights (#11637)
Update epoch heights
* new: add forest bootstrap nodes (#11636)
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
* Merge pull request #11491 from filecoin-project/fix/remove-decommissioned-pl-bootstrap-nodes
Remove PL operated bootstrap nodes from mainnet.pi
* feat: api: new verified registry methods to get all allocations and claims (#11631)
* new verireg methods
* update changelog and add itest
* update itest and cli
* update new method's support till v9
* remove gateway APIs
* fix cli internal var names
* chore:: backport #11609 to the feat/nv22 branch (#11644)
* feat: api: improve the correctness of Eth's trace_block (#11609)
* Improve the correctness of Eth's trace_block
- Improve encoding/decoding of parameters and return values:
- Encode "native" parameters and return values with Solidity ABI.
- Correctly decode parameters to "create" calls.
- Use the correct (ish) output for "create" calls.
- Handle all forms of "create".
- Make robust with respect to reverts:
- Use the actor ID/address from the trace instead of looking it up in
the state-tree (may not exist in the state-tree due to a revert).
- Gracefully handle failed actor/contract creation.
- Improve performance:
- We avoid looking anything up in the state-tree when translating the
trace, which should significantly improve performance.
- Improve code readability:
- Remove all "backtracking" logic.
- Use an "environment" struct to store temporary state instead of
attaching it to the trace.
- Fix random bugs:
- Fix an allocation bug in the "address" logic (need to set the
capacity before modifying the slice).
- Improved error checking/handling.
- Use correct types for `trace_block` action/results (create, call, etc.).
- And use the correct types for Result/Action structs instead of reusing the same "Call" action every time.
- Improve error messages.
* Make gen
Make gen
---------
Co-authored-by: Steven Allen <steven@stebalien.com>
* fix: add UpgradePhoenixHeight to StateGetNetworkParams (#11648)
* chore: deps: update to go-state-types v13.0.0-rc.1
* do NOT update the cache when running the real migration
* Merge pull request #11632 from hanabi1224/hm/drand-test
feat: drand quicknet: allow scheduling drand quicknet upgrade before nv22 on 2k devnet
* chore: deps: update to go-state-types v13.0.0-rc.2
chore: deps: update to go-state-types v13.0.0-rc.2
* feat: set migration config UpgradeEpoch for v13 actors upgrade
* Built-in actor events first draft
* itest for DDO non-market verified data w/ builtin actor events
* Tests for builtin actor events API
* Clean up DDO+Events tests, add lots of explainer comments
* Minor tweaks to events types
* Avoid duplicate messages when looking for receipts
* Rename internal events modules for clarity
* Adjust actor event API after review
* s/ActorEvents/Events/g in global config
* Manage event sending rate for SubscribeActorEvents
* Terminate SubscribeActorEvents chan when at max height
* Document future API changes
* More clarity in actor event API docs
* More post-review changes, lots of tests for SubscribeActorEvents
Use BlockDelay as the window for receiving events on the SubscribeActorEvents
channel. We expect the user to have received the initial batch of historical
events (if any) in one block's time. For real-time events we expect them to
not fall behind by roughly one block's time.
* Remove duplicate code from actor event type marshalling tests
Reduce verbosity and remove duplicate test logic from actor event types
JSON marshalling tests.
* Rename actor events test to follow go convention
Add missing `s` to `actor_events` test file to follow golang convention
used across the repo.
* Run actor events table tests in deterministic order
Refactor `map` usage for actor event table tests to ensure deterministic
test execution order, making debugging potential issues easier. If
non-determinism is a target, leverage Go's built-in parallel testing
capabilities.
* Reduce scope for filter removal failure when getting actor events
Use a fresh context to remove the temporary filter installed solely to
get the actor events. This should reduce chances of failure in a case
where the original context may be expired/cancelled.
Refactor removal into a `defer` statement for a more readable, concise
return statement.
* Use fixed RNG seed for actor event tests
Improve determinism in actor event tests by using a fixed RNG seed. This
makes up a more reproducible test suit.
* Use provided libraries to assert eventual conditions
Use the functionalities already provided by `testify` to assert eventual
conditions, and remove the use of `time.Sleep`.
Remove duplicate code in utility functions that are already defined.
Refactor assertion helper functions to use consistent terminology:
"require" implies fatal error, whereas "assert" implies error where the
test may proceed executing.
* Update changelog for actor events APIs
* Fix concerns and docs identified by review
* Update actor bundle to v13.0.0-rc3
Update actor bundle to v13.0.0-rc3
* Prep Lotus v1.26.0-rc1
- For sanity reverting the mainnet upgrade epoch to 99999999, and then only set it when cutting the final release
-Update Calibnet CIDs to v13.0.0-rc3
- Add GetActorEvents, SubscribeActorEvents, GetAllClaims and GetAllAllocations methods to the changelog
Co-Authored-By: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
* Update CHANGELOG.md
Co-authored-by: Masih H. Derkani <m@derkani.org>
* Make gen
Make gen
* fix: beacon: validate drand change at nv16 correctly
* bump to v1.26.0-rc2
* test: cleanup ddo verified itest, extract steps to functions
also add allocation-removed event case
* test: extract verified DDO test to separate file, add more checks
* test: add additional actor events checks
* Add verification for "deal-activated" actor event
* docs(drand): document the meaning of "IsChained" (#11692)
* Resolve conflicts
I encountered multiple issues when trying to run make gen. And these changes fixed a couple of them:
- go mod tidy
- Remove RaftState/RaftLeader
- Revert `if ts.Height() > claim.TermMax+claim.TermStart || !cctx.IsSet("expired")` to the what is in the release/v1.26.0: `if tsHeight > val.TermMax || !expired`
* fixup imports, make jen
* Update version
Update version in master to v1.27.0-dev
* Update node/impl/full/dummy.go
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
* Adjust ListClaimsCmd
Adjust ListClaimsCmd according to review
---------
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Co-authored-by: Rod Vagg <rod@vagg.org>
Co-authored-by: Samuel Arogbonlo <47984109+samuelarogbonlo@users.noreply.github.com>
Co-authored-by: LexLuthr <88259624+LexLuthr@users.noreply.github.com>
Co-authored-by: tom123222 <160735201+tom123222@users.noreply.github.com>
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
2024-03-12 09:33:58 +00:00
|
|
|
"github.com/filecoin-project/lotus/storage/pipeline/piece"
|
2019-11-04 19:57:54 +00:00
|
|
|
"github.com/filecoin-project/lotus/storage/sectorblocks"
|
|
|
|
)
|
|
|
|
|
2020-09-11 11:28:09 +00:00
|
|
|
var addPieceRetryWait = 5 * time.Minute
|
2020-09-11 17:45:57 +00:00
|
|
|
var addPieceRetryTimeout = 6 * time.Hour
|
2021-03-02 09:24:57 +00:00
|
|
|
var defaultMaxProviderCollateralMultiplier = uint64(2)
|
2020-07-08 10:52:37 +00:00
|
|
|
var log = logging.Logger("storageadapter")
|
2019-11-04 19:57:54 +00:00
|
|
|
|
|
|
|
type ProviderNodeAdapter struct {
|
2021-04-05 17:56:53 +00:00
|
|
|
v1api.FullNode
|
2019-11-04 19:57:54 +00:00
|
|
|
|
|
|
|
secb *sectorblocks.SectorBlocks
|
2020-01-24 20:19:52 +00:00
|
|
|
ev *events.Events
|
2020-10-02 16:34:50 +00:00
|
|
|
|
2021-01-08 15:28:38 +00:00
|
|
|
dealPublisher *DealPublisher
|
|
|
|
|
2021-03-02 09:24:57 +00:00
|
|
|
addBalanceSpec *api.MessageSendSpec
|
|
|
|
maxDealCollateralMultiplier uint64
|
2021-08-30 08:42:41 +00:00
|
|
|
dsMatcher *dealStateMatcher
|
2021-03-02 09:24:57 +00:00
|
|
|
scMgr *SectorCommittedManager
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2021-08-04 00:10:30 +00:00
|
|
|
func NewProviderNodeAdapter(fc *config.MinerFeeConfig, dc *config.DealmakingConfig) func(mctx helpers.MetricsCtx, lc fx.Lifecycle, secb *sectorblocks.SectorBlocks, full v1api.FullNode, dealPublisher *DealPublisher) (storagemarket.StorageProviderNode, error) {
|
|
|
|
return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, secb *sectorblocks.SectorBlocks, full v1api.FullNode, dealPublisher *DealPublisher) (storagemarket.StorageProviderNode, error) {
|
2021-02-02 17:43:49 +00:00
|
|
|
ctx := helpers.LifecycleCtx(mctx, lc)
|
|
|
|
|
2021-08-04 00:10:30 +00:00
|
|
|
ev, err := events.NewEvents(ctx, full)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-10-02 16:34:50 +00:00
|
|
|
na := &ProviderNodeAdapter{
|
2021-01-08 15:28:38 +00:00
|
|
|
FullNode: full,
|
2020-10-02 16:34:50 +00:00
|
|
|
|
2021-01-08 15:28:38 +00:00
|
|
|
secb: secb,
|
|
|
|
ev: ev,
|
|
|
|
dealPublisher: dealPublisher,
|
2021-08-30 08:42:41 +00:00
|
|
|
dsMatcher: newDealStateMatcher(state.NewStatePredicates(state.WrapFastAPI(full))),
|
2020-10-02 16:34:50 +00:00
|
|
|
}
|
|
|
|
if fc != nil {
|
|
|
|
na.addBalanceSpec = &api.MessageSendSpec{MaxFee: abi.TokenAmount(fc.MaxMarketBalanceAddFee)}
|
|
|
|
}
|
2021-03-02 09:24:57 +00:00
|
|
|
na.maxDealCollateralMultiplier = defaultMaxProviderCollateralMultiplier
|
|
|
|
if dc != nil {
|
|
|
|
na.maxDealCollateralMultiplier = dc.MaxProviderCollateralMultiplier
|
|
|
|
}
|
2021-01-08 15:28:38 +00:00
|
|
|
na.scMgr = NewSectorCommittedManager(ev, na, &apiWrapper{api: full})
|
|
|
|
|
2021-08-04 00:10:30 +00:00
|
|
|
return na, nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 01:31:56 +00:00
|
|
|
func (n *ProviderNodeAdapter) PublishDeals(ctx context.Context, deal storagemarket.MinerDeal) (cid.Cid, error) {
|
2021-01-08 15:28:38 +00:00
|
|
|
return n.dealPublisher.Publish(ctx, deal.ClientDealProposal)
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 13:44:51 +00:00
|
|
|
func (n *ProviderNodeAdapter) OnDealComplete(ctx context.Context, deal storagemarket.MinerDeal, pieceSize abi.UnpaddedPieceSize, pieceData shared.ReadSeekStarter) (*storagemarket.PackingResult, error) {
|
2020-08-27 15:50:37 +00:00
|
|
|
if deal.PublishCid == nil {
|
|
|
|
return nil, xerrors.Errorf("deal.PublishCid can't be nil")
|
|
|
|
}
|
|
|
|
|
chore: Merge nv22 into master (#11699)
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* feat: drand: refactor round verification
* feat: sealing: Support nv22 DDO features in the sealing pipeline (#11226)
* Initial work supporting DDO pieces in lotus-miner
* sealing: Update pipeline input to operate on UniversalPiece
* sealing: Update pipeline checks/sealing states to operate on UniversalPiece
* sealing: Make pipeline build with UniversalPiece
* move PieceDealInfo out of api
* make gen
* make sealing pipeline unit tests pass
* fix itest ensemble build
* don't panic in SectorsStatus with deals
* stop linter from complaining about checkPieces
* fix sector import tests
* mod tidy
* sealing: Add logic for (pre)committing DDO sectors
* sealing: state-types with method defs
* DDO non-snap pipeline works(?), DDO Itests
* DDO support in snapdeals pipeline
* make gen
* update actor bundles
* update the gst market fix
* fix: chain: use PreCommitSectorsBatch2 when setting up genesis
* some bug fixes
* integration working changes
* update actor bundles
* Make TestOnboardRawPieceSnap pass
* Appease the linter
* Make deadlines test pass with v12 actors
* Update go-state-types, abstract market DealState
* make gen
* mod tidy, lint fixes
* Fix some more tests
* Bump version in master
Bump version in master
* Make gen
Make gen
* fix sender
* fix: lotus-provider: Fix winning PoSt
* fix: sql Scan cannot write to an object
* Actually show miner-addrs in info-log
Actually show miner-addrs in lotus-provider info-log
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* ddo is now nv22
* make gen
* temp actor bundle with ddo
* use working go-state-types
* gst with v13 market migration
* update bundle, builtin.MethodsMiner.ProveCommitSectors2 -> 3
* actually working v13 migration, v13 migration itest
* Address review
* sealing: Correct DDO snap pledge math
* itests: Mixed ddo itest
* pipeline: Fix sectorWeight
* sealing: convert market deals into PAMs in mixed sectors
* sealing: make market to ddo conversion work
* fix lint
* update gst
* Update actors and GST to lastest integ branch
* commit batcher: Update ProveCommitSectors3Params builder logic
* make gen
* use builtin-actors master
* ddo: address review
* itests: Add commd assertions to ddo tests
* make gen
* gst with fixed types
* config knobs for RequireActivationSuccess
* storage: Drop obsolete flaky tasts
---------
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Phi <orjan.roren@gmail.com>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
* feat: implement FIP-0063
* chore: deps: update to go-multiaddr v0.12.2 (#11602)
* feat: fvm: update the FVM/FFI to v4.1 (#11608) (#11612)
This:
1. Adds nv22 support.
2. Updates the message tracing format.
Co-authored-by: Steven Allen <steven@stebalien.com>
* AggregateProofType nil when doing batch updates
Use latest nv22 go-state-types version with matching update
* Update to v13.0.0-rc.2 bundle
* chore: Upgrade heights and codename
Update upgrade heights
Co-Authored-By: Steven Allen <steven@stebalien.com>
* Update epoch after nv22 DRAND switch
Update epoch after nv22 DRAND switch
* Update Mango codename to Phoneix
Make the codename for the Drand-change inline with Dragon style.
* Add UpgradePhoenixHeight to API params
* set UpgradePhoenixHeight to be one hour after Dragon
* Make gen
Make gen and UpgradePhoenixHeight in butterfly and local devnet to be in line with Calibration and Mainnet
* Update epoch heights (#11637)
Update epoch heights
* new: add forest bootstrap nodes (#11636)
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
* Merge pull request #11491 from filecoin-project/fix/remove-decommissioned-pl-bootstrap-nodes
Remove PL operated bootstrap nodes from mainnet.pi
* feat: api: new verified registry methods to get all allocations and claims (#11631)
* new verireg methods
* update changelog and add itest
* update itest and cli
* update new method's support till v9
* remove gateway APIs
* fix cli internal var names
* chore:: backport #11609 to the feat/nv22 branch (#11644)
* feat: api: improve the correctness of Eth's trace_block (#11609)
* Improve the correctness of Eth's trace_block
- Improve encoding/decoding of parameters and return values:
- Encode "native" parameters and return values with Solidity ABI.
- Correctly decode parameters to "create" calls.
- Use the correct (ish) output for "create" calls.
- Handle all forms of "create".
- Make robust with respect to reverts:
- Use the actor ID/address from the trace instead of looking it up in
the state-tree (may not exist in the state-tree due to a revert).
- Gracefully handle failed actor/contract creation.
- Improve performance:
- We avoid looking anything up in the state-tree when translating the
trace, which should significantly improve performance.
- Improve code readability:
- Remove all "backtracking" logic.
- Use an "environment" struct to store temporary state instead of
attaching it to the trace.
- Fix random bugs:
- Fix an allocation bug in the "address" logic (need to set the
capacity before modifying the slice).
- Improved error checking/handling.
- Use correct types for `trace_block` action/results (create, call, etc.).
- And use the correct types for Result/Action structs instead of reusing the same "Call" action every time.
- Improve error messages.
* Make gen
Make gen
---------
Co-authored-by: Steven Allen <steven@stebalien.com>
* fix: add UpgradePhoenixHeight to StateGetNetworkParams (#11648)
* chore: deps: update to go-state-types v13.0.0-rc.1
* do NOT update the cache when running the real migration
* Merge pull request #11632 from hanabi1224/hm/drand-test
feat: drand quicknet: allow scheduling drand quicknet upgrade before nv22 on 2k devnet
* chore: deps: update to go-state-types v13.0.0-rc.2
chore: deps: update to go-state-types v13.0.0-rc.2
* feat: set migration config UpgradeEpoch for v13 actors upgrade
* Built-in actor events first draft
* itest for DDO non-market verified data w/ builtin actor events
* Tests for builtin actor events API
* Clean up DDO+Events tests, add lots of explainer comments
* Minor tweaks to events types
* Avoid duplicate messages when looking for receipts
* Rename internal events modules for clarity
* Adjust actor event API after review
* s/ActorEvents/Events/g in global config
* Manage event sending rate for SubscribeActorEvents
* Terminate SubscribeActorEvents chan when at max height
* Document future API changes
* More clarity in actor event API docs
* More post-review changes, lots of tests for SubscribeActorEvents
Use BlockDelay as the window for receiving events on the SubscribeActorEvents
channel. We expect the user to have received the initial batch of historical
events (if any) in one block's time. For real-time events we expect them to
not fall behind by roughly one block's time.
* Remove duplicate code from actor event type marshalling tests
Reduce verbosity and remove duplicate test logic from actor event types
JSON marshalling tests.
* Rename actor events test to follow go convention
Add missing `s` to `actor_events` test file to follow golang convention
used across the repo.
* Run actor events table tests in deterministic order
Refactor `map` usage for actor event table tests to ensure deterministic
test execution order, making debugging potential issues easier. If
non-determinism is a target, leverage Go's built-in parallel testing
capabilities.
* Reduce scope for filter removal failure when getting actor events
Use a fresh context to remove the temporary filter installed solely to
get the actor events. This should reduce chances of failure in a case
where the original context may be expired/cancelled.
Refactor removal into a `defer` statement for a more readable, concise
return statement.
* Use fixed RNG seed for actor event tests
Improve determinism in actor event tests by using a fixed RNG seed. This
makes up a more reproducible test suit.
* Use provided libraries to assert eventual conditions
Use the functionalities already provided by `testify` to assert eventual
conditions, and remove the use of `time.Sleep`.
Remove duplicate code in utility functions that are already defined.
Refactor assertion helper functions to use consistent terminology:
"require" implies fatal error, whereas "assert" implies error where the
test may proceed executing.
* Update changelog for actor events APIs
* Fix concerns and docs identified by review
* Update actor bundle to v13.0.0-rc3
Update actor bundle to v13.0.0-rc3
* Prep Lotus v1.26.0-rc1
- For sanity reverting the mainnet upgrade epoch to 99999999, and then only set it when cutting the final release
-Update Calibnet CIDs to v13.0.0-rc3
- Add GetActorEvents, SubscribeActorEvents, GetAllClaims and GetAllAllocations methods to the changelog
Co-Authored-By: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
* Update CHANGELOG.md
Co-authored-by: Masih H. Derkani <m@derkani.org>
* Make gen
Make gen
* fix: beacon: validate drand change at nv16 correctly
* bump to v1.26.0-rc2
* test: cleanup ddo verified itest, extract steps to functions
also add allocation-removed event case
* test: extract verified DDO test to separate file, add more checks
* test: add additional actor events checks
* Add verification for "deal-activated" actor event
* docs(drand): document the meaning of "IsChained" (#11692)
* Resolve conflicts
I encountered multiple issues when trying to run make gen. And these changes fixed a couple of them:
- go mod tidy
- Remove RaftState/RaftLeader
- Revert `if ts.Height() > claim.TermMax+claim.TermStart || !cctx.IsSet("expired")` to the what is in the release/v1.26.0: `if tsHeight > val.TermMax || !expired`
* fixup imports, make jen
* Update version
Update version in master to v1.27.0-dev
* Update node/impl/full/dummy.go
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
* Adjust ListClaimsCmd
Adjust ListClaimsCmd according to review
---------
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Co-authored-by: Rod Vagg <rod@vagg.org>
Co-authored-by: Samuel Arogbonlo <47984109+samuelarogbonlo@users.noreply.github.com>
Co-authored-by: LexLuthr <88259624+LexLuthr@users.noreply.github.com>
Co-authored-by: tom123222 <160735201+tom123222@users.noreply.github.com>
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
2024-03-12 09:33:58 +00:00
|
|
|
sdInfo := piece.PieceDealInfo{
|
2021-01-25 10:28:39 +00:00
|
|
|
DealID: deal.DealID,
|
|
|
|
DealProposal: &deal.Proposal,
|
|
|
|
PublishCid: deal.PublishCid,
|
chore: Merge nv22 into master (#11699)
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* feat: drand: refactor round verification
* feat: sealing: Support nv22 DDO features in the sealing pipeline (#11226)
* Initial work supporting DDO pieces in lotus-miner
* sealing: Update pipeline input to operate on UniversalPiece
* sealing: Update pipeline checks/sealing states to operate on UniversalPiece
* sealing: Make pipeline build with UniversalPiece
* move PieceDealInfo out of api
* make gen
* make sealing pipeline unit tests pass
* fix itest ensemble build
* don't panic in SectorsStatus with deals
* stop linter from complaining about checkPieces
* fix sector import tests
* mod tidy
* sealing: Add logic for (pre)committing DDO sectors
* sealing: state-types with method defs
* DDO non-snap pipeline works(?), DDO Itests
* DDO support in snapdeals pipeline
* make gen
* update actor bundles
* update the gst market fix
* fix: chain: use PreCommitSectorsBatch2 when setting up genesis
* some bug fixes
* integration working changes
* update actor bundles
* Make TestOnboardRawPieceSnap pass
* Appease the linter
* Make deadlines test pass with v12 actors
* Update go-state-types, abstract market DealState
* make gen
* mod tidy, lint fixes
* Fix some more tests
* Bump version in master
Bump version in master
* Make gen
Make gen
* fix sender
* fix: lotus-provider: Fix winning PoSt
* fix: sql Scan cannot write to an object
* Actually show miner-addrs in info-log
Actually show miner-addrs in lotus-provider info-log
* [WIP] feat: Add nv22 skeleton
Addition of Network Version 22 skeleton
* update FFI
* ddo is now nv22
* make gen
* temp actor bundle with ddo
* use working go-state-types
* gst with v13 market migration
* update bundle, builtin.MethodsMiner.ProveCommitSectors2 -> 3
* actually working v13 migration, v13 migration itest
* Address review
* sealing: Correct DDO snap pledge math
* itests: Mixed ddo itest
* pipeline: Fix sectorWeight
* sealing: convert market deals into PAMs in mixed sectors
* sealing: make market to ddo conversion work
* fix lint
* update gst
* Update actors and GST to lastest integ branch
* commit batcher: Update ProveCommitSectors3Params builder logic
* make gen
* use builtin-actors master
* ddo: address review
* itests: Add commd assertions to ddo tests
* make gen
* gst with fixed types
* config knobs for RequireActivationSuccess
* storage: Drop obsolete flaky tasts
---------
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Phi <orjan.roren@gmail.com>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
* feat: implement FIP-0063
* chore: deps: update to go-multiaddr v0.12.2 (#11602)
* feat: fvm: update the FVM/FFI to v4.1 (#11608) (#11612)
This:
1. Adds nv22 support.
2. Updates the message tracing format.
Co-authored-by: Steven Allen <steven@stebalien.com>
* AggregateProofType nil when doing batch updates
Use latest nv22 go-state-types version with matching update
* Update to v13.0.0-rc.2 bundle
* chore: Upgrade heights and codename
Update upgrade heights
Co-Authored-By: Steven Allen <steven@stebalien.com>
* Update epoch after nv22 DRAND switch
Update epoch after nv22 DRAND switch
* Update Mango codename to Phoneix
Make the codename for the Drand-change inline with Dragon style.
* Add UpgradePhoenixHeight to API params
* set UpgradePhoenixHeight to be one hour after Dragon
* Make gen
Make gen and UpgradePhoenixHeight in butterfly and local devnet to be in line with Calibration and Mainnet
* Update epoch heights (#11637)
Update epoch heights
* new: add forest bootstrap nodes (#11636)
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
* Merge pull request #11491 from filecoin-project/fix/remove-decommissioned-pl-bootstrap-nodes
Remove PL operated bootstrap nodes from mainnet.pi
* feat: api: new verified registry methods to get all allocations and claims (#11631)
* new verireg methods
* update changelog and add itest
* update itest and cli
* update new method's support till v9
* remove gateway APIs
* fix cli internal var names
* chore:: backport #11609 to the feat/nv22 branch (#11644)
* feat: api: improve the correctness of Eth's trace_block (#11609)
* Improve the correctness of Eth's trace_block
- Improve encoding/decoding of parameters and return values:
- Encode "native" parameters and return values with Solidity ABI.
- Correctly decode parameters to "create" calls.
- Use the correct (ish) output for "create" calls.
- Handle all forms of "create".
- Make robust with respect to reverts:
- Use the actor ID/address from the trace instead of looking it up in
the state-tree (may not exist in the state-tree due to a revert).
- Gracefully handle failed actor/contract creation.
- Improve performance:
- We avoid looking anything up in the state-tree when translating the
trace, which should significantly improve performance.
- Improve code readability:
- Remove all "backtracking" logic.
- Use an "environment" struct to store temporary state instead of
attaching it to the trace.
- Fix random bugs:
- Fix an allocation bug in the "address" logic (need to set the
capacity before modifying the slice).
- Improved error checking/handling.
- Use correct types for `trace_block` action/results (create, call, etc.).
- And use the correct types for Result/Action structs instead of reusing the same "Call" action every time.
- Improve error messages.
* Make gen
Make gen
---------
Co-authored-by: Steven Allen <steven@stebalien.com>
* fix: add UpgradePhoenixHeight to StateGetNetworkParams (#11648)
* chore: deps: update to go-state-types v13.0.0-rc.1
* do NOT update the cache when running the real migration
* Merge pull request #11632 from hanabi1224/hm/drand-test
feat: drand quicknet: allow scheduling drand quicknet upgrade before nv22 on 2k devnet
* chore: deps: update to go-state-types v13.0.0-rc.2
chore: deps: update to go-state-types v13.0.0-rc.2
* feat: set migration config UpgradeEpoch for v13 actors upgrade
* Built-in actor events first draft
* itest for DDO non-market verified data w/ builtin actor events
* Tests for builtin actor events API
* Clean up DDO+Events tests, add lots of explainer comments
* Minor tweaks to events types
* Avoid duplicate messages when looking for receipts
* Rename internal events modules for clarity
* Adjust actor event API after review
* s/ActorEvents/Events/g in global config
* Manage event sending rate for SubscribeActorEvents
* Terminate SubscribeActorEvents chan when at max height
* Document future API changes
* More clarity in actor event API docs
* More post-review changes, lots of tests for SubscribeActorEvents
Use BlockDelay as the window for receiving events on the SubscribeActorEvents
channel. We expect the user to have received the initial batch of historical
events (if any) in one block's time. For real-time events we expect them to
not fall behind by roughly one block's time.
* Remove duplicate code from actor event type marshalling tests
Reduce verbosity and remove duplicate test logic from actor event types
JSON marshalling tests.
* Rename actor events test to follow go convention
Add missing `s` to `actor_events` test file to follow golang convention
used across the repo.
* Run actor events table tests in deterministic order
Refactor `map` usage for actor event table tests to ensure deterministic
test execution order, making debugging potential issues easier. If
non-determinism is a target, leverage Go's built-in parallel testing
capabilities.
* Reduce scope for filter removal failure when getting actor events
Use a fresh context to remove the temporary filter installed solely to
get the actor events. This should reduce chances of failure in a case
where the original context may be expired/cancelled.
Refactor removal into a `defer` statement for a more readable, concise
return statement.
* Use fixed RNG seed for actor event tests
Improve determinism in actor event tests by using a fixed RNG seed. This
makes up a more reproducible test suit.
* Use provided libraries to assert eventual conditions
Use the functionalities already provided by `testify` to assert eventual
conditions, and remove the use of `time.Sleep`.
Remove duplicate code in utility functions that are already defined.
Refactor assertion helper functions to use consistent terminology:
"require" implies fatal error, whereas "assert" implies error where the
test may proceed executing.
* Update changelog for actor events APIs
* Fix concerns and docs identified by review
* Update actor bundle to v13.0.0-rc3
Update actor bundle to v13.0.0-rc3
* Prep Lotus v1.26.0-rc1
- For sanity reverting the mainnet upgrade epoch to 99999999, and then only set it when cutting the final release
-Update Calibnet CIDs to v13.0.0-rc3
- Add GetActorEvents, SubscribeActorEvents, GetAllClaims and GetAllAllocations methods to the changelog
Co-Authored-By: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
* Update CHANGELOG.md
Co-authored-by: Masih H. Derkani <m@derkani.org>
* Make gen
Make gen
* fix: beacon: validate drand change at nv16 correctly
* bump to v1.26.0-rc2
* test: cleanup ddo verified itest, extract steps to functions
also add allocation-removed event case
* test: extract verified DDO test to separate file, add more checks
* test: add additional actor events checks
* Add verification for "deal-activated" actor event
* docs(drand): document the meaning of "IsChained" (#11692)
* Resolve conflicts
I encountered multiple issues when trying to run make gen. And these changes fixed a couple of them:
- go mod tidy
- Remove RaftState/RaftLeader
- Revert `if ts.Height() > claim.TermMax+claim.TermStart || !cctx.IsSet("expired")` to the what is in the release/v1.26.0: `if tsHeight > val.TermMax || !expired`
* fixup imports, make jen
* Update version
Update version in master to v1.27.0-dev
* Update node/impl/full/dummy.go
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
* Adjust ListClaimsCmd
Adjust ListClaimsCmd according to review
---------
Signed-off-by: samuelarogbonlo <sbayo971@gmail.com>
Co-authored-by: TippyFlits <james.bluett@protocol.ai>
Co-authored-by: Aayush <arajasek94@gmail.com>
Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com>
Co-authored-by: Jennifer Wang <jiayingw703@gmail.com>
Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Co-authored-by: Andrew Jackson (Ajax) <snadrus@gmail.com>
Co-authored-by: Steven Allen <steven@stebalien.com>
Co-authored-by: Rod Vagg <rod@vagg.org>
Co-authored-by: Samuel Arogbonlo <47984109+samuelarogbonlo@users.noreply.github.com>
Co-authored-by: LexLuthr <88259624+LexLuthr@users.noreply.github.com>
Co-authored-by: tom123222 <160735201+tom123222@users.noreply.github.com>
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
2024-03-12 09:33:58 +00:00
|
|
|
DealSchedule: piece.DealSchedule{
|
2020-04-07 22:34:30 +00:00
|
|
|
StartEpoch: deal.ClientDealProposal.Proposal.StartEpoch,
|
|
|
|
EndEpoch: deal.ClientDealProposal.Proposal.EndEpoch,
|
|
|
|
},
|
2020-07-08 18:35:55 +00:00
|
|
|
KeepUnsealed: deal.FastRetrieval,
|
2020-09-11 11:28:09 +00:00
|
|
|
}
|
|
|
|
|
2021-12-17 13:44:51 +00:00
|
|
|
// Attempt to add the piece to the sector
|
2020-09-11 11:28:09 +00:00
|
|
|
p, offset, err := n.secb.AddPiece(ctx, pieceSize, pieceData, sdInfo)
|
2021-08-06 02:23:29 +00:00
|
|
|
curTime := build.Clock.Now()
|
|
|
|
for build.Clock.Since(curTime) < addPieceRetryTimeout {
|
2021-12-17 13:44:51 +00:00
|
|
|
// Check if there was an error because of too many sectors being sealed
|
2022-06-14 19:23:17 +00:00
|
|
|
if !xerrors.Is(err, pipeline.ErrTooManySectorsSealing) {
|
2020-09-17 15:30:15 +00:00
|
|
|
if err != nil {
|
2021-02-11 11:00:26 +00:00
|
|
|
log.Errorf("failed to addPiece for deal %d, err: %v", deal.DealID, err)
|
2020-09-17 15:30:15 +00:00
|
|
|
}
|
2021-12-17 13:44:51 +00:00
|
|
|
|
|
|
|
// There was either a fatal error or no error. In either case
|
|
|
|
// don't retry AddPiece
|
2020-09-11 17:45:57 +00:00
|
|
|
break
|
|
|
|
}
|
2021-12-17 13:44:51 +00:00
|
|
|
|
|
|
|
// The piece could not be added to the sector because there are too
|
|
|
|
// many sectors being sealed, back-off for a while before trying again
|
2020-09-11 11:28:09 +00:00
|
|
|
select {
|
2021-08-06 02:23:29 +00:00
|
|
|
case <-build.Clock.After(addPieceRetryWait):
|
2021-12-17 13:44:51 +00:00
|
|
|
// Reset the reader to the start
|
|
|
|
err = pieceData.SeekStart()
|
|
|
|
if err != nil {
|
|
|
|
return nil, xerrors.Errorf("failed to reset piece reader to start before retrying AddPiece for deal %d: %w", deal.DealID, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Attempt to add the piece again
|
2020-09-11 11:28:09 +00:00
|
|
|
p, offset, err = n.secb.AddPiece(ctx, pieceSize, pieceData, sdInfo)
|
|
|
|
case <-ctx.Done():
|
|
|
|
return nil, xerrors.New("context expired while waiting to retry AddPiece")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-04 19:57:54 +00:00
|
|
|
if err != nil {
|
2020-07-30 12:31:31 +00:00
|
|
|
return nil, xerrors.Errorf("AddPiece failed: %s", err)
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
2020-02-05 04:08:08 +00:00
|
|
|
log.Warnf("New Deal: deal %d", deal.DealID)
|
2019-11-04 19:57:54 +00:00
|
|
|
|
2020-07-30 12:31:31 +00:00
|
|
|
return &storagemarket.PackingResult{
|
|
|
|
SectorNumber: p,
|
|
|
|
Offset: offset,
|
|
|
|
Size: pieceSize.Padded(),
|
|
|
|
}, nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2020-04-07 02:17:02 +00:00
|
|
|
func (n *ProviderNodeAdapter) VerifySignature(ctx context.Context, sig crypto.Signature, addr address.Address, input []byte, encodedTs shared.TipSetToken) (bool, error) {
|
2020-04-16 21:06:31 +00:00
|
|
|
addr, err := n.StateAccountKey(ctx, addr, types.EmptyTSK)
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
|
|
|
|
err = sigs.Verify(&sig, addr, input)
|
2020-04-07 02:17:02 +00:00
|
|
|
return err == nil, err
|
2020-02-20 08:37:10 +00:00
|
|
|
}
|
|
|
|
|
2021-01-20 02:06:00 +00:00
|
|
|
func (n *ProviderNodeAdapter) GetMinerWorkerAddress(ctx context.Context, maddr address.Address, tok shared.TipSetToken) (address.Address, error) {
|
2020-03-18 18:37:32 +00:00
|
|
|
tsk, err := types.TipSetKeyFromBytes(tok)
|
|
|
|
if err != nil {
|
|
|
|
return address.Undef, err
|
|
|
|
}
|
|
|
|
|
2021-01-20 02:06:00 +00:00
|
|
|
mi, err := n.StateMinerInfo(ctx, maddr, tsk)
|
2020-04-16 17:36:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return address.Address{}, err
|
|
|
|
}
|
|
|
|
return mi.Worker, nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2023-06-09 18:07:14 +00:00
|
|
|
func (n *ProviderNodeAdapter) GetProofType(ctx context.Context, maddr address.Address, tok shared.TipSetToken) (abi.RegisteredSealProof, error) {
|
|
|
|
tsk, err := types.TipSetKeyFromBytes(tok)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
mi, err := n.StateMinerInfo(ctx, maddr, tsk)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
nver, err := n.StateNetworkVersion(ctx, tsk)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// false because this variance is not consumed.
|
|
|
|
const configWantSynthetic = false
|
|
|
|
|
|
|
|
return miner.PreferredSealProofTypeFromWindowPoStType(nver, mi.WindowPoStProofType, configWantSynthetic)
|
|
|
|
}
|
|
|
|
|
2020-02-12 22:32:26 +00:00
|
|
|
func (n *ProviderNodeAdapter) SignBytes(ctx context.Context, signer address.Address, b []byte) (*crypto.Signature, error) {
|
2020-04-16 20:38:42 +00:00
|
|
|
signer, err := n.StateAccountKey(ctx, signer, types.EmptyTSK)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2020-01-10 18:01:48 +00:00
|
|
|
localSignature, err := n.WalletSign(ctx, signer, b)
|
2019-12-17 10:46:39 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2020-02-20 08:37:10 +00:00
|
|
|
return localSignature, nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2020-11-10 15:45:48 +00:00
|
|
|
func (n *ProviderNodeAdapter) ReserveFunds(ctx context.Context, wallet, addr address.Address, amt abi.TokenAmount) (cid.Cid, error) {
|
|
|
|
return n.MarketReserveFunds(ctx, wallet, addr, amt)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (n *ProviderNodeAdapter) ReleaseFunds(ctx context.Context, addr address.Address, amt abi.TokenAmount) error {
|
|
|
|
return n.MarketReleaseFunds(ctx, addr, amt)
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Adds funds with the StorageMinerActor for a storage participant. Used by both providers and clients.
|
2020-05-05 01:31:56 +00:00
|
|
|
func (n *ProviderNodeAdapter) AddFunds(ctx context.Context, addr address.Address, amount abi.TokenAmount) (cid.Cid, error) {
|
2019-11-04 19:57:54 +00:00
|
|
|
// (Provider Node API)
|
|
|
|
smsg, err := n.MpoolPushMessage(ctx, &types.Message{
|
2020-09-21 23:01:29 +00:00
|
|
|
To: market.Address,
|
2020-08-06 21:08:42 +00:00
|
|
|
From: addr,
|
|
|
|
Value: amount,
|
2020-10-08 20:32:54 +00:00
|
|
|
Method: market.Methods.AddBalance,
|
2020-10-02 16:34:50 +00:00
|
|
|
}, n.addBalanceSpec)
|
2019-11-04 19:57:54 +00:00
|
|
|
if err != nil {
|
2020-05-05 01:31:56 +00:00
|
|
|
return cid.Undef, err
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2020-05-05 01:31:56 +00:00
|
|
|
return smsg.Cid(), nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2020-04-07 02:17:02 +00:00
|
|
|
func (n *ProviderNodeAdapter) GetBalance(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (storagemarket.Balance, error) {
|
|
|
|
tsk, err := types.TipSetKeyFromBytes(encodedTs)
|
|
|
|
if err != nil {
|
|
|
|
return storagemarket.Balance{}, err
|
|
|
|
}
|
|
|
|
|
|
|
|
bal, err := n.StateMarketBalance(ctx, addr, tsk)
|
2019-11-04 19:57:54 +00:00
|
|
|
if err != nil {
|
|
|
|
return storagemarket.Balance{}, err
|
|
|
|
}
|
|
|
|
|
2020-02-20 08:37:10 +00:00
|
|
|
return utils.ToSharedBalance(bal), nil
|
2019-11-04 19:57:54 +00:00
|
|
|
}
|
|
|
|
|
2020-07-27 17:59:30 +00:00
|
|
|
// TODO: why doesnt this method take in a sector ID?
|
2020-07-30 12:31:31 +00:00
|
|
|
func (n *ProviderNodeAdapter) LocatePieceForDealWithinSector(ctx context.Context, dealID abi.DealID, encodedTs shared.TipSetToken) (sectorID abi.SectorNumber, offset abi.PaddedPieceSize, length abi.PaddedPieceSize, err error) {
|
2021-12-11 21:03:00 +00:00
|
|
|
refs, err := n.secb.GetRefs(ctx, dealID)
|
2020-01-24 20:19:52 +00:00
|
|
|
if err != nil {
|
|
|
|
return 0, 0, 0, err
|
|
|
|
}
|
|
|
|
if len(refs) == 0 {
|
|
|
|
return 0, 0, 0, xerrors.New("no sector information for deal ID")
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: better strategy (e.g. look for already unsealed)
|
|
|
|
var best api.SealedRef
|
2021-05-19 11:05:07 +00:00
|
|
|
var bestSi api.SectorInfo
|
2020-01-24 20:19:52 +00:00
|
|
|
for _, r := range refs {
|
2021-05-19 11:05:07 +00:00
|
|
|
si, err := n.secb.SectorBuilder.SectorsStatus(ctx, r.SectorID, false)
|
2020-01-24 20:19:52 +00:00
|
|
|
if err != nil {
|
|
|
|
return 0, 0, 0, xerrors.Errorf("getting sector info: %w", err)
|
|
|
|
}
|
2022-06-14 19:23:17 +00:00
|
|
|
if si.State == api.SectorState(pipeline.Proving) {
|
2020-01-24 20:19:52 +00:00
|
|
|
best = r
|
|
|
|
bestSi = si
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2022-06-14 19:23:17 +00:00
|
|
|
if bestSi.State == api.SectorState(pipeline.UndefinedSectorState) {
|
2020-01-24 20:19:52 +00:00
|
|
|
return 0, 0, 0, xerrors.New("no sealed sector found")
|
|
|
|
}
|
2020-07-30 12:31:31 +00:00
|
|
|
return best.SectorID, best.Offset, best.Size.Padded(), nil
|
2020-01-24 20:19:52 +00:00
|
|
|
}
|
|
|
|
|
2020-07-30 04:55:37 +00:00
|
|
|
func (n *ProviderNodeAdapter) DealProviderCollateralBounds(ctx context.Context, size abi.PaddedPieceSize, isVerified bool) (abi.TokenAmount, abi.TokenAmount, error) {
|
2020-07-30 12:31:31 +00:00
|
|
|
bounds, err := n.StateDealProviderCollateralBounds(ctx, size, isVerified, types.EmptyTSK)
|
|
|
|
if err != nil {
|
|
|
|
return abi.TokenAmount{}, abi.TokenAmount{}, err
|
|
|
|
}
|
|
|
|
|
2021-03-02 09:24:57 +00:00
|
|
|
// The maximum amount of collateral that the provider will put into escrow
|
|
|
|
// for a deal is calculated as a multiple of the minimum bounded amount
|
|
|
|
max := types.BigMul(bounds.Min, types.NewInt(n.maxDealCollateralMultiplier))
|
|
|
|
|
|
|
|
return bounds.Min, max, nil
|
2020-07-30 04:55:37 +00:00
|
|
|
}
|
|
|
|
|
2021-01-08 15:28:38 +00:00
|
|
|
// TODO: Remove dealID parameter, change publishCid to be cid.Cid (instead of pointer)
|
2022-09-26 16:47:48 +00:00
|
|
|
func (n *ProviderNodeAdapter) OnDealSectorPreCommitted(ctx context.Context, provider address.Address, dealID abi.DealID, proposal markettypes.DealProposal, publishCid *cid.Cid, cb storagemarket.DealSectorPreCommittedCallback) error {
|
2022-04-20 21:34:28 +00:00
|
|
|
return n.scMgr.OnDealSectorPreCommitted(ctx, provider, proposal, *publishCid, cb)
|
2020-11-20 16:30:17 +00:00
|
|
|
}
|
|
|
|
|
2021-01-08 15:28:38 +00:00
|
|
|
// TODO: Remove dealID parameter, change publishCid to be cid.Cid (instead of pointer)
|
2022-09-26 16:47:48 +00:00
|
|
|
func (n *ProviderNodeAdapter) OnDealSectorCommitted(ctx context.Context, provider address.Address, dealID abi.DealID, sectorNumber abi.SectorNumber, proposal markettypes.DealProposal, publishCid *cid.Cid, cb storagemarket.DealSectorCommittedCallback) error {
|
2022-04-20 21:34:28 +00:00
|
|
|
return n.scMgr.OnDealSectorCommitted(ctx, provider, sectorNumber, proposal, *publishCid, cb)
|
2020-01-24 20:19:52 +00:00
|
|
|
}
|
|
|
|
|
2020-03-18 18:37:32 +00:00
|
|
|
func (n *ProviderNodeAdapter) GetChainHead(ctx context.Context) (shared.TipSetToken, abi.ChainEpoch, error) {
|
|
|
|
head, err := n.ChainHead(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return head.Key().Bytes(), head.Height(), nil
|
|
|
|
}
|
|
|
|
|
2020-09-11 18:00:42 +00:00
|
|
|
func (n *ProviderNodeAdapter) WaitForMessage(ctx context.Context, mcid cid.Cid, cb func(code exitcode.ExitCode, bytes []byte, finalCid cid.Cid, err error) error) error {
|
2021-04-05 17:56:53 +00:00
|
|
|
receipt, err := n.StateWaitMsg(ctx, mcid, 2*build.MessageConfidence, api.LookbackNoLimit, true)
|
2020-05-05 01:31:56 +00:00
|
|
|
if err != nil {
|
2020-09-11 18:00:42 +00:00
|
|
|
return cb(0, nil, cid.Undef, err)
|
2020-05-05 01:31:56 +00:00
|
|
|
}
|
2020-09-11 18:00:42 +00:00
|
|
|
return cb(receipt.Receipt.ExitCode, receipt.Receipt.Return, receipt.Message, nil)
|
2020-05-05 01:31:56 +00:00
|
|
|
}
|
|
|
|
|
2022-09-26 16:47:48 +00:00
|
|
|
func (n *ProviderNodeAdapter) WaitForPublishDeals(ctx context.Context, publishCid cid.Cid, proposal markettypes.DealProposal) (*storagemarket.PublishDealsWaitResult, error) {
|
2021-01-26 13:20:36 +00:00
|
|
|
// Wait for deal to be published (plus additional time for confidence)
|
2021-04-05 17:56:53 +00:00
|
|
|
receipt, err := n.StateWaitMsg(ctx, publishCid, 2*build.MessageConfidence, api.LookbackNoLimit, true)
|
2021-01-26 13:20:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, xerrors.Errorf("WaitForPublishDeals errored: %w", err)
|
|
|
|
}
|
|
|
|
if receipt.Receipt.ExitCode != exitcode.Ok {
|
|
|
|
return nil, xerrors.Errorf("WaitForPublishDeals exit code: %s", receipt.Receipt.ExitCode)
|
|
|
|
}
|
|
|
|
|
|
|
|
// The deal ID may have changed since publish if there was a reorg, so
|
|
|
|
// get the current deal ID
|
|
|
|
head, err := n.ChainHead(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return nil, xerrors.Errorf("WaitForPublishDeals failed to get chain head: %w", err)
|
|
|
|
}
|
|
|
|
|
2022-06-16 09:12:33 +00:00
|
|
|
res, err := n.scMgr.dealInfo.GetCurrentDealInfo(ctx, head.Key(), &proposal, publishCid)
|
2021-01-26 13:20:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, xerrors.Errorf("WaitForPublishDeals getting deal info errored: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return &storagemarket.PublishDealsWaitResult{DealID: res.DealID, FinalCid: receipt.Message}, nil
|
|
|
|
}
|
|
|
|
|
2020-09-17 08:17:14 +00:00
|
|
|
func (n *ProviderNodeAdapter) GetDataCap(ctx context.Context, addr address.Address, encodedTs shared.TipSetToken) (*abi.StoragePower, error) {
|
2020-07-08 08:35:50 +00:00
|
|
|
tsk, err := types.TipSetKeyFromBytes(encodedTs)
|
|
|
|
if err != nil {
|
2020-09-17 08:17:14 +00:00
|
|
|
return nil, err
|
2020-07-08 08:35:50 +00:00
|
|
|
}
|
2020-09-17 08:17:14 +00:00
|
|
|
|
|
|
|
sp, err := n.StateVerifiedClientStatus(ctx, addr, tsk)
|
2020-09-17 15:30:15 +00:00
|
|
|
return sp, err
|
2020-07-08 08:35:50 +00:00
|
|
|
}
|
|
|
|
|
2021-08-30 08:42:41 +00:00
|
|
|
func (n *ProviderNodeAdapter) OnDealExpiredOrSlashed(ctx context.Context, dealID abi.DealID, onDealExpired storagemarket.DealExpiredCallback, onDealSlashed storagemarket.DealSlashedCallback) error {
|
|
|
|
head, err := n.ChainHead(ctx)
|
|
|
|
if err != nil {
|
|
|
|
return xerrors.Errorf("client: failed to get chain head: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
sd, err := n.StateMarketStorageDeal(ctx, dealID, head.Key())
|
|
|
|
if err != nil {
|
|
|
|
return xerrors.Errorf("client: failed to look up deal %d on chain: %w", dealID, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Called immediately to check if the deal has already expired or been slashed
|
2021-08-04 00:10:30 +00:00
|
|
|
checkFunc := func(ctx context.Context, ts *types.TipSet) (done bool, more bool, err error) {
|
2021-08-30 08:42:41 +00:00
|
|
|
if ts == nil {
|
|
|
|
// keep listening for events
|
|
|
|
return false, true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if the deal has already expired
|
|
|
|
if sd.Proposal.EndEpoch <= ts.Height() {
|
|
|
|
onDealExpired(nil)
|
|
|
|
return true, false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// If there is no deal assume it's already been slashed
|
|
|
|
if sd.State.SectorStartEpoch < 0 {
|
|
|
|
onDealSlashed(ts.Height(), nil)
|
|
|
|
return true, false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// No events have occurred yet, so return
|
|
|
|
// done: false, more: true (keep listening for events)
|
|
|
|
return false, true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Called when there was a match against the state change we're looking for
|
|
|
|
// and the chain has advanced to the confidence height
|
|
|
|
stateChanged := func(ts *types.TipSet, ts2 *types.TipSet, states events.StateChange, h abi.ChainEpoch) (more bool, err error) {
|
|
|
|
// Check if the deal has already expired
|
|
|
|
if ts2 == nil || sd.Proposal.EndEpoch <= ts2.Height() {
|
|
|
|
onDealExpired(nil)
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Timeout waiting for state change
|
|
|
|
if states == nil {
|
|
|
|
log.Error("timed out waiting for deal expiry")
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
changedDeals, ok := states.(state.ChangedDeals)
|
|
|
|
if !ok {
|
|
|
|
panic("Expected state.ChangedDeals")
|
|
|
|
}
|
|
|
|
|
|
|
|
deal, ok := changedDeals[dealID]
|
|
|
|
if !ok {
|
|
|
|
// No change to deal
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Deal was slashed
|
|
|
|
if deal.To == nil {
|
|
|
|
onDealSlashed(ts2.Height(), nil)
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Called when there was a chain reorg and the state change was reverted
|
|
|
|
revert := func(ctx context.Context, ts *types.TipSet) error {
|
|
|
|
// TODO: Is it ok to just ignore this?
|
|
|
|
log.Warn("deal state reverted; TODO: actually handle this!")
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Watch for state changes to the deal
|
|
|
|
match := n.dsMatcher.matcher(ctx, dealID)
|
|
|
|
|
|
|
|
// Wait until after the end epoch for the deal and then timeout
|
|
|
|
timeout := (sd.Proposal.EndEpoch - head.Height()) + 1
|
|
|
|
if err := n.ev.StateChanged(checkFunc, stateChanged, revert, int(build.MessageConfidence)+1, timeout, match); err != nil {
|
|
|
|
return xerrors.Errorf("failed to set up state changed handler: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
2020-07-08 08:35:50 +00:00
|
|
|
}
|
|
|
|
|
2019-11-04 19:57:54 +00:00
|
|
|
var _ storagemarket.StorageProviderNode = &ProviderNodeAdapter{}
|