Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Claim verifreg allocations from miner actor #715

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Claim verifreg allocations from miner actor #715

merged 1 commit into from
Sep 28, 2022

Conversation

ZenGround0
Copy link
Contributor

@ZenGround0 ZenGround0 commented Sep 26, 2022 •
edited
Loading

Closes #596

  • change market actor deal activation return value
  • call verifreg from miner actor
  • fix unit and itests
  • come to a decision about partial failures and corresponding restructuring of verifreg claim allocations

anorth
anorth reviewed Sep 26, 2022
View reviewed changes
actors/market/src/types.rs Outdated Show resolved Hide resolved
actors/market/src/lib.rs Outdated Show resolved Hide resolved
actors/miner/src/lib.rs Outdated
// activate deals with builtin market and claim allocations with verified registry actor
// returns an error in case of a fatal programmer error
// returns Ok(None) in case deal activation or verified allocation claim fails
fn activate_deals_and_verified_deals<RT, BS>(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

activate_deals_and_claim_allocations?

@ZenGround0 ZenGround0 requested a review from anorth September 26, 2022 21:42
anorth
anorth approved these changes Sep 26, 2022
View reviewed changes
actors/market/src/lib.rs Outdated Show resolved Hide resolved
actors/market/tests/verify_deals_for_activation_test.rs Outdated Show resolved Hide resolved
actors/market/src/types.rs Outdated Show resolved Hide resolved
actors/verifreg/src/lib.rs Outdated Show resolved Hide resolved
actors/verifreg/src/lib.rs Outdated Show resolved Hide resolved
runtime/src/util/batch_return.rs Outdated Show resolved Hide resolved
@anorth anorth mentioned this pull request Sep 28, 2022
Merged
@ZenGround0
Integrate FIL+ and miner actor
e76183d 
* Add FIL+ allocation claim to sector activation
* Match deal activation error semantics on alloc claim
* can_claim_allocation allows claiming on the epoch of expiration
@ZenGround0 ZenGround0 force-pushed the feat/miner-verifreg-integration-take2 branch from 70e7a3c to e76183d Compare September 28, 2022 04:24
@ZenGround0 ZenGround0 marked this pull request as ready for review September 28, 2022 04:26
@ZenGround0 ZenGround0 merged commit 5934421 into decouple-fil+ Sep 28, 2022
@ZenGround0 ZenGround0 deleted the feat/miner-verifreg-integration-take2 branch September 28, 2022 04:45
@arajasek arajasek mentioned this pull request Sep 29, 2022
Merged
@ZenGround0 ZenGround0 mentioned this pull request Sep 29, 2022
Closed
shamb0 pushed a commit to shamb0/builtin-actors that referenced this pull request Jan 31, 2023
@ZenGround0 @shamb0
Claim verifreg allocations from miner actor (filecoin-project#715)
07c522f 
Integrate FIL+ and miner actor
* Add FIL+ allocation claim to sector activation
* Match deal activation error semantics on alloc claim
* can_claim_allocation allows claiming on the epoch of expiration

Co-authored-by: zenground0 <[email protected]>
@anorth anorth mentioned this pull request Jan 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anorth anorth anorth approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZenGround0 @anorth