pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 22:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump wasm-instrument (#12234)

Browse Source 
* Bump wasm-instrument

* Fix benchmarks
This commit is contained in:
Alexander Theißen
2022-09-15 08:00:11 +02:00
committed by GitHub
parent 4a3c70ecae
commit 4a6e78b8df
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/contracts/src/wasm/runtime.rs
+4 -4
View File
@@ -164,7 +164,7 @@ impl<T: Into<DispatchError>> From<T> for TrapReason {
pub enum RuntimeCosts {
/// Charge the gas meter with the cost of a metering block. The charged costs are
/// the supplied cost of the block plus the overhead of the metering itself.
MeteringBlock(u32),
MeteringBlock(u64),
/// Weight charged for copying data from the sandbox.
CopyFromContract(u32),
/// Weight charged for copying data to the sandbox.
@@ -261,7 +261,7 @@ impl RuntimeCosts {
{
use self::RuntimeCosts::*;
let weight = match *self {
MeteringBlock(amount) => s.gas.saturating_add(amount.into()),
MeteringBlock(amount) => s.gas.saturating_add(amount),
CopyFromContract(len) => s.return_per_byte.saturating_mul(len.into()),
CopyToContract(len) => s.input_per_byte.saturating_mul(len.into()),
Caller => s.caller,
@@ -957,7 +957,7 @@ pub mod env {
/// This call is supposed to be called only by instrumentation injected code.
///
/// - amount: How much gas is used.
fn gas(ctx: Runtime<E>, amount: u32) -> Result<(), TrapReason> {
fn gas(ctx: Runtime<E>, amount: u64) -> Result<(), TrapReason> {
ctx.charge_gas(RuntimeCosts::MeteringBlock(amount))?;
Ok(())
}
@@ -1737,7 +1737,7 @@ pub mod env {
#[prefixed_alias]
fn gas_left(ctx: Runtime<E>, out_ptr: u32, out_len_ptr: u32) -> Result<(), TrapReason> {
ctx.charge_gas(RuntimeCosts::GasLeft)?;
let gas_left = &ctx.ext.gas_meter().gas_left().encode();
let gas_left = &ctx.ext.gas_meter().gas_left().ref_time().encode();
Ok(ctx.write_sandbox_output(out_ptr, out_len_ptr, gas_left, false, already_charged)?)
}