feat: sealing: Support nv22 DDO features in the sealing pipeline #11226

magik6k · 2023-08-31T10:47:25Z

Related Issues

Related to #11125

~~On top of #11220~~

Depends on ~~filecoin-project/go-state-types#209~~ filecoin-project/go-state-types#236

Proposed Changes

Additional Info

Checklist

Before you mark the PR ready for review, please make sure that:

Commits have a clear commit message.
PR title is in the form of of <PR type>: <area>: <change being made>
- example: fix: mempool: Introduce a cache for valid signatures
- PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
- area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
New features have usage guidelines and / or documentation updates in
- Lotus Documentation
- Discussion Tutorials
Tests exist for new functionality or change in behavior
CI is green

…lPiece

storage/pipeline/commit_batch.go

storage/pipeline/piece/piece_info.go

storage/pipeline/states_replica_update.go

storage/pipeline/states_sealing.go

storage/pipeline/commit_batch.go

magik6k · 2023-09-01T16:17:08Z

Most important todos (top to bottom):

Make the ddo itests pass
Implement conversion of dealIDs to PAMs in mixed pieces
Implement remaining ITests (todos in the direct_data_onboard itest file), and make them pass
Implement the accept-ddo lotus-miner command (for testing in devnets / on mainnet; can reuse logic from itests likely)

storage/pipeline/piece/piece_info.go

storage/pipeline/commit_batch.go

…tion

itests/direct_data_onboard_test.go

snadrus · 2024-01-11T03:14:52Z

storage/pipeline/commit_batch.go

+	collateral := big.Zero()
+
+	for _, sector := range sectors {
+		if b.todo[sector].DealIDPrecommit {


please don't name variables "todo"

This has been here and in the 3 other batchers for a while now, and has quite a lot of usages, I'd rather avoid committing this refactor into this PR

storage/pipeline/commit_batch.go

storage/pipeline/piece/piece_info.go

snadrus · 2024-01-24T15:59:25Z

documentation/en/cli-lotus.md

@@ -7,7 +7,7 @@ USAGE:
   lotus [global options] command [command options] [arguments...]

 VERSION:
-   1.25.2
+   1.25.3-dev


This is matching master, probably got here due to conflicts resolving; Before this gets into any staging branch this will change to v1.26.x-x, but for now anything -dev is more correct.

itests/direct_data_onboard_test.go

lib/result/result.go

snadrus · 2024-01-24T16:20:06Z

storage/pipeline/commit_batch.go

+		return append(ret0, ret1...), nil
+	}
+
+	mcid, err := sendMsg(b.mctx, b.api, from, b.maddr, builtin.MethodsMiner.ProveCommitSectors3, needFunds, maxFee, enc.Bytes())


How are we handling if the sector is getting used by 2+ tasks at once?
Do they fail at sendMsg? Is it any cheaper to have an internal fail-retry mechanism vs failing the task?

All sectors fail, and each will retry individually - this is not very expensive, and each sector failing individually means that before retrying each will re-run all pre-submission checks, which are quite extensive.

storage/pipeline/piece/piece_info.go

) * 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 <[email protected]> Co-authored-by: Aayush <[email protected]> Co-authored-by: Shrenuj Bansal <[email protected]> Co-authored-by: Phi <[email protected]> Co-authored-by: Andrew Jackson (Ajax) <[email protected]> Co-authored-by: TippyFlits <[email protected]>

* [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 <[email protected]> Co-authored-by: Aayush <[email protected]> Co-authored-by: Shrenuj Bansal <[email protected]> Co-authored-by: Phi <[email protected]> Co-authored-by: Andrew Jackson (Ajax) <[email protected]> Co-authored-by: TippyFlits <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Update CHANGELOG.md Co-authored-by: Masih H. Derkani <[email protected]> * 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 <[email protected]> * Adjust ListClaimsCmd Adjust ListClaimsCmd according to review --------- Signed-off-by: samuelarogbonlo <[email protected]> Co-authored-by: TippyFlits <[email protected]> Co-authored-by: Aayush <[email protected]> Co-authored-by: Łukasz Magiera <[email protected]> Co-authored-by: Jennifer Wang <[email protected]> Co-authored-by: Shrenuj Bansal <[email protected]> Co-authored-by: Andrew Jackson (Ajax) <[email protected]> Co-authored-by: Steven Allen <[email protected]> Co-authored-by: Rod Vagg <[email protected]> Co-authored-by: Samuel Arogbonlo <[email protected]> Co-authored-by: LexLuthr <[email protected]> Co-authored-by: tom123222 <[email protected]> Co-authored-by: Aarsh Shah <[email protected]> Co-authored-by: Masih H. Derkani <[email protected]> Co-authored-by: Jiaying Wang <[email protected]>

) * 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 <[email protected]> Co-authored-by: Aayush <[email protected]> Co-authored-by: Shrenuj Bansal <[email protected]> Co-authored-by: Phi <[email protected]> Co-authored-by: Andrew Jackson (Ajax) <[email protected]> Co-authored-by: TippyFlits <[email protected]>

magik6k added 18 commits August 29, 2023 17:17

Initial work supporting DDO pieces in lotus-miner

5cc5cc4

sealing: Update pipeline input to operate on UniversalPiece

2da5d90

sealing: Update pipeline checks/sealing states to operate on Universa…

9b2412a

…lPiece

sealing: Make pipeline build with UniversalPiece

746ddac

move PieceDealInfo out of api

