allow the verify consensus fault extern to return gasused #330
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
This was referenced Feb 16, 2022
Stebalien
requested changes
Feb 16, 2022
actors/runtime/src/runtime/fvm.rs
Outdated
| fvm::crypto::verify_consensus_fault(h1, h2, extra).map_err(|_| Error::msg("no fault")) | ||
| let ret = fvm::crypto::verify_consensus_fault(h1, h2, extra) | ||
| .map_err(|_| Error::msg("failed to verify fault"))?; | ||
| self.charge_gas("verify_consensus_fault_accesses", ret.gas_used); |
There was a problem hiding this comment.
We should be charging this gas inside the FVM Kernel, not inside the actor runtime.
shared/src/consensus/mod.rs
Outdated
| /// Consensus fault types in VM. | ||
| #[derive(FromPrimitive, Clone, Copy, Debug)] | ||
| #[repr(u8)] | ||
| pub enum ConsensusFaultType { | ||
| NoFault = 0, |
There was a problem hiding this comment.
I'm pretty strongly against a "no fault" variant as it means all the other fields in the ConsensusFault object will be garbage. We only do this kind of thing in go because go doesn't have enums/options.
There was a problem hiding this comment.
synced on this: decision is to move the "no fault" (Go) -> Option (Rust) step into the FFI
|
(basically, this change shouldn't have to touch the actors or actor runtime) |
Stebalien
approved these changes
Feb 18, 2022
shared/src/consensus/mod.rs
Outdated
Comment on lines
16
to
24
| /// Result of checking two headers for a consensus fault, with the gas used | ||
| /// Only for v14 and earlier | ||
| #[derive(Clone, Debug)] | ||
| pub struct ConsensusFaultWithGas { | ||
| /// The fault. | ||
| pub fault: Option<ConsensusFault>, | ||
| /// Gas used in checking the fault | ||
| pub gas_used: i64, | ||
| } |
There was a problem hiding this comment.
- There's no real need for a named type here. We can just use
(Option<ConsensusFault>, i64). - This doesn't really belong in "shared" (shared is for types shared between actors and the FVM, not the FVM and lotus).
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.
Addresses #319