Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes parallel vps' gas accounting
Browse files Browse the repository at this point in the history
grarco committed Aug 18, 2023
1 parent 3f29691 commit 189594d
Showing 2 changed files with 16 additions and 7 deletions.
21 changes: 15 additions & 6 deletions core/src/ledger/gas.rs
Original file line number Diff line number Diff line change
@@ -310,19 +310,27 @@ impl VpGasMeter {
}

impl VpsGas {
/// Set the gas cost from a single VP run. It consumes the [`VpGasMeter`]
/// Set the gas cost from a VP run. It consumes the [`VpGasMeter`]
/// instance which shouldn't be accessed passed this point.
pub fn set(&mut self, vp_gas_meter: VpGasMeter) -> Result<()> {
debug_assert_eq!(self.max, None);
debug_assert!(self.rest.is_empty());
self.max = Some(vp_gas_meter.current_gas);
match self.max {
Some(previous_max) => {
if vp_gas_meter.current_gas > previous_max {
self.rest.push(previous_max);
self.max = Some(vp_gas_meter.current_gas);
} else {
self.rest.push(vp_gas_meter.current_gas);
}
}
None => self.max = Some(vp_gas_meter.current_gas),
}
self.check_limit(&vp_gas_meter)
}

/// Merge validity predicates gas meters from parallelized runs.
/// Merge validity predicates gas meters from parallelized runs. Consumes the other 'VpsGas' instance which shouldn't be used passed this point.
pub fn merge(
&mut self,
other: &mut VpsGas,
mut other: VpsGas,
tx_gas_meter: &TxGasMeter,
) -> Result<()> {
match (self.max, other.max) {
@@ -344,6 +352,7 @@ impl VpsGas {
self.check_limit(tx_gas_meter)
}

/// Check if the vp went out of gas. Starts from the gas consumed by the transaction.
fn check_limit(&self, gas_meter: &impl GasMetering) -> Result<()> {
let total = gas_meter
.get_tx_consumed_gas()
2 changes: 1 addition & 1 deletion shared/src/ledger/protocol/mod.rs
Original file line number Diff line number Diff line change
@@ -1085,7 +1085,7 @@ fn merge_vp_results(
errors.append(&mut b.errors);
let mut gas_used = a.gas_used;

gas_used.merge(&mut b.gas_used, tx_gas_meter)?;
gas_used.merge(b.gas_used, tx_gas_meter)?;

Ok(VpsResult {
accepted_vps,

0 comments on commit 189594d

Please sign in to comment.