5747bbd

make gen

bbaa12d

make sealing pipeline unit tests pass

40c2f1b

fix itest ensemble build

12c474f

don't panic in SectorsStatus with deals

b5a8b43

stop linter from complaining about checkPieces

62dc44d

fix sector import tests

9cb0e74

mod tidy

fd310cc

sealing: Add logic for (pre)committing DDO sectors

fe27ce8

sealing: state-types with method defs

ce3294c

DDO non-snap pipeline works(?), DDO Itests

eeec223

DDO support in snapdeals pipeline

fbdfa9f

make gen

7f71e5f

update actor bundles

3ccc28b

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/commit_batch.go Outdated Show resolved Hide resolved

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/piece/piece_info.go Show resolved Hide resolved

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/states_replica_update.go Outdated Show resolved Hide resolved

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/states_sealing.go Show resolved Hide resolved

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/states_sealing.go Outdated Show resolved Hide resolved

magik6k commented Sep 1, 2023

View reviewed changes

storage/pipeline/commit_batch.go Outdated Show resolved Hide resolved

jennijuju linked an issue Sep 4, 2023 that may be closed by this pull request

Implementation plan for direct data onboarding proposal' in Lotus-Miner #11125

Closed

jennijuju force-pushed the feat/ddo-integration branch from 22e6974 to 3ccc28b Compare September 4, 2023 15:22

jennijuju reviewed Sep 4, 2023

View reviewed changes

storage/pipeline/piece/piece_info.go Show resolved Hide resolved

jennijuju reviewed Sep 4, 2023

View reviewed changes

storage/pipeline/piece/piece_info.go Show resolved Hide resolved

jennijuju reviewed Sep 4, 2023

View reviewed changes

storage/pipeline/commit_batch.go Show resolved Hide resolved

arajasek force-pushed the feat/nv22 branch from a0d54cd to 1324822 Compare January 11, 2024 15:57

magik6k added 2 commits January 23, 2024 16:06

Merge remote-tracking branch 'origin/feat/nv22' into feat/ddo-integra…

631d59e

…tion

update gst

1e60878

magik6k force-pushed the feat/ddo-integration branch from 0fb3687 to 1e60878 Compare January 24, 2024 14:32

Update actors and GST to lastest integ branch

0f75286

magik6k force-pushed the feat/ddo-integration branch from 26a0db3 to 0f75286 Compare January 24, 2024 15:01

snadrus requested changes Jan 24, 2024

View reviewed changes

magik6k added 3 commits January 24, 2024 17:25

commit batcher: Update ProveCommitSectors3Params builder logic

9062297

make gen

76aa2e8

use builtin-actors master

d8f47df

snadrus requested changes Jan 24, 2024

View reviewed changes

magik6k added 3 commits January 24, 2024 18:31

ddo: address review

eec6df0

itests: Add commd assertions to ddo tests

3389e26

make gen

f7e6831

magik6k force-pushed the feat/ddo-integration branch from 6b9c9e7 to f7e6831 Compare January 24, 2024 19:59

snadrus approved these changes Jan 24, 2024

View reviewed changes

gst with fixed types

52361f7

magik6k force-pushed the feat/ddo-integration branch from 7984900 to 268a238 Compare January 25, 2024 12:36

config knobs for RequireActivationSuccess

aa13b5a

magik6k force-pushed the feat/ddo-integration branch from 268a238 to aa13b5a Compare January 25, 2024 12:39

storage: Drop obsolete flaky tasts

ebd3b65

magik6k merged commit 9e03fca into feat/nv22 Jan 25, 2024
90 checks passed

magik6k deleted the feat/ddo-integration branch January 25, 2024 14:15

rjan90 mentioned this pull request Jan 25, 2024

Implementation plan for direct data onboarding proposal' in Lotus-Miner #11125

Closed

simlecode mentioned this pull request Jan 31, 2024

feat: refactor market deal state filecoin-project/venus#6271

Merged

6 tasks

rvagg mentioned this pull request Feb 7, 2024

AggregateProofType nil when doing batch updates #11611

Merged

jennijuju mentioned this pull request Jul 25, 2024

chore: release: v1.28.1 prep #12303

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: sealing: Support nv22 DDO features in the sealing pipeline #11226

feat: sealing: Support nv22 DDO features in the sealing pipeline #11226

magik6k commented Aug 31, 2023 •

edited

Loading

magik6k commented Sep 1, 2023

snadrus Jan 11, 2024

magik6k Jan 24, 2024

snadrus Jan 24, 2024

magik6k Jan 24, 2024

snadrus Jan 24, 2024

magik6k Jan 24, 2024

feat: sealing: Support nv22 DDO features in the sealing pipeline #11226

feat: sealing: Support nv22 DDO features in the sealing pipeline #11226

Conversation

magik6k commented Aug 31, 2023 • edited Loading

Related Issues

Proposed Changes

Additional Info

Checklist

magik6k commented Sep 1, 2023

snadrus Jan 11, 2024

Choose a reason for hiding this comment

magik6k Jan 24, 2024

Choose a reason for hiding this comment

snadrus Jan 24, 2024

Choose a reason for hiding this comment

magik6k Jan 24, 2024

Choose a reason for hiding this comment

snadrus Jan 24, 2024

Choose a reason for hiding this comment

magik6k Jan 24, 2024

Choose a reason for hiding this comment

magik6k commented Aug 31, 2023 •

edited

Loading