From 76d6a2398e927bce9e739702c1ef8e98437ee26f Mon Sep 17 00:00:00 2001 From: Harald Heckmann Date: Thu, 26 Oct 2023 18:44:00 +0200 Subject: [PATCH] Extend benchmark list (#1170) * Add orderbook and parimutuel pallets to benchmark list * Rename orderbook-v1 to orderbook --- Cargo.lock | 12 +- Cargo.toml | 8 +- README.md | 2 +- runtime/battery-station/Cargo.toml | 8 +- runtime/common/src/lib.rs | 22 ++-- runtime/zeitgeist/Cargo.toml | 8 +- scripts/benchmarks/configuration.sh | 2 +- scripts/tests/fuzz.sh | 2 +- zrml/{orderbook-v1 => orderbook}/Cargo.toml | 4 +- zrml/{orderbook-v1 => orderbook}/README.md | 0 .../fuzz/Cargo.toml | 4 +- .../fuzz/orderbook_v1_full_workflow.rs | 2 +- .../src/benchmarks.rs | 0 zrml/{orderbook-v1 => orderbook}/src/lib.rs | 0 zrml/{orderbook-v1 => orderbook}/src/mock.rs | 0 zrml/{orderbook-v1 => orderbook}/src/tests.rs | 0 zrml/{orderbook-v1 => orderbook}/src/types.rs | 0 zrml/{orderbook-v1 => orderbook}/src/utils.rs | 0 .../src/weights.rs | 115 +++++++++--------- 19 files changed, 96 insertions(+), 93 deletions(-) rename zrml/{orderbook-v1 => orderbook}/Cargo.toml (93%) rename zrml/{orderbook-v1 => orderbook}/README.md (100%) rename zrml/{orderbook-v1 => orderbook}/fuzz/Cargo.toml (82%) rename zrml/{orderbook-v1 => orderbook}/fuzz/orderbook_v1_full_workflow.rs (99%) rename zrml/{orderbook-v1 => orderbook}/src/benchmarks.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/lib.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/mock.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/tests.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/types.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/utils.rs (100%) rename zrml/{orderbook-v1 => orderbook}/src/weights.rs (67%) diff --git a/Cargo.lock b/Cargo.lock index edeca217f..f7e33ea0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -624,7 +624,7 @@ dependencies = [ "zrml-liquidity-mining", "zrml-market-commons", "zrml-neo-swaps", - "zrml-orderbook-v1", + "zrml-orderbook", "zrml-parimutuel", "zrml-prediction-markets", "zrml-rikiddo", @@ -14483,7 +14483,7 @@ dependencies = [ "zrml-liquidity-mining", "zrml-market-commons", "zrml-neo-swaps", - "zrml-orderbook-v1", + "zrml-orderbook", "zrml-parimutuel", "zrml-prediction-markets", "zrml-rikiddo", @@ -14653,7 +14653,7 @@ dependencies = [ ] [[package]] -name = "zrml-orderbook-v1" +name = "zrml-orderbook" version = "0.4.1" dependencies = [ "frame-benchmarking", @@ -14671,18 +14671,18 @@ dependencies = [ "test-case", "zeitgeist-primitives", "zrml-market-commons", - "zrml-orderbook-v1", + "zrml-orderbook", ] [[package]] -name = "zrml-orderbook-v1-fuzz" +name = "zrml-orderbook-fuzz" version = "0.0.0" dependencies = [ "arbitrary", "frame-system", "libfuzzer-sys", "zeitgeist-primitives", - "zrml-orderbook-v1", + "zrml-orderbook", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9558220c3..e4718530d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ default-members = [ "zrml/liquidity-mining", "zrml/market-commons", "zrml/neo-swaps", - "zrml/orderbook-v1", + "zrml/orderbook", "zrml/parimutuel", "zrml/prediction-markets", "zrml/prediction-markets/runtime-api", @@ -34,8 +34,8 @@ members = [ "zrml/liquidity-mining", "zrml/market-commons", "zrml/neo-swaps", - "zrml/orderbook-v1", - "zrml/orderbook-v1/fuzz", + "zrml/orderbook", + "zrml/orderbook/fuzz", "zrml/parimutuel", "zrml/prediction-markets", "zrml/prediction-markets/fuzz", @@ -234,7 +234,7 @@ zrml-global-disputes = { path = "zrml/global-disputes", default-features = false zrml-liquidity-mining = { path = "zrml/liquidity-mining", default-features = false } zrml-market-commons = { path = "zrml/market-commons", default-features = false } zrml-neo-swaps = { path = "zrml/neo-swaps", default-features = false } -zrml-orderbook-v1 = { path = "zrml/orderbook-v1", default-features = false } +zrml-orderbook = { path = "zrml/orderbook", default-features = false } zrml-parimutuel = { path = "zrml/parimutuel", default-features = false } zrml-prediction-markets = { path = "zrml/prediction-markets", default-features = false } zrml-prediction-markets-runtime-api = { path = "zrml/prediction-markets/runtime-api", default-features = false } diff --git a/README.md b/README.md index 56c7fa352..0f98b4ee0 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ _anything_. - [neo-swaps](./zrml/neo-swaps) - An implementation of the Logarithmic Market Scoring Rule as constant function market maker, tailor-made for decentralized combinatorial markets and Futarchy. -- [orderbook-v1](./zrml/orderbook-v1) - A naive orderbook implementation that's +- [orderbook](./zrml/orderbook) - A naive orderbook implementation that's only part of Zeitgeist's PoC. Will be replaced by a v2 orderbook that uses 0x-style hybrid on-chain and off-chain trading. - [parimutuel](./zrml/parimutuel) - A straightforward parimutuel market maker diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml index 11ce2d3f4..5cc792b90 100644 --- a/runtime/battery-station/Cargo.toml +++ b/runtime/battery-station/Cargo.toml @@ -113,7 +113,7 @@ zrml-global-disputes = { workspace = true, optional = true } zrml-liquidity-mining = { workspace = true } zrml-market-commons = { workspace = true } zrml-neo-swaps = { workspace = true } -zrml-orderbook-v1 = { workspace = true } +zrml-orderbook = { workspace = true } zrml-parimutuel = { workspace = true } zrml-prediction-markets = { workspace = true } zrml-rikiddo = { workspace = true } @@ -218,7 +218,7 @@ runtime-benchmarks = [ "zrml-global-disputes/runtime-benchmarks", "zrml-styx/runtime-benchmarks", "zrml-swaps/runtime-benchmarks", - "zrml-orderbook-v1/runtime-benchmarks", + "zrml-orderbook/runtime-benchmarks", ] std = [ "frame-executive/std", @@ -335,7 +335,7 @@ std = [ "zrml-styx/std", "zrml-swaps-runtime-api/std", "zrml-swaps/std", - "zrml-orderbook-v1/std", + "zrml-orderbook/std", ] try-runtime = [ "frame-executive/try-runtime", @@ -390,7 +390,7 @@ try-runtime = [ "zrml-global-disputes/try-runtime", "zrml-styx/try-runtime", "zrml-swaps/try-runtime", - "zrml-orderbook-v1/try-runtime", + "zrml-orderbook/try-runtime", # Parachain "pallet-author-inherent?/try-runtime", diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 417ed4f04..0e29d2223 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -316,7 +316,7 @@ macro_rules! create_runtime { Styx: zrml_styx::{Call, Event, Pallet, Storage} = 58, GlobalDisputes: zrml_global_disputes::{Call, Event, Pallet, Storage} = 59, NeoSwaps: zrml_neo_swaps::{Call, Event, Pallet, Storage} = 60, - Orderbook: zrml_orderbook_v1::{Call, Event, Pallet, Storage} = 61, + Orderbook: zrml_orderbook::{Call, Event, Pallet, Storage} = 61, Parimutuel: zrml_parimutuel::{Call, Event, Pallet, Storage} = 62, $($additional_pallets)* @@ -863,9 +863,9 @@ macro_rules! impl_config_traits { c, RuntimeCall::Swaps(zrml_swaps::Call::swap_exact_amount_in { .. }) | RuntimeCall::Swaps(zrml_swaps::Call::swap_exact_amount_out { .. }) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::place_order { .. }) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::fill_order { .. }) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::remove_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::place_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::fill_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::remove_order { .. }) ), ProxyType::HandleAssets => matches!( c, @@ -885,9 +885,9 @@ macro_rules! impl_config_traits { | RuntimeCall::PredictionMarkets( zrml_prediction_markets::Call::deploy_swap_pool_and_additional_liquidity { .. } ) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::place_order { .. }) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::fill_order { .. }) - | RuntimeCall::Orderbook(zrml_orderbook_v1::Call::remove_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::place_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::fill_order { .. }) + | RuntimeCall::Orderbook(zrml_orderbook::Call::remove_order { .. }) ), } } @@ -1267,12 +1267,12 @@ macro_rules! impl_config_traits { type PalletId = NeoSwapsPalletId; } - impl zrml_orderbook_v1::Config for Runtime { + impl zrml_orderbook::Config for Runtime { type AssetManager = AssetManager; type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type PalletId = OrderbookPalletId; - type WeightInfo = zrml_orderbook_v1::weights::WeightInfo; + type WeightInfo = zrml_orderbook::weights::WeightInfo; } impl zrml_parimutuel::Config for Runtime { @@ -1392,7 +1392,7 @@ macro_rules! create_runtime_api { list_benchmark!(list, extra, zrml_court, Court); list_benchmark!(list, extra, zrml_simple_disputes, SimpleDisputes); list_benchmark!(list, extra, zrml_global_disputes, GlobalDisputes); - list_benchmark!(list, extra, zrml_orderbook_v1, Orderbook); + list_benchmark!(list, extra, zrml_orderbook, Orderbook); list_benchmark!(list, extra, zrml_parimutuel, Parimutuel); #[cfg(not(feature = "parachain"))] list_benchmark!(list, extra, zrml_prediction_markets, PredictionMarkets); @@ -1496,7 +1496,7 @@ macro_rules! create_runtime_api { add_benchmark!(params, batches, zrml_court, Court); add_benchmark!(params, batches, zrml_simple_disputes, SimpleDisputes); add_benchmark!(params, batches, zrml_global_disputes, GlobalDisputes); - add_benchmark!(params, batches, zrml_orderbook_v1, Orderbook); + add_benchmark!(params, batches, zrml_orderbook, Orderbook); add_benchmark!(params, batches, zrml_parimutuel, Parimutuel); #[cfg(not(feature = "parachain"))] add_benchmark!(params, batches, zrml_prediction_markets, PredictionMarkets); diff --git a/runtime/zeitgeist/Cargo.toml b/runtime/zeitgeist/Cargo.toml index b588c9735..170503a16 100644 --- a/runtime/zeitgeist/Cargo.toml +++ b/runtime/zeitgeist/Cargo.toml @@ -112,7 +112,7 @@ zrml-global-disputes = { workspace = true, optional = true } zrml-liquidity-mining = { workspace = true } zrml-market-commons = { workspace = true } zrml-neo-swaps = { workspace = true } -zrml-orderbook-v1 = { workspace = true } +zrml-orderbook = { workspace = true } zrml-parimutuel = { workspace = true } zrml-prediction-markets = { workspace = true } zrml-rikiddo = { workspace = true } @@ -216,7 +216,7 @@ runtime-benchmarks = [ "zrml-global-disputes/runtime-benchmarks", "zrml-styx/runtime-benchmarks", "zrml-swaps/runtime-benchmarks", - "zrml-orderbook-v1/runtime-benchmarks", + "zrml-orderbook/runtime-benchmarks", ] std = [ "frame-executive/std", @@ -325,7 +325,7 @@ std = [ "zrml-swaps-runtime-api/std", "zrml-styx/std", "zrml-swaps/std", - "zrml-orderbook-v1/std", + "zrml-orderbook/std", ] try-runtime = [ "frame-executive/try-runtime", @@ -380,7 +380,7 @@ try-runtime = [ "zrml-global-disputes/try-runtime", "zrml-styx/try-runtime", "zrml-swaps/try-runtime", - "zrml-orderbook-v1/try-runtime", + "zrml-orderbook/try-runtime", # Parachain "pallet-author-inherent?/try-runtime", diff --git a/scripts/benchmarks/configuration.sh b/scripts/benchmarks/configuration.sh index f5ce38ec1..7543915c1 100644 --- a/scripts/benchmarks/configuration.sh +++ b/scripts/benchmarks/configuration.sh @@ -28,7 +28,7 @@ export ORML_WEIGHT_TEMPLATE="./misc/orml_weight_template.hbs" export ZEITGEIST_PALLETS=( zrml_authorized zrml_court zrml_global_disputes zrml_liquidity_mining zrml_neo_swaps \ - zrml_prediction_markets zrml_swaps zrml_styx \ + zrml_orderbook zrml_parimutuel zrml_prediction_markets zrml_swaps zrml_styx \ ) export ZEITGEIST_PALLETS_RUNS="${ZEITGEIST_PALLETS_RUNS:-1000}" export ZEITGEIST_PALLETS_STEPS="${ZEITGEIST_PALLETS_STEPS:-10}" diff --git a/scripts/tests/fuzz.sh b/scripts/tests/fuzz.sh index e1b7e0be0..f0c9eb67b 100755 --- a/scripts/tests/fuzz.sh +++ b/scripts/tests/fuzz.sh @@ -69,7 +69,7 @@ cargo fuzz run --release --fuzz-dir zrml/swaps/fuzz pool_exit_with_exact_pool_am cargo fuzz run --release --fuzz-dir zrml/swaps/fuzz pool_exit -- -runs=$(($(($RUNS * $POOL_EXIT_FACT)) / $BASE)) # --- Orderbook-v1 Pallet fuzz tests --- -cargo fuzz run --release --fuzz-dir zrml/orderbook-v1/fuzz orderbook_v1_full_workflow -- -runs=$RUNS +cargo fuzz run --release --fuzz-dir zrml/orderbook/fuzz orderbook_v1_full_workflow -- -runs=$RUNS # --- Rikiddo Pallet fuzz tests --- # Profile release is required here since it triggers debug assertions otherwise diff --git a/zrml/orderbook-v1/Cargo.toml b/zrml/orderbook/Cargo.toml similarity index 93% rename from zrml/orderbook-v1/Cargo.toml rename to zrml/orderbook/Cargo.toml index 4b174cec2..8eba77144 100644 --- a/zrml/orderbook-v1/Cargo.toml +++ b/zrml/orderbook/Cargo.toml @@ -19,7 +19,7 @@ zrml-market-commons = { workspace = true, optional = true } [dev-dependencies] test-case = { workspace = true } -zrml-orderbook-v1 = { workspace = true, features = ["mock", "default"] } +zrml-orderbook = { workspace = true, features = ["mock", "default"] } [features] default = ["std"] @@ -53,5 +53,5 @@ try-runtime = [ [package] authors = ["Zeitgeist PM "] edition = "2021" -name = "zrml-orderbook-v1" +name = "zrml-orderbook" version = "0.4.1" diff --git a/zrml/orderbook-v1/README.md b/zrml/orderbook/README.md similarity index 100% rename from zrml/orderbook-v1/README.md rename to zrml/orderbook/README.md diff --git a/zrml/orderbook-v1/fuzz/Cargo.toml b/zrml/orderbook/fuzz/Cargo.toml similarity index 82% rename from zrml/orderbook-v1/fuzz/Cargo.toml rename to zrml/orderbook/fuzz/Cargo.toml index c5f651a47..4daed00cc 100644 --- a/zrml/orderbook-v1/fuzz/Cargo.toml +++ b/zrml/orderbook/fuzz/Cargo.toml @@ -9,12 +9,12 @@ arbitrary = { workspace = true, features = ["derive"] } frame-system = { workspace = true, features = ["default"] } libfuzzer-sys = { workspace = true } zeitgeist-primitives = { workspace = true, features = ["default"] } -zrml-orderbook-v1 = { workspace = true, features = ["default", "mock"] } +zrml-orderbook = { workspace = true, features = ["default", "mock"] } [package] authors = ["Automatically generated"] edition = "2021" -name = "zrml-orderbook-v1-fuzz" +name = "zrml-orderbook-fuzz" publish = false version = "0.0.0" diff --git a/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs b/zrml/orderbook/fuzz/orderbook_v1_full_workflow.rs similarity index 99% rename from zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs rename to zrml/orderbook/fuzz/orderbook_v1_full_workflow.rs index 1cf64d054..4212d80bf 100644 --- a/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs +++ b/zrml/orderbook/fuzz/orderbook_v1_full_workflow.rs @@ -20,7 +20,7 @@ use libfuzzer_sys::fuzz_target; use zeitgeist_primitives::types::{Asset, ScalarPosition, SerdeWrapper}; -use zrml_orderbook_v1::{ +use zrml_orderbook::{ mock::{ExtBuilder, Orderbook, RuntimeOrigin}, types::OrderSide, }; diff --git a/zrml/orderbook-v1/src/benchmarks.rs b/zrml/orderbook/src/benchmarks.rs similarity index 100% rename from zrml/orderbook-v1/src/benchmarks.rs rename to zrml/orderbook/src/benchmarks.rs diff --git a/zrml/orderbook-v1/src/lib.rs b/zrml/orderbook/src/lib.rs similarity index 100% rename from zrml/orderbook-v1/src/lib.rs rename to zrml/orderbook/src/lib.rs diff --git a/zrml/orderbook-v1/src/mock.rs b/zrml/orderbook/src/mock.rs similarity index 100% rename from zrml/orderbook-v1/src/mock.rs rename to zrml/orderbook/src/mock.rs diff --git a/zrml/orderbook-v1/src/tests.rs b/zrml/orderbook/src/tests.rs similarity index 100% rename from zrml/orderbook-v1/src/tests.rs rename to zrml/orderbook/src/tests.rs diff --git a/zrml/orderbook-v1/src/types.rs b/zrml/orderbook/src/types.rs similarity index 100% rename from zrml/orderbook-v1/src/types.rs rename to zrml/orderbook/src/types.rs diff --git a/zrml/orderbook-v1/src/utils.rs b/zrml/orderbook/src/utils.rs similarity index 100% rename from zrml/orderbook-v1/src/utils.rs rename to zrml/orderbook/src/utils.rs diff --git a/zrml/orderbook-v1/src/weights.rs b/zrml/orderbook/src/weights.rs similarity index 67% rename from zrml/orderbook-v1/src/weights.rs rename to zrml/orderbook/src/weights.rs index 9b173638b..1855bba8b 100644 --- a/zrml/orderbook-v1/src/weights.rs +++ b/zrml/orderbook/src/weights.rs @@ -1,4 +1,5 @@ -// Copyright 2023 Forecasting Technologies LTD. +// Copyright 2022-2023 Forecasting Technologies LTD. +// Copyright 2021-2022 Zeitgeist PM LLC. // // This file is part of Zeitgeist. // @@ -14,28 +15,30 @@ // // You should have received a copy of the GNU General Public License // along with Zeitgeist. If not, see . -//! Autogenerated weights for zrml_orderbook_v1 + +//! Autogenerated weights for zrml_orderbook //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: `2023-09-14`, STEPS: `10`, REPEAT: `1000`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: `2023-10-26`, STEPS: `10`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `chralt`, CPU: `` +//! HOSTNAME: `sea212-PC`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` //! EXECUTION: `Some(Wasm)`, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` // Executed Command: -// ./target/release/zeitgeist +// ./target/debug/zeitgeist // benchmark // pallet // --chain=dev // --steps=10 -// --repeat=1000 -// --pallet=zrml_orderbook_v1 +// --repeat=10 +// --pallet=zrml_orderbook // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --output=./zrml/orderbook-v1/src/weights.rs // --template=./misc/weight_template.hbs +// --header=./HEADER_GPL3 +// --output=./zrml/orderbook/src/weights.rs #![allow(unused_parens)] #![allow(unused_imports)] @@ -44,7 +47,7 @@ use core::marker::PhantomData; use frame_support::{traits::Get, weights::Weight}; /// Trait containing the required functions for weight retrival within -/// zrml_orderbook_v1 (automatically generated) +/// zrml_orderbook (automatically generated) pub trait WeightInfoZeitgeist { fn remove_order_ask() -> Weight; fn remove_order_bid() -> Weight; @@ -54,41 +57,41 @@ pub trait WeightInfoZeitgeist { fn place_order_bid() -> Weight; } -/// Weight functions for zrml_orderbook_v1 (automatically generated) +/// Weight functions for zrml_orderbook (automatically generated) pub struct WeightInfo(PhantomData); impl WeightInfoZeitgeist for WeightInfo { /// Storage: Orderbook Orders (r:1 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) /// Storage: Tokens Reserves (r:1 w:1) /// Proof: Tokens Reserves (max_values: None, max_size: Some(1276), added: 3751, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen) fn remove_order_ask() -> Weight { // Proof Size summary in bytes: - // Measured: `635` - // Estimated: `8999` - // Minimum execution time: 28_000 nanoseconds. - Weight::from_parts(31_000_000, 8999) - .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + // Measured: `637` + // Estimated: `8967` + // Minimum execution time: 362_440 nanoseconds. + Weight::from_parts(363_640_000, 8967) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) } /// Storage: Orderbook Orders (r:1 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) /// Storage: Balances Reserves (r:1 w:1) /// Proof: Balances Reserves (max_values: None, max_size: Some(1249), added: 3724, mode: MaxEncodedLen) fn remove_order_bid() -> Weight { // Proof Size summary in bytes: - // Measured: `316` - // Estimated: `6374` - // Minimum execution time: 27_000 nanoseconds. - Weight::from_parts(29_000_000, 6374) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Measured: `284` + // Estimated: `6342` + // Minimum execution time: 326_778 nanoseconds. + Weight::from_parts(330_518_000, 6342) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } /// Storage: Orderbook Orders (r:1 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) /// Storage: MarketCommons Markets (r:1 w:0) - /// Proof: MarketCommons Markets (max_values: None, max_size: Some(541), added: 3016, mode: MaxEncodedLen) + /// Proof: MarketCommons Markets (max_values: None, max_size: Some(678), added: 3153, mode: MaxEncodedLen) /// Storage: Tokens Reserves (r:1 w:1) /// Proof: Tokens Reserves (max_values: None, max_size: Some(1276), added: 3751, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:2 w:2) @@ -97,17 +100,17 @@ impl WeightInfoZeitgeist for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen) fn fill_order_ask() -> Weight { // Proof Size summary in bytes: - // Measured: `1304` - // Estimated: `17220` - // Minimum execution time: 70_000 nanoseconds. - Weight::from_parts(73_000_000, 17220) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) + // Measured: `1310` + // Estimated: `17325` + // Minimum execution time: 872_283 nanoseconds. + Weight::from_parts(873_872_000, 17325) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(5)) } /// Storage: Orderbook Orders (r:1 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) /// Storage: MarketCommons Markets (r:1 w:0) - /// Proof: MarketCommons Markets (max_values: None, max_size: Some(541), added: 3016, mode: MaxEncodedLen) + /// Proof: MarketCommons Markets (max_values: None, max_size: Some(678), added: 3153, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:2 w:2) /// Proof: Tokens Accounts (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen) /// Storage: Balances Reserves (r:1 w:1) @@ -116,15 +119,15 @@ impl WeightInfoZeitgeist for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(132), added: 2607, mode: MaxEncodedLen) fn fill_order_bid() -> Weight { // Proof Size summary in bytes: - // Measured: `1243` - // Estimated: `17193` - // Minimum execution time: 62_000 nanoseconds. - Weight::from_parts(64_000_000, 17193) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) + // Measured: `1249` + // Estimated: `17298` + // Minimum execution time: 766_910 nanoseconds. + Weight::from_parts(769_050_000, 17298) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(5)) } /// Storage: MarketCommons Markets (r:1 w:0) - /// Proof: MarketCommons Markets (max_values: None, max_size: Some(541), added: 3016, mode: MaxEncodedLen) + /// Proof: MarketCommons Markets (max_values: None, max_size: Some(678), added: 3153, mode: MaxEncodedLen) /// Storage: Orderbook NextOrderId (r:1 w:1) /// Proof: Orderbook NextOrderId (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Tokens Reserves (r:1 w:1) @@ -132,31 +135,31 @@ impl WeightInfoZeitgeist for WeightInfo { /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(123), added: 2598, mode: MaxEncodedLen) /// Storage: Orderbook Orders (r:0 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) fn place_order_ask() -> Weight { // Proof Size summary in bytes: - // Measured: `588` - // Estimated: `9876` - // Minimum execution time: 35_000 nanoseconds. - Weight::from_parts(38_000_000, 9876) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) + // Measured: `626` + // Estimated: `10013` + // Minimum execution time: 441_322 nanoseconds. + Weight::from_parts(443_332_000, 10013) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(4)) } /// Storage: MarketCommons Markets (r:1 w:0) - /// Proof: MarketCommons Markets (max_values: None, max_size: Some(541), added: 3016, mode: MaxEncodedLen) + /// Proof: MarketCommons Markets (max_values: None, max_size: Some(678), added: 3153, mode: MaxEncodedLen) /// Storage: Orderbook NextOrderId (r:1 w:1) /// Proof: Orderbook NextOrderId (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Balances Reserves (r:1 w:1) /// Proof: Balances Reserves (max_values: None, max_size: Some(1249), added: 3724, mode: MaxEncodedLen) /// Storage: Orderbook Orders (r:0 w:1) - /// Proof: Orderbook Orders (max_values: None, max_size: Some(175), added: 2650, mode: MaxEncodedLen) + /// Proof: Orderbook Orders (max_values: None, max_size: Some(143), added: 2618, mode: MaxEncodedLen) fn place_order_bid() -> Weight { // Proof Size summary in bytes: - // Measured: `330` - // Estimated: `7251` - // Minimum execution time: 31_000 nanoseconds. - Weight::from_parts(32_000_000, 7251) - .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + // Measured: `334` + // Estimated: `7388` + // Minimum execution time: 369_460 nanoseconds. + Weight::from_parts(370_870_000, 7388) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) } }