Verifreg to use ActorID #936
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sudo-shashank
force-pushed
the
shashank/verifreg-changes-#869
branch
from
a7b0013 to
6ff37e0
Compare
anorth
reviewed
Dec 13, 2022
actors/verifreg/src/lib.rs
Outdated
Comment on lines
1024
to
1041
| let code_cid = | ||
| rt.get_actor_code_cid(&id).with_context_code(ExitCode::USR_ILLEGAL_ARGUMENT, || { | ||
| format!("no code CID for provider {}", addr) | ||
| })?; | ||
| let provider_type = rt | ||
| .resolve_builtin_actor_type(&code_cid) | ||
| .with_context_code(ExitCode::USR_ILLEGAL_ARGUMENT, || { | ||
| format!("provider code {} must be built-in miner actor", code_cid) | ||
| })?; | ||
| if provider_type != Type::Miner { | ||
| return Err(actor_error!( | ||
| illegal_argument, | ||
| "allocation provider {} must be a miner actor, was {:?}", | ||
| addr, | ||
| provider_type | ||
| )); | ||
| } | ||
| Ok(id) |
There was a problem hiding this comment.
We still need the last two checks here. The only one to remove is the address resolution at the top
sudo-shashank
force-pushed
the
shashank/verifreg-changes-#869
branch
from
f6be7e8 to
c768f94
Compare
anorth
approved these changes
Dec 13, 2022
| @@ -879,7 +879,7 @@ fn alloc_request_for_deal( | |||
| let alloc_expiration = | |||
| min(deal.proposal.start_epoch, curr_epoch + policy.maximum_verified_allocation_expiration); | |||
| ext::verifreg::AllocationRequest { | |||
| provider: deal.proposal.provider, | |||
| provider: deal.proposal.provider.id().unwrap(), | |||
There was a problem hiding this comment.
This is ok, but please add a brief comment to this method noting that the proposal must have ID addresses.
| @@ -628,8 +628,6 @@ impl Actor { | |||
| let mut new_allocs = Vec::with_capacity(reqs.allocations.len()); | |||
| for req in &reqs.allocations { | |||
| validate_new_allocation(req, rt.policy(), curr_epoch)?; | |||
| // Require the provider for new allocations to be a miner actor. | |||
| // This doesn't matter much, but is more ergonomic to fail rather than lock up datacap. | |||
actors/verifreg/src/lib.rs
Outdated
| let id = rt.resolve_address(addr).with_context_code(ExitCode::USR_ILLEGAL_ARGUMENT, || { | ||
| format!("failed to resolve provider address {}", addr) | ||
| })?; | ||
| fn resolve_miner_id(rt: &mut impl Runtime, id: &ActorID) -> Result<ActorID, ActorError> { |
There was a problem hiding this comment.
Please rename this to check_miner_id, since this no longer does resolution.
Change the parameter to ActorID, not &ActorID.
Change the return type to Result<(), ActorError> since the return is just the parameter, and at the call site you can use req.provider instead of provider_id.
shamb0
pushed a commit
to shamb0/builtin-actors
that referenced
this pull request
Jan 31, 2023
…ject#936) * Use ActorID in ClaimExtensionRequest * Use ActorID in AllocationRequest * Remove unused fn resolve_miner_id * Fix receive_alloc_requires_miner_actor test * Fix datacap transfer scenario test * Use ActorID in market actor * Fixed resolve_miner_id * Cleanup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Closes #869