Skip to content

Commit

Permalink
F28 fix (#1343)
Browse files Browse the repository at this point in the history 
* Fix state snapshots that could not be cleared

* fix cargo fmt

Co-authored-by: noot <elizabethjbinks@gmail.com>
  • Loading branch information
@elmattic @noot
elmattic and noot authored Jan 6, 2022
1 parent efd56e9 commit 87ab772
Showing 1 changed file with 109 additions and 103 deletions.
212 changes: 109 additions & 103 deletions vm/interpreter/src/vm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,128 +443,134 @@ where
})
.map_err(|e| e.to_string())?;

self.state.snapshot()?;
let send_clo = || -> Result<ApplyRet, String> {
self.state.snapshot()?;

// Perform transaction
let (mut ret_data, rt, mut act_err) = self.send(msg.message(), Some(msg_gas_cost));
if let Some(err) = &act_err {
if err.is_fatal() {
return Err(format!(
"[from={}, to={}, seq={}, m={}, h={}] fatal error: {}",
msg.from(),
msg.to(),
msg.sequence(),
msg.method_num(),
self.epoch,
err
));
} else {
debug!(
"[from={}, to={}, seq={}, m={}] send error: {}",
msg.from(),
msg.to(),
msg.sequence(),
msg.method_num(),
err
);
if !ret_data.is_empty() {
// Perform transaction
let (mut ret_data, rt, mut act_err) = self.send(msg.message(), Some(msg_gas_cost));
if let Some(err) = &act_err {
if err.is_fatal() {
return Err(format!(
"message invocation errored, but had a return value anyway: {}",
"[from={}, to={}, seq={}, m={}, h={}] fatal error: {}",
msg.from(),
msg.to(),
msg.sequence(),
msg.method_num(),
self.epoch,
err
));
} else {
debug!(
"[from={}, to={}, seq={}, m={}] send error: {}",
msg.from(),
msg.to(),
msg.sequence(),
msg.method_num(),
err
);
if !ret_data.is_empty() {
return Err(format!(
"message invocation errored, but had a return value anyway: {}",
err
));
}
}
}
}

let gas_used = if let Some(mut rt) = rt {
if !ret_data.is_empty() {
if let Err(e) = rt.charge_gas(rt.price_list().on_chain_return_value(ret_data.len()))
{
act_err = Some(e);
ret_data = Serialized::default();
let gas_used = if let Some(mut rt) = rt {
if !ret_data.is_empty() {
if let Err(e) =
rt.charge_gas(rt.price_list().on_chain_return_value(ret_data.len()))
{
act_err = Some(e);
ret_data = Serialized::default();
}
}
if rt.gas_used() < 0 {
0
} else {
rt.gas_used()
}
}
if rt.gas_used() < 0 {
0
} else {
rt.gas_used()
}
} else {
return Err(format!("send returned None runtime: {:?}", act_err));
};
return Err(format!("send returned None runtime: {:?}", act_err));
};

let err_code = if let Some(err) = &act_err {
if !err.is_ok() {
// Revert all state changes on error.
self.state.revert_to_snapshot()?;
}
err.exit_code()
} else {
ExitCode::Ok
};
let err_code = if let Some(err) = &act_err {
if !err.is_ok() {
// Revert all state changes on error.
self.state.revert_to_snapshot()?;
}
err.exit_code()
} else {
ExitCode::Ok
};

let should_burn = self
.should_burn(self.state(), msg, err_code)
.map_err(|e| format!("failed to decide whether to burn: {}", e))?;

let GasOutputs {
base_fee_burn,
miner_tip,
over_estimation_burn,
refund,
miner_penalty,
..
} = compute_gas_outputs(
gas_used,
msg.gas_limit(),
&self.base_fee,
msg.gas_fee_cap(),
msg.gas_premium().clone(),
should_burn,
);
let should_burn = self
.should_burn(self.state(), msg, err_code)
.map_err(|e| format!("failed to decide whether to burn: {}", e))?;

let GasOutputs {
base_fee_burn,
miner_tip,
over_estimation_burn,
refund,
miner_penalty,
..
} = compute_gas_outputs(
gas_used,
msg.gas_limit(),
&self.base_fee,
msg.gas_fee_cap(),
msg.gas_premium().clone(),
should_burn,
);

let mut transfer_to_actor = |addr: &Address, amt: &TokenAmount| -> Result<(), String> {
if amt.sign() == Sign::Minus {
return Err("attempted to transfer negative value into actor".into());
}
if amt.is_zero() {
return Ok(());
}

let mut transfer_to_actor = |addr: &Address, amt: &TokenAmount| -> Result<(), String> {
if amt.sign() == Sign::Minus {
return Err("attempted to transfer negative value into actor".into());
}
if amt.is_zero() {
return Ok(());
}
self.state
.mutate_actor(addr, |act| {
act.deposit_funds(amt);
Ok(())
})
.map_err(|e| e.to_string())?;
Ok(())
};

self.state
.mutate_actor(addr, |act| {
act.deposit_funds(amt);
Ok(())
})
.map_err(|e| e.to_string())?;
Ok(())
};
transfer_to_actor(&*BURNT_FUNDS_ACTOR_ADDR, &base_fee_burn)?;

transfer_to_actor(&*BURNT_FUNDS_ACTOR_ADDR, &base_fee_burn)?;
transfer_to_actor(&**reward::ADDRESS, &miner_tip)?;

transfer_to_actor(&**reward::ADDRESS, &miner_tip)?;
transfer_to_actor(&*BURNT_FUNDS_ACTOR_ADDR, &over_estimation_burn)?;

transfer_to_actor(&*BURNT_FUNDS_ACTOR_ADDR, &over_estimation_burn)?;
// refund unused gas
transfer_to_actor(msg.from(), &refund)?;

// refund unused gas
transfer_to_actor(msg.from(), &refund)?;
if &base_fee_burn + over_estimation_burn + &refund + &miner_tip != gas_cost {
// Sanity check. This could be a fatal error.
return Err("Gas handling math is wrong".to_owned());
}

if &base_fee_burn + over_estimation_burn + &refund + &miner_tip != gas_cost {
// Sanity check. This could be a fatal error.
return Err("Gas handling math is wrong".to_owned());
}
self.state.clear_snapshot()?;
Ok(ApplyRet {
msg_receipt: MessageReceipt {
return_data: ret_data,
exit_code: err_code,
gas_used,
},
penalty: miner_penalty,
act_error: act_err,
miner_tip,
})
};

Ok(ApplyRet {
msg_receipt: MessageReceipt {
return_data: ret_data,
exit_code: err_code,
gas_used,
},
penalty: miner_penalty,
act_error: act_err,
miner_tip,
})
let res = send_clo();
self.state.clear_snapshot()?;
res
}

/// Instantiates a new Runtime, and calls vm_send to do the execution.
Expand Down

0 comments on commit 87ab772

Please sign in to comment.