From ba7eb264c0114dfcb4a01d7ad18c04ae6a86477e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= Date: Wed, 25 Aug 2021 13:37:15 +0200 Subject: [PATCH] Remove dependency on sandboxing host functions (#9592) * Embed wasmi into the runtime * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs Co-authored-by: Parity Benchmarking Bot --- Cargo.lock | 2 + frame/contracts/src/weights.rs | 1250 ++++++++--------- primitives/sandbox/Cargo.toml | 9 + .../{with_std.rs => embedded_executor.rs} | 208 ++- .../{without_std.rs => host_executor.rs} | 0 primitives/sandbox/src/lib.rs | 13 +- 6 files changed, 743 insertions(+), 739 deletions(-) rename primitives/sandbox/{with_std.rs => embedded_executor.rs} (69%) rename primitives/sandbox/{without_std.rs => host_executor.rs} (100%) diff --git a/Cargo.lock b/Cargo.lock index 43aa746599d66..37784ba8f301b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9354,6 +9354,7 @@ name = "sp-sandbox" version = "0.10.0-dev" dependencies = [ "assert_matches", + "log 0.4.14", "parity-scale-codec", "sp-core", "sp-io", @@ -11143,6 +11144,7 @@ dependencies = [ "downcast-rs", "errno", "libc", + "libm", "memory_units", "num-rational 0.2.4", "num-traits", diff --git a/frame/contracts/src/weights.rs b/frame/contracts/src/weights.rs index cffdb6ca9f006..b7e711a37aa2b 100644 --- a/frame/contracts/src/weights.rs +++ b/frame/contracts/src/weights.rs @@ -18,7 +18,7 @@ //! Autogenerated weights for pallet_contracts //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2021-08-07, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2021-08-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 // Executed Command: @@ -155,47 +155,47 @@ pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { // Storage: Contracts DeletionQueue (r:1 w:0) fn on_initialize() -> Weight { - (3_175_000 as Weight) + (3_227_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn on_initialize_per_trie_key(k: u32, ) -> Weight { (0 as Weight) // Standard Error: 3_000 - .saturating_add((2_201_000 as Weight).saturating_mul(k as Weight)) + .saturating_add((2_273_000 as Weight).saturating_mul(k as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(k as Weight))) } // Storage: Contracts DeletionQueue (r:1 w:0) fn on_initialize_per_queue_item(q: u32, ) -> Weight { - (66_035_000 as Weight) - // Standard Error: 6_000 - .saturating_add((38_159_000 as Weight).saturating_mul(q as Weight)) + (50_365_000 as Weight) + // Standard Error: 7_000 + .saturating_add((39_799_000 as Weight).saturating_mul(q as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Contracts PristineCode (r:1 w:0) // Storage: Contracts CodeStorage (r:0 w:1) fn instrument(c: u32, ) -> Weight { - (35_007_000 as Weight) - // Standard Error: 110_000 - .saturating_add((75_739_000 as Weight).saturating_mul(c as Weight)) + (40_033_000 as Weight) + // Standard Error: 109_000 + .saturating_add((76_424_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Contracts CodeStorage (r:1 w:0) fn code_load(c: u32, ) -> Weight { - (6_238_000 as Weight) - // Standard Error: 0 - .saturating_add((1_671_000 as Weight).saturating_mul(c as Weight)) + (6_675_000 as Weight) + // Standard Error: 1_000 + .saturating_add((1_668_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } // Storage: Contracts CodeStorage (r:1 w:1) fn code_refcount(c: u32, ) -> Weight { - (10_080_000 as Weight) - // Standard Error: 0 - .saturating_add((2_694_000 as Weight).saturating_mul(c as Weight)) + (10_560_000 as Weight) + // Standard Error: 2_000 + .saturating_add((2_704_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -206,11 +206,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Contracts CodeStorage (r:1 w:1) // Storage: Contracts PristineCode (r:0 w:1) fn instantiate_with_code(c: u32, s: u32, ) -> Weight { - (182_161_000 as Weight) - // Standard Error: 115_000 - .saturating_add((113_515_000 as Weight).saturating_mul(c as Weight)) - // Standard Error: 7_000 - .saturating_add((2_314_000 as Weight).saturating_mul(s as Weight)) + (479_578_000 as Weight) + // Standard Error: 166_000 + .saturating_add((187_167_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 10_000 + .saturating_add((2_450_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -220,9 +220,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn instantiate(s: u32, ) -> Weight { - (183_914_000 as Weight) - // Standard Error: 1_000 - .saturating_add((2_224_000 as Weight).saturating_mul(s as Weight)) + (237_664_000 as Weight) + // Standard Error: 2_000 + .saturating_add((2_249_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -231,7 +231,7 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn call() -> Weight { - (166_507_000 as Weight) + (223_426_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -305,9 +305,9 @@ impl WeightInfo for SubstrateWeight { // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0) // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0) fn claim_surcharge(c: u32, ) -> Weight { - (126_115_000 as Weight) - // Standard Error: 2_000 - .saturating_add((2_829_000 as Weight).saturating_mul(c as Weight)) + (130_759_000 as Weight) + // Standard Error: 3_000 + .saturating_add((2_850_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -316,9 +316,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_caller(r: u32, ) -> Weight { - (134_110_000 as Weight) - // Standard Error: 130_000 - .saturating_add((230_337_000 as Weight).saturating_mul(r as Weight)) + (492_555_000 as Weight) + // Standard Error: 174_000 + .saturating_add((136_915_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -327,9 +327,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_address(r: u32, ) -> Weight { - (131_212_000 as Weight) - // Standard Error: 116_000 - .saturating_add((230_568_000 as Weight).saturating_mul(r as Weight)) + (487_655_000 as Weight) + // Standard Error: 165_000 + .saturating_add((137_827_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -338,9 +338,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_gas_left(r: u32, ) -> Weight { - (135_149_000 as Weight) - // Standard Error: 149_000 - .saturating_add((224_830_000 as Weight).saturating_mul(r as Weight)) + (488_993_000 as Weight) + // Standard Error: 195_000 + .saturating_add((137_040_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -349,9 +349,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_balance(r: u32, ) -> Weight { - (148_463_000 as Weight) - // Standard Error: 246_000 - .saturating_add((480_930_000 as Weight).saturating_mul(r as Weight)) + (500_062_000 as Weight) + // Standard Error: 208_000 + .saturating_add((392_337_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -360,9 +360,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_value_transferred(r: u32, ) -> Weight { - (137_790_000 as Weight) - // Standard Error: 152_000 - .saturating_add((224_961_000 as Weight).saturating_mul(r as Weight)) + (492_064_000 as Weight) + // Standard Error: 156_000 + .saturating_add((137_082_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -371,9 +371,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_minimum_balance(r: u32, ) -> Weight { - (134_238_000 as Weight) - // Standard Error: 135_000 - .saturating_add((224_433_000 as Weight).saturating_mul(r as Weight)) + (496_566_000 as Weight) + // Standard Error: 159_000 + .saturating_add((137_377_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -382,9 +382,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_tombstone_deposit(r: u32, ) -> Weight { - (135_053_000 as Weight) - // Standard Error: 147_000 - .saturating_add((223_955_000 as Weight).saturating_mul(r as Weight)) + (491_566_000 as Weight) + // Standard Error: 163_000 + .saturating_add((137_586_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -393,9 +393,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_rent_allowance(r: u32, ) -> Weight { - (138_522_000 as Weight) - // Standard Error: 145_000 - .saturating_add((223_459_000 as Weight).saturating_mul(r as Weight)) + (491_459_000 as Weight) + // Standard Error: 150_000 + .saturating_add((137_402_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -404,9 +404,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_block_number(r: u32, ) -> Weight { - (133_568_000 as Weight) - // Standard Error: 143_000 - .saturating_add((224_792_000 as Weight).saturating_mul(r as Weight)) + (488_379_000 as Weight) + // Standard Error: 170_000 + .saturating_add((136_564_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -415,9 +415,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_now(r: u32, ) -> Weight { - (134_786_000 as Weight) - // Standard Error: 130_000 - .saturating_add((224_331_000 as Weight).saturating_mul(r as Weight)) + (494_827_000 as Weight) + // Standard Error: 175_000 + .saturating_add((137_178_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -427,9 +427,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: TransactionPayment NextFeeMultiplier (r:1 w:0) fn seal_weight_to_fee(r: u32, ) -> Weight { - (147_402_000 as Weight) - // Standard Error: 233_000 - .saturating_add((439_237_000 as Weight).saturating_mul(r as Weight)) + (497_508_000 as Weight) + // Standard Error: 191_000 + .saturating_add((323_559_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -438,9 +438,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_gas(r: u32, ) -> Weight { - (115_711_000 as Weight) - // Standard Error: 88_000 - .saturating_add((113_467_000 as Weight).saturating_mul(r as Weight)) + (179_076_000 as Weight) + // Standard Error: 124_000 + .saturating_add((62_013_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -449,9 +449,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_input(r: u32, ) -> Weight { - (123_004_000 as Weight) - // Standard Error: 78_000 - .saturating_add((6_674_000 as Weight).saturating_mul(r as Weight)) + (480_920_000 as Weight) + // Standard Error: 182_000 + .saturating_add((3_254_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -460,9 +460,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_input_per_kb(n: u32, ) -> Weight { - (131_611_000 as Weight) - // Standard Error: 0 - .saturating_add((1_035_000 as Weight).saturating_mul(n as Weight)) + (487_910_000 as Weight) + // Standard Error: 1_000 + .saturating_add((1_218_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -471,9 +471,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_return(r: u32, ) -> Weight { - (118_327_000 as Weight) - // Standard Error: 84_000 - .saturating_add((4_274_000 as Weight).saturating_mul(r as Weight)) + (470_960_000 as Weight) + // Standard Error: 678_000 + .saturating_add((2_506_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -482,9 +482,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_return_per_kb(n: u32, ) -> Weight { - (126_129_000 as Weight) - // Standard Error: 0 - .saturating_add((495_000 as Weight).saturating_mul(n as Weight)) + (478_623_000 as Weight) + // Standard Error: 1_000 + .saturating_add((749_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -494,9 +494,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: Contracts DeletionQueue (r:1 w:1) fn seal_terminate(r: u32, ) -> Weight { - (123_759_000 as Weight) - // Standard Error: 115_000 - .saturating_add((89_730_000 as Weight).saturating_mul(r as Weight)) + (481_930_000 as Weight) + // Standard Error: 511_000 + .saturating_add((84_726_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -508,9 +508,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0) fn seal_restore_to(r: u32, ) -> Weight { - (151_364_000 as Weight) - // Standard Error: 263_000 - .saturating_add((99_367_000 as Weight).saturating_mul(r as Weight)) + (514_296_000 as Weight) + // Standard Error: 458_000 + .saturating_add((93_769_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -518,9 +518,9 @@ impl WeightInfo for SubstrateWeight { } // Storage: Skipped Metadata (r:0 w:0) fn seal_restore_to_per_delta(d: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_919_000 - .saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight)) + (313_520_000 as Weight) + // Standard Error: 1_783_000 + .saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight)) .saturating_add(T::DbWeight::get().reads(7 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(d as Weight))) .saturating_add(T::DbWeight::get().writes(7 as Weight)) @@ -532,9 +532,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0) fn seal_random(r: u32, ) -> Weight { - (137_660_000 as Weight) - // Standard Error: 204_000 - .saturating_add((563_042_000 as Weight).saturating_mul(r as Weight)) + (484_059_000 as Weight) + // Standard Error: 285_000 + .saturating_add((443_946_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -543,9 +543,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_deposit_event(r: u32, ) -> Weight { - (137_087_000 as Weight) - // Standard Error: 413_000 - .saturating_add((835_499_000 as Weight).saturating_mul(r as Weight)) + (491_593_000 as Weight) + // Standard Error: 386_000 + .saturating_add((733_958_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -555,11 +555,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: System EventTopics (r:100 w:100) fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight { - (1_117_515_000 as Weight) - // Standard Error: 2_167_000 - .saturating_add((494_145_000 as Weight).saturating_mul(t as Weight)) - // Standard Error: 427_000 - .saturating_add((150_093_000 as Weight).saturating_mul(n as Weight)) + (1_342_357_000 as Weight) + // Standard Error: 2_458_000 + .saturating_add((521_445_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 484_000 + .saturating_add((195_792_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(t as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -570,9 +570,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_set_rent_allowance(r: u32, ) -> Weight { - (132_070_000 as Weight) - // Standard Error: 129_000 - .saturating_add((155_669_000 as Weight).saturating_mul(r as Weight)) + (209_818_000 as Weight) + // Standard Error: 157_000 + .saturating_add((93_289_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -581,17 +581,17 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_debug_message(r: u32, ) -> Weight { - (126_971_000 as Weight) - // Standard Error: 90_000 - .saturating_add((122_445_000 as Weight).saturating_mul(r as Weight)) + (200_027_000 as Weight) + // Standard Error: 145_000 + .saturating_add((79_038_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn seal_set_storage(r: u32, ) -> Weight { - (125_746_000 as Weight) - // Standard Error: 610_000 - .saturating_add((501_265_000 as Weight).saturating_mul(r as Weight)) + (477_211_000 as Weight) + // Standard Error: 709_000 + .saturating_add((407_264_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -603,17 +603,17 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1) fn seal_set_storage_per_kb(n: u32, ) -> Weight { - (563_219_000 as Weight) - // Standard Error: 219_000 - .saturating_add((41_578_000 as Weight).saturating_mul(n as Weight)) + (832_538_000 as Weight) + // Standard Error: 262_000 + .saturating_add((87_211_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn seal_clear_storage(r: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_727_000 - .saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight)) + (199_686_000 as Weight) + // Standard Error: 1_610_000 + .saturating_add((905_125_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -621,9 +621,9 @@ impl WeightInfo for SubstrateWeight { } // Storage: Skipped Metadata (r:0 w:0) fn seal_get_storage(r: u32, ) -> Weight { - (9_115_000 as Weight) - // Standard Error: 784_000 - .saturating_add((660_533_000 as Weight).saturating_mul(r as Weight)) + (335_052_000 as Weight) + // Standard Error: 885_000 + .saturating_add((545_754_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -634,9 +634,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0) fn seal_get_storage_per_kb(n: u32, ) -> Weight { - (563_175_000 as Weight) - // Standard Error: 206_000 - .saturating_add((89_626_000 as Weight).saturating_mul(n as Weight)) + (800_556_000 as Weight) + // Standard Error: 337_000 + .saturating_add((133_492_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -645,9 +645,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_transfer(r: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_750_000 - .saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight)) + (317_531_000 as Weight) + // Standard Error: 1_627_000 + .saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) @@ -659,8 +659,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) fn seal_call(r: u32, ) -> Weight { (0 as Weight) - // Standard Error: 6_692_000 - .saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 8_848_000 + .saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((200 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -671,13 +671,13 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:101 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight { - (11_238_437_000 as Weight) - // Standard Error: 81_620_000 - .saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight)) - // Standard Error: 29_000 - .saturating_add((32_106_000 as Weight).saturating_mul(i as Weight)) - // Standard Error: 31_000 - .saturating_add((54_386_000 as Weight).saturating_mul(o as Weight)) + (47_469_660_000 as Weight) + // Standard Error: 45_192_000 + .saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 16_000 + .saturating_add((75_339_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 17_000 + .saturating_add((121_494_000 as Weight).saturating_mul(o as Weight)) .saturating_add(T::DbWeight::get().reads(205 as Weight)) .saturating_add(T::DbWeight::get().writes(101 as Weight)) .saturating_add(T::DbWeight::get().writes((101 as Weight).saturating_mul(t as Weight))) @@ -689,8 +689,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Contracts AccountCounter (r:1 w:1) fn seal_instantiate(r: u32, ) -> Weight { (0 as Weight) - // Standard Error: 35_258_000 - .saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 32_740_000 + .saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((300 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) @@ -702,13 +702,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: Contracts AccountCounter (r:1 w:1) fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight { - (14_725_288_000 as Weight) - // Standard Error: 53_000 - .saturating_add((33_848_000 as Weight).saturating_mul(i as Weight)) - // Standard Error: 53_000 - .saturating_add((57_054_000 as Weight).saturating_mul(o as Weight)) - // Standard Error: 53_000 - .saturating_add((180_033_000 as Weight).saturating_mul(s as Weight)) + (54_718_944_000 as Weight) + // Standard Error: 29_000 + .saturating_add((75_276_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 29_000 + .saturating_add((121_341_000 as Weight).saturating_mul(o as Weight)) + // Standard Error: 29_000 + .saturating_add((223_964_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(206 as Weight)) .saturating_add(T::DbWeight::get().writes(204 as Weight)) } @@ -717,9 +717,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_sha2_256(r: u32, ) -> Weight { - (131_974_000 as Weight) - // Standard Error: 125_000 - .saturating_add((220_711_000 as Weight).saturating_mul(r as Weight)) + (485_310_000 as Weight) + // Standard Error: 169_000 + .saturating_add((143_364_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -728,9 +728,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight { - (367_148_000 as Weight) - // Standard Error: 12_000 - .saturating_add((462_143_000 as Weight).saturating_mul(n as Weight)) + (632_820_000 as Weight) + // Standard Error: 29_000 + .saturating_add((511_722_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -739,9 +739,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_keccak_256(r: u32, ) -> Weight { - (134_585_000 as Weight) - // Standard Error: 131_000 - .saturating_add((227_264_000 as Weight).saturating_mul(r as Weight)) + (484_331_000 as Weight) + // Standard Error: 195_000 + .saturating_add((151_617_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -750,9 +750,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight { - (325_319_000 as Weight) - // Standard Error: 12_000 - .saturating_add((313_033_000 as Weight).saturating_mul(n as Weight)) + (565_213_000 as Weight) + // Standard Error: 28_000 + .saturating_add((359_762_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -761,9 +761,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_256(r: u32, ) -> Weight { - (135_347_000 as Weight) - // Standard Error: 150_000 - .saturating_add((199_764_000 as Weight).saturating_mul(r as Weight)) + (481_843_000 as Weight) + // Standard Error: 186_000 + .saturating_add((122_838_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -772,9 +772,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight { - (424_473_000 as Weight) - // Standard Error: 13_000 - .saturating_add((130_936_000 as Weight).saturating_mul(n as Weight)) + (582_445_000 as Weight) + // Standard Error: 28_000 + .saturating_add((176_329_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -783,9 +783,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_128(r: u32, ) -> Weight { - (128_776_000 as Weight) - // Standard Error: 118_000 - .saturating_add((203_125_000 as Weight).saturating_mul(r as Weight)) + (486_320_000 as Weight) + // Standard Error: 147_000 + .saturating_add((123_460_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -794,266 +794,266 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight { - (445_726_000 as Weight) - // Standard Error: 14_000 - .saturating_add((130_931_000 as Weight).saturating_mul(n as Weight)) + (515_967_000 as Weight) + // Standard Error: 33_000 + .saturating_add((176_423_000 as Weight).saturating_mul(n as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn instr_i64const(r: u32, ) -> Weight { - (22_161_000 as Weight) - // Standard Error: 36_000 - .saturating_add((3_329_000 as Weight).saturating_mul(r as Weight)) + (54_127_000 as Weight) + // Standard Error: 25_000 + .saturating_add((10_198_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64load(r: u32, ) -> Weight { - (24_430_000 as Weight) - // Standard Error: 65_000 - .saturating_add((159_566_000 as Weight).saturating_mul(r as Weight)) + (55_411_000 as Weight) + // Standard Error: 148_000 + .saturating_add((22_916_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64store(r: u32, ) -> Weight { - (24_443_000 as Weight) - // Standard Error: 62_000 - .saturating_add((232_854_000 as Weight).saturating_mul(r as Weight)) + (55_462_000 as Weight) + // Standard Error: 134_000 + .saturating_add((24_449_000 as Weight).saturating_mul(r as Weight)) } fn instr_select(r: u32, ) -> Weight { - (22_158_000 as Weight) - // Standard Error: 34_000 - .saturating_add((12_112_000 as Weight).saturating_mul(r as Weight)) + (54_114_000 as Weight) + // Standard Error: 18_000 + .saturating_add((26_214_000 as Weight).saturating_mul(r as Weight)) } fn instr_if(r: u32, ) -> Weight { - (22_178_000 as Weight) - // Standard Error: 23_000 - .saturating_add((11_374_000 as Weight).saturating_mul(r as Weight)) + (54_118_000 as Weight) + // Standard Error: 18_000 + .saturating_add((26_492_000 as Weight).saturating_mul(r as Weight)) } fn instr_br(r: u32, ) -> Weight { - (22_157_000 as Weight) - // Standard Error: 41_000 - .saturating_add((5_826_000 as Weight).saturating_mul(r as Weight)) + (54_119_000 as Weight) + // Standard Error: 304_000 + .saturating_add((18_424_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_if(r: u32, ) -> Weight { - (22_182_000 as Weight) - // Standard Error: 34_000 - .saturating_add((13_647_000 as Weight).saturating_mul(r as Weight)) + (55_352_000 as Weight) + // Standard Error: 13_000 + .saturating_add((32_291_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_table(r: u32, ) -> Weight { - (22_083_000 as Weight) - // Standard Error: 44_000 - .saturating_add((14_901_000 as Weight).saturating_mul(r as Weight)) + (54_115_000 as Weight) + // Standard Error: 16_000 + .saturating_add((27_785_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_table_per_entry(e: u32, ) -> Weight { - (32_689_000 as Weight) + (86_048_000 as Weight) // Standard Error: 1_000 - .saturating_add((154_000 as Weight).saturating_mul(e as Weight)) + .saturating_add((82_000 as Weight).saturating_mul(e as Weight)) } fn instr_call(r: u32, ) -> Weight { - (22_313_000 as Weight) - // Standard Error: 383_000 - .saturating_add((89_804_000 as Weight).saturating_mul(r as Weight)) + (54_654_000 as Weight) + // Standard Error: 82_000 + .saturating_add((199_159_000 as Weight).saturating_mul(r as Weight)) } fn instr_call_indirect(r: u32, ) -> Weight { - (29_939_000 as Weight) - // Standard Error: 230_000 - .saturating_add((185_309_000 as Weight).saturating_mul(r as Weight)) + (67_478_000 as Weight) + // Standard Error: 113_000 + .saturating_add((302_597_000 as Weight).saturating_mul(r as Weight)) } fn instr_call_indirect_per_param(p: u32, ) -> Weight { - (221_596_000 as Weight) - // Standard Error: 3_000 - .saturating_add((4_045_000 as Weight).saturating_mul(p as Weight)) + (384_281_000 as Weight) + // Standard Error: 13_000 + .saturating_add((9_984_000 as Weight).saturating_mul(p as Weight)) } fn instr_local_get(r: u32, ) -> Weight { - (22_171_000 as Weight) - // Standard Error: 28_000 - .saturating_add((3_362_000 as Weight).saturating_mul(r as Weight)) + (55_473_000 as Weight) + // Standard Error: 16_000 + .saturating_add((9_287_000 as Weight).saturating_mul(r as Weight)) } fn instr_local_set(r: u32, ) -> Weight { - (22_182_000 as Weight) - // Standard Error: 31_000 - .saturating_add((3_801_000 as Weight).saturating_mul(r as Weight)) + (55_426_000 as Weight) + // Standard Error: 38_000 + .saturating_add((10_559_000 as Weight).saturating_mul(r as Weight)) } fn instr_local_tee(r: u32, ) -> Weight { - (22_200_000 as Weight) - // Standard Error: 27_000 - .saturating_add((5_080_000 as Weight).saturating_mul(r as Weight)) + (55_332_000 as Weight) + // Standard Error: 8_000 + .saturating_add((15_640_000 as Weight).saturating_mul(r as Weight)) } fn instr_global_get(r: u32, ) -> Weight { - (25_255_000 as Weight) - // Standard Error: 41_000 - .saturating_add((8_875_000 as Weight).saturating_mul(r as Weight)) + (74_497_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_067_000 as Weight).saturating_mul(r as Weight)) } fn instr_global_set(r: u32, ) -> Weight { - (25_145_000 as Weight) - // Standard Error: 37_000 - .saturating_add((9_556_000 as Weight).saturating_mul(r as Weight)) + (74_445_000 as Weight) + // Standard Error: 49_000 + .saturating_add((17_650_000 as Weight).saturating_mul(r as Weight)) } fn instr_memory_current(r: u32, ) -> Weight { - (24_435_000 as Weight) - // Standard Error: 49_000 - .saturating_add((4_204_000 as Weight).saturating_mul(r as Weight)) + (54_500_000 as Weight) + // Standard Error: 17_000 + .saturating_add((9_307_000 as Weight).saturating_mul(r as Weight)) } fn instr_memory_grow(r: u32, ) -> Weight { - (23_158_000 as Weight) - // Standard Error: 5_969_000 - .saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight)) + (54_382_000 as Weight) + // Standard Error: 5_644_000 + .saturating_add((748_424_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64clz(r: u32, ) -> Weight { - (21_984_000 as Weight) - // Standard Error: 25_000 - .saturating_add((5_421_000 as Weight).saturating_mul(r as Weight)) + (54_133_000 as Weight) + // Standard Error: 20_000 + .saturating_add((15_830_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ctz(r: u32, ) -> Weight { - (22_069_000 as Weight) - // Standard Error: 26_000 - .saturating_add((5_187_000 as Weight).saturating_mul(r as Weight)) + (54_129_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_894_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64popcnt(r: u32, ) -> Weight { - (22_042_000 as Weight) - // Standard Error: 28_000 - .saturating_add((6_116_000 as Weight).saturating_mul(r as Weight)) + (54_181_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_847_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64eqz(r: u32, ) -> Weight { - (22_018_000 as Weight) - // Standard Error: 34_000 - .saturating_add((5_130_000 as Weight).saturating_mul(r as Weight)) + (54_130_000 as Weight) + // Standard Error: 17_000 + .saturating_add((15_825_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64extendsi32(r: u32, ) -> Weight { - (21_933_000 as Weight) - // Standard Error: 29_000 - .saturating_add((5_005_000 as Weight).saturating_mul(r as Weight)) + (54_122_000 as Weight) + // Standard Error: 19_000 + .saturating_add((15_803_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64extendui32(r: u32, ) -> Weight { - (22_066_000 as Weight) - // Standard Error: 34_000 - .saturating_add((4_877_000 as Weight).saturating_mul(r as Weight)) + (54_100_000 as Weight) + // Standard Error: 28_000 + .saturating_add((15_822_000 as Weight).saturating_mul(r as Weight)) } fn instr_i32wrapi64(r: u32, ) -> Weight { - (22_003_000 as Weight) - // Standard Error: 25_000 - .saturating_add((5_018_000 as Weight).saturating_mul(r as Weight)) + (54_143_000 as Weight) + // Standard Error: 19_000 + .saturating_add((15_868_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64eq(r: u32, ) -> Weight { - (22_130_000 as Weight) - // Standard Error: 35_000 - .saturating_add((7_071_000 as Weight).saturating_mul(r as Weight)) + (54_133_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_121_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ne(r: u32, ) -> Weight { - (22_112_000 as Weight) - // Standard Error: 24_000 - .saturating_add((7_056_000 as Weight).saturating_mul(r as Weight)) + (54_177_000 as Weight) + // Standard Error: 14_000 + .saturating_add((21_003_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64lts(r: u32, ) -> Weight { - (22_114_000 as Weight) - // Standard Error: 27_000 - .saturating_add((6_974_000 as Weight).saturating_mul(r as Weight)) + (54_164_000 as Weight) + // Standard Error: 31_000 + .saturating_add((21_041_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ltu(r: u32, ) -> Weight { - (22_111_000 as Weight) - // Standard Error: 32_000 - .saturating_add((7_183_000 as Weight).saturating_mul(r as Weight)) + (54_171_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_101_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64gts(r: u32, ) -> Weight { - (22_148_000 as Weight) - // Standard Error: 28_000 - .saturating_add((7_044_000 as Weight).saturating_mul(r as Weight)) + (54_177_000 as Weight) + // Standard Error: 12_000 + .saturating_add((21_074_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64gtu(r: u32, ) -> Weight { - (22_158_000 as Weight) - // Standard Error: 33_000 - .saturating_add((7_116_000 as Weight).saturating_mul(r as Weight)) + (54_073_000 as Weight) + // Standard Error: 13_000 + .saturating_add((21_136_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64les(r: u32, ) -> Weight { - (22_194_000 as Weight) - // Standard Error: 31_000 - .saturating_add((7_039_000 as Weight).saturating_mul(r as Weight)) + (54_116_000 as Weight) + // Standard Error: 17_000 + .saturating_add((21_140_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64leu(r: u32, ) -> Weight { - (22_219_000 as Weight) - // Standard Error: 23_000 - .saturating_add((7_076_000 as Weight).saturating_mul(r as Weight)) + (54_115_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_164_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ges(r: u32, ) -> Weight { - (22_170_000 as Weight) - // Standard Error: 50_000 - .saturating_add((7_122_000 as Weight).saturating_mul(r as Weight)) + (54_261_000 as Weight) + // Standard Error: 123_000 + .saturating_add((20_921_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64geu(r: u32, ) -> Weight { - (22_113_000 as Weight) - // Standard Error: 27_000 - .saturating_add((7_069_000 as Weight).saturating_mul(r as Weight)) + (54_090_000 as Weight) + // Standard Error: 38_000 + .saturating_add((21_171_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64add(r: u32, ) -> Weight { - (22_090_000 as Weight) - // Standard Error: 29_000 - .saturating_add((6_956_000 as Weight).saturating_mul(r as Weight)) + (54_129_000 as Weight) + // Standard Error: 27_000 + .saturating_add((21_086_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64sub(r: u32, ) -> Weight { - (22_006_000 as Weight) - // Standard Error: 30_000 - .saturating_add((7_094_000 as Weight).saturating_mul(r as Weight)) + (54_126_000 as Weight) + // Standard Error: 11_000 + .saturating_add((21_051_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64mul(r: u32, ) -> Weight { - (22_111_000 as Weight) - // Standard Error: 29_000 - .saturating_add((6_825_000 as Weight).saturating_mul(r as Weight)) + (54_153_000 as Weight) + // Standard Error: 22_000 + .saturating_add((21_021_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64divs(r: u32, ) -> Weight { - (22_041_000 as Weight) - // Standard Error: 29_000 - .saturating_add((13_164_000 as Weight).saturating_mul(r as Weight)) + (54_168_000 as Weight) + // Standard Error: 19_000 + .saturating_add((27_336_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64divu(r: u32, ) -> Weight { - (21_989_000 as Weight) - // Standard Error: 28_000 - .saturating_add((12_808_000 as Weight).saturating_mul(r as Weight)) + (54_124_000 as Weight) + // Standard Error: 22_000 + .saturating_add((24_783_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rems(r: u32, ) -> Weight { - (22_045_000 as Weight) - // Standard Error: 39_000 - .saturating_add((13_387_000 as Weight).saturating_mul(r as Weight)) + (54_203_000 as Weight) + // Standard Error: 21_000 + .saturating_add((27_539_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64remu(r: u32, ) -> Weight { - (22_075_000 as Weight) - // Standard Error: 40_000 - .saturating_add((12_791_000 as Weight).saturating_mul(r as Weight)) + (54_176_000 as Weight) + // Standard Error: 19_000 + .saturating_add((24_686_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64and(r: u32, ) -> Weight { - (22_044_000 as Weight) - // Standard Error: 32_000 - .saturating_add((7_090_000 as Weight).saturating_mul(r as Weight)) + (54_111_000 as Weight) + // Standard Error: 356_000 + .saturating_add((22_077_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64or(r: u32, ) -> Weight { - (22_133_000 as Weight) - // Standard Error: 40_000 - .saturating_add((6_967_000 as Weight).saturating_mul(r as Weight)) + (54_124_000 as Weight) + // Standard Error: 15_000 + .saturating_add((21_060_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64xor(r: u32, ) -> Weight { - (22_069_000 as Weight) - // Standard Error: 41_000 - .saturating_add((7_026_000 as Weight).saturating_mul(r as Weight)) + (54_153_000 as Weight) + // Standard Error: 24_000 + .saturating_add((21_064_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shl(r: u32, ) -> Weight { - (22_165_000 as Weight) - // Standard Error: 44_000 - .saturating_add((7_440_000 as Weight).saturating_mul(r as Weight)) + (54_122_000 as Weight) + // Standard Error: 23_000 + .saturating_add((21_187_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shrs(r: u32, ) -> Weight { - (22_063_000 as Weight) - // Standard Error: 34_000 - .saturating_add((7_309_000 as Weight).saturating_mul(r as Weight)) + (54_149_000 as Weight) + // Standard Error: 18_000 + .saturating_add((21_110_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shru(r: u32, ) -> Weight { - (22_086_000 as Weight) - // Standard Error: 36_000 - .saturating_add((7_188_000 as Weight).saturating_mul(r as Weight)) + (54_136_000 as Weight) + // Standard Error: 13_000 + .saturating_add((21_066_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rotl(r: u32, ) -> Weight { - (22_109_000 as Weight) - // Standard Error: 45_000 - .saturating_add((7_169_000 as Weight).saturating_mul(r as Weight)) + (54_231_000 as Weight) + // Standard Error: 30_000 + .saturating_add((21_073_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rotr(r: u32, ) -> Weight { - (22_076_000 as Weight) - // Standard Error: 28_000 - .saturating_add((7_070_000 as Weight).saturating_mul(r as Weight)) + (54_139_000 as Weight) + // Standard Error: 17_000 + .saturating_add((21_097_000 as Weight).saturating_mul(r as Weight)) } } @@ -1061,47 +1061,47 @@ impl WeightInfo for SubstrateWeight { impl WeightInfo for () { // Storage: Contracts DeletionQueue (r:1 w:0) fn on_initialize() -> Weight { - (3_175_000 as Weight) + (3_227_000 as Weight) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn on_initialize_per_trie_key(k: u32, ) -> Weight { (0 as Weight) // Standard Error: 3_000 - .saturating_add((2_201_000 as Weight).saturating_mul(k as Weight)) + .saturating_add((2_273_000 as Weight).saturating_mul(k as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(k as Weight))) } // Storage: Contracts DeletionQueue (r:1 w:0) fn on_initialize_per_queue_item(q: u32, ) -> Weight { - (66_035_000 as Weight) - // Standard Error: 6_000 - .saturating_add((38_159_000 as Weight).saturating_mul(q as Weight)) + (50_365_000 as Weight) + // Standard Error: 7_000 + .saturating_add((39_799_000 as Weight).saturating_mul(q as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Contracts PristineCode (r:1 w:0) // Storage: Contracts CodeStorage (r:0 w:1) fn instrument(c: u32, ) -> Weight { - (35_007_000 as Weight) - // Standard Error: 110_000 - .saturating_add((75_739_000 as Weight).saturating_mul(c as Weight)) + (40_033_000 as Weight) + // Standard Error: 109_000 + .saturating_add((76_424_000 as Weight).saturating_mul(c as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Contracts CodeStorage (r:1 w:0) fn code_load(c: u32, ) -> Weight { - (6_238_000 as Weight) - // Standard Error: 0 - .saturating_add((1_671_000 as Weight).saturating_mul(c as Weight)) + (6_675_000 as Weight) + // Standard Error: 1_000 + .saturating_add((1_668_000 as Weight).saturating_mul(c as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) } // Storage: Contracts CodeStorage (r:1 w:1) fn code_refcount(c: u32, ) -> Weight { - (10_080_000 as Weight) - // Standard Error: 0 - .saturating_add((2_694_000 as Weight).saturating_mul(c as Weight)) + (10_560_000 as Weight) + // Standard Error: 2_000 + .saturating_add((2_704_000 as Weight).saturating_mul(c as Weight)) .saturating_add(RocksDbWeight::get().reads(1 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1112,11 +1112,11 @@ impl WeightInfo for () { // Storage: Contracts CodeStorage (r:1 w:1) // Storage: Contracts PristineCode (r:0 w:1) fn instantiate_with_code(c: u32, s: u32, ) -> Weight { - (182_161_000 as Weight) - // Standard Error: 115_000 - .saturating_add((113_515_000 as Weight).saturating_mul(c as Weight)) - // Standard Error: 7_000 - .saturating_add((2_314_000 as Weight).saturating_mul(s as Weight)) + (479_578_000 as Weight) + // Standard Error: 166_000 + .saturating_add((187_167_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 10_000 + .saturating_add((2_450_000 as Weight).saturating_mul(s as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } @@ -1126,9 +1126,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn instantiate(s: u32, ) -> Weight { - (183_914_000 as Weight) - // Standard Error: 1_000 - .saturating_add((2_224_000 as Weight).saturating_mul(s as Weight)) + (237_664_000 as Weight) + // Standard Error: 2_000 + .saturating_add((2_249_000 as Weight).saturating_mul(s as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) } @@ -1137,7 +1137,7 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn call() -> Weight { - (166_507_000 as Weight) + (223_426_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -1211,9 +1211,9 @@ impl WeightInfo for () { // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743aeb9db1dfeed3a7b47b] (r:1 w:0) // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743abdc9db5edf43ffcb0d] (r:1 w:0) fn claim_surcharge(c: u32, ) -> Weight { - (126_115_000 as Weight) - // Standard Error: 2_000 - .saturating_add((2_829_000 as Weight).saturating_mul(c as Weight)) + (130_759_000 as Weight) + // Standard Error: 3_000 + .saturating_add((2_850_000 as Weight).saturating_mul(c as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(4 as Weight)) } @@ -1222,9 +1222,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_caller(r: u32, ) -> Weight { - (134_110_000 as Weight) - // Standard Error: 130_000 - .saturating_add((230_337_000 as Weight).saturating_mul(r as Weight)) + (492_555_000 as Weight) + // Standard Error: 174_000 + .saturating_add((136_915_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1233,9 +1233,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_address(r: u32, ) -> Weight { - (131_212_000 as Weight) - // Standard Error: 116_000 - .saturating_add((230_568_000 as Weight).saturating_mul(r as Weight)) + (487_655_000 as Weight) + // Standard Error: 165_000 + .saturating_add((137_827_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1244,9 +1244,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_gas_left(r: u32, ) -> Weight { - (135_149_000 as Weight) - // Standard Error: 149_000 - .saturating_add((224_830_000 as Weight).saturating_mul(r as Weight)) + (488_993_000 as Weight) + // Standard Error: 195_000 + .saturating_add((137_040_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1255,9 +1255,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_balance(r: u32, ) -> Weight { - (148_463_000 as Weight) - // Standard Error: 246_000 - .saturating_add((480_930_000 as Weight).saturating_mul(r as Weight)) + (500_062_000 as Weight) + // Standard Error: 208_000 + .saturating_add((392_337_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1266,9 +1266,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_value_transferred(r: u32, ) -> Weight { - (137_790_000 as Weight) - // Standard Error: 152_000 - .saturating_add((224_961_000 as Weight).saturating_mul(r as Weight)) + (492_064_000 as Weight) + // Standard Error: 156_000 + .saturating_add((137_082_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1277,9 +1277,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_minimum_balance(r: u32, ) -> Weight { - (134_238_000 as Weight) - // Standard Error: 135_000 - .saturating_add((224_433_000 as Weight).saturating_mul(r as Weight)) + (496_566_000 as Weight) + // Standard Error: 159_000 + .saturating_add((137_377_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1288,9 +1288,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_tombstone_deposit(r: u32, ) -> Weight { - (135_053_000 as Weight) - // Standard Error: 147_000 - .saturating_add((223_955_000 as Weight).saturating_mul(r as Weight)) + (491_566_000 as Weight) + // Standard Error: 163_000 + .saturating_add((137_586_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1299,9 +1299,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_rent_allowance(r: u32, ) -> Weight { - (138_522_000 as Weight) - // Standard Error: 145_000 - .saturating_add((223_459_000 as Weight).saturating_mul(r as Weight)) + (491_459_000 as Weight) + // Standard Error: 150_000 + .saturating_add((137_402_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1310,9 +1310,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_block_number(r: u32, ) -> Weight { - (133_568_000 as Weight) - // Standard Error: 143_000 - .saturating_add((224_792_000 as Weight).saturating_mul(r as Weight)) + (488_379_000 as Weight) + // Standard Error: 170_000 + .saturating_add((136_564_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1321,9 +1321,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_now(r: u32, ) -> Weight { - (134_786_000 as Weight) - // Standard Error: 130_000 - .saturating_add((224_331_000 as Weight).saturating_mul(r as Weight)) + (494_827_000 as Weight) + // Standard Error: 175_000 + .saturating_add((137_178_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1333,9 +1333,9 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: TransactionPayment NextFeeMultiplier (r:1 w:0) fn seal_weight_to_fee(r: u32, ) -> Weight { - (147_402_000 as Weight) - // Standard Error: 233_000 - .saturating_add((439_237_000 as Weight).saturating_mul(r as Weight)) + (497_508_000 as Weight) + // Standard Error: 191_000 + .saturating_add((323_559_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1344,9 +1344,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_gas(r: u32, ) -> Weight { - (115_711_000 as Weight) - // Standard Error: 88_000 - .saturating_add((113_467_000 as Weight).saturating_mul(r as Weight)) + (179_076_000 as Weight) + // Standard Error: 124_000 + .saturating_add((62_013_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1355,9 +1355,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_input(r: u32, ) -> Weight { - (123_004_000 as Weight) - // Standard Error: 78_000 - .saturating_add((6_674_000 as Weight).saturating_mul(r as Weight)) + (480_920_000 as Weight) + // Standard Error: 182_000 + .saturating_add((3_254_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1366,9 +1366,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_input_per_kb(n: u32, ) -> Weight { - (131_611_000 as Weight) - // Standard Error: 0 - .saturating_add((1_035_000 as Weight).saturating_mul(n as Weight)) + (487_910_000 as Weight) + // Standard Error: 1_000 + .saturating_add((1_218_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1377,9 +1377,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_return(r: u32, ) -> Weight { - (118_327_000 as Weight) - // Standard Error: 84_000 - .saturating_add((4_274_000 as Weight).saturating_mul(r as Weight)) + (470_960_000 as Weight) + // Standard Error: 678_000 + .saturating_add((2_506_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1388,9 +1388,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_return_per_kb(n: u32, ) -> Weight { - (126_129_000 as Weight) - // Standard Error: 0 - .saturating_add((495_000 as Weight).saturating_mul(n as Weight)) + (478_623_000 as Weight) + // Standard Error: 1_000 + .saturating_add((749_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1400,9 +1400,9 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: Contracts DeletionQueue (r:1 w:1) fn seal_terminate(r: u32, ) -> Weight { - (123_759_000 as Weight) - // Standard Error: 115_000 - .saturating_add((89_730_000 as Weight).saturating_mul(r as Weight)) + (481_930_000 as Weight) + // Standard Error: 511_000 + .saturating_add((84_726_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1414,9 +1414,9 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a6368696c645f73746f726167653a64656661756c743af3fd4cc2fc8d170b6d] (r:1 w:0) fn seal_restore_to(r: u32, ) -> Weight { - (151_364_000 as Weight) - // Standard Error: 263_000 - .saturating_add((99_367_000 as Weight).saturating_mul(r as Weight)) + (514_296_000 as Weight) + // Standard Error: 458_000 + .saturating_add((93_769_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1424,9 +1424,9 @@ impl WeightInfo for () { } // Storage: Skipped Metadata (r:0 w:0) fn seal_restore_to_per_delta(d: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_919_000 - .saturating_add((2_415_482_000 as Weight).saturating_mul(d as Weight)) + (313_520_000 as Weight) + // Standard Error: 1_783_000 + .saturating_add((2_435_407_000 as Weight).saturating_mul(d as Weight)) .saturating_add(RocksDbWeight::get().reads(7 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(d as Weight))) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) @@ -1438,9 +1438,9 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0) fn seal_random(r: u32, ) -> Weight { - (137_660_000 as Weight) - // Standard Error: 204_000 - .saturating_add((563_042_000 as Weight).saturating_mul(r as Weight)) + (484_059_000 as Weight) + // Standard Error: 285_000 + .saturating_add((443_946_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1449,9 +1449,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_deposit_event(r: u32, ) -> Weight { - (137_087_000 as Weight) - // Standard Error: 413_000 - .saturating_add((835_499_000 as Weight).saturating_mul(r as Weight)) + (491_593_000 as Weight) + // Standard Error: 386_000 + .saturating_add((733_958_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1461,11 +1461,11 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: System EventTopics (r:100 w:100) fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight { - (1_117_515_000 as Weight) - // Standard Error: 2_167_000 - .saturating_add((494_145_000 as Weight).saturating_mul(t as Weight)) - // Standard Error: 427_000 - .saturating_add((150_093_000 as Weight).saturating_mul(n as Weight)) + (1_342_357_000 as Weight) + // Standard Error: 2_458_000 + .saturating_add((521_445_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 484_000 + .saturating_add((195_792_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(t as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1476,9 +1476,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_set_rent_allowance(r: u32, ) -> Weight { - (132_070_000 as Weight) - // Standard Error: 129_000 - .saturating_add((155_669_000 as Weight).saturating_mul(r as Weight)) + (209_818_000 as Weight) + // Standard Error: 157_000 + .saturating_add((93_289_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1487,17 +1487,17 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_debug_message(r: u32, ) -> Weight { - (126_971_000 as Weight) - // Standard Error: 90_000 - .saturating_add((122_445_000 as Weight).saturating_mul(r as Weight)) + (200_027_000 as Weight) + // Standard Error: 145_000 + .saturating_add((79_038_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn seal_set_storage(r: u32, ) -> Weight { - (125_746_000 as Weight) - // Standard Error: 610_000 - .saturating_add((501_265_000 as Weight).saturating_mul(r as Weight)) + (477_211_000 as Weight) + // Standard Error: 709_000 + .saturating_add((407_264_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1509,17 +1509,17 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:1) fn seal_set_storage_per_kb(n: u32, ) -> Weight { - (563_219_000 as Weight) - // Standard Error: 219_000 - .saturating_add((41_578_000 as Weight).saturating_mul(n as Weight)) + (832_538_000 as Weight) + // Standard Error: 262_000 + .saturating_add((87_211_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } // Storage: Skipped Metadata (r:0 w:0) fn seal_clear_storage(r: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_727_000 - .saturating_add((1_001_461_000 as Weight).saturating_mul(r as Weight)) + (199_686_000 as Weight) + // Standard Error: 1_610_000 + .saturating_add((905_125_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1527,9 +1527,9 @@ impl WeightInfo for () { } // Storage: Skipped Metadata (r:0 w:0) fn seal_get_storage(r: u32, ) -> Weight { - (9_115_000 as Weight) - // Standard Error: 784_000 - .saturating_add((660_533_000 as Weight).saturating_mul(r as Weight)) + (335_052_000 as Weight) + // Standard Error: 885_000 + .saturating_add((545_754_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1540,9 +1540,9 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x7afa01283080ef247df84e0ba38ea5a587d25ce6633a6bfbba02068c14023441] (r:1 w:0) fn seal_get_storage_per_kb(n: u32, ) -> Weight { - (563_175_000 as Weight) - // Standard Error: 206_000 - .saturating_add((89_626_000 as Weight).saturating_mul(n as Weight)) + (800_556_000 as Weight) + // Standard Error: 337_000 + .saturating_add((133_492_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1551,9 +1551,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_transfer(r: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 1_750_000 - .saturating_add((4_820_493_000 as Weight).saturating_mul(r as Weight)) + (317_531_000 as Weight) + // Standard Error: 1_627_000 + .saturating_add((4_748_591_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().reads((100 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) @@ -1565,8 +1565,8 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) fn seal_call(r: u32, ) -> Weight { (0 as Weight) - // Standard Error: 6_692_000 - .saturating_add((11_477_937_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 8_848_000 + .saturating_add((46_947_679_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().reads((200 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) @@ -1577,13 +1577,13 @@ impl WeightInfo for () { // Storage: System Account (r:101 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_call_per_transfer_input_output_kb(t: u32, i: u32, o: u32, ) -> Weight { - (11_238_437_000 as Weight) - // Standard Error: 81_620_000 - .saturating_add((3_700_413_000 as Weight).saturating_mul(t as Weight)) - // Standard Error: 29_000 - .saturating_add((32_106_000 as Weight).saturating_mul(i as Weight)) - // Standard Error: 31_000 - .saturating_add((54_386_000 as Weight).saturating_mul(o as Weight)) + (47_469_660_000 as Weight) + // Standard Error: 45_192_000 + .saturating_add((3_691_145_000 as Weight).saturating_mul(t as Weight)) + // Standard Error: 16_000 + .saturating_add((75_339_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 17_000 + .saturating_add((121_494_000 as Weight).saturating_mul(o as Weight)) .saturating_add(RocksDbWeight::get().reads(205 as Weight)) .saturating_add(RocksDbWeight::get().writes(101 as Weight)) .saturating_add(RocksDbWeight::get().writes((101 as Weight).saturating_mul(t as Weight))) @@ -1595,8 +1595,8 @@ impl WeightInfo for () { // Storage: Contracts AccountCounter (r:1 w:1) fn seal_instantiate(r: u32, ) -> Weight { (0 as Weight) - // Standard Error: 35_258_000 - .saturating_add((20_674_357_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 32_740_000 + .saturating_add((55_623_588_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().reads((300 as Weight).saturating_mul(r as Weight))) .saturating_add(RocksDbWeight::get().writes(3 as Weight)) @@ -1608,13 +1608,13 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: Contracts AccountCounter (r:1 w:1) fn seal_instantiate_per_input_output_salt_kb(i: u32, o: u32, s: u32, ) -> Weight { - (14_725_288_000 as Weight) - // Standard Error: 53_000 - .saturating_add((33_848_000 as Weight).saturating_mul(i as Weight)) - // Standard Error: 53_000 - .saturating_add((57_054_000 as Weight).saturating_mul(o as Weight)) - // Standard Error: 53_000 - .saturating_add((180_033_000 as Weight).saturating_mul(s as Weight)) + (54_718_944_000 as Weight) + // Standard Error: 29_000 + .saturating_add((75_276_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 29_000 + .saturating_add((121_341_000 as Weight).saturating_mul(o as Weight)) + // Standard Error: 29_000 + .saturating_add((223_964_000 as Weight).saturating_mul(s as Weight)) .saturating_add(RocksDbWeight::get().reads(206 as Weight)) .saturating_add(RocksDbWeight::get().writes(204 as Weight)) } @@ -1623,9 +1623,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_sha2_256(r: u32, ) -> Weight { - (131_974_000 as Weight) - // Standard Error: 125_000 - .saturating_add((220_711_000 as Weight).saturating_mul(r as Weight)) + (485_310_000 as Weight) + // Standard Error: 169_000 + .saturating_add((143_364_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1634,9 +1634,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight { - (367_148_000 as Weight) - // Standard Error: 12_000 - .saturating_add((462_143_000 as Weight).saturating_mul(n as Weight)) + (632_820_000 as Weight) + // Standard Error: 29_000 + .saturating_add((511_722_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1645,9 +1645,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_keccak_256(r: u32, ) -> Weight { - (134_585_000 as Weight) - // Standard Error: 131_000 - .saturating_add((227_264_000 as Weight).saturating_mul(r as Weight)) + (484_331_000 as Weight) + // Standard Error: 195_000 + .saturating_add((151_617_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1656,9 +1656,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight { - (325_319_000 as Weight) - // Standard Error: 12_000 - .saturating_add((313_033_000 as Weight).saturating_mul(n as Weight)) + (565_213_000 as Weight) + // Standard Error: 28_000 + .saturating_add((359_762_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1667,9 +1667,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_256(r: u32, ) -> Weight { - (135_347_000 as Weight) - // Standard Error: 150_000 - .saturating_add((199_764_000 as Weight).saturating_mul(r as Weight)) + (481_843_000 as Weight) + // Standard Error: 186_000 + .saturating_add((122_838_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1678,9 +1678,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight { - (424_473_000 as Weight) - // Standard Error: 13_000 - .saturating_add((130_936_000 as Weight).saturating_mul(n as Weight)) + (582_445_000 as Weight) + // Standard Error: 28_000 + .saturating_add((176_329_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1689,9 +1689,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_128(r: u32, ) -> Weight { - (128_776_000 as Weight) - // Standard Error: 118_000 - .saturating_add((203_125_000 as Weight).saturating_mul(r as Weight)) + (486_320_000 as Weight) + // Standard Error: 147_000 + .saturating_add((123_460_000 as Weight).saturating_mul(r as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -1700,265 +1700,265 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight { - (445_726_000 as Weight) - // Standard Error: 14_000 - .saturating_add((130_931_000 as Weight).saturating_mul(n as Weight)) + (515_967_000 as Weight) + // Standard Error: 33_000 + .saturating_add((176_423_000 as Weight).saturating_mul(n as Weight)) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } fn instr_i64const(r: u32, ) -> Weight { - (22_161_000 as Weight) - // Standard Error: 36_000 - .saturating_add((3_329_000 as Weight).saturating_mul(r as Weight)) + (54_127_000 as Weight) + // Standard Error: 25_000 + .saturating_add((10_198_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64load(r: u32, ) -> Weight { - (24_430_000 as Weight) - // Standard Error: 65_000 - .saturating_add((159_566_000 as Weight).saturating_mul(r as Weight)) + (55_411_000 as Weight) + // Standard Error: 148_000 + .saturating_add((22_916_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64store(r: u32, ) -> Weight { - (24_443_000 as Weight) - // Standard Error: 62_000 - .saturating_add((232_854_000 as Weight).saturating_mul(r as Weight)) + (55_462_000 as Weight) + // Standard Error: 134_000 + .saturating_add((24_449_000 as Weight).saturating_mul(r as Weight)) } fn instr_select(r: u32, ) -> Weight { - (22_158_000 as Weight) - // Standard Error: 34_000 - .saturating_add((12_112_000 as Weight).saturating_mul(r as Weight)) + (54_114_000 as Weight) + // Standard Error: 18_000 + .saturating_add((26_214_000 as Weight).saturating_mul(r as Weight)) } fn instr_if(r: u32, ) -> Weight { - (22_178_000 as Weight) - // Standard Error: 23_000 - .saturating_add((11_374_000 as Weight).saturating_mul(r as Weight)) + (54_118_000 as Weight) + // Standard Error: 18_000 + .saturating_add((26_492_000 as Weight).saturating_mul(r as Weight)) } fn instr_br(r: u32, ) -> Weight { - (22_157_000 as Weight) - // Standard Error: 41_000 - .saturating_add((5_826_000 as Weight).saturating_mul(r as Weight)) + (54_119_000 as Weight) + // Standard Error: 304_000 + .saturating_add((18_424_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_if(r: u32, ) -> Weight { - (22_182_000 as Weight) - // Standard Error: 34_000 - .saturating_add((13_647_000 as Weight).saturating_mul(r as Weight)) + (55_352_000 as Weight) + // Standard Error: 13_000 + .saturating_add((32_291_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_table(r: u32, ) -> Weight { - (22_083_000 as Weight) - // Standard Error: 44_000 - .saturating_add((14_901_000 as Weight).saturating_mul(r as Weight)) + (54_115_000 as Weight) + // Standard Error: 16_000 + .saturating_add((27_785_000 as Weight).saturating_mul(r as Weight)) } fn instr_br_table_per_entry(e: u32, ) -> Weight { - (32_689_000 as Weight) + (86_048_000 as Weight) // Standard Error: 1_000 - .saturating_add((154_000 as Weight).saturating_mul(e as Weight)) + .saturating_add((82_000 as Weight).saturating_mul(e as Weight)) } fn instr_call(r: u32, ) -> Weight { - (22_313_000 as Weight) - // Standard Error: 383_000 - .saturating_add((89_804_000 as Weight).saturating_mul(r as Weight)) + (54_654_000 as Weight) + // Standard Error: 82_000 + .saturating_add((199_159_000 as Weight).saturating_mul(r as Weight)) } fn instr_call_indirect(r: u32, ) -> Weight { - (29_939_000 as Weight) - // Standard Error: 230_000 - .saturating_add((185_309_000 as Weight).saturating_mul(r as Weight)) + (67_478_000 as Weight) + // Standard Error: 113_000 + .saturating_add((302_597_000 as Weight).saturating_mul(r as Weight)) } fn instr_call_indirect_per_param(p: u32, ) -> Weight { - (221_596_000 as Weight) - // Standard Error: 3_000 - .saturating_add((4_045_000 as Weight).saturating_mul(p as Weight)) + (384_281_000 as Weight) + // Standard Error: 13_000 + .saturating_add((9_984_000 as Weight).saturating_mul(p as Weight)) } fn instr_local_get(r: u32, ) -> Weight { - (22_171_000 as Weight) - // Standard Error: 28_000 - .saturating_add((3_362_000 as Weight).saturating_mul(r as Weight)) + (55_473_000 as Weight) + // Standard Error: 16_000 + .saturating_add((9_287_000 as Weight).saturating_mul(r as Weight)) } fn instr_local_set(r: u32, ) -> Weight { - (22_182_000 as Weight) - // Standard Error: 31_000 - .saturating_add((3_801_000 as Weight).saturating_mul(r as Weight)) + (55_426_000 as Weight) + // Standard Error: 38_000 + .saturating_add((10_559_000 as Weight).saturating_mul(r as Weight)) } fn instr_local_tee(r: u32, ) -> Weight { - (22_200_000 as Weight) - // Standard Error: 27_000 - .saturating_add((5_080_000 as Weight).saturating_mul(r as Weight)) + (55_332_000 as Weight) + // Standard Error: 8_000 + .saturating_add((15_640_000 as Weight).saturating_mul(r as Weight)) } fn instr_global_get(r: u32, ) -> Weight { - (25_255_000 as Weight) - // Standard Error: 41_000 - .saturating_add((8_875_000 as Weight).saturating_mul(r as Weight)) + (74_497_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_067_000 as Weight).saturating_mul(r as Weight)) } fn instr_global_set(r: u32, ) -> Weight { - (25_145_000 as Weight) - // Standard Error: 37_000 - .saturating_add((9_556_000 as Weight).saturating_mul(r as Weight)) + (74_445_000 as Weight) + // Standard Error: 49_000 + .saturating_add((17_650_000 as Weight).saturating_mul(r as Weight)) } fn instr_memory_current(r: u32, ) -> Weight { - (24_435_000 as Weight) - // Standard Error: 49_000 - .saturating_add((4_204_000 as Weight).saturating_mul(r as Weight)) + (54_500_000 as Weight) + // Standard Error: 17_000 + .saturating_add((9_307_000 as Weight).saturating_mul(r as Weight)) } fn instr_memory_grow(r: u32, ) -> Weight { - (23_158_000 as Weight) - // Standard Error: 5_969_000 - .saturating_add((2_339_630_000 as Weight).saturating_mul(r as Weight)) + (54_382_000 as Weight) + // Standard Error: 5_644_000 + .saturating_add((748_424_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64clz(r: u32, ) -> Weight { - (21_984_000 as Weight) - // Standard Error: 25_000 - .saturating_add((5_421_000 as Weight).saturating_mul(r as Weight)) + (54_133_000 as Weight) + // Standard Error: 20_000 + .saturating_add((15_830_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ctz(r: u32, ) -> Weight { - (22_069_000 as Weight) - // Standard Error: 26_000 - .saturating_add((5_187_000 as Weight).saturating_mul(r as Weight)) + (54_129_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_894_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64popcnt(r: u32, ) -> Weight { - (22_042_000 as Weight) - // Standard Error: 28_000 - .saturating_add((6_116_000 as Weight).saturating_mul(r as Weight)) + (54_181_000 as Weight) + // Standard Error: 22_000 + .saturating_add((15_847_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64eqz(r: u32, ) -> Weight { - (22_018_000 as Weight) - // Standard Error: 34_000 - .saturating_add((5_130_000 as Weight).saturating_mul(r as Weight)) + (54_130_000 as Weight) + // Standard Error: 17_000 + .saturating_add((15_825_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64extendsi32(r: u32, ) -> Weight { - (21_933_000 as Weight) - // Standard Error: 29_000 - .saturating_add((5_005_000 as Weight).saturating_mul(r as Weight)) + (54_122_000 as Weight) + // Standard Error: 19_000 + .saturating_add((15_803_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64extendui32(r: u32, ) -> Weight { - (22_066_000 as Weight) - // Standard Error: 34_000 - .saturating_add((4_877_000 as Weight).saturating_mul(r as Weight)) + (54_100_000 as Weight) + // Standard Error: 28_000 + .saturating_add((15_822_000 as Weight).saturating_mul(r as Weight)) } fn instr_i32wrapi64(r: u32, ) -> Weight { - (22_003_000 as Weight) - // Standard Error: 25_000 - .saturating_add((5_018_000 as Weight).saturating_mul(r as Weight)) + (54_143_000 as Weight) + // Standard Error: 19_000 + .saturating_add((15_868_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64eq(r: u32, ) -> Weight { - (22_130_000 as Weight) - // Standard Error: 35_000 - .saturating_add((7_071_000 as Weight).saturating_mul(r as Weight)) + (54_133_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_121_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ne(r: u32, ) -> Weight { - (22_112_000 as Weight) - // Standard Error: 24_000 - .saturating_add((7_056_000 as Weight).saturating_mul(r as Weight)) + (54_177_000 as Weight) + // Standard Error: 14_000 + .saturating_add((21_003_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64lts(r: u32, ) -> Weight { - (22_114_000 as Weight) - // Standard Error: 27_000 - .saturating_add((6_974_000 as Weight).saturating_mul(r as Weight)) + (54_164_000 as Weight) + // Standard Error: 31_000 + .saturating_add((21_041_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ltu(r: u32, ) -> Weight { - (22_111_000 as Weight) - // Standard Error: 32_000 - .saturating_add((7_183_000 as Weight).saturating_mul(r as Weight)) + (54_171_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_101_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64gts(r: u32, ) -> Weight { - (22_148_000 as Weight) - // Standard Error: 28_000 - .saturating_add((7_044_000 as Weight).saturating_mul(r as Weight)) + (54_177_000 as Weight) + // Standard Error: 12_000 + .saturating_add((21_074_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64gtu(r: u32, ) -> Weight { - (22_158_000 as Weight) - // Standard Error: 33_000 - .saturating_add((7_116_000 as Weight).saturating_mul(r as Weight)) + (54_073_000 as Weight) + // Standard Error: 13_000 + .saturating_add((21_136_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64les(r: u32, ) -> Weight { - (22_194_000 as Weight) - // Standard Error: 31_000 - .saturating_add((7_039_000 as Weight).saturating_mul(r as Weight)) + (54_116_000 as Weight) + // Standard Error: 17_000 + .saturating_add((21_140_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64leu(r: u32, ) -> Weight { - (22_219_000 as Weight) - // Standard Error: 23_000 - .saturating_add((7_076_000 as Weight).saturating_mul(r as Weight)) + (54_115_000 as Weight) + // Standard Error: 21_000 + .saturating_add((21_164_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64ges(r: u32, ) -> Weight { - (22_170_000 as Weight) - // Standard Error: 50_000 - .saturating_add((7_122_000 as Weight).saturating_mul(r as Weight)) + (54_261_000 as Weight) + // Standard Error: 123_000 + .saturating_add((20_921_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64geu(r: u32, ) -> Weight { - (22_113_000 as Weight) - // Standard Error: 27_000 - .saturating_add((7_069_000 as Weight).saturating_mul(r as Weight)) + (54_090_000 as Weight) + // Standard Error: 38_000 + .saturating_add((21_171_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64add(r: u32, ) -> Weight { - (22_090_000 as Weight) - // Standard Error: 29_000 - .saturating_add((6_956_000 as Weight).saturating_mul(r as Weight)) + (54_129_000 as Weight) + // Standard Error: 27_000 + .saturating_add((21_086_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64sub(r: u32, ) -> Weight { - (22_006_000 as Weight) - // Standard Error: 30_000 - .saturating_add((7_094_000 as Weight).saturating_mul(r as Weight)) + (54_126_000 as Weight) + // Standard Error: 11_000 + .saturating_add((21_051_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64mul(r: u32, ) -> Weight { - (22_111_000 as Weight) - // Standard Error: 29_000 - .saturating_add((6_825_000 as Weight).saturating_mul(r as Weight)) + (54_153_000 as Weight) + // Standard Error: 22_000 + .saturating_add((21_021_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64divs(r: u32, ) -> Weight { - (22_041_000 as Weight) - // Standard Error: 29_000 - .saturating_add((13_164_000 as Weight).saturating_mul(r as Weight)) + (54_168_000 as Weight) + // Standard Error: 19_000 + .saturating_add((27_336_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64divu(r: u32, ) -> Weight { - (21_989_000 as Weight) - // Standard Error: 28_000 - .saturating_add((12_808_000 as Weight).saturating_mul(r as Weight)) + (54_124_000 as Weight) + // Standard Error: 22_000 + .saturating_add((24_783_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rems(r: u32, ) -> Weight { - (22_045_000 as Weight) - // Standard Error: 39_000 - .saturating_add((13_387_000 as Weight).saturating_mul(r as Weight)) + (54_203_000 as Weight) + // Standard Error: 21_000 + .saturating_add((27_539_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64remu(r: u32, ) -> Weight { - (22_075_000 as Weight) - // Standard Error: 40_000 - .saturating_add((12_791_000 as Weight).saturating_mul(r as Weight)) + (54_176_000 as Weight) + // Standard Error: 19_000 + .saturating_add((24_686_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64and(r: u32, ) -> Weight { - (22_044_000 as Weight) - // Standard Error: 32_000 - .saturating_add((7_090_000 as Weight).saturating_mul(r as Weight)) + (54_111_000 as Weight) + // Standard Error: 356_000 + .saturating_add((22_077_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64or(r: u32, ) -> Weight { - (22_133_000 as Weight) - // Standard Error: 40_000 - .saturating_add((6_967_000 as Weight).saturating_mul(r as Weight)) + (54_124_000 as Weight) + // Standard Error: 15_000 + .saturating_add((21_060_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64xor(r: u32, ) -> Weight { - (22_069_000 as Weight) - // Standard Error: 41_000 - .saturating_add((7_026_000 as Weight).saturating_mul(r as Weight)) + (54_153_000 as Weight) + // Standard Error: 24_000 + .saturating_add((21_064_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shl(r: u32, ) -> Weight { - (22_165_000 as Weight) - // Standard Error: 44_000 - .saturating_add((7_440_000 as Weight).saturating_mul(r as Weight)) + (54_122_000 as Weight) + // Standard Error: 23_000 + .saturating_add((21_187_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shrs(r: u32, ) -> Weight { - (22_063_000 as Weight) - // Standard Error: 34_000 - .saturating_add((7_309_000 as Weight).saturating_mul(r as Weight)) + (54_149_000 as Weight) + // Standard Error: 18_000 + .saturating_add((21_110_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64shru(r: u32, ) -> Weight { - (22_086_000 as Weight) - // Standard Error: 36_000 - .saturating_add((7_188_000 as Weight).saturating_mul(r as Weight)) + (54_136_000 as Weight) + // Standard Error: 13_000 + .saturating_add((21_066_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rotl(r: u32, ) -> Weight { - (22_109_000 as Weight) - // Standard Error: 45_000 - .saturating_add((7_169_000 as Weight).saturating_mul(r as Weight)) + (54_231_000 as Weight) + // Standard Error: 30_000 + .saturating_add((21_073_000 as Weight).saturating_mul(r as Weight)) } fn instr_i64rotr(r: u32, ) -> Weight { - (22_076_000 as Weight) - // Standard Error: 28_000 - .saturating_add((7_070_000 as Weight).saturating_mul(r as Weight)) + (54_139_000 as Weight) + // Standard Error: 17_000 + .saturating_add((21_097_000 as Weight).saturating_mul(r as Weight)) } } diff --git a/primitives/sandbox/Cargo.toml b/primitives/sandbox/Cargo.toml index f15f1c02d511c..a4d4a4d5d031a 100755 --- a/primitives/sandbox/Cargo.toml +++ b/primitives/sandbox/Cargo.toml @@ -12,6 +12,12 @@ readme = "README.md" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] +[target.'cfg(target_arch = "wasm32")'.dependencies] +wasmi = { version = "0.9.0", default-features = false, features = ["core"] } + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +wasmi = "0.9.0" + [dependencies] wasmi = { version = "0.9.0", optional = true } sp-core = { version = "4.0.0-dev", default-features = false, path = "../core" } @@ -19,6 +25,7 @@ sp-std = { version = "4.0.0-dev", default-features = false, path = "../std" } sp-io = { version = "4.0.0-dev", default-features = false, path = "../io" } sp-wasm-interface = { version = "4.0.0-dev", default-features = false, path = "../wasm-interface" } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } +log = { version = "0.4", default-features = false } [dev-dependencies] wat = "1.0" @@ -33,5 +40,7 @@ std = [ "codec/std", "sp-io/std", "sp-wasm-interface/std", + "log/std", ] strict = [] +wasmer-sandbox = [] diff --git a/primitives/sandbox/with_std.rs b/primitives/sandbox/embedded_executor.rs similarity index 69% rename from primitives/sandbox/with_std.rs rename to primitives/sandbox/embedded_executor.rs index d5f87f165137e..678da3c3aeaf5 100755 --- a/primitives/sandbox/with_std.rs +++ b/primitives/sandbox/embedded_executor.rs @@ -15,16 +15,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -use sp_std::collections::btree_map::BTreeMap; -use sp_std::fmt; - +use super::{Error, HostError, HostFuncType, ReturnValue, Value, TARGET}; +use alloc::string::String; +use log::debug; +use sp_std::{ + borrow::ToOwned, collections::btree_map::BTreeMap, fmt, marker::PhantomData, prelude::*, +}; use wasmi::{ - Externals, FuncInstance, FuncRef, GlobalDescriptor, GlobalRef, ImportResolver, - MemoryDescriptor, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef, - RuntimeArgs, RuntimeValue, Signature, TableDescriptor, TableRef, Trap, TrapKind + memory_units::Pages, Externals, FuncInstance, FuncRef, GlobalDescriptor, GlobalRef, + ImportResolver, MemoryDescriptor, MemoryInstance, MemoryRef, Module, ModuleInstance, ModuleRef, + RuntimeArgs, RuntimeValue, Signature, TableDescriptor, TableRef, Trap, TrapKind, }; -use wasmi::memory_units::Pages; -use super::{Error, Value, ReturnValue, HostFuncType, HostError}; #[derive(Clone)] pub struct Memory { @@ -37,7 +38,8 @@ impl Memory { memref: MemoryInstance::alloc( Pages(initial as usize), maximum.map(|m| Pages(m as usize)), - ).map_err(|_| Error::Module)?, + ) + .map_err(|_| Error::Module)?, }) } @@ -60,17 +62,13 @@ struct DefinedHostFunctions { impl Clone for DefinedHostFunctions { fn clone(&self) -> DefinedHostFunctions { - DefinedHostFunctions { - funcs: self.funcs.clone(), - } + DefinedHostFunctions { funcs: self.funcs.clone() } } } impl DefinedHostFunctions { fn new() -> DefinedHostFunctions { - DefinedHostFunctions { - funcs: Vec::new(), - } + DefinedHostFunctions { funcs: Vec::new() } } fn define(&mut self, f: HostFuncType) -> HostFuncIndex { @@ -102,16 +100,12 @@ impl<'a, T> Externals for GuestExternals<'a, T> { index: usize, args: RuntimeArgs, ) -> Result, Trap> { - let args = args.as_ref() - .iter() - .cloned() - .map(Into::into) - .collect::>(); + let args = args.as_ref().iter().cloned().map(to_interface).collect::>(); let result = (self.defined_host_functions.funcs[index])(self.state, &args); match result { Ok(value) => Ok(match value { - ReturnValue::Value(v) => Some(v.into()), + ReturnValue::Value(v) => Some(to_wasmi(v)), ReturnValue::Unit => None, }), Err(HostError) => Err(TrapKind::Host(Box::new(DummyHostError)).into()), @@ -143,8 +137,7 @@ impl EnvironmentDefinitionBuilder { N2: Into>, { let idx = self.defined_host_functions.define(f); - self.map - .insert((module.into(), field.into()), ExternVal::HostFunc(idx)); + self.map.insert((module.into(), field.into()), ExternVal::HostFunc(idx)); } pub fn add_memory(&mut self, module: N1, field: N2, mem: Memory) @@ -152,8 +145,7 @@ impl EnvironmentDefinitionBuilder { N1: Into>, N2: Into>, { - self.map - .insert((module.into(), field.into()), ExternVal::Memory(mem)); + self.map.insert((module.into(), field.into()), ExternVal::Memory(mem)); } } @@ -164,21 +156,17 @@ impl ImportResolver for EnvironmentDefinitionBuilder { field_name: &str, signature: &Signature, ) -> Result { - let key = ( - module_name.as_bytes().to_owned(), - field_name.as_bytes().to_owned(), - ); + let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned()); let externval = self.map.get(&key).ok_or_else(|| { - wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name)) + debug!(target: TARGET, "Export {}:{} not found", module_name, field_name); + wasmi::Error::Instantiation(String::new()) })?; let host_func_idx = match *externval { ExternVal::HostFunc(ref idx) => idx, _ => { - return Err(wasmi::Error::Instantiation(format!( - "Export {}:{} is not a host func", - module_name, field_name - ))) - } + debug!(target: TARGET, "Export {}:{} is not a host func", module_name, field_name); + return Err(wasmi::Error::Instantiation(String::new())) + }, }; Ok(FuncInstance::alloc_host(signature.clone(), host_func_idx.0)) } @@ -189,9 +177,8 @@ impl ImportResolver for EnvironmentDefinitionBuilder { _field_name: &str, _global_type: &GlobalDescriptor, ) -> Result { - Err(wasmi::Error::Instantiation(format!( - "Importing globals is not supported yet" - ))) + debug!(target: TARGET, "Importing globals is not supported yet"); + Err(wasmi::Error::Instantiation(String::new())) } fn resolve_memory( @@ -200,21 +187,17 @@ impl ImportResolver for EnvironmentDefinitionBuilder { field_name: &str, _memory_type: &MemoryDescriptor, ) -> Result { - let key = ( - module_name.as_bytes().to_owned(), - field_name.as_bytes().to_owned(), - ); + let key = (module_name.as_bytes().to_owned(), field_name.as_bytes().to_owned()); let externval = self.map.get(&key).ok_or_else(|| { - wasmi::Error::Instantiation(format!("Export {}:{} not found", module_name, field_name)) + debug!(target: TARGET, "Export {}:{} not found", module_name, field_name); + wasmi::Error::Instantiation(String::new()) })?; let memory = match *externval { ExternVal::Memory(ref m) => m, _ => { - return Err(wasmi::Error::Instantiation(format!( - "Export {}:{} is not a memory", - module_name, field_name - ))) - } + debug!(target: TARGET, "Export {}:{} is not a memory", module_name, field_name); + return Err(wasmi::Error::Instantiation(String::new())) + }, }; Ok(memory.memref.clone()) } @@ -225,16 +208,15 @@ impl ImportResolver for EnvironmentDefinitionBuilder { _field_name: &str, _table_type: &TableDescriptor, ) -> Result { - Err(wasmi::Error::Instantiation(format!( - "Importing tables is not supported yet" - ))) + debug!("Importing tables is not supported yet"); + Err(wasmi::Error::Instantiation(String::new())) } } pub struct Instance { instance: ModuleRef, defined_host_functions: DefinedHostFunctions, - _marker: std::marker::PhantomData, + _marker: PhantomData, } impl Instance { @@ -244,26 +226,19 @@ impl Instance { state: &mut T, ) -> Result, Error> { let module = Module::from_buffer(code).map_err(|_| Error::Module)?; - let not_started_instance = ModuleInstance::new(&module, env_def_builder) - .map_err(|_| Error::Module)?; - + let not_started_instance = + ModuleInstance::new(&module, env_def_builder).map_err(|_| Error::Module)?; let defined_host_functions = env_def_builder.defined_host_functions.clone(); let instance = { - let mut externals = GuestExternals { - state, - defined_host_functions: &defined_host_functions, - }; - let instance = not_started_instance.run_start(&mut externals) - .map_err(|_| Error::Execution)?; + let mut externals = + GuestExternals { state, defined_host_functions: &defined_host_functions }; + let instance = + not_started_instance.run_start(&mut externals).map_err(|_| Error::Execution)?; instance }; - Ok(Instance { - instance, - defined_host_functions, - _marker: std::marker::PhantomData::, - }) + Ok(Instance { instance, defined_host_functions, _marker: PhantomData:: }) } pub fn invoke( @@ -272,35 +247,49 @@ impl Instance { args: &[Value], state: &mut T, ) -> Result { - let args = args.iter().cloned().map(Into::into).collect::>(); + let args = args.iter().cloned().map(to_wasmi).collect::>(); - let mut externals = GuestExternals { - state, - defined_host_functions: &self.defined_host_functions, - }; - let result = self.instance - .invoke_export(&name, &args, &mut externals); + let mut externals = + GuestExternals { state, defined_host_functions: &self.defined_host_functions }; + let result = self.instance.invoke_export(&name, &args, &mut externals); match result { Ok(None) => Ok(ReturnValue::Unit), - Ok(Some(val)) => Ok(ReturnValue::Value(val.into())), + Ok(Some(val)) => Ok(ReturnValue::Value(to_interface(val))), Err(_err) => Err(Error::Execution), } } pub fn get_global_val(&self, name: &str) -> Option { - let global = self.instance - .export_by_name(name)? - .as_global()? - .get(); + let global = self.instance.export_by_name(name)?.as_global()?.get(); + + Some(to_interface(global)) + } +} + +/// Convert the substrate value type to the wasmi value type. +fn to_wasmi(value: Value) -> RuntimeValue { + match value { + Value::I32(val) => RuntimeValue::I32(val), + Value::I64(val) => RuntimeValue::I64(val), + Value::F32(val) => RuntimeValue::F32(val.into()), + Value::F64(val) => RuntimeValue::F64(val.into()), + } +} - Some(global.into()) +/// Convert the wasmi value type to the substrate value type. +fn to_interface(value: RuntimeValue) -> Value { + match value { + RuntimeValue::I32(val) => Value::I32(val), + RuntimeValue::I64(val) => Value::I64(val), + RuntimeValue::F32(val) => Value::F32(val.into()), + RuntimeValue::F64(val) => Value::F64(val.into()), } } #[cfg(test)] mod tests { - use crate::{Error, Value, ReturnValue, HostError, EnvironmentDefinitionBuilder, Instance}; + use crate::{EnvironmentDefinitionBuilder, Error, HostError, Instance, ReturnValue, Value}; use assert_matches::assert_matches; fn execute_sandboxed(code: &[u8], args: &[Value]) -> Result { @@ -310,7 +299,7 @@ mod tests { fn env_assert(_e: &mut State, args: &[Value]) -> Result { if args.len() != 1 { - return Err(HostError); + return Err(HostError) } let condition = args[0].as_i32().ok_or_else(|| HostError)?; if condition != 0 { @@ -321,7 +310,7 @@ mod tests { } fn env_inc_counter(e: &mut State, args: &[Value]) -> Result { if args.len() != 1 { - return Err(HostError); + return Err(HostError) } let inc_by = args[0].as_i32().ok_or_else(|| HostError)?; e.counter += inc_by as u32; @@ -330,7 +319,7 @@ mod tests { /// Function that takes one argument of any type and returns that value. fn env_polymorphic_id(_e: &mut State, args: &[Value]) -> Result { if args.len() != 1 { - return Err(HostError); + return Err(HostError) } Ok(ReturnValue::Value(args[0])) } @@ -350,7 +339,8 @@ mod tests { #[test] fn invoke_args() { - let code = wat::parse_str(r#" + let code = wat::parse_str( + r#" (module (import "env" "assert" (func $assert (param i32))) @@ -371,21 +361,19 @@ mod tests { ) ) ) - "#).unwrap(); - - let result = execute_sandboxed( - &code, - &[ - Value::I32(0x12345678), - Value::I64(0x1234567887654321), - ] - ); + "#, + ) + .unwrap(); + + let result = + execute_sandboxed(&code, &[Value::I32(0x12345678), Value::I64(0x1234567887654321)]); assert!(result.is_ok()); } #[test] fn return_value() { - let code = wat::parse_str(r#" + let code = wat::parse_str( + r#" (module (func (export "call") (param $x i32) (result i32) (i32.add @@ -394,20 +382,18 @@ mod tests { ) ) ) - "#).unwrap(); - - let return_val = execute_sandboxed( - &code, - &[ - Value::I32(0x1336), - ] - ).unwrap(); + "#, + ) + .unwrap(); + + let return_val = execute_sandboxed(&code, &[Value::I32(0x1336)]).unwrap(); assert_eq!(return_val, ReturnValue::Value(Value::I32(0x1337))); } #[test] fn signatures_dont_matter() { - let code = wat::parse_str(r#" + let code = wat::parse_str( + r#" (module (import "env" "polymorphic_id" (func $id_i32 (param i32) (result i32))) (import "env" "polymorphic_id" (func $id_i64 (param i64) (result i64))) @@ -434,7 +420,9 @@ mod tests { ) ) ) - "#).unwrap(); + "#, + ) + .unwrap(); let return_val = execute_sandboxed(&code, &[]).unwrap(); assert_eq!(return_val, ReturnValue::Unit); @@ -449,7 +437,8 @@ mod tests { let mut env_builder = EnvironmentDefinitionBuilder::new(); env_builder.add_host_func("env", "returns_i32", env_returns_i32); - let code = wat::parse_str(r#" + let code = wat::parse_str( + r#" (module ;; It's actually returns i32, but imported as if it returned i64 (import "env" "returns_i32" (func $returns_i32 (result i64))) @@ -460,15 +449,14 @@ mod tests { ) ) ) - "#).unwrap(); + "#, + ) + .unwrap(); // It succeeds since we are able to import functions with types we want. let mut instance = Instance::new(&code, &env_builder, &mut ()).unwrap(); // But this fails since we imported a function that returns i32 as if it returned i64. - assert_matches!( - instance.invoke("call", &[], &mut ()), - Err(Error::Execution) - ); + assert_matches!(instance.invoke("call", &[], &mut ()), Err(Error::Execution)); } } diff --git a/primitives/sandbox/without_std.rs b/primitives/sandbox/host_executor.rs similarity index 100% rename from primitives/sandbox/without_std.rs rename to primitives/sandbox/host_executor.rs diff --git a/primitives/sandbox/src/lib.rs b/primitives/sandbox/src/lib.rs index 94cb676b51edc..1724b4152ff3d 100755 --- a/primitives/sandbox/src/lib.rs +++ b/primitives/sandbox/src/lib.rs @@ -38,17 +38,22 @@ #![warn(missing_docs)] #![cfg_attr(not(feature = "std"), no_std)] +extern crate alloc; + use sp_std::prelude::*; pub use sp_core::sandbox::HostError; pub use sp_wasm_interface::{ReturnValue, Value}; +/// The target used for logging. +const TARGET: &str = "runtime::sandbox"; + mod imp { - #[cfg(feature = "std")] - include!("../with_std.rs"); + #[cfg(all(feature = "wasmer-sandbox", not(feature = "std")))] + include!("../host_executor.rs"); - #[cfg(not(feature = "std"))] - include!("../without_std.rs"); + #[cfg(not(all(feature = "wasmer-sandbox", not(feature = "std"))))] + include!("../embedded_executor.rs"); } /// Error that can occur while using this crate.