From bf13a3d1a802c0e674764cb57f3fae30ad1edc1b Mon Sep 17 00:00:00 2001 From: hussein Date: Wed, 11 Jan 2023 11:48:49 +0100 Subject: [PATCH 01/44] chore: upgrade polkadot to v0.9.30 --- Makefile.toml | 80 + code/Cargo.lock | 7710 ++++++++++------- code/Cargo.toml | 447 +- .../local-integration-tests/Cargo.toml | 116 +- code/parachain/frame/airdrop/Cargo.toml | 24 +- .../frame/assets-registry/Cargo.toml | 22 +- code/parachain/frame/assets/Cargo.toml | 22 +- code/parachain/frame/assets/rpc/Cargo.toml | 8 +- .../frame/assets/runtime-api/Cargo.toml | 4 +- .../parachain/frame/bonded-finance/Cargo.toml | 18 +- code/parachain/frame/call-filter/Cargo.toml | 16 +- .../frame/composable-maths/Cargo.toml | 10 +- .../frame/composable-support/Cargo.toml | 14 +- .../frame/composable-tests-helpers/Cargo.toml | 12 +- .../frame/composable-traits/Cargo.toml | 18 +- code/parachain/frame/cosmwasm/Cargo.toml | 22 +- code/parachain/frame/cosmwasm/rpc/Cargo.toml | 8 +- .../frame/cosmwasm/runtime-api/Cargo.toml | 4 +- .../frame/crowdloan-rewards/Cargo.toml | 28 +- .../frame/crowdloan-rewards/rpc/Cargo.toml | 10 +- .../crowdloan-rewards/runtime-api/Cargo.toml | 2 +- .../frame/currency-factory/Cargo.toml | 20 +- code/parachain/frame/dex-router/Cargo.toml | 22 +- code/parachain/frame/dutch-auction/Cargo.toml | 30 +- code/parachain/frame/fnft/Cargo.toml | 22 +- .../frame/governance-registry/Cargo.toml | 16 +- code/parachain/frame/lending/Cargo.toml | 36 +- code/parachain/frame/lending/rpc/Cargo.toml | 8 +- .../frame/lending/runtime-api/Cargo.toml | 2 +- code/parachain/frame/liquidations/Cargo.toml | 28 +- code/parachain/frame/mosaic/Cargo.toml | 20 +- code/parachain/frame/oracle/Cargo.toml | 22 +- code/parachain/frame/pablo/Cargo.toml | 20 +- code/parachain/frame/pablo/rpc/Cargo.toml | 8 +- .../frame/pablo/runtime-api/Cargo.toml | 4 +- code/parachain/frame/privilege/Cargo.toml | 14 +- .../frame/staking-rewards/Cargo.toml | 24 +- code/parachain/frame/vault/Cargo.toml | 20 +- code/parachain/frame/vesting/Cargo.toml | 16 +- code/parachain/node/Cargo.toml | 112 +- code/parachain/runtime/common/Cargo.toml | 38 +- code/parachain/runtime/composable/Cargo.toml | 104 +- code/parachain/runtime/composable/src/lib.rs | 34 - code/parachain/runtime/dali/Cargo.toml | 117 +- code/parachain/runtime/dali/src/lib.rs | 34 - code/parachain/runtime/picasso/Cargo.toml | 115 +- code/parachain/runtime/picasso/src/lib.rs | 34 - code/parachain/runtime/primitives/Cargo.toml | 8 +- code/simnode/common/Cargo.toml | 34 +- code/simnode/simnode-node/Cargo.toml | 4 +- code/simnode/simnode-tests/Cargo.toml | 34 +- code/utils/common/Cargo.toml | 8 +- code/utils/composable-subxt/Cargo.toml | 10 +- code/utils/price-feed/Cargo.toml | 2 +- code/utils/wasm-optimizer/Cargo.toml | 2 +- code/utils/xcmp/Cargo.toml | 16 +- .../runtime-upgrades-and-versioning.md | 4 +- 57 files changed, 5466 insertions(+), 4171 deletions(-) create mode 100644 Makefile.toml diff --git a/Makefile.toml b/Makefile.toml new file mode 100644 index 00000000000..81d468a3ee1 --- /dev/null +++ b/Makefile.toml @@ -0,0 +1,80 @@ +[env] +CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true +NIGHTLY_VERSION = "2022-04-18" + +[tasks.fmt] +script = ''' +cd code +cargo +nightly fmt +''' +workspace = false + +[tasks.build] +script = ''' +cd code +cargo build --release +''' +workspace = false + +[tasks.polkadot] +script = ''' +if [ ! -d "../polkadot" ] ; then + git clone -b v0.9.30 https://github.com/paritytech/polkadot ../polkadot +fi +cd ../polkadot && cargo build --release +''' +workspace = false + +[tasks.start-devnet] +dependencies = ["build", "git-polkadot"] +script = ''' +cd code +cargo run --release -- --version +cd ../polkadot && cargo run --release -- --version && pwd && cd ../composable +cd scripts/polkadot-launch && yarn && yarn composable +''' +workspace = false + +[tasks.start-devnet-docker] +dependencies = [] +script = ''' +docker run --rm -ti -u$(id -u):$(id -g) -p9944:9944 -p9988:9988 -p9998:9998 composablefi/composable-sandbox:latest +''' +workspace = false + +[tasks.remove-composable-sandbox-image] +dependencies = [] +script = ''' +docker rmi composablefi/composable-sandbox:latest +''' +workspace = false + +[tasks.run-unit-tests] +env = { SKIP_WASM_BUILD = 1 } +script = ''' +cd code +cargo test --workspace --locked --release --verbose +''' +workspace = false + +[tasks.style] +script = ''' +make style +''' +workspace = false + +[tasks.check-ci] +env = { SKIP_WASM_BUILD = 1 } +script = ''' +cd code +cargo +nightly-$NIGHTLY_VERSION check --benches --all --features runtime-benchmarks # checks all rust crates with default-features, tests, benchmarks +env -u RUSTFLAGS cargo +nightly-$NIGHTLY_VERSION clippy --all-targets --tests -- -D warnings +''' +workspace = false + +[tasks.build-benchmarks] +script = ''' +cd code +cargo build --release --features runtime-benchmarks +''' +workspace = false diff --git a/code/Cargo.lock b/code/Cargo.lock index 92894f6eb4f..bbde1d9d5c6 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -18,7 +18,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.0", ] [[package]] @@ -162,9 +171,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "approx" @@ -175,6 +184,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "array-bytes" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + [[package]] name = "arrayref" version = "0.3.6" @@ -224,10 +239,10 @@ dependencies = [ "jsonrpsee 0.14.0", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -237,8 +252,8 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -247,8 +262,8 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -452,13 +467,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -476,9 +491,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -508,9 +523,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" +checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" dependencies = [ "async-trait", "axum-core", @@ -541,9 +556,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" +checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" dependencies = [ "async-trait", "bytes 1.3.0", @@ -558,14 +573,14 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621" +checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -590,16 +605,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.5.4", - "object 0.29.0", + "miniz_oxide", + "object 0.30.2", "rustc-demangle", ] @@ -646,6 +661,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -664,32 +685,35 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "beefy-primitives", + "array-bytes", + "async-trait", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "fnv", "futures 0.3.25", "futures-timer", - "hex", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", + "sc-consensus", "sc-finality-grandpa", "sc-keystore", "sc-network", + "sc-network-common", "sc-network-gossip", "sc-utils", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-keystore", - "sp-mmr-primitives", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -698,20 +722,20 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "beefy-gadget", - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", "sc-rpc", "sc-utils", "serde", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] @@ -720,22 +744,45 @@ name = "beefy-light-client" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "beefy-light-client-primitives", - "beefy-primitives", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "ckb-merkle-mountain-range", + "derive_more", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parity-scale-codec", + "rs_merkle", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "beefy-light-client" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "ckb-merkle-mountain-range", "derive_more", - "frame-support", - "light-client-common", - "pallet-beefy-mmr", - "pallet-mmr", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", "rs_merkle", - "sp-core", - "sp-core-hashing", - "sp-mmr-primitives", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -743,38 +790,77 @@ name = "beefy-light-client-primitives" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "ckb-merkle-mountain-range", + "derive_more", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "rs_merkle", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "beefy-light-client-primitives" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "ckb-merkle-mountain-range", "derive_more", - "light-client-common", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", "rs_merkle", - "sp-core", - "sp-mmr-primitives", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "beefy-merkle-tree" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "beefy-primitives" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "beefy-primitives", - "sp-api", + "parity-scale-codec", + "scale-info", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -821,8 +907,8 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "regex", "rustc-hash", "shlex", @@ -863,9 +949,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -1003,8 +1089,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.47", - "syn 1.0.105", + "proc-macro2 1.0.49", + "syn 1.0.107", ] [[package]] @@ -1013,9 +1099,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1024,9 +1110,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1046,11 +1132,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.17" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" dependencies = [ "memchr", + "serde", ] [[package]] @@ -1106,9 +1193,9 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1155,9 +1242,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" dependencies = [ "serde", ] @@ -1179,16 +1266,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.16", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -1202,6 +1289,15 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-expr" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +dependencies = [ + "smallvec 1.10.0", +] + [[package]] name = "cfg-if" version = "0.1.10" @@ -1356,13 +1452,13 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" dependencies = [ "bitflags", - "clap_derive 4.0.21", - "clap_lex 0.3.0", + "clap_derive 4.1.0", + "clap_lex 0.3.1", "is-terminal", "once_cell", "strsim 0.10.0", @@ -1377,22 +1473,22 @@ checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -1406,9 +1502,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -1437,7 +1533,7 @@ version = "0.1.0" dependencies = [ "axum", "axum-macros", - "clap 4.0.29", + "clap 4.1.1", "serde", "tokio", "tracing", @@ -1471,7 +1567,7 @@ name = "collator-sidecar" version = "0.1.0" dependencies = [ "async-std", - "env_logger", + "env_logger 0.9.3", "jsonrpsee 0.11.0", "serde", "structopt", @@ -1500,9 +1596,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "comfy-table" -version = "6.1.3" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "strum", "strum_macros", @@ -1516,9 +1612,9 @@ dependencies = [ "composable-support", "composable-traits", "cumulus-pallet-xcm", - "cumulus-primitives-core", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "num-traits", "orml-tokens", "orml-traits", @@ -1529,19 +1625,19 @@ dependencies = [ "pallet-sudo", "pallet-treasury", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "primitives", "scale-info", "serde", "smallvec 1.10.0", "sp-consensus-aura", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] @@ -1558,15 +1654,15 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-tests-helpers", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "proptest", "rust_decimal", "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1588,13 +1684,13 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-client-service", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "dali-runtime", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-benchmarking-cli", "hex", "jsonrpsee 0.14.0", @@ -1604,16 +1700,16 @@ dependencies = [ "once_cell", "pablo-rpc", "pablo-runtime-api", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-crowdloan-rewards", - "pallet-ibc", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "picasso-runtime", "polkadot-cli", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "polkadot-service", "primitives", "sc-basic-authorship", @@ -1635,22 +1731,22 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-trie", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -1671,13 +1767,13 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -1686,7 +1782,7 @@ dependencies = [ "orml-unknown-tokens", "orml-xcm-support", "orml-xtokens", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-assets-registry", "pallet-aura", "pallet-authorship", @@ -1704,36 +1800,35 @@ dependencies = [ "pallet-preimage", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vault", - "pallet-xcm", - "parachain-info", + "pallet-xcm 0.9.30", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "primitives", "scale-info", - "simnode-runtime-apis", "smallvec 1.10.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", - "xcm", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] @@ -1749,14 +1844,14 @@ version = "0.1.0" dependencies = [ "base58", "clap 3.2.23", - "env_logger", + "env_logger 0.9.3", "hex", "parity-scale-codec", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "subxt 0.23.0", "tokio", ] @@ -1765,8 +1860,8 @@ dependencies = [ name = "composable-support" version = "1.0.0" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex", "is_sorted", "num-traits", @@ -1777,10 +1872,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1788,15 +1883,15 @@ name = "composable-tests-helpers" version = "1.0.0" dependencies = [ "composable-support", - "frame-support", - "frame-system", - "pallet-timestamp", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1805,27 +1900,27 @@ version = "1.0.0" dependencies = [ "bitflags", "composable-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-proxy", "parity-scale-codec", "plotters", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "proptest", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils 0.8.14", ] @@ -1972,7 +2067,7 @@ name = "cosmwasm-derive" version = "1.1.6" source = "git+https://github.com/ComposableFi/cosmwasm?rev=21351cc1ced863b9af7c8a69f923036bc919b3b1#21351cc1ced863b9af7c8a69f923036bc919b3b1" dependencies = [ - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -1981,7 +2076,7 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fca30d51f7e5fbfa6440d8b10d7df0231bdf77e97fd3fe5d0cb79cc4822e50c" dependencies = [ - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -1992,10 +2087,10 @@ dependencies = [ "jsonrpsee 0.14.0", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2003,8 +2098,8 @@ name = "cosmwasm-runtime-api" version = "1.0.0" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2026,9 +2121,9 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06c8f516a13ae481016aa35f0b5c4652459e8aee65b15b6fb51547a07cea5a0" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2115,25 +2210,27 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ + "arrayvec 0.7.2", + "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log 0.4.17", "regalloc2", "smallvec 1.10.0", @@ -2142,33 +2239,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log 0.4.17", @@ -2178,15 +2275,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -2195,9 +2292,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2288,14 +2385,14 @@ version = "1.0.0" dependencies = [ "composable-support", "crowdloan-rewards-runtime-api", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "jsonrpsee 0.14.0", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2304,7 +2401,7 @@ version = "1.0.0" dependencies = [ "composable-support", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2371,8 +2468,8 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -2407,26 +2504,26 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "clap 3.2.23", "parity-scale-codec", "sc-chain-spec", "sc-cli", "sc-service", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "url 2.3.1", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "futures 0.3.25", "parity-scale-codec", @@ -2434,23 +2531,23 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", "cumulus-client-consensus-common", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "futures 0.3.25", "parity-scale-codec", "sc-client-api", @@ -2458,16 +2555,16 @@ dependencies = [ "sc-consensus-aura", "sc-consensus-slots", "sc-telemetry", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "tracing", ] @@ -2475,28 +2572,28 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.25", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-client-api", "sc-consensus", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-runtime", - "sp-trie", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2506,24 +2603,24 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", @@ -2531,271 +2628,270 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "sc-client-api", "sc-consensus", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "parking_lot 0.12.1", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-client-api", "sc-consensus", "sc-consensus-babe", "sc-service", "sc-telemetry", "sc-tracing", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-aura", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-aura", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ + "bytes 1.3.0", "cumulus-pallet-parachain-system-proc-macro", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "log 0.4.17", "pallet-balances", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "scale-info", "serde", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", - "sp-version", - "xcm", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-session", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "rand_chacha 0.3.1", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] -name = "cumulus-ping" +name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27#b86cd207fc77af888f223c10363ae4d18a4b63b4" dependencies = [ - "cumulus-pallet-xcm", - "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", - "scale-info", - "serde", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "polkadot-core-primitives 0.9.27", + "polkadot-parachain 0.9.27", + "polkadot-primitives 0.9.27", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", - "sp-api", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "polkadot-core-primitives 0.9.30", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", "parity-scale-codec", "sc-client-api", "scale-info", - "sp-api", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "futures 0.3.25", "parity-scale-codec", - "sp-inherents", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" -dependencies = [ - "cumulus-primitives-core", - "frame-support", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", - "xcm", +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" +dependencies = [ + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "log 0.4.17", + "parity-scale-codec", + "polkadot-core-primitives 0.9.30", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", - "parking_lot 0.12.1", "polkadot-cli", "polkadot-client", "polkadot-service", @@ -2806,60 +2902,60 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "derive_more", "futures 0.3.25", - "jsonrpsee-core 0.14.0", + "jsonrpsee-core 0.15.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", "backoff", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-service", "sc-client-api", "sc-rpc-api", - "sp-api", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tokio", "tracing", "url 2.3.1", @@ -2868,14 +2964,14 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-primitives", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "polkadot-primitives 0.9.30", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2906,13 +3002,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if 1.0.0", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] @@ -2956,7 +3053,7 @@ dependencies = [ "cosmwasm-std 1.0.0", "cw2", "schemars", - "semver 1.0.14", + "semver 1.0.16", "serde", "thiserror", ] @@ -3003,7 +3100,7 @@ dependencies = [ "cw2", "cw20", "hex", - "prost 0.11.3", + "prost 0.11.6", "schemars", "serde", "serde-json-wasm", @@ -3027,7 +3124,7 @@ dependencies = [ "cw20", "hex", "num", - "prost 0.11.3", + "prost 0.11.6", "schemars", "serde", "serde-json-wasm", @@ -3050,7 +3147,7 @@ dependencies = [ "cw20", "hex", "num", - "prost 0.11.3", + "prost 0.11.6", "schemars", "serde", "serde-json-wasm", @@ -3075,7 +3172,7 @@ dependencies = [ "cw2", "cw20", "hex", - "prost 0.11.3", + "prost 0.11.6", "schemars", "serde", "serde-json-wasm", @@ -3118,9 +3215,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -3130,34 +3227,34 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "scratch", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3176,19 +3273,19 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex", "hex-literal", - "ibc", - "ibc-primitives", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "ibc-runtime-api", "lending-runtime-api", "orml-tokens", @@ -3198,7 +3295,7 @@ dependencies = [ "orml-xtokens", "pablo-runtime-api", "pallet-asset-tx-payment", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-assets-registry", "pallet-aura", "pallet-authorship", @@ -3215,8 +3312,8 @@ dependencies = [ "pallet-dutch-auction", "pallet-fnft", "pallet-governance-registry", - "pallet-ibc", - "pallet-ibc-ping", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "pallet-identity", "pallet-indices", "pallet-lending", @@ -3230,38 +3327,37 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-staking-rewards", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vault", "pallet-vesting 1.0.0", - "pallet-xcm", - "parachain-info", + "pallet-xcm 0.9.30", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "primitives", "scale-info", - "simnode-runtime-apis", "smallvec 1.10.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", - "xcm", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] @@ -3289,10 +3385,10 @@ checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "strsim 0.10.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -3302,8 +3398,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core", - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3329,7 +3425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" dependencies = [ "data-encoding", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -3347,9 +3443,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3359,10 +3455,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "rustc_version 0.4.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -3478,9 +3574,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "dwrote" @@ -3510,16 +3606,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -3535,9 +3631,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -3624,9 +3720,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3650,20 +3746,20 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "enumn" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" +checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3679,6 +3775,19 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log 0.4.17", + "regex", + "termcolor", +] + [[package]] name = "environmental" version = "1.1.4" @@ -3687,9 +3796,9 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "erased-serde" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11" +checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" dependencies = [ "serde", ] @@ -3747,8 +3856,8 @@ checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" dependencies = [ "blake3 1.3.3", "fs-err", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", ] [[package]] @@ -3759,9 +3868,9 @@ checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" dependencies = [ "blake2", "fs-err", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -3814,9 +3923,9 @@ dependencies = [ "expander 0.0.4", "indexmap", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "thiserror", ] @@ -3855,13 +3964,19 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger", + "env_logger 0.10.0", "log 0.4.17", ] @@ -3879,9 +3994,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" dependencies = [ "either", "futures 0.3.25", @@ -3895,9 +4010,9 @@ dependencies = [ [[package]] name = "fixed" -version = "1.20.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418922d2c280b8c68f82699494cc8c48f392233233a9a8b9a48a57a36c0ad0ef" +checksum = "f1965703169d4c3581f1d853e6a0bacf2ad9ba5d161f58ac331de95b37584a50" dependencies = [ "az", "bytemuck", @@ -3931,7 +4046,7 @@ checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -3941,7 +4056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b" dependencies = [ "eyre", - "paste 1.0.9", + "paste 1.0.11", ] [[package]] @@ -3999,7 +4114,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", ] @@ -4022,41 +4137,64 @@ checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "linregress", + "log 0.4.17", + "parity-scale-codec", + "paste 1.0.11", + "scale-info", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "frame-benchmarking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "linregress", "log 0.4.17", "parity-scale-codec", - "paste 1.0.9", + "paste 1.0.11", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", + "array-bytes", "chrono", "clap 3.2.23", "comfy-table", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "gethostname", "handlebars", "hash-db", - "hex", "itertools", "kvdb", "lazy_static", @@ -4076,17 +4214,17 @@ dependencies = [ "serde", "serde_json", "serde_nanos", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-database", - "sp-externalities", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tempfile", "thiserror", "thousands", @@ -4095,44 +4233,45 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-election-provider-solution-type", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-try-runtime", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -4150,117 +4289,204 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "bitflags", + "frame-metadata", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "impl-trait-for-tuples", + "k256", + "log 0.4.17", + "once_cell", + "parity-scale-codec", + "paste 1.0.11", + "scale-info", + "serde", + "smallvec 1.10.0", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tt-call", +] + +[[package]] +name = "frame-support" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "k256", "log 0.4.17", "once_cell", "parity-scale-codec", - "paste 1.0.9", + "paste 1.0.11", "scale-info", "serde", "smallvec 1.10.0", - "sp-arithmetic", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "Inflector", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", - "frame-support-procedural-tools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "cfg-expr", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "itertools", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "frame-support-procedural-tools-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "frame-system" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "sp-api", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "parity-scale-codec", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -4422,9 +4648,9 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -4578,17 +4804,23 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -4617,17 +4849,38 @@ dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "hash-db", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "grandpa-light-client-primitives" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "anyhow", + "derive_more", + "finality-grandpa", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "hash-db", - "light-client-common", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", - "sp-core", - "sp-finality-grandpa", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -4637,18 +4890,39 @@ source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5 dependencies = [ "anyhow", "finality-grandpa", - "frame-support", - "grandpa-light-client-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "hash-db", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "primitive-types", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "grandpa-light-client-verifier" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "anyhow", + "finality-grandpa", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "hash-db", - "light-client-common", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", "primitive-types", - "sp-finality-grandpa", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -4683,18 +4957,18 @@ dependencies = [ [[package]] name = "half" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" dependencies = [ "crunchy", ] [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log 0.4.17", "pest", @@ -5061,13 +5335,39 @@ source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5 dependencies = [ "derive_more", "flex-error", - "ibc-derive", - "ibc-proto", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ics23", + "num-traits", + "parity-scale-codec", + "primitive-types", + "prost 0.11.6", + "safe-regex", + "serde", + "serde_derive", + "serde_json", + "subtle-encoding", + "tendermint", + "tendermint-proto", + "time 0.3.17", + "tracing", + "uint", +] + +[[package]] +name = "ibc" +version = "0.15.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "derive_more", + "flex-error", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "ics23", "num-traits", "parity-scale-codec", "primitive-types", - "prost 0.11.3", + "prost 0.11.6", "safe-regex", "serde", "serde_derive", @@ -5087,9 +5387,21 @@ source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5 dependencies = [ "convert_case 0.6.0", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "ibc-derive" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "convert_case 0.6.0", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5098,31 +5410,66 @@ version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ "base58", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "hex", - "ibc", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "parity-scale-codec", "ripemd", "scale-info", "serde", "sha2 0.10.6", "sha3", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] -name = "ibc-proto" -version = "0.18.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +name = "ibc-primitives" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" dependencies = [ - "base64 0.13.1", + "base58", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "hex", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "parity-scale-codec", + "ripemd", + "scale-info", + "serde", + "sha2 0.10.6", + "sha3", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "ibc-proto" +version = "0.18.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +dependencies = [ + "base64 0.13.1", "bytes 1.3.0", - "prost 0.11.3", + "prost 0.11.6", + "serde", + "tendermint-proto", +] + +[[package]] +name = "ibc-proto" +version = "0.18.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "base64 0.13.1", + "bytes 1.3.0", + "prost 0.11.6", "serde", "tendermint-proto", ] @@ -5132,11 +5479,11 @@ name = "ibc-runtime-api" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "ibc-primitives", - "pallet-ibc", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -5146,10 +5493,30 @@ source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5 dependencies = [ "bytes 1.3.0", "flex-error", - "ibc", - "ibc-proto", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ics23", + "prost 0.11.6", + "serde", + "serde_json", + "subtle-encoding", + "tendermint", + "tendermint-light-client-verifier", + "tendermint-proto", + "time 0.3.17", +] + +[[package]] +name = "ics07-tendermint" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "bytes 1.3.0", + "flex-error", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "ics23", - "prost 0.11.3", + "prost 0.11.6", "serde", "serde_json", "subtle-encoding", @@ -5167,21 +5534,48 @@ dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "grandpa-light-client-primitives", - "grandpa-light-client-verifier", - "ibc", - "ibc-proto", - "light-client-common", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "primitive-types", + "prost 0.11.6", + "prost-build 0.11.6", + "prost-types 0.11.6", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tendermint", + "tendermint-proto", +] + +[[package]] +name = "ics10-grandpa" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "anyhow", + "derive_more", + "finality-grandpa", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", "primitive-types", - "prost 0.11.3", - "prost-build 0.11.4", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-build 0.11.6", + "prost-types 0.11.6", "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "tendermint", "tendermint-proto", ] @@ -5192,24 +5586,52 @@ version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ "anyhow", - "beefy-light-client", - "beefy-light-client-primitives", - "beefy-primitives", + "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "bytes 1.3.0", + "derive_more", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "primitive-types", + "prost 0.11.6", + "prost-build 0.11.6", + "prost-types 0.11.6", + "serde", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tendermint", + "tendermint-proto", +] + +[[package]] +name = "ics11-beefy" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "anyhow", + "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "bytes 1.3.0", "derive_more", - "ibc", - "ibc-proto", - "light-client-common", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", "primitive-types", - "prost 0.11.3", - "prost-build 0.11.4", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-build 0.11.6", + "prost-types 0.11.6", "serde", - "sp-mmr-primitives", - "sp-runtime", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "tendermint", "tendermint-proto", ] @@ -5222,7 +5644,7 @@ dependencies = [ "anyhow", "bytes 1.3.0", "hex", - "prost 0.11.3", + "prost 0.11.6", ] [[package]] @@ -5330,9 +5752,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5391,12 +5813,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "io-lifetimes" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" - [[package]] name = "io-lifetimes" version = "0.7.5" @@ -5405,9 +5821,9 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", "windows-sys 0.42.0", @@ -5442,19 +5858,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 1.0.3", - "rustix 0.36.5", + "io-lifetimes 1.0.4", + "rustix 0.36.6", "windows-sys 0.42.0", ] @@ -5475,9 +5891,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -5573,11 +5989,10 @@ checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ "jsonrpsee-client-transport 0.14.0", "jsonrpsee-core 0.14.0", - "jsonrpsee-http-server", + "jsonrpsee-http-server 0.14.0", "jsonrpsee-proc-macros 0.14.0", "jsonrpsee-types 0.14.0", - "jsonrpsee-ws-client", - "jsonrpsee-ws-server", + "jsonrpsee-ws-server 0.14.0", "tracing", ] @@ -5589,6 +6004,12 @@ checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ "jsonrpsee-client-transport 0.15.1", "jsonrpsee-core 0.15.1", + "jsonrpsee-http-server 0.15.1", + "jsonrpsee-proc-macros 0.15.1", + "jsonrpsee-types 0.15.1", + "jsonrpsee-ws-client", + "jsonrpsee-ws-server 0.15.1", + "tracing", ] [[package]] @@ -5688,20 +6109,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" dependencies = [ "anyhow", + "arrayvec 0.7.2", "async-lock", "async-trait", "beef", "futures-channel", "futures-timer", "futures-util", + "globset", + "http", + "hyper 0.14.23", "jsonrpsee-types 0.15.1", + "lazy_static", + "parking_lot 0.12.1", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", + "soketto", "thiserror", "tokio", "tracing", "tracing-futures", + "unicase 2.6.0", ] [[package]] @@ -5740,6 +6170,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-http-server" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +dependencies = [ + "futures-channel", + "futures-util", + "hyper 0.14.23", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.11.0" @@ -5747,9 +6195,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7e19642c62b191afcd74fb8cab29f209f5fc24fbd2efed1ffd4393ef447428" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5759,9 +6207,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" +dependencies = [ + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -5808,13 +6268,14 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" +checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" dependencies = [ - "jsonrpsee-client-transport 0.14.0", - "jsonrpsee-core 0.14.0", - "jsonrpsee-types 0.14.0", + "http", + "jsonrpsee-client-transport 0.15.1", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", ] [[package]] @@ -5835,6 +6296,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-ws-server" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-futures", +] + [[package]] name = "k256" version = "0.10.4" @@ -5869,16 +6350,16 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -5897,6 +6378,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-gilt", "pallet-grandpa", "pallet-identity", @@ -5913,22 +6395,22 @@ dependencies = [ "pallet-proxy", "pallet-recovery", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-fn", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm", + "pallet-xcm 0.9.30", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", @@ -5936,40 +6418,40 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "substrate-wasm-builder", - "xcm", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] name = "kusama-runtime-constants" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "smallvec 1.10.0", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -6051,10 +6533,10 @@ dependencies = [ "lending-runtime-api", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -6064,14 +6546,14 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -6093,6 +6575,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + [[package]] name = "libm" version = "0.2.6" @@ -6535,8 +7023,8 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" dependencies = [ - "quote 1.0.21", - "syn 1.0.105", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -6696,19 +7184,35 @@ dependencies = [ "anyhow", "derive_more", "hash-db", - "ibc", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "parity-scale-codec", + "primitive-types", + "serde", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "light-client-common" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "anyhow", + "derive_more", + "hash-db", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "parity-scale-codec", "primitive-types", "serde", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -6738,12 +7242,6 @@ dependencies = [ "statrs", ] -[[package]] -name = "linux-raw-sys" -version = "0.0.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" - [[package]] name = "linux-raw-sys" version = "0.0.46" @@ -6752,9 +7250,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lite-json" @@ -6774,100 +7272,6 @@ dependencies = [ "paste 0.1.18", ] -[[package]] -name = "local-integration-tests" -version = "0.1.0" -dependencies = [ - "base58", - "common", - "composable-tests-helpers", - "composable-traits", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "dali-runtime", - "env_logger", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "hex", - "hex-literal", - "kusama-runtime", - "more-asserts 0.3.1", - "num-traits", - "orml-tokens", - "orml-traits", - "orml-unknown-tokens", - "orml-xtokens", - "pallet-assets 1.0.0", - "pallet-assets-registry", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-call-filter", - "pallet-collator-selection", - "pallet-collective", - "pallet-currency-factory", - "pallet-democracy", - "pallet-governance-registry", - "pallet-indices", - "pallet-liquidations", - "pallet-membership", - "pallet-oracle", - "pallet-randomness-collective-flip", - "pallet-scheduler", - "pallet-session", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vault", - "pallet-xcm", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "paste 1.0.9", - "picasso-runtime", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-parachains", - "primitives", - "rococo-runtime", - "scale-info", - "smallvec 1.10.0", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-transaction-pool", - "sp-version", - "statemine-runtime", - "xcm", - "xcm-builder", - "xcm-emulator", - "xcm-executor", -] - [[package]] name = "lock_api" version = "0.3.4" @@ -7013,11 +7417,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.4.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "libc", + "rustix 0.36.6", ] [[package]] @@ -7139,15 +7543,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -7201,20 +7596,8 @@ dependencies = [ ] [[package]] -name = "more-asserts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" - -[[package]] -name = "more-asserts" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" - -[[package]] -name = "multiaddr" -version = "0.14.0" +name = "multiaddr" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ @@ -7266,9 +7649,9 @@ checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ "proc-macro-crate 1.2.1", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -7334,9 +7717,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7417,7 +7800,7 @@ checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" dependencies = [ "anyhow", "byteorder", - "paste 1.0.9", + "paste 1.0.11", "thiserror", ] @@ -7474,9 +7857,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -7543,9 +7926,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7610,45 +7993,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", - "libm", + "libm 0.2.6", ] [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown 0.11.2", + "hashbrown 0.12.3", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.29.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -7664,9 +8047,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.44" +version = "0.10.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -7683,9 +8066,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7696,9 +8079,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.79" +version = "0.9.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" dependencies = [ "autocfg 1.1.0", "cc", @@ -7710,7 +8093,7 @@ dependencies = [ [[package]] name = "orchestra" version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "dyn-clonable", @@ -7726,15 +8109,15 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "expander 0.0.6", "itertools", "petgraph", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -7751,14 +8134,14 @@ name = "orml-tokens" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "orml-traits", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -7766,17 +8149,17 @@ name = "orml-traits" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", ] [[package]] @@ -7784,14 +8167,14 @@ name = "orml-unknown-tokens" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "orml-xcm-support", "parity-scale-codec", "scale-info", "serde", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", ] [[package]] @@ -7799,13 +8182,13 @@ name = "orml-utilities" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] @@ -7813,13 +8196,13 @@ name = "orml-xcm-support" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "orml-traits", "parity-scale-codec", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", + "xcm-executor 0.9.27", ] [[package]] @@ -7827,20 +8210,20 @@ name = "orml-xtokens" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "orml-traits", "orml-xcm-support", - "pallet-xcm", + "pallet-xcm 0.9.27", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", + "xcm-executor 0.9.27", ] [[package]] @@ -7892,10 +8275,10 @@ dependencies = [ "pablo-runtime-api", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -7905,8 +8288,18 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if 1.0.0", + "libm 0.1.4", ] [[package]] @@ -7917,47 +8310,46 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "ecdsa", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex", "hex-literal", "libsecp256k1", "multihash", "p256", "pallet-balances", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "proptest", "rand_core 0.6.4", "rustc-hex", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -7967,9 +8359,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "num-traits", "orml-tokens", "orml-traits", @@ -7979,26 +8371,12 @@ dependencies = [ "primitives", "proptest", "scale-info", - "sp-api", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", -] - -[[package]] -name = "pallet-assets" -version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8006,165 +8384,204 @@ name = "pallet-assets-registry" version = "1.0.0" dependencies = [ "composable-traits", - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-balances", "pallet-currency-factory", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", - "pallet-timestamp", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-aura", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", - "pallet-session", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-authority-discovery", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authorship", - "pallet-session", - "pallet-timestamp", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "pallet-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "beefy-primitives", - "frame-support", - "frame-system", - "pallet-session", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "beefy-merkle-tree", - "beefy-primitives", - "frame-support", - "frame-system", + "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "hex", "log 0.4.17", - "pallet-beefy", - "pallet-mmr", - "pallet-session", + "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "pallet-beefy-mmr" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "array-bytes", + "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "log 0.4.17", + "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8174,41 +8591,41 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-tokens", "orml-traits", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-vesting 1.0.0", "parity-scale-codec", "proptest", "proptest-derive", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8216,73 +8633,73 @@ name = "pallet-call-filter" version = "1.0.0" dependencies = [ "composable-traits", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "smallvec 1.10.0", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authorship", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "rand 0.8.5", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8293,23 +8710,23 @@ dependencies = [ "composable-traits", "cosmwasm-vm", "cosmwasm-vm-wasmi", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex", - "ibc", - "ibc-primitives", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "lazy_static", "libsecp256k1", "log 0.4.17", "num-traits", "orml-tokens", "orml-traits", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-balances", "pallet-governance-registry", - "pallet-ibc", - "pallet-timestamp", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "parity-wasm 0.45.0", "primitives", @@ -8319,14 +8736,14 @@ dependencies = [ "serde_json", "sha2 0.10.6", "sha3", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "wasm-instrument 0.2.0", "wasmi 0.11.0", - "wasmi-validation 0.4.1", + "wasmi-validation 0.4.1 (git+https://github.com/ComposableFi/wasmi?rev=cd8c0c775a1d197a35ff3d5c7d6cded3d476411b)", ] [[package]] @@ -8336,25 +8753,25 @@ dependencies = [ "composable-support", "composable-tests-helpers", "ed25519-dalek", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex", "hex-literal", "libsecp256k1", "pallet-balances", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "rustc-hex", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8363,34 +8780,34 @@ version = "1.0.0" dependencies = [ "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-balances", "parity-scale-codec", "proptest", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8400,24 +8817,24 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-tokens", "orml-traits", "pallet-balances", "pallet-currency-factory", "pallet-pablo", "pallet-staking-rewards", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8428,53 +8845,54 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "cumulus-primitives-core", - "frame-benchmarking", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex-literal", "log 0.4.17", "num-traits", "orml-tokens", "orml-traits", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-balances", "pallet-currency-factory", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "primitives", "proptest", "scale-info", "serde", "smallvec 1.10.0", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", + "pallet-election-provider-support-benchmarking", "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "strum", ] @@ -8482,32 +8900,53 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "pallet-fast-unstake" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-election-provider-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "log 0.4.17", + "pallet-balances", + "pallet-staking", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "parity-scale-codec", + "scale-info", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8517,33 +8956,33 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-proxy", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8551,40 +8990,40 @@ name = "pallet-governance-registry" version = "1.0.0" dependencies = [ "composable-traits", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-traits", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authorship", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-finality-grandpa", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8592,42 +9031,87 @@ name = "pallet-ibc" version = "0.0.1" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "beefy-light-client-primitives", - "cumulus-primitives-core", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", "derive_more", "finality-grandpa", - "frame-benchmarking", - "frame-support", - "frame-system", - "grandpa-light-client-primitives", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "hex", "hex-literal", - "ibc", - "ibc-derive", - "ibc-primitives", - "ibc-proto", - "ics07-tendermint", - "ics10-grandpa", - "ics11-beefy", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "ics23", - "light-client-common", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", "log 0.4.17", - "pallet-ibc-ping", - "pallet-timestamp", - "parachain-info", + "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", "parity-scale-codec", - "prost 0.11.3", + "prost 0.11.6", "scale-info", "serde", "serde_json", "sha2 0.10.6", - "simple-iavl", - "sp-core", - "sp-finality-grandpa", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tendermint", + "tendermint-light-client-verifier", + "tendermint-proto", +] + +[[package]] +name = "pallet-ibc" +version = "0.0.1" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "derive_more", + "finality-grandpa", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "hex", + "hex-literal", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ics23", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "log 0.4.17", + "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "parity-scale-codec", + "prost 0.11.6", + "scale-info", + "serde_json", + "sha2 0.10.6", + "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "tendermint", "tendermint-light-client-verifier", "tendermint-proto", @@ -8638,70 +9122,88 @@ name = "pallet-ibc-ping" version = "0.0.1" source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "frame-support", - "frame-system", - "ibc", - "ibc-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "pallet-ibc-ping" +version = "0.0.1" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8712,23 +9214,23 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex-literal", "log 0.4.17", "num-traits", "once_cell", "orml-tokens", "orml-traits", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-balances", "pallet-currency-factory", "pallet-dutch-auction", "pallet-liquidations", "pallet-oracle", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-vault", "parity-scale-codec", "primitives", @@ -8737,14 +9239,14 @@ dependencies = [ "scale-info", "serde", "smallvec 1.10.0", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] @@ -8755,80 +9257,98 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex-literal", "log 0.4.17", "num-traits", "orml-tokens", "orml-traits", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-balances", "pallet-currency-factory", "pallet-dutch-auction", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitives", "proptest", "scale-info", "smallvec 1.10.0", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "pallet-mmr" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "ckb-merkle-mountain-range", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "parity-scale-codec", + "scale-info", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ckb-merkle-mountain-range", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-mmr-primitives", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", - "sp-mmr-primitives", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8838,9 +9358,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "num-traits", "orml-tokens", @@ -8850,112 +9370,113 @@ dependencies = [ "plotters", "proptest", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-bags-list", "pallet-nomination-pools", "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-babe", "pallet-balances", "pallet-grandpa", "pallet-im-online", "pallet-offences", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8965,24 +9486,24 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "lite-json", "log 0.4.17", "pallet-balances", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "parking_lot 0.12.1", "proptest", "scale-info", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8993,40 +9514,40 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "orml-tokens", "orml-traits", "pallet-currency-factory", "pallet-staking-rewards", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "proptest", "rust_decimal", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -9036,169 +9557,190 @@ dependencies = [ "bitflags", "composable-support", "composable-traits", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "pallet-session" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "impl-trait-for-tuples", "log 0.4.17", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "log 0.4.17", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-session", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-staking", "rand 0.7.3", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authorship", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -9208,169 +9750,172 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "env_logger", - "frame-benchmarking", - "frame-support", - "frame-system", + "env_logger 0.9.3", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "orml-tokens", "orml-traits", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-balances", "pallet-currency-factory", "pallet-fnft", "pallet-proxy", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitives", "proptest", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "parity-scale-codec", + "scale-info", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "pallet-timestamp" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-rpc", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", -] - -[[package]] -name = "pallet-uniques" -version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -9381,9 +9926,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "num-traits", "once_cell", @@ -9394,11 +9939,11 @@ dependencies = [ "proptest", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -9407,110 +9952,112 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-tokens", "orml-traits", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "pallet-xcm" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", + "xcm-executor 0.9.27", +] + +[[package]] +name = "pallet-xcm" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27#b86cd207fc77af888f223c10363ae4d18a4b63b4" dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", "scale-info", "serde", ] [[package]] -name = "parachains-common" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +name = "parachain-info" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-executive", - "frame-support", - "frame-system", - "pallet-asset-tx-payment", - "pallet-assets 4.0.0-dev", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", "scale-info", - "sp-consensus-aura", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "serde", ] [[package]] @@ -9541,6 +10088,7 @@ dependencies = [ "arrayvec 0.7.2", "bitvec", "byte-slice-cast", + "bytes 1.3.0", "impl-trait-for-tuples", "parity-scale-codec-derive", "serde", @@ -9553,9 +10101,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9586,8 +10134,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2 1.0.47", - "syn 1.0.105", + "proc-macro2 1.0.49", + "syn 1.0.107", "synstructure", ] @@ -9625,7 +10173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", - "parking_lot_core 0.6.2", + "parking_lot_core 0.6.3", "rustc_version 0.2.3", ] @@ -9637,7 +10185,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api 0.4.9", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -9647,14 +10195,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api 0.4.9", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.6", ] [[package]] name = "parking_lot_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" dependencies = [ "cfg-if 0.1.10", "cloudabi", @@ -9667,9 +10215,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", @@ -9681,9 +10229,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9704,9 +10252,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "paste-impl" @@ -9774,9 +10322,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" +checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" dependencies = [ "thiserror", "ucd-trie", @@ -9784,9 +10332,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" +checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" dependencies = [ "pest", "pest_generator", @@ -9794,26 +10342,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" +checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "pest_meta" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" +checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" dependencies = [ "once_cell", "pest", - "sha1 0.10.5", + "sha2 0.10.6", ] [[package]] @@ -9841,13 +10389,13 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -9859,7 +10407,7 @@ dependencies = [ "orml-xtokens", "pablo-runtime-api", "pallet-asset-tx-payment", - "pallet-assets 1.0.0", + "pallet-assets", "pallet-assets-registry", "pallet-aura", "pallet-authorship", @@ -9881,36 +10429,35 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting 1.0.0", - "pallet-xcm", - "parachain-info", + "pallet-xcm 0.9.30", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "primitives", "scale-info", - "simnode-runtime-apis", "smallvec 1.10.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", - "xcm", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] @@ -9935,9 +10482,9 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -9981,6 +10528,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "plotters" version = "0.3.4" @@ -10036,42 +10589,42 @@ dependencies = [ "bitflags", "crc32fast", "flate2", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] name = "polkadot-approval-distribution" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "derive_more", "fatality", @@ -10083,18 +10636,18 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", - "sp-core", - "sp-keystore", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "fatality", "futures 0.3.25", @@ -10105,7 +10658,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "sc-network", "thiserror", @@ -10114,8 +10667,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "clap 3.2.23", "frame-benchmarking-cli", @@ -10130,9 +10683,9 @@ dependencies = [ "sc-service", "sc-sysinfo", "sc-tracing", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-trie", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -10140,19 +10693,19 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives", - "frame-benchmarking", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-benchmarking-cli", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-rpc-runtime-api", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", + "polkadot-core-primitives 0.9.30", "polkadot-node-core-parachains-inherent", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-runtime", "polkadot-runtime-common", "rococo-runtime", @@ -10160,29 +10713,29 @@ dependencies = [ "sc-consensus", "sc-executor", "sc-service", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-mmr-primitives", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", ] [[package]] name = "polkadot-collator-protocol" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "always-assert", "fatality", @@ -10192,10 +10745,10 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", - "sp-keystore", - "sp-runtime", + "polkadot-primitives 0.9.30", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] @@ -10203,20 +10756,33 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +dependencies = [ + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "polkadot-core-primitives" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "parity-scale-codec", "parity-util-mem", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polkadot-dispute-distribution" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "derive_more", "fatality", @@ -10228,52 +10794,52 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-network", - "sp-application-crypto", - "sp-keystore", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "reed-solomon-novelpoly", - "sp-core", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "polkadot-gossip-support" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "always-assert", "async-trait", @@ -10286,8 +10852,9 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-network", + "sc-network-common", "sp-consensus", "thiserror", "tracing-gum", @@ -10295,8 +10862,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "parity-scale-codec", @@ -10304,8 +10871,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", + "polkadot-primitives 0.9.30", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -10313,8 +10880,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", "derive_more", @@ -10329,21 +10896,21 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-keystore", "schnorrkel", - "sp-application-crypto", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots", - "sp-runtime", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", "futures 0.3.25", @@ -10355,15 +10922,15 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-backing" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", "fatality", @@ -10372,23 +10939,23 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-statement-table", - "sp-keystore", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", + "polkadot-primitives 0.9.30", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", "wasm-timer", @@ -10396,8 +10963,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "futures 0.3.25", @@ -10406,21 +10973,21 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "sp-maybe-compressed-blob", "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-client-api", "sc-consensus-babe", "sp-blockchain", @@ -10429,8 +10996,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "futures-timer", @@ -10439,15 +11006,15 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "fatality", "futures 0.3.25", @@ -10457,7 +11024,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-keystore", "thiserror", "tracing-gum", @@ -10465,25 +11032,25 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "futures 0.3.25", "futures-timer", "polkadot-node-subsystem", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sp-blockchain", - "sp-inherents", - "sp-runtime", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", "fatality", @@ -10492,7 +11059,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "thiserror", "tracing-gum", @@ -10500,8 +11067,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "always-assert", "assert_matches", @@ -10511,45 +11078,45 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project", - "polkadot-core-primitives", - "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-core-primitives 0.9.30", + "polkadot-node-metrics", + "polkadot-parachain 0.9.30", "rand 0.8.5", "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "slotmap", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-maybe-compressed-blob", - "sp-tracing", - "sp-wasm-interface", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tempfile", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives", - "sp-keystore", + "polkadot-primitives 0.9.30", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "futures 0.3.25", "memory-lru", @@ -10557,15 +11124,15 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sp-consensus-babe", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-std", "lazy_static", @@ -10574,23 +11141,23 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-network", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bs58", "futures 0.3.25", "futures-timer", "log 0.4.17", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "prioritized-metered-channel", "sc-cli", "sc-service", @@ -10601,20 +11168,22 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "derive_more", "fatality", "futures 0.3.25", + "hex", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "rand 0.8.5", "sc-authority-discovery", "sc-network", + "sc-network-common", "strum", "thiserror", "tracing-gum", @@ -10622,21 +11191,21 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bounded-vec", "futures 0.3.25", "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "schnorrkel", "serde", - "sp-application-crypto", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-core", - "sp-keystore", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-maybe-compressed-blob", "thiserror", "zstd", @@ -10644,8 +11213,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -10654,8 +11223,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "derive_more", @@ -10664,12 +11233,12 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-statement-table", "sc-network", "smallvec 1.10.0", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-babe", "substrate-prometheus-endpoint", "thiserror", @@ -10677,8 +11246,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "derive_more", @@ -10698,20 +11267,20 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "prioritized-metered-channel", "rand 0.8.5", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "futures 0.3.25", @@ -10724,86 +11293,133 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-client-api", - "sp-api", - "sp-core", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing-gum", ] [[package]] name = "polkadot-parachain" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" dependencies = [ "derive_more", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", + "polkadot-core-primitives 0.9.27", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "polkadot-parachain" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" +dependencies = [ + "derive_more", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "parity-scale-codec", + "parity-util-mem", + "polkadot-core-primitives 0.9.30", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polkadot-performance-test" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "env_logger", + "env_logger 0.9.3", "kusama-runtime", "log 0.4.17", "polkadot-erasure-coding", "polkadot-node-core-pvf", "polkadot-node-primitives", - "quote 1.0.21", + "quote 1.0.23", "thiserror", ] [[package]] name = "polkadot-primitives" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +dependencies = [ + "bitvec", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "hex-literal", + "parity-scale-codec", + "parity-util-mem", + "polkadot-core-primitives 0.9.27", + "polkadot-parachain 0.9.27", + "scale-info", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "polkadot-primitives" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-core-primitives 0.9.30", + "polkadot-parachain 0.9.30", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", - "sp-version", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polkadot-rpc" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -10814,29 +11430,29 @@ dependencies = [ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -10854,31 +11470,35 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", "pallet-offences", "pallet-offences-benchmarking", "pallet-preimage", "pallet-proxy", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm", + "pallet-xcm 0.9.30", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", @@ -10887,40 +11507,40 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "substrate-wasm-builder", - "xcm", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] name = "polkadot-runtime-common" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "libsecp256k1", "log 0.4.17", @@ -10928,110 +11548,111 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", - "pallet-beefy-mmr", + "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-election-provider-multi-phase", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-staking", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "pallet-treasury", "pallet-vesting 4.0.0-dev", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", "serde_derive", "slot-range-helper", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", - "xcm", + "xcm 0.9.30", ] [[package]] name = "polkadot-runtime-constants" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "smallvec 1.10.0", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bs58", "parity-scale-codec", - "polkadot-primitives", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", + "polkadot-primitives 0.9.30", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polkadot-runtime-parachains" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitflags", "bitvec", "derive_more", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-staking", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-vesting 4.0.0-dev", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", - "xcm", - "xcm-executor", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] name = "polkadot-service" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "async-trait", "beefy-gadget", - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-rpc-runtime-api", "futures 0.3.25", "hex-literal", @@ -11072,8 +11693,8 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "polkadot-rpc", "polkadot-runtime", "polkadot-runtime-constants", @@ -11090,11 +11711,11 @@ dependencies = [ "sc-consensus", "sc-consensus-babe", "sc-consensus-slots", - "sc-consensus-uncles", "sc-executor", "sc-finality-grandpa", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-service", "sc-sync-state-rpc", @@ -11103,25 +11724,25 @@ dependencies = [ "sc-transaction-pool", "serde", "serde_json", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-finality-grandpa", - "sp-inherents", - "sp-io", - "sp-keystore", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-trie", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -11130,8 +11751,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -11142,28 +11763,28 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", - "sp-staking", + "polkadot-primitives 0.9.30", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "parity-scale-codec", - "polkadot-primitives", - "sp-core", + "polkadot-primitives 0.9.30", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "polling" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", @@ -11215,12 +11836,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ - "proc-macro2 1.0.47", - "syn 1.0.105", + "proc-macro2 1.0.49", + "syn 1.0.107", ] [[package]] @@ -11232,7 +11853,7 @@ dependencies = [ "clap 3.2.23", "custom_derive", "enum_derive", - "env_logger", + "env_logger 0.9.3", "futures 0.3.25", "jsonrpc-client-transports", "jsonrpc-core", @@ -11244,7 +11865,7 @@ dependencies = [ "serde_json", "signal-hook", "signal-hook-tokio", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "subxt 0.22.0", "tokio", "tokio-stream", @@ -11271,20 +11892,20 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "lazy_static", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "coarsetime", "crossbeam-queue", @@ -11323,9 +11944,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "version_check 0.9.4", ] @@ -11335,16 +11956,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "version_check 0.9.4", ] [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" @@ -11357,9 +11978,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -11396,9 +12017,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -11444,12 +12065,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes 1.3.0", - "prost-derive 0.11.2", + "prost-derive 0.11.6", ] [[package]] @@ -11476,9 +12097,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes 1.3.0", "heck 0.4.0", @@ -11488,10 +12109,10 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost 0.11.3", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-types 0.11.6", "regex", - "syn 1.0.105", + "syn 1.0.107", "tempfile", "which", ] @@ -11517,22 +12138,22 @@ checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -11547,12 +12168,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes 1.3.0", - "prost 0.11.3", + "prost 0.11.6", ] [[package]] @@ -11579,9 +12200,9 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -11618,11 +12239,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ - "proc-macro2 1.0.47", + "proc-macro2 1.0.49", ] [[package]] @@ -11918,35 +12539,35 @@ dependencies = [ "derive_more", "fs-err", "itertools", - "static_init", + "static_init 0.5.2", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "regalloc2" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" +checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" dependencies = [ "fxhash", "log 0.4.17", @@ -11956,9 +12577,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -11980,33 +12601,21 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi 0.3.9", -] - [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "env_logger", - "jsonrpsee 0.14.0", + "env_logger 0.9.3", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -12074,12 +12683,6 @@ dependencies = [ "quick-error 1.2.3", ] -[[package]] -name = "retain_mut" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - [[package]] name = "rfc6979" version = "0.1.0" @@ -12135,9 +12738,9 @@ version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -12152,15 +12755,15 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-merkle-tree", - "beefy-primitives", - "frame-benchmarking", + "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -12169,28 +12772,42 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", + "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-bounties", + "pallet-child-bounties", "pallet-collective", + "pallet-democracy", + "pallet-elections-phragmen", + "pallet-gilt", "pallet-grandpa", + "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-multisig", "pallet-offences", + "pallet-preimage", "pallet-proxy", - "pallet-session", + "pallet-recovery", + "pallet-scheduler", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-society", "pallet-staking", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", "pallet-utility", - "pallet-xcm", + "pallet-vesting 4.0.0-dev", + "pallet-xcm 0.9.30", + "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", @@ -12198,37 +12815,38 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "static_assertions", "substrate-wasm-builder", - "xcm", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] name = "rococo-runtime-constants" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "smallvec 1.10.0", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -12243,11 +12861,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi 0.3.9", ] @@ -12276,6 +12895,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "rust_decimal" version = "1.27.0" @@ -12336,21 +12965,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", -] - -[[package]] -name = "rustix" -version = "0.33.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 0.5.3", - "libc", - "linux-raw-sys 0.0.42", - "winapi 0.3.9", + "semver 1.0.16", ] [[package]] @@ -12369,23 +12984,23 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.3", + "io-lifetimes 1.0.4", "libc", - "linux-raw-sys 0.1.3", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log 0.4.17", "ring", @@ -12400,7 +13015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.1", + "rustls-pemfile 1.0.2", "schannel", "security-framework", ] @@ -12416,18 +13031,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rusty-fork" @@ -12454,9 +13069,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe-mix" @@ -12541,18 +13156,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", - "sp-core", - "sp-wasm-interface", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", @@ -12565,13 +13180,13 @@ dependencies = [ "prost-build 0.10.4", "rand 0.7.3", "sc-client-api", - "sc-network", - "sp-api", - "sp-authority-discovery", + "sc-network-common", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", ] @@ -12579,7 +13194,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "futures-timer", @@ -12590,69 +13205,69 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-trait-for-tuples", "memmap2", "parity-scale-codec", "sc-chain-spec-derive", - "sc-network", + "sc-network-common", "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "chrono", "clap 3.2.23", "fdlimit", "futures 0.3.25", - "hex", "libp2p", "log 0.4.17", "names", @@ -12664,6 +13279,7 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", + "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -12671,12 +13287,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", - "sp-version", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tiny-bip39", "tokio", @@ -12685,7 +13301,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "fnv", "futures 0.3.25", @@ -12696,24 +13312,24 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-database", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "kvdb", @@ -12726,19 +13342,19 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", @@ -12749,12 +13365,12 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", ] @@ -12762,7 +13378,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", @@ -12773,17 +13389,17 @@ dependencies = [ "sc-consensus", "sc-consensus-slots", "sc-telemetry", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", ] @@ -12791,7 +13407,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "fork-tree", @@ -12804,7 +13420,6 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "rand 0.7.3", - "retain_mut", "sc-client-api", "sc-consensus", "sc-consensus-epochs", @@ -12813,20 +13428,20 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", ] @@ -12834,76 +13449,42 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime", -] - -[[package]] -name = "sc-consensus-manual-seal" -version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" -dependencies = [ - "assert_matches", - "async-trait", - "futures 0.3.25", - "jsonrpsee 0.14.0", - "log 0.4.17", - "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sc-consensus-aura", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-transaction-pool", - "sc-transaction-pool-api", - "serde", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-timestamp", - "substrate-prometheus-endpoint", - "thiserror", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", @@ -12913,33 +13494,21 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "thiserror", -] - -[[package]] -name = "sc-consensus-uncles" -version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" -dependencies = [ - "sc-client-api", - "sp-authorship", - "sp-runtime", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", "lru 0.7.8", @@ -12948,86 +13517,85 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tasks", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", - "wasmi 0.9.1", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "environmental", "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", "sp-sandbox", - "sp-serializer", - "sp-wasm-interface", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", - "wasm-instrument 0.1.1", - "wasmi 0.9.1", + "wasm-instrument 0.3.0", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-sandbox", - "sp-wasm-interface", - "wasmi 0.9.1", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "cfg-if 1.0.0", "libc", "log 0.4.17", "once_cell", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "rustix 0.35.13", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-sandbox", - "sp-wasm-interface", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ahash", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.25", "futures-timer", - "hex", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", @@ -13043,15 +13611,15 @@ dependencies = [ "sc-telemetry", "sc-utils", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-keystore", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", ] @@ -13059,11 +13627,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "finality-grandpa", "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "sc-client-api", @@ -13072,15 +13640,15 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ansi_term", "futures 0.3.25", @@ -13088,32 +13656,33 @@ dependencies = [ "log 0.4.17", "parity-util-mem", "sc-client-api", - "sc-network", + "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "async-trait", - "hex", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "async-trait", "asynchronous-codec", "bitflags", @@ -13124,7 +13693,6 @@ dependencies = [ "fork-tree", "futures 0.3.25", "futures-timer", - "hex", "ip_network", "libp2p", "linked-hash-map", @@ -13135,7 +13703,6 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "prost 0.10.4", - "prost-build 0.10.4", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -13146,40 +13713,67 @@ dependencies = [ "serde", "serde_json", "smallvec 1.10.0", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", - "void", "zeroize", ] +[[package]] +name = "sc-network-bitswap" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "cid", + "futures 0.3.25", + "libp2p", + "log 0.4.17", + "prost 0.11.6", + "prost-build 0.11.6", + "sc-client-api", + "sc-network-common", + "sp-blockchain", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "thiserror", + "unsigned-varint", + "void", +] + [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "async-trait", "bitflags", + "bytes 1.3.0", "futures 0.3.25", + "futures-timer", "libp2p", + "linked_hash_set", "parity-scale-codec", "prost-build 0.10.4", "sc-consensus", "sc-peerset", + "serde", "smallvec 1.10.0", + "sp-blockchain", "sp-consensus", - "sp-finality-grandpa", - "sp-runtime", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ahash", "futures 0.3.25", @@ -13187,8 +13781,9 @@ dependencies = [ "libp2p", "log 0.4.17", "lru 0.7.8", - "sc-network", - "sp-runtime", + "sc-network-common", + "sc-peerset", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "tracing", ] @@ -13196,8 +13791,9 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "futures 0.3.25", "libp2p", "log 0.4.17", @@ -13208,16 +13804,17 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "fork-tree", "futures 0.3.25", "libp2p", @@ -13231,39 +13828,60 @@ dependencies = [ "sc-network-common", "sc-peerset", "smallvec 1.10.0", - "sp-arithmetic", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] +[[package]] +name = "sc-network-transactions" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "array-bytes", + "futures 0.3.25", + "hex", + "libp2p", + "log 0.4.17", + "parity-scale-codec", + "pin-project", + "sc-network-common", + "sc-peerset", + "sp-consensus", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "bytes 1.3.0", "fnv", "futures 0.3.25", "futures-timer", - "hex", "hyper 0.14.23", "hyper-rustls", + "libp2p", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.1", "rand 0.7.3", "sc-client-api", - "sc-network", + "sc-network-common", + "sc-peerset", "sc-utils", - "sp-api", - "sp-core", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "threadpool", "tracing", ] @@ -13271,7 +13889,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "libp2p", @@ -13284,7 +13902,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", "substrate-prometheus-endpoint", @@ -13293,11 +13911,11 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "hash-db", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", @@ -13309,24 +13927,24 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", - "sp-keystore", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", "sp-rpc", - "sp-runtime", - "sp-session", - "sp-version", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", @@ -13335,21 +13953,21 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-rpc", - "sp-runtime", - "sp-tracing", - "sp-version", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "serde_json", "substrate-prometheus-endpoint", @@ -13359,7 +13977,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "directories", @@ -13367,7 +13985,7 @@ dependencies = [ "futures 0.3.25", "futures-timer", "hash-db", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "parity-util-mem", @@ -13383,9 +14001,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", + "sc-network-transactions", "sc-offchain", "sc-rpc", "sc-rpc-server", @@ -13397,24 +14017,25 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", - "sp-version", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -13426,7 +14047,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", "parity-scale-codec", @@ -13434,15 +14055,15 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -13452,14 +14073,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "libc", @@ -13470,15 +14091,15 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "chrono", "futures 0.3.25", @@ -13496,7 +14117,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ansi_term", "atty", @@ -13512,12 +14133,12 @@ dependencies = [ "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing", "tracing-log", @@ -13527,18 +14148,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "futures-timer", @@ -13547,16 +14168,15 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.12.1", - "retain_mut", "sc-client-api", "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -13565,20 +14185,20 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "log 0.4.17", "serde", "sp-blockchain", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "futures-timer", @@ -13621,9 +14241,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" dependencies = [ "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -13645,12 +14265,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -13671,10 +14290,10 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "serde_derive_internals", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -13709,9 +14328,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -13744,11 +14363,29 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys 0.4.2", +] + +[[package]] +name = "secp256k1" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +dependencies = [ + "secp256k1-sys 0.6.1", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" dependencies = [ - "secp256k1-sys", + "cc", ] [[package]] @@ -13821,9 +14458,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ "serde", ] @@ -13845,9 +14482,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -13862,22 +14499,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -13886,9 +14523,9 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -13902,9 +14539,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -13922,9 +14559,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" dependencies = [ "serde", ] @@ -13942,13 +14579,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -14124,85 +14761,24 @@ dependencies = [ "approx", "num-complex", "num-traits", - "paste 1.0.9", + "paste 1.0.11", ] [[package]] -name = "simnode-common" +name = "simple-iavl" version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" dependencies = [ - "common", - "composable-node", - "composable-runtime", - "cumulus-primitives-parachain-inherent", - "dali-runtime", - "derive_more", - "frame-benchmarking", - "frame-system", - "jsonrpsee 0.14.0", - "pallet-asset-tx-payment", - "pallet-transaction-payment", - "picasso-runtime", - "sc-cli", - "sc-consensus", - "sc-consensus-manual-seal", - "sc-executor", - "sc-rpc", - "sc-service", - "simnode-runtime-apis", - "sp-api", - "sp-consensus-aura", - "sp-runtime", - "sp-transaction-pool", - "substrate-simnode", -] - -[[package]] -name = "simnode-runtime-apis" -version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-simnode?branch=polkadot-v0.9.27#a7bae3e69784a81d29ccc47afe6d367adc2b3936" -dependencies = [ - "parity-scale-codec", - "sp-api", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", -] - -[[package]] -name = "simnode-tests" -version = "0.1.0" -dependencies = [ - "common", - "composable-node", - "composable-runtime", - "cumulus-pallet-parachain-system", - "dali-runtime", - "frame-benchmarking", - "frame-system", - "hex", - "num-traits", - "pallet-sudo", - "parachain-info", - "parity-scale-codec", - "picasso-runtime", - "polkadot-primitives", - "sc-cli", - "sc-client-api", - "sc-executor", - "sc-rpc", - "sc-service", - "simnode-common", - "simnode-runtime-apis", - "sp-api", - "sp-blockchain", - "sp-keyring", - "sp-runtime", - "substrate-simnode", + "bytes 1.3.0", + "ics23", + "sha2 0.10.6", + "tendermint", ] [[package]] name = "simple-iavl" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" dependencies = [ "bytes 1.3.0", "ics23", @@ -14236,14 +14812,14 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "enumn", "parity-scale-codec", - "paste 1.0.9", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "paste 1.0.11", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -14303,7 +14879,7 @@ dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-pre.5", "rand_core 0.6.4", "ring", "rustc_version 0.4.0", @@ -14340,206 +14916,368 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "hash-db", + "log 0.4.17", + "parity-scale-codec", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "log 0.4.17", "parity-scale-codec", - "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-version", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "blake2", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "sp-api-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "blake2", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "sp-application-crypto" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acb4490364cb3b097a6755343e552495b0013778152300714be4647d107e9a2e" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-application-crypto" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-arithmetic" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ef21f82cc10f75ed046b65e2f8048080ee76e59f1b8aed55c7150daebfd35b" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ + "integer-sqrt", + "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "static_assertions", ] [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-authority-discovery" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures 0.3.25", "log 0.4.17", "lru 0.7.8", "parity-scale-codec", "parking_lot 0.12.1", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", "futures-timer", "log 0.4.17", "parity-scale-codec", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots", - "sp-inherents", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "merlin", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots", + "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus-vrf", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-consensus-slots" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-timestamp", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77963e2aa8fadb589118c3aede2e78b6c4bcf1c01d588fbf33e915b390825fbd" +dependencies = [ + "base58", + "bitflags", + "blake2-rfc", + "byteorder", + "dyn-clonable", + "ed25519-dalek", + "futures 0.3.25", + "hash-db", + "hash256-std-hasher", + "hex", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log 0.4.17", + "merlin", + "num-traits", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.12.1", + "primitive-types", + "rand 0.7.3", + "regex", + "scale-info", + "schnorrkel", + "secp256k1 0.21.3", + "secrecy", + "serde", + "sp-core-hashing 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "wasmi 0.9.1", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "base58", "bitflags", @@ -14565,15 +15303,15 @@ dependencies = [ "regex", "scale-info", "schnorrkel", - "secp256k1", + "secp256k1 0.24.3", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "ss58-registry", "substrate-bip39", "thiserror", @@ -14582,35 +15320,120 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2", + "byteorder", + "dyn-clonable", + "ed25519-zebra", + "futures 0.3.25", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log 0.4.17", + "merlin", + "num-traits", + "parity-scale-codec", + "parity-util-mem", + "parking_lot 0.12.1", + "primitive-types", + "rand 0.7.3", + "regex", + "scale-info", + "schnorrkel", + "secp256k1 0.24.3", + "secrecy", + "serde", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "wasmi 0.13.2", + "zeroize", +] + +[[package]] +name = "sp-core-hashing" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec864a6a67249f0c8dd3d5acab43623a61677e85ff4f2f9b04b802d2fe780e83" +dependencies = [ + "blake2-rfc", + "byteorder", + "sha2 0.9.9", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tiny-keccak", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "blake2", + "byteorder", + "digest 0.10.6", + "sha2 0.10.6", + "sha3", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "twox-hash", +] + [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "blake2", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "proc-macro2 1.0.49", + "quote 1.0.23", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "syn 1.0.107", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "sp-core-hashing", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "syn 1.0.107", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -14619,77 +15442,205 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] -name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +name = "sp-debug-derive" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] -name = "sp-finality-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +name = "sp-debug-derive" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "finality-grandpa", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +name = "sp-externalities" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcfd91f92a2a59224230a77c4a5d6f51709620c0aab4e51f108ccece6adc56f" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-externalities" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-externalities" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-finality-grandpa" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "finality-grandpa", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-finality-grandpa" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "finality-grandpa", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "thiserror", +] + +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "935fd3c71bad6811a7984cabb74d323b8ca3107024024c3eabb610e0182ba8d3" +dependencies = [ + "futures 0.3.25", + "hash-db", + "libsecp256k1", + "log 0.4.17", + "parity-scale-codec", + "parking_lot 0.12.1", + "secp256k1 0.21.3", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-keystore 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-state-machine 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "futures 0.3.25", + "hash-db", + "libsecp256k1", + "log 0.4.17", + "parity-scale-codec", + "parking_lot 0.12.1", + "secp256k1 0.24.3", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "bytes 1.3.0", "futures 0.3.25", "hash-db", "libsecp256k1", "log 0.4.17", "parity-scale-codec", "parking_lot 0.12.1", - "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "secp256k1 0.24.3", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", "tracing-core", ] @@ -14697,18 +15648,52 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "strum", ] [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3261eddca8c8926e3e1de136a7980cb3afc3455247d9d6f3119d9b292f73aaee" +dependencies = [ + "async-trait", + "futures 0.3.25", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "schnorrkel", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "async-trait", + "futures 0.3.25", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "schnorrkel", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures 0.3.25", @@ -14717,15 +15702,15 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core", - "sp-externalities", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "thiserror", "zstd", @@ -14734,46 +15719,82 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "log 0.4.17", + "parity-scale-codec", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-mmr-primitives" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", "parity-scale-codec", "serde", - "sp-api", - "sp-core", - "sp-debug-derive", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-panic-handler" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2101f3c555fceafcfcfb0e61c55ea9ed80dc60bd77d54d9f25b369edb029e9a4" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-panic-handler" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "backtrace", + "lazy_static", + "regex", ] [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "backtrace", "lazy_static", @@ -14783,17 +15804,62 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-runtime" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d8a8d5ab5d349c6cf9300af1721b7b6446ba63401dbb11c10a1d65197aa5f" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log 0.4.17", + "parity-scale-codec", + "parity-util-mem", + "paste 1.0.11", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-runtime" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log 0.4.17", + "parity-scale-codec", + "parity-util-mem", + "paste 1.0.11", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "either", "hash256-std-hasher", @@ -14801,98 +15867,222 @@ dependencies = [ "log 0.4.17", "parity-scale-codec", "parity-util-mem", - "paste 1.0.9", + "paste 1.0.11", "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", +] + +[[package]] +name = "sp-runtime-interface" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158bf0305c75a50fc0e334b889568f519a126e32b87900c3f4251202dece7b4b" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface-proc-macro 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "static_assertions", ] [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "bytes 1.3.0", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-storage 6.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ecb916b9664ed9f90abef0ff5a3e61454c1efea5861b2997e03f39b59b955f" +dependencies = [ + "Inflector", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "Inflector", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "Inflector", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-wasm-interface", - "wasmi 0.9.1", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "wasmi 0.13.2", ] [[package]] -name = "sp-serializer" +name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ - "serde", - "serde_json", + "parity-scale-codec", + "scale-info", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-staking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-state-machine" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecee3b33eb78c99997676a571656bcc35db6886abecfddd13e76a73b5871c6c1" +dependencies = [ + "hash-db", + "log 0.4.17", + "num-traits", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.7.3", + "smallvec 1.10.0", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-panic-handler 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "tracing", + "trie-db 0.23.1", + "trie-root", +] + +[[package]] +name = "sp-state-machine" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "hash-db", + "log 0.4.17", + "num-traits", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.7.3", + "smallvec 1.10.0", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "thiserror", + "tracing", + "trie-root", ] [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "log 0.4.17", @@ -14901,11 +16091,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec 1.10.0", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing", "trie-root", @@ -14920,7 +16110,12 @@ checksum = "14804d6069ee7a388240b665f17908d98386ffb0b5d39f89a4099fc7a2a4c03f" [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" + +[[package]] +name = "sp-std" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" [[package]] name = "sp-storage" @@ -14932,59 +16127,113 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", + "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", +] + +[[package]] +name = "sp-storage" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "log 0.4.17", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "async-trait", "futures-timer", "log 0.4.17", "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "thiserror", ] +[[package]] +name = "sp-timestamp" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "async-trait", + "futures-timer", + "log 0.4.17", + "parity-scale-codec", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "thiserror", +] + +[[package]] +name = "sp-tracing" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a67e555d171c4238bd223393cda747dd20ec7d4f5fe5c042c056cb7fde9eda" +dependencies = [ + "parity-scale-codec", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "sp-tracing" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -14993,195 +16242,237 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "sp-api", - "sp-runtime", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-trie" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6fc34f4f291886914733e083b62708d829f3e6b8d7a7ca7fa8a55a3d7640b0b" +dependencies = [ + "hash-db", + "memory-db", + "parity-scale-codec", + "scale-info", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.23.1", + "trie-root", ] [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", "scale-info", - "sp-core", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", "thiserror", - "trie-db", + "trie-db 0.23.1", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "ahash", + "hash-db", + "hashbrown 0.12.3", + "lazy_static", + "lru 0.7.8", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "thiserror", + "tracing", + "trie-db 0.24.0", "trie-root", ] [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", - "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-version-proc-macro", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm 0.45.0", + "scale-info", + "serde", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "parity-scale-codec", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "sp-version-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d88debe690c2b24eaa9536a150334fcef2ae184c21a0e5b3e80135407a7d52" dependencies = [ "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.9.1", - "wasmtime", ] [[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +name = "sp-wasm-interface" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +dependencies = [ + "impl-trait-for-tuples", + "log 0.4.17", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "wasmi 0.9.1", +] [[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +name = "sp-wasm-interface" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "base64ct", - "der", + "impl-trait-for-tuples", + "log 0.4.17", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "wasmi 0.13.2", + "wasmtime", ] [[package]] -name = "ss58-registry" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "Inflector", - "num-format", - "proc-macro2 1.0.47", - "quote 1.0.21", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", "serde", - "serde_json", - "unicode-xid 0.2.4", + "smallvec 1.10.0", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "spin" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "standback" -version = "0.2.17" +name = "spki" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "statemine-runtime" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/cumulus?rev=f730e6747be173e2d4609381edc7929c8671f4d8#f730e6747be173e2d4609381edc7929c8671f4d8" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" dependencies = [ - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-ping", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "hex-literal", - "kusama-runtime-constants", - "log 0.4.17", - "pallet-asset-tx-payment", - "pallet-assets 4.0.0-dev", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-multisig", - "pallet-proxy", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-runtime-common", - "scale-info", + "base64ct", + "der", +] + +[[package]] +name = "ss58-registry" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d44528162f980c0e03c71e005d334332c8da0aec9f2b0b4bdc557ed4a9f24776" +dependencies = [ + "Inflector", + "num-format", + "proc-macro2 1.0.49", + "quote 1.0.23", "serde", - "smallvec 1.10.0", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "serde_json", + "unicode-xid 0.2.4", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check 0.9.4", ] [[package]] @@ -15199,7 +16490,22 @@ dependencies = [ "cfg_aliases", "libc", "parking_lot 0.11.2", - "static_init_macro", + "static_init_macro 0.5.0", +] + +[[package]] +name = "static_init" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" +dependencies = [ + "bitflags", + "cfg_aliases", + "libc", + "parking_lot 0.11.2", + "parking_lot_core 0.8.6", + "static_init_macro 1.0.2", + "winapi 0.3.9", ] [[package]] @@ -15210,9 +16516,22 @@ checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf" dependencies = [ "cfg_aliases", "memchr", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "static_init_macro" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -15248,11 +16567,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "serde", "serde_derive", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -15262,13 +16581,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "serde", "serde_derive", "serde_json", "sha1 0.6.1", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -15308,9 +16627,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -15329,10 +16648,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "rustversion", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -15351,36 +16670,36 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "platforms", + "platforms 2.0.0", ] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.25", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "futures-util", "hyper 0.14.23", @@ -15390,89 +16709,31 @@ dependencies = [ "tokio", ] -[[package]] -name = "substrate-simnode" -version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-simnode?branch=polkadot-v0.9.27#a7bae3e69784a81d29ccc47afe6d367adc2b3936" -dependencies = [ - "anyhow", - "clap 3.2.23", - "cumulus-pallet-parachain-system", - "cumulus-primitives-parachain-inherent", - "cumulus-test-relay-sproof-builder", - "frame-support", - "frame-system", - "futures 0.3.25", - "hash-db", - "jsonrpsee 0.14.0", - "log 0.4.17", - "num-traits", - "parachain-info", - "parity-scale-codec", - "polkadot-primitives", - "sc-basic-authorship", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-manual-seal", - "sc-executor", - "sc-finality-grandpa", - "sc-informant", - "sc-network", - "sc-rpc", - "sc-rpc-server", - "sc-service", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", - "simnode-runtime-apis", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-externalities", - "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-offchain", - "sp-runtime", - "sp-runtime-interface", - "sp-session", - "sp-state-machine", - "sp-transaction-pool", - "sp-wasm-interface", - "tokio", -] - [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "sp-trie", - "trie-db", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "trie-db 0.24.0", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ansi_term", "build-helper", @@ -15524,8 +16785,8 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-macro 0.22.0", "subxt-metadata 0.22.0", "thiserror", @@ -15550,10 +16811,10 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-macro 0.23.0", - "subxt-metadata 0.23.0 (git+https://github.com/paritytech/subxt?rev=2fe9a1446d32b93a10804db3304ccaac65f764b8)", + "subxt-metadata 0.23.0", "thiserror", "tracing", ] @@ -15569,28 +16830,28 @@ dependencies = [ "heck 0.4.0", "parity-scale-codec", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "scale-info", "subxt-metadata 0.22.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] name = "subxt-codegen" version = "0.23.0" -source = "git+https://github.com/paritytech//subxt?rev=2fe9a1446d32b93a10804db3304ccaac65f764b8#2fe9a1446d32b93a10804db3304ccaac65f764b8" +source = "git+https://github.com/paritytech/subxt?rev=2fe9a1446d32b93a10804db3304ccaac65f764b8#2fe9a1446d32b93a10804db3304ccaac65f764b8" dependencies = [ "darling", "frame-metadata", "heck 0.4.0", "parity-scale-codec", "proc-macro-error", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "scale-info", - "subxt-metadata 0.23.0 (git+https://github.com/paritytech//subxt?rev=2fe9a1446d32b93a10804db3304ccaac65f764b8)", - "syn 1.0.105", + "subxt-metadata 0.23.0", + "syn 1.0.107", ] [[package]] @@ -15602,7 +16863,7 @@ dependencies = [ "darling", "proc-macro-error", "subxt-codegen 0.22.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -15613,7 +16874,7 @@ dependencies = [ "darling", "proc-macro-error", "subxt-codegen 0.23.0", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -15625,18 +16886,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core", -] - -[[package]] -name = "subxt-metadata" -version = "0.23.0" -source = "git+https://github.com/paritytech//subxt?rev=2fe9a1446d32b93a10804db3304ccaac65f764b8#2fe9a1446d32b93a10804db3304ccaac65f764b8" -dependencies = [ - "frame-metadata", - "parity-scale-codec", - "scale-info", - "sp-core", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -15647,7 +16897,7 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -15672,12 +16922,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "unicode-ident", ] @@ -15693,9 +16943,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "unicode-xid 0.2.4", ] @@ -15759,8 +17009,8 @@ dependencies = [ "futures 0.3.25", "num-traits", "once_cell", - "prost 0.11.3", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-types 0.11.6", "serde", "serde_bytes", "serde_json", @@ -15796,8 +17046,8 @@ dependencies = [ "flex-error", "num-derive", "num-traits", - "prost 0.11.3", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-types 0.11.6", "serde", "serde_bytes", "subtle-encoding", @@ -15806,9 +17056,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -15830,22 +17080,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -15988,10 +17238,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.47", - "quote 1.0.21", + "proc-macro2 1.0.49", + "quote 1.0.23", "standback", - "syn 1.0.105", + "syn 1.0.107", ] [[package]] @@ -16013,6 +17263,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -16030,9 +17289,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.23.0" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" dependencies = [ "autocfg 1.1.0", "bytes 1.3.0", @@ -16086,9 +17345,9 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -16206,9 +17465,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -16279,9 +17538,9 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -16306,25 +17565,25 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "polkadot-node-jaeger", - "polkadot-primitives", + "polkadot-primitives 0.9.30", "tracing", "tracing-gum-proc-macro", ] [[package]] name = "tracing-gum-proc-macro" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "expander 0.0.6", "proc-macro-crate 1.2.1", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -16404,6 +17663,19 @@ dependencies = [ "smallvec 1.10.0", ] +[[package]] +name = "trie-db" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" +dependencies = [ + "hash-db", + "hashbrown 0.12.3", + "log 0.4.17", + "rustc-hex", + "smallvec 1.10.0", +] + [[package]] name = "trie-root" version = "0.17.0" @@ -16458,17 +17730,18 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5#9bdc51acad943bd07fae159f59564a1b464d33b5" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "clap 3.2.23", - "jsonrpsee 0.14.0", + "frame-try-runtime", + "jsonrpsee 0.15.1", "log 0.4.17", "parity-scale-codec", "remote-externalities", @@ -16477,21 +17750,21 @@ dependencies = [ "sc-executor", "sc-service", "serde", - "sp-core", - "sp-externalities", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "zstd", ] [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "ttf-parser" @@ -16615,9 +17888,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -16716,11 +17989,11 @@ dependencies = [ "composable-runtime", "dali-runtime", "derive_more", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "picasso-runtime", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -16879,9 +18152,9 @@ dependencies = [ "bumpalo", "log 0.4.17", "once_cell", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -16903,7 +18176,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ - "quote 1.0.21", + "quote 1.0.23", "wasm-bindgen-macro-support", ] @@ -16913,9 +18186,9 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -16939,18 +18212,18 @@ dependencies = [ [[package]] name = "wasm-instrument" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "8bca81f5279342b38b17d9acbf007a46ddeb73144e2bd5f0a21bfa9fc5d4ab3e" dependencies = [ - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", ] [[package]] name = "wasm-instrument" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bca81f5279342b38b17d9acbf007a46ddeb73144e2bd5f0a21bfa9fc5d4ab3e" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" dependencies = [ "parity-wasm 0.45.0", ] @@ -16987,12 +18260,11 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", - "libm", "memory_units 0.3.0", "num-rational 0.2.4", "num-traits", "parity-wasm 0.42.2", - "wasmi-validation 0.4.0", + "wasmi-validation 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -17001,15 +18273,26 @@ version = "0.11.0" source = "git+https://github.com/ComposableFi/wasmi?rev=cd8c0c775a1d197a35ff3d5c7d6cded3d476411b#cd8c0c775a1d197a35ff3d5c7d6cded3d476411b" dependencies = [ "parity-wasm 0.45.0", - "wasmi-validation 0.4.1", - "wasmi_core", + "wasmi-validation 0.4.1 (git+https://github.com/ComposableFi/wasmi?rev=cd8c0c775a1d197a35ff3d5c7d6cded3d476411b)", + "wasmi_core 0.1.0", +] + +[[package]] +name = "wasmi" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" +dependencies = [ + "parity-wasm 0.45.0", + "wasmi-validation 0.5.0", + "wasmi_core 0.2.1", ] [[package]] name = "wasmi-validation" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8" +checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" dependencies = [ "parity-wasm 0.42.2", ] @@ -17022,47 +18305,66 @@ dependencies = [ "parity-wasm 0.45.0", ] +[[package]] +name = "wasmi-validation" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" +dependencies = [ + "parity-wasm 0.45.0", +] + [[package]] name = "wasmi_core" version = "0.1.0" source = "git+https://github.com/ComposableFi/wasmi?rev=cd8c0c775a1d197a35ff3d5c7d6cded3d476411b#cd8c0c775a1d197a35ff3d5c7d6cded3d476411b" dependencies = [ - "libm", + "libm 0.2.6", "memory_units 0.4.0", "num-rational 0.4.1", "num-traits", "parity-wasm 0.45.0", ] +[[package]] +name = "wasmi_core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" +dependencies = [ + "downcast-rs", + "libm 0.2.6", + "memory_units 0.4.0", + "num-rational 0.4.1", + "num-traits", +] + [[package]] name = "wasmparser" -version = "0.85.0" +version = "0.89.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" dependencies = [ "indexmap", ] [[package]] name = "wasmtime" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", - "backtrace", "bincode", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log 0.4.17", - "object 0.28.4", + "object 0.29.0", "once_cell", - "paste 1.0.9", + "paste 1.0.11", "psm", "rayon", - "region", "serde", "target-lexicon", "wasmparser", @@ -17071,14 +18373,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi 0.3.9", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +dependencies = [ + "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", "base64 0.13.1", @@ -17086,19 +18397,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log 0.4.17", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", - "winapi 0.3.9", + "windows-sys 0.36.1", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -17106,10 +18417,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log 0.4.17", - "more-asserts 0.2.2", - "object 0.28.4", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -17118,17 +18428,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log 0.4.17", - "more-asserts 0.2.2", - "object 0.28.4", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -17138,49 +18447,47 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", "cfg-if 1.0.0", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log 0.4.17", - "object 0.28.4", - "region", + "object 0.29.0", "rustc-demangle", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-runtime", - "winapi 0.3.9", + "windows-sys 0.36.1", ] [[package]] name = "wasmtime-jit-debug" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ - "lazy_static", - "object 0.28.4", - "rustix 0.33.7", + "object 0.29.0", + "once_cell", + "rustix 0.35.13", ] [[package]] name = "wasmtime-runtime" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" dependencies = [ "anyhow", - "backtrace", "cc", "cfg-if 1.0.0", "indexmap", @@ -17189,21 +18496,21 @@ dependencies = [ "mach", "memfd", "memoffset 0.6.5", - "more-asserts 0.2.2", + "paste 1.0.11", "rand 0.8.5", - "region", - "rustix 0.33.7", + "rustix 0.35.13", "thiserror", + "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "winapi 0.3.9", + "windows-sys 0.36.1", ] [[package]] name = "wasmtime-types" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ "cranelift-entity", "serde", @@ -17298,16 +18605,16 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -17323,6 +18630,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -17338,23 +18646,23 @@ dependencies = [ "pallet-proxy", "pallet-recovery", "pallet-scheduler", - "pallet-session", + "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm", + "pallet-xcm 0.9.30", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", + "polkadot-parachain 0.9.30", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", @@ -17362,39 +18670,39 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api", - "sp-authority-discovery", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", + "xcm 0.9.30", "xcm-builder", - "xcm-executor", + "xcm-executor 0.9.30", ] [[package]] name = "westend-runtime-constants" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "polkadot-primitives 0.9.30", "polkadot-runtime-common", "smallvec 1.10.0", - "sp-runtime", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -17490,19 +18798,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -17518,9 +18826,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -17536,9 +18844,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -17554,9 +18862,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -17572,15 +18880,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -17596,9 +18904,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -17651,89 +18959,106 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" dependencies = [ "derivative", "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-runtime", - "xcm-procedural", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm-procedural 0.9.27", +] + +[[package]] +name = "xcm" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" +dependencies = [ + "derivative", + "impl-trait-for-tuples", + "log 0.4.17", + "parity-scale-codec", + "scale-info", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm-procedural 0.9.30", ] [[package]] name = "xcm-builder" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log 0.4.17", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain 0.9.30", "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", + "xcm-executor 0.9.30", ] [[package]] -name = "xcm-emulator" -version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe#ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe" +name = "xcm-executor" +version = "0.9.27" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" dependencies = [ - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "cumulus-test-relay-sproof-builder", - "frame-support", - "frame-system", - "parachain-info", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "impl-trait-for-tuples", + "log 0.4.17", "parity-scale-codec", - "paste 1.0.9", - "polkadot-primitives", - "polkadot-runtime-parachains", - "quote 1.0.21", - "sp-io", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", - "xcm-executor", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "xcm 0.9.27", ] [[package]] name = "xcm-executor" -version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-benchmarking", - "frame-support", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", - "xcm", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm 0.9.30", ] [[package]] name = "xcm-procedural" version = "0.9.27" -source = "git+https://github.com/ComposableFi/polkadot?branch=release-v0.9.27#25034c56032915cd5d1ef1c8a4646621e4e872fe" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" +dependencies = [ + "Inflector", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + +[[package]] +name = "xcm-procedural" +version = "0.9.30" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "Inflector", - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", ] [[package]] @@ -17743,17 +19068,17 @@ dependencies = [ "base58", "clap 3.2.23", "composable-subxt", - "env_logger", + "env_logger 0.9.3", "hex", "parity-scale-codec", "sc-cli", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-runtime-interface", - "sp-std 4.0.0 (git+https://github.com/ComposableFi/substrate?rev=9bdc51acad943bd07fae159f59564a1b464d33b5)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "subxt 0.23.0", "tokio", ] @@ -17767,7 +19092,7 @@ dependencies = [ "fixed", "num", "parity-scale-codec", - "prost 0.11.3", + "prost 0.11.6", "scale-info", "schemars", "serde", @@ -17779,9 +19104,9 @@ name = "xcvm-proto" version = "0.1.0" dependencies = [ "fixed", - "prost 0.11.3", - "prost-build 0.11.4", - "prost-types 0.11.2", + "prost 0.11.6", + "prost-build 0.11.6", + "prost-types 0.11.6", "xcvm-core", ] @@ -17832,9 +19157,9 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "syn 1.0.105", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", "synstructure", ] @@ -17859,10 +19184,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/code/Cargo.toml b/code/Cargo.toml index 6af6463f682..aee89f63ae0 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -30,7 +30,7 @@ exclude = ["utils/extrinsics-docs-scraper", "integration-tests"] members = [ "services/cmc-api", "parachain/frame/*", - "integration-tests/local-integration-tests", + # "integration-tests/local-integration-tests", "parachain/node", "parachain/runtime/common", "parachain/runtime/primitives", @@ -44,8 +44,8 @@ members = [ "utils/price-feed", "utils/collator-sidecar", "utils/composable-subxt", - "simnode/simnode-tests", - "simnode/common", + # "simnode/simnode-tests", + # "simnode/common", "utils/xcmp", "utils/wasm-optimizer", "xcvm/lib/*", @@ -74,228 +74,229 @@ rpath = false [patch.crates-io] serde-json-wasm = { git = "https://github.com/hussein-aitlahcen/serde-json-wasm", rev = "1608a13d2a2ba90605d9626a51ff6667aca5a2d6" } -sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -wasmi-validation = { git = "https://github.com/ComposableFi/wasmi", rev = "cd8c0c775a1d197a35ff3d5c7d6cded3d476411b" } +# wasmi-validation = { git = "https://github.com/ComposableFi/wasmi", rev = "cd8c0c775a1d197a35ff3d5c7d6cded3d476411b" } -[patch."https://github.com/paritytech/subxt"] -subxt-codegen = { git = "https://github.com/paritytech//subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } +# sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -[patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-collator = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-consensus-aura = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-consensus-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-network = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-pov-recovery = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-client-service = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-aura-ext = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-dmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-parachain-system = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-session-benchmarking = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-xcm = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-primitives-core = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-primitives-timestamp = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-primitives-utility = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-relay-chain-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -pallet-collator-selection = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -parachains-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -statemine-runtime = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# [patch."https://github.com/paritytech/subxt"] +# subxt-codegen = { git = "https://github.com/paritytech//subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } -parachain-info = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# [patch."https://github.com/paritytech/cumulus"] +# cumulus-client-cli = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-collator = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-consensus-aura = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-consensus-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-network = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-pov-recovery = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-client-service = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-aura-ext = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-dmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-parachain-system = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-session-benchmarking = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-xcm = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-pallet-xcmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-primitives-core = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-primitives-parachain-inherent = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-primitives-timestamp = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-primitives-utility = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-relay-chain-inprocess-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-relay-chain-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-relay-chain-rpc-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# cumulus-test-relay-sproof-builder = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# pallet-collator-selection = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# parachains-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } +# statemine-runtime = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -[patch.'https://github.com/paritytech/polkadot'] -kusama-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -kusama-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -pallet-xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-core-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-parachain = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-runtime-common = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -polkadot-runtime-parachains = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -westend-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.27" } +# parachain-info = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -[patch."https://github.com/paritytech/substrate"] -beefy-gadget = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -beefy-gadget-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -beefy-merkle-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -beefy-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -fork-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-benchmarking-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-election-provider-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-executive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-support-procedural = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-support-procedural-tools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-support-procedural-tools-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-system-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-system-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -frame-try-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-asset-tx-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-assets = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-bags-list = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-balances = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-beefy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-beefy-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-child-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-collective = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-democracy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-election-provider-multi-phase = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-election-provider-support-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-elections-phragmen = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-gilt = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-identity = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-im-online = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-indices = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-membership = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-mmr-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-multisig = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-nomination-pools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-nomination-pools-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-nomination-pools-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-offences = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-offences-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-preimage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-proxy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-randomness-collective-flip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-recovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-scheduler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-session-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-society = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-staking-reward-curve = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-staking-reward-fn = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-sudo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-tips = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-transaction-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-transaction-payment-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-treasury = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-uniques = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-utility = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -pallet-vesting = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -remote-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-allocator = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-basic-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-chain-spec = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-chain-spec-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-client-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-client-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-babe-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-epochs = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-manual-seal = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-consensus-uncles = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-executor = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-executor-common = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-executor-wasmi = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-executor-wasmtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-finality-grandpa-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-informant = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-network = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-network-gossip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-peerset = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-proposer-metrics = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-rpc-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-rpc-server = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-service = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-state-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-sync-state-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-sysinfo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-telemetry = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-tracing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-transaction-pool-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sc-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-api-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-blockchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-consensus-vrf = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-core-hashing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-core-hashing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-database = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-inherents = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-keyring = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-maybe-compressed-blob = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-mmr-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-npos-elections = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-panic-handler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-runtime-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-runtime-interface-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-sandbox = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-serializer = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-state-machine = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-std = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-storage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-tasks = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-transaction-storage-proof = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-trie = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-version = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-version-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -sp-wasm-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -substrate-build-script-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -substrate-frame-rpc-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -substrate-prometheus-endpoint = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -substrate-state-trie-migration-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -substrate-wasm-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -try-runtime-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# [patch.'https://github.com/paritytech/polkadot'] +# kusama-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# kusama-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# pallet-xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-core-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-parachain = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-runtime-common = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# polkadot-runtime-parachains = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# westend-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# xcm-builder = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } +# xcm-executor = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } + +# [patch."https://github.com/paritytech/substrate"] +# beefy-gadget = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# beefy-gadget-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# beefy-merkle-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# beefy-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# fork-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-benchmarking-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-election-provider-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-executive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-support-procedural = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-support-procedural-tools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-support-procedural-tools-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-system-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-system-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# frame-try-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-asset-tx-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-assets = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-bags-list = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-balances = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-beefy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-beefy-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-child-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-collective = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-democracy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-election-provider-multi-phase = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-election-provider-support-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-elections-phragmen = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-gilt = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-identity = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-im-online = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-indices = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-membership = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-mmr-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-multisig = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-nomination-pools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-nomination-pools-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-nomination-pools-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-offences = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-offences-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-preimage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-proxy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-randomness-collective-flip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-recovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-scheduler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-session-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-society = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-staking-reward-curve = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-staking-reward-fn = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-sudo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-tips = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-transaction-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-transaction-payment-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-treasury = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-uniques = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-utility = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# pallet-vesting = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# remote-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-allocator = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-basic-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-chain-spec = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-chain-spec-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-client-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-client-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-babe-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-epochs = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-manual-seal = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-consensus-uncles = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-executor = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-executor-common = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-executor-wasmi = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-executor-wasmtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-finality-grandpa-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-informant = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-network = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-network-gossip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-peerset = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-proposer-metrics = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-rpc-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-rpc-server = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-service = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-state-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-sync-state-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-sysinfo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-telemetry = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-tracing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-transaction-pool-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sc-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-api-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-blockchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-consensus-vrf = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-core-hashing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-core-hashing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-database = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-inherents = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-keyring = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-maybe-compressed-blob = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-mmr-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-npos-elections = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-panic-handler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-runtime-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-runtime-interface-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-sandbox = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-serializer = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-state-machine = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-std = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-storage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-tasks = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-transaction-storage-proof = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-trie = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-version = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-version-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# sp-wasm-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# substrate-build-script-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# substrate-frame-rpc-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# substrate-prometheus-endpoint = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# substrate-state-trie-migration-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# substrate-wasm-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } +# try-runtime-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } diff --git a/code/integration-tests/local-integration-tests/Cargo.toml b/code/integration-tests/local-integration-tests/Cargo.toml index 96b8bce02dc..1c4ee99e611 100644 --- a/code/integration-tests/local-integration-tests/Cargo.toml +++ b/code/integration-tests/local-integration-tests/Cargo.toml @@ -19,45 +19,45 @@ normal = [ ] [dependencies] -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } num-traits = { version = "0.2.14", default-features = false } # primitives -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # modules -aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } smallvec = "1.6.1" -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local modules assets = { package = "pallet-assets", path = "../../parachain/frame/assets", default-features = false, optional = true } @@ -75,50 +75,50 @@ vault = { package = "pallet-vault", path = "../../parachain/frame/vault", defaul # Used for the node template's RPCs -system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # Used for runtime benchmarking -benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive", ] } hex-literal = { version = "0.3.3", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities -collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } sp-keyring = { git = "https://github.com/paritytech/substrate", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +parachains-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } paste = "1.0.6" -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -rococo-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +rococo-runtime = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe", default-features = false } dali-runtime = { package = "dali-runtime", path = "../../parachain/runtime/dali", default-features = false, optional = true } diff --git a/code/parachain/frame/airdrop/Cargo.toml b/code/parachain/frame/airdrop/Cargo.toml index 8d43aa226ea..8c4ca6b27ab 100644 --- a/code/parachain/frame/airdrop/Cargo.toml +++ b/code/parachain/frame/airdrop/Cargo.toml @@ -18,31 +18,31 @@ version = "3.0.0" composable-tests-helpers = { path = "../composable-tests-helpers" } hex-literal = "0.3.3" libsecp256k1 = { version = "0.7.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" rand_core = { version = "0.6.3", features = ["getrandom"] } serde = "1.0.136" -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dependencies] libsecp256k1 = { version = "0.7.0", default-features = false, optional = true, features = [ "hmac", "static-context", ] } -sp-application-crypto = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-application-crypto = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # FRAME -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # substrate primitives -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # SCALE scale-info = { version = "2.1.1", default-features = false, features = [ diff --git a/code/parachain/frame/assets-registry/Cargo.toml b/code/parachain/frame/assets-registry/Cargo.toml index c9ccfd4cee0..4134db9b944 100644 --- a/code/parachain/frame/assets-registry/Cargo.toml +++ b/code/parachain/frame/assets-registry/Cargo.toml @@ -21,15 +21,15 @@ version = "3.0.0" [dependencies] composable-traits = { path = "../composable-traits", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } log = { version = "0.4.14", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ @@ -37,8 +37,8 @@ scale-info = { version = "2.1.1", default-features = false, features = [ ] } [dev-dependencies] -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory", default-features = false } [features] diff --git a/code/parachain/frame/assets/Cargo.toml b/code/parachain/frame/assets/Cargo.toml index ec6f7799744..09abb5c0a89 100644 --- a/code/parachain/frame/assets/Cargo.toml +++ b/code/parachain/frame/assets/Cargo.toml @@ -9,17 +9,17 @@ version = "1.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } primitives = { path = "../../runtime/primitives", default-features = false } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local composable-support = { path = "../composable-support", default-features = false } @@ -38,10 +38,10 @@ num-traits = { version = "0.2.14", default-features = false } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } governance-registry = { package = "pallet-governance-registry", path = "../governance-registry" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" [package.metadata.cargo-udeps.ignore] diff --git a/code/parachain/frame/assets/rpc/Cargo.toml b/code/parachain/frame/assets/rpc/Cargo.toml index e20570c947a..31eaa195486 100644 --- a/code/parachain/frame/assets/rpc/Cargo.toml +++ b/code/parachain/frame/assets/rpc/Cargo.toml @@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # substrate primitives -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local assets-runtime-api = { path = "../runtime-api" } diff --git a/code/parachain/frame/assets/runtime-api/Cargo.toml b/code/parachain/frame/assets/runtime-api/Cargo.toml index 7b82e8cf635..d206aaa00f3 100644 --- a/code/parachain/frame/assets/runtime-api/Cargo.toml +++ b/code/parachain/frame/assets/runtime-api/Cargo.toml @@ -15,8 +15,8 @@ codec = { default-features = false, features = [ ], package = "parity-scale-codec", version = "3.0.0" } composable-support = { path = "../../composable-support", default-features = false } composable-traits = { path = "../../composable-traits", default-features = false } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/bonded-finance/Cargo.toml b/code/parachain/frame/bonded-finance/Cargo.toml index e3d3e696626..d5645b23918 100644 --- a/code/parachain/frame/bonded-finance/Cargo.toml +++ b/code/parachain/frame/bonded-finance/Cargo.toml @@ -16,17 +16,17 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { default-features = false, path = "../composable-support" } composable-traits = { path = "../../frame/composable-traits", default-features = false } @@ -36,7 +36,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li composable-tests-helpers = { path = "../composable-tests-helpers" } composable-traits = { path = "../../frame/composable-traits" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-vesting = { path = "../../frame/vesting" } proptest = "1.0" proptest-derive = "0.3" diff --git a/code/parachain/frame/call-filter/Cargo.toml b/code/parachain/frame/call-filter/Cargo.toml index b42f8f305bb..e88dff3e905 100644 --- a/code/parachain/frame/call-filter/Cargo.toml +++ b/code/parachain/frame/call-filter/Cargo.toml @@ -13,17 +13,17 @@ scale-info = { version = "2.1.1", features = [ "derive", ], default-features = false } serde = { version = "1.0.136", optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } smallvec = "1.4.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/composable-maths/Cargo.toml b/code/parachain/frame/composable-maths/Cargo.toml index 5b7abdfd652..253017b59bf 100644 --- a/code/parachain/frame/composable-maths/Cargo.toml +++ b/code/parachain/frame/composable-maths/Cargo.toml @@ -13,12 +13,12 @@ composable-tests-helpers = { path = "../composable-tests-helpers" } proptest = "1.0" [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } codec = { version = "3.0.0", package = "parity-scale-codec", default-features = false, features = [ "derive", diff --git a/code/parachain/frame/composable-support/Cargo.toml b/code/parachain/frame/composable-support/Cargo.toml index 877da831697..de6d37fdc7d 100644 --- a/code/parachain/frame/composable-support/Cargo.toml +++ b/code/parachain/frame/composable-support/Cargo.toml @@ -10,12 +10,12 @@ version = "1.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } codec = { version = "3.0.0", package = "parity-scale-codec", default-features = false, features = [ "derive", @@ -35,10 +35,10 @@ rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.136", features = ["derive"], optional = true } [dev-dependencies] -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = { version = "1.0" } serde_json = "1.0.45" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/composable-tests-helpers/Cargo.toml b/code/parachain/frame/composable-tests-helpers/Cargo.toml index 314070183f4..ef511b97acf 100644 --- a/code/parachain/frame/composable-tests-helpers/Cargo.toml +++ b/code/parachain/frame/composable-tests-helpers/Cargo.toml @@ -10,16 +10,16 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] composable-support = { default-features = false, path = "../composable-support" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } serde = { version = "1.0.136", optional = true } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dependencies.codec] default-features = false diff --git a/code/parachain/frame/composable-traits/Cargo.toml b/code/parachain/frame/composable-traits/Cargo.toml index d3fd2528823..e58845285df 100644 --- a/code/parachain/frame/composable-traits/Cargo.toml +++ b/code/parachain/frame/composable-traits/Cargo.toml @@ -9,15 +9,15 @@ version = "1.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -proxy = { package = "pallet-proxy", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +proxy = { package = "pallet-proxy", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } bitflags = "1.3.2" composable-support = { default-features = false, path = "../composable-support" } diff --git a/code/parachain/frame/cosmwasm/Cargo.toml b/code/parachain/frame/cosmwasm/Cargo.toml index 71b51f76c97..bf008c1f013 100644 --- a/code/parachain/frame/cosmwasm/Cargo.toml +++ b/code/parachain/frame/cosmwasm/Cargo.toml @@ -22,9 +22,9 @@ cosmwasm-vm-wasmi = { git = "https://github.com/ComposableFi/cosmwasm-vm", rev = "iterator", "stargate", ] } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", optional = true } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", optional = true } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex = { version = "0.4", default-features = false, features = ["alloc"] } ibc = { git = "https://github.com/ComposableFi/centauri/", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } ibc-primitives = { git = "https://github.com/ComposableFi/centauri/", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false, optional = false } @@ -35,8 +35,8 @@ libsecp256k1 = { version = "0.7.0", default-features = false } log = { version = "0.4.14", default-features = false } pallet-assets = { default-features = false, path = "../assets" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri/", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri/", rev = "c80e2b203ecfb1925b0330aafba0f736c99fa5f6", default-features = false } parity-wasm = { version = "0.45.0", default-features = false } primitives = { path = "../../runtime/primitives", default-features = false } rand = { version = "0.8.5", optional = true, default-features = false, features = [ @@ -52,11 +52,11 @@ serde_json = { version = "1.0.82", default-features = false, features = [ ] } sha2 = { version = "0.10", default-features = false } sha3 = { version = "0.10", default-features = false } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } wasm-instrument = { version = "0.2", default-features = false } wasmi = { git = "https://github.com/ComposableFi/wasmi", rev = "cd8c0c775a1d197a35ff3d5c7d6cded3d476411b", default-features = false } wasmi-validation = { git = "https://github.com/ComposableFi/wasmi", rev = "cd8c0c775a1d197a35ff3d5c7d6cded3d476411b", default-features = false } @@ -71,7 +71,7 @@ lazy_static = { version = "1.4.0", default-features = false, features = [ num-traits = { version = "0.2.14", default-features = false } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } rand = { version = "0.8.5", default-features = false, features = [ "alloc", "small_rng", diff --git a/code/parachain/frame/cosmwasm/rpc/Cargo.toml b/code/parachain/frame/cosmwasm/rpc/Cargo.toml index e879aabc0e6..d81ad8884a8 100644 --- a/code/parachain/frame/cosmwasm/rpc/Cargo.toml +++ b/code/parachain/frame/cosmwasm/rpc/Cargo.toml @@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # substrate primitives -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local cosmwasm-runtime-api = { path = "../runtime-api" } diff --git a/code/parachain/frame/cosmwasm/runtime-api/Cargo.toml b/code/parachain/frame/cosmwasm/runtime-api/Cargo.toml index 499920d598c..22ece3d6d00 100644 --- a/code/parachain/frame/cosmwasm/runtime-api/Cargo.toml +++ b/code/parachain/frame/cosmwasm/runtime-api/Cargo.toml @@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { default-features = false, features = [ "derive", ], package = "parity-scale-codec", version = "3.0.0" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/crowdloan-rewards/Cargo.toml b/code/parachain/frame/crowdloan-rewards/Cargo.toml index 0220bb01b57..6e257752739 100644 --- a/code/parachain/frame/crowdloan-rewards/Cargo.toml +++ b/code/parachain/frame/crowdloan-rewards/Cargo.toml @@ -18,13 +18,13 @@ version = "3.0.0" [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } ed25519-dalek = "1.0.1" -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = "0.3.3" libsecp256k1 = { version = "0.7.0" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } serde = { version = '1.0.136' } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dependencies] ed25519-dalek = { version = "1.0.1", default-features = false, optional = true, features = [ @@ -35,20 +35,20 @@ libsecp256k1 = { version = "0.7.0", default-features = false, optional = true, f "hmac", "static-context", ] } -sp-application-crypto = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-application-crypto = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # FRAME -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", optional = true } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", optional = true } # substrate primitives -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # SCALE scale-info = { version = "2.1.1", default-features = false, features = [ diff --git a/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml b/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml index b862daed4f5..8f90b0ffa83 100644 --- a/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml +++ b/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml @@ -11,13 +11,13 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # FRAME -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # substrate primitives -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local composable-support = { path = "../../composable-support" } diff --git a/code/parachain/frame/crowdloan-rewards/runtime-api/Cargo.toml b/code/parachain/frame/crowdloan-rewards/runtime-api/Cargo.toml index 6aed39c456b..60ff9fb11b0 100644 --- a/code/parachain/frame/crowdloan-rewards/runtime-api/Cargo.toml +++ b/code/parachain/frame/crowdloan-rewards/runtime-api/Cargo.toml @@ -14,7 +14,7 @@ codec = { default-features = false, features = [ "derive", ], package = "parity-scale-codec", version = "3.0.0" } composable-support = { path = "../../composable-support", default-features = false } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # REVIEW: Does the runtime API need features? diff --git a/code/parachain/frame/currency-factory/Cargo.toml b/code/parachain/frame/currency-factory/Cargo.toml index 5d7324eff12..68e54457e8a 100644 --- a/code/parachain/frame/currency-factory/Cargo.toml +++ b/code/parachain/frame/currency-factory/Cargo.toml @@ -17,27 +17,27 @@ version = "3.0.0" [dependencies] # FRAME -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # substrate primitives scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local composable-traits = { path = "../composable-traits", default-features = false } [dev-dependencies] composable-tests-helpers = { version = "1.0.0", path = "../composable-tests-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0.0" [features] diff --git a/code/parachain/frame/dex-router/Cargo.toml b/code/parachain/frame/dex-router/Cargo.toml index 5028ab65c8d..85d02bb3b8b 100644 --- a/code/parachain/frame/dex-router/Cargo.toml +++ b/code/parachain/frame/dex-router/Cargo.toml @@ -10,15 +10,15 @@ version = "1.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } @@ -36,14 +36,14 @@ version = "3.0.0" [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { version = "1.0.0", path = "../currency-factory" } pallet-pablo = { path = "../pablo" } pallet-staking-rewards = { path = "../staking-rewards" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/dutch-auction/Cargo.toml b/code/parachain/frame/dutch-auction/Cargo.toml index 493359e9d69..a7fb443ed94 100644 --- a/code/parachain/frame/dutch-auction/Cargo.toml +++ b/code/parachain/frame/dutch-auction/Cargo.toml @@ -22,37 +22,37 @@ version = "3.0.0" [dependencies] composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2.14", default-features = false } orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } serde = { version = '1.0.136', optional = true } smallvec = "1.7.0" -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } pallet-assets = { path = '../assets' } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } primitives = { path = "../../runtime/primitives", default-features = false } proptest = "1.0" diff --git a/code/parachain/frame/fnft/Cargo.toml b/code/parachain/frame/fnft/Cargo.toml index 1aea20b4f54..e0e83ae2aa8 100644 --- a/code/parachain/frame/fnft/Cargo.toml +++ b/code/parachain/frame/fnft/Cargo.toml @@ -17,18 +17,18 @@ version = "3.0.0" [dependencies] composable-tests-helpers = { default-features = false, path = "../composable-tests-helpers", optional = true } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } @@ -36,9 +36,9 @@ composable-traits = { path = "../composable-traits", default-features = false } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } composable-traits = { path = "../composable-traits", features = ["test-utils"] } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/governance-registry/Cargo.toml b/code/parachain/frame/governance-registry/Cargo.toml index b98ed034c62..5dd986f29fb 100644 --- a/code/parachain/frame/governance-registry/Cargo.toml +++ b/code/parachain/frame/governance-registry/Cargo.toml @@ -10,14 +10,14 @@ version = "1.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-traits = { path = "../composable-traits", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } @@ -32,7 +32,7 @@ package = "parity-scale-codec" version = "3.0.0" [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/lending/Cargo.toml b/code/parachain/frame/lending/Cargo.toml index 94f4bc8b2e0..165d5be29ef 100644 --- a/code/parachain/frame/lending/Cargo.toml +++ b/code/parachain/frame/lending/Cargo.toml @@ -19,24 +19,24 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.27" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.27" } -sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.30" } +sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.30" } composable-support = { default-features = false, path = "../composable-support" } composable-traits = { default-features = false, path = "../composable-traits" } pallet-oracle = { default-features = false, optional = true, path = "../oracle" } pallet-vault = { default-features = false, path = "../vault", optional = true } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-keystore = { default-features = false, version = "0.12.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27", optional = true } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keystore = { default-features = false, version = "0.12.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2.14", default-features = false } @@ -49,21 +49,21 @@ serde = { version = '1.0.136', optional = true, features = ['derive'] } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } composable-traits = { path = "../composable-traits", features = ["test-utils"] } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate", features = [ "try-runtime", -], branch = "polkadot-v0.9.27" } +], branch = "polkadot-v0.9.30" } hex-literal = "0.3.3" once_cell = "1.8.0" orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } pallet-assets = { path = "../assets" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } pallet-dutch-auction = { path = "../dutch-auction" } pallet-liquidations = { path = "../liquidations" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } primitives = { path = "../../runtime/primitives", default-features = false } proptest = "1.0" rand = { version = "0.7.2" } diff --git a/code/parachain/frame/lending/rpc/Cargo.toml b/code/parachain/frame/lending/rpc/Cargo.toml index b2b35b75a69..eb989cc1f02 100644 --- a/code/parachain/frame/lending/rpc/Cargo.toml +++ b/code/parachain/frame/lending/rpc/Cargo.toml @@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # substrate primitives -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local composable-support = { path = "../../composable-support" } diff --git a/code/parachain/frame/lending/runtime-api/Cargo.toml b/code/parachain/frame/lending/runtime-api/Cargo.toml index a46107fefaf..de69c76c1f7 100644 --- a/code/parachain/frame/lending/runtime-api/Cargo.toml +++ b/code/parachain/frame/lending/runtime-api/Cargo.toml @@ -15,7 +15,7 @@ codec = { default-features = false, features = [ ], package = "parity-scale-codec", version = "3.0.0" } composable-support = { path = "../../composable-support", default-features = false } composable-traits = { path = "../../composable-traits", default-features = false } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/liquidations/Cargo.toml b/code/parachain/frame/liquidations/Cargo.toml index 19e255ba340..54849201dc4 100644 --- a/code/parachain/frame/liquidations/Cargo.toml +++ b/code/parachain/frame/liquidations/Cargo.toml @@ -19,42 +19,42 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } log = "0.4" orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } pallet-assets = { default-features = false, path = "../assets" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-dutch-auction = { default-features = false, path = "../dutch-auction" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27", optional = true } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30", optional = true } num-traits = { version = "0.2.14", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } pallet-assets = { path = "../assets" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } pallet-dutch-auction = { path = "../dutch-auction" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } primitives = { path = "../../runtime/primitives", default-features = false } proptest = "1.0" smallvec = "1.7.0" diff --git a/code/parachain/frame/mosaic/Cargo.toml b/code/parachain/frame/mosaic/Cargo.toml index 748003e7b9f..088d54cab92 100644 --- a/code/parachain/frame/mosaic/Cargo.toml +++ b/code/parachain/frame/mosaic/Cargo.toml @@ -24,15 +24,15 @@ version = "3.0.0" [dependencies] composable-traits = { path = "../composable-traits", default-features = false } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } log = { version = "0.4.14", default-features = false } @@ -44,10 +44,10 @@ scale-info = { version = "2.1.1", default-features = false, features = [ [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" [features] diff --git a/code/parachain/frame/oracle/Cargo.toml b/code/parachain/frame/oracle/Cargo.toml index b953878697e..60d8eeb8040 100644 --- a/code/parachain/frame/oracle/Cargo.toml +++ b/code/parachain/frame/oracle/Cargo.toml @@ -20,14 +20,14 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } lite-json = { version = "0.1.3", default-features = false } log = { version = "0.4.16", default-features = false } @@ -35,7 +35,7 @@ serde_json = { version = "1.0.79", default-features = false, features = [ "alloc", ] } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } @@ -45,12 +45,12 @@ scale-info = { version = "2.1.1", default-features = false, features = [ [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } parking_lot = "0.12.0" proptest = "1.0.0" serde = { version = '1.0.136' } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/frame/pablo/Cargo.toml b/code/parachain/frame/pablo/Cargo.toml index 0c7401c0ace..f1cecac466b 100644 --- a/code/parachain/frame/pablo/Cargo.toml +++ b/code/parachain/frame/pablo/Cargo.toml @@ -19,28 +19,28 @@ version = "3.0.0" composable-maths = { path = "../composable-maths", default-features = false } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = { version = "0.4.14", default-features = false } rust_decimal = { version = "1", default-features = false, features = ["maths"] } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } pallet-currency-factory = { path = "../currency-factory" } pallet-staking-rewards = { path = "../staking-rewards" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = { version = "1.0" } [features] diff --git a/code/parachain/frame/pablo/rpc/Cargo.toml b/code/parachain/frame/pablo/rpc/Cargo.toml index a6dfe1e445a..962d96445a4 100644 --- a/code/parachain/frame/pablo/rpc/Cargo.toml +++ b/code/parachain/frame/pablo/rpc/Cargo.toml @@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # substrate primitives -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local composable-support = { path = "../../composable-support" } diff --git a/code/parachain/frame/pablo/runtime-api/Cargo.toml b/code/parachain/frame/pablo/runtime-api/Cargo.toml index 09fe792500b..2f6c1f36905 100644 --- a/code/parachain/frame/pablo/runtime-api/Cargo.toml +++ b/code/parachain/frame/pablo/runtime-api/Cargo.toml @@ -15,8 +15,8 @@ codec = { default-features = false, features = [ ], package = "parity-scale-codec", version = "3.0.0" } composable-support = { path = "../../composable-support", default-features = false } composable-traits = { path = "../../composable-traits", default-features = false } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # REVIEW: Does the runtime API need features? diff --git a/code/parachain/frame/privilege/Cargo.toml b/code/parachain/frame/privilege/Cargo.toml index 0e4174c0682..358cd1dc82e 100644 --- a/code/parachain/frame/privilege/Cargo.toml +++ b/code/parachain/frame/privilege/Cargo.toml @@ -15,17 +15,17 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } bitflags = "1.3.2" composable-support = { version = "1.0.0", path = "../composable-support", default-features = false } diff --git a/code/parachain/frame/staking-rewards/Cargo.toml b/code/parachain/frame/staking-rewards/Cargo.toml index 45bc7aa9dcc..b3e3ba5481d 100644 --- a/code/parachain/frame/staking-rewards/Cargo.toml +++ b/code/parachain/frame/staking-rewards/Cargo.toml @@ -13,9 +13,9 @@ targets = ["x86_64-unknown-linux-gnu"] composable-support = { default-features = false, path = "../../frame/composable-support" } composable-tests-helpers = { default-features = false, path = "../composable-tests-helpers", optional = true } composable-traits = { default-features = false, path = "../../frame/composable-traits" } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = "0.4.17" orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } parity-scale-codec = { default-features = false, features = [ @@ -24,24 +24,24 @@ parity-scale-codec = { default-features = false, features = [ scale-info = { default-features = false, version = "2.1.1", features = [ "derive", ] } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] env_logger = "0.9.0" -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } log = "0.4.17" orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } pallet-assets = { path = "../assets" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } pallet-fnft = { path = "../fnft" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } primitives = { path = "../../runtime/primitives", default-features = false } proptest = "1.0" diff --git a/code/parachain/frame/vault/Cargo.toml b/code/parachain/frame/vault/Cargo.toml index 8e565d896f3..da830394ba6 100644 --- a/code/parachain/frame/vault/Cargo.toml +++ b/code/parachain/frame/vault/Cargo.toml @@ -16,15 +16,15 @@ package = "parity-scale-codec" version = "3.0.0" [dependencies] -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } @@ -38,11 +38,11 @@ scale-info = { version = "2.1.1", default-features = false, features = [ [dev-dependencies] composable-tests-helpers = { version = "1.0.0", path = "../composable-tests-helpers" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } once_cell = "1.8.0" orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" serde = { version = '1.0.136' } diff --git a/code/parachain/frame/vesting/Cargo.toml b/code/parachain/frame/vesting/Cargo.toml index 7b7ac615235..6b82876b933 100644 --- a/code/parachain/frame/vesting/Cargo.toml +++ b/code/parachain/frame/vesting/Cargo.toml @@ -15,13 +15,13 @@ scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } serde = { version = '1.0.136', optional = true } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } composable-support = { path = "../composable-support", default-features = false } composable-traits = { version = "1.0.0", path = "../../frame/composable-traits", default-features = false } @@ -29,8 +29,8 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [dev-dependencies] orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index 662a5a2394d..73948889ebe 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -41,76 +41,76 @@ pablo-runtime-api = { path = "../frame/pablo/runtime-api" } pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355" } # FRAME Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } ## Substrate Client Dependencies -grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-service = { git = "https://github.com/paritytech/substrate", features = [ "wasmtime", -], branch = "polkadot-v0.9.27" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +], branch = "polkadot-v0.9.30" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } ## Substrate Primitive Dependencies -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } # Polkadot dependencies polkadot-cli = { git = "https://github.com/paritytech/polkadot", features = [ "rococo-native", -], branch = "release-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } +], branch = "release-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] hex = "0.4.3" diff --git a/code/parachain/runtime/common/Cargo.toml b/code/parachain/runtime/common/Cargo.toml index 52a462b3b36..34ade515250 100644 --- a/code/parachain/runtime/common/Cargo.toml +++ b/code/parachain/runtime/common/Cargo.toml @@ -15,27 +15,27 @@ normal = ["primitives"] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive", ] } -frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # xcm -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } @@ -48,10 +48,10 @@ scale-info = { version = "2.1.1", default-features = false, features = [ smallvec = "1.7.0" [dev-dependencies] -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } serde = { version = "1.0.136" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/code/parachain/runtime/composable/Cargo.toml b/code/parachain/runtime/composable/Cargo.toml index 1d2b06b0788..db3e2da59ff 100644 --- a/code/parachain/runtime/composable/Cargo.toml +++ b/code/parachain/runtime/composable/Cargo.toml @@ -25,44 +25,44 @@ normal = [ ] [dependencies] -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # primitives -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # modules -aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/crowdloan-rewards', default-features = false } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } smallvec = "1.6.1" -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local modules assets = { package = "pallet-assets", path = '../../frame/assets', default-features = false } @@ -78,8 +78,8 @@ primitives = { path = "../primitives", default-features = false } vault = { package = "pallet-vault", path = "../../frame/vault", default-features = false, optional = true } # Used for the node template's RPCs -system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local RPCs assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } @@ -89,39 +89,36 @@ crowdloan-rewards-runtime-api = { path = '../../frame/crowdloan-rewards/runtime- codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive", ] } -frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.4", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities -collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -# simnode support -simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.27" } - [features] builtin-wasm = [] default = ["std"] @@ -218,5 +215,4 @@ std = [ "transaction-payment-rpc-runtime-api/std", "assets-runtime-api/std", "crowdloan-rewards-runtime-api/std", - "simnode-apis/std", ] diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index b5cdf13aafd..50d9890121c 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -1002,40 +1002,6 @@ impl_runtime_apis! { } } - impl simnode_apis::CreateTransactionApi for Runtime - where - Call: Codec, - AccountId: Codec + EncodeLike + Into + Clone+ PartialEq + TypeInfo + Debug, - { - fn create_transaction(call: Call, signer: AccountId) -> Vec { - use sp_runtime::{ - generic::Era, MultiSignature, - traits::StaticLookup, - }; - use sp_core::sr25519; - let nonce = frame_system::Pallet::::account_nonce(signer.clone()); - let extra = ( - system::CheckNonZeroSender::::new(), - system::CheckSpecVersion::::new(), - system::CheckTxVersion::::new(), - system::CheckGenesis::::new(), - system::CheckEra::::from(Era::Immortal), - system::CheckNonce::::from(nonce), - system::CheckWeight::::new(), - transaction_payment::ChargeTransactionPayment::::from(0), - ); - let signature = MultiSignature::from(sr25519::Signature([0_u8;64])); - let address = AccountIdLookup::unlookup(signer.into()); - let ext = generic::UncheckedExtrinsic::::new_signed( - call, - address, - signature, - extra, - ); - ext.encode() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 5a8a5b03ad3..913fcbecc57 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -25,48 +25,48 @@ normal = [ ] [dependencies] -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # primitives -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # modules -aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } smallvec = "1.6.1" -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local modules assets = { package = "pallet-assets", path = '../../frame/assets', default-features = false } @@ -97,8 +97,8 @@ cosmwasm = { package = "pallet-cosmwasm", path = "../../frame/cosmwasm", default hex = { version = "0.4.0", default-features = false } # Used for the node template's RPCs -system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local RPCs assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } @@ -111,39 +111,36 @@ pablo-runtime-api = { path = '../../frame/pablo/runtime-api', default-features = codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive", ] } -frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities -collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -# simnode support -simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.27" } - # IBC support ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } ibc-primitives = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } @@ -152,7 +149,7 @@ pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d8 pallet-ibc-ping = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } [dev-dependencies] -frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } [features] builtin-wasm = [] @@ -213,7 +210,8 @@ runtime-benchmarks = [ "common/runtime-benchmarks", "pallet-staking-rewards/runtime-benchmarks", "cosmwasm/runtime-benchmarks", - "asset-tx-payment/runtime-benchmarks", + # FIXUP(hussein) + # "asset-tx-payment/runtime-benchmarks", "pallet-ibc/runtime-benchmarks", ] std = [ @@ -274,7 +272,6 @@ std = [ "scale-info/std", "scheduler/std", "session/std", - "simnode-apis/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-aura/std", diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 0930df2607e..bcf7808a71a 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1723,40 +1723,6 @@ impl_runtime_apis! { } } - impl simnode_apis::CreateTransactionApi for Runtime - where - Call: Codec, - AccountId: Codec + EncodeLike + Into + Clone+ PartialEq + TypeInfo + Debug, - { - fn create_transaction(call: Call, signer: AccountId) -> Vec { - use sp_runtime::{ - generic::Era, MultiSignature, - traits::StaticLookup, - }; - use sp_core::sr25519; - let nonce = frame_system::Pallet::::account_nonce(signer.clone()); - let extra = ( - system::CheckNonZeroSender::::new(), - system::CheckSpecVersion::::new(), - system::CheckTxVersion::::new(), - system::CheckGenesis::::new(), - system::CheckEra::::from(Era::Immortal), - system::CheckNonce::::from(nonce), - system::CheckWeight::::new(), - asset_tx_payment::ChargeAssetTxPayment::::from(0, None), - ); - let signature = MultiSignature::from(sr25519::Signature([0_u8;64])); - let address = AccountIdLookup::unlookup(signer.into()); - let ext = generic::UncheckedExtrinsic::::new_signed( - call, - address, - signature, - extra, - ); - ext.encode() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/code/parachain/runtime/picasso/Cargo.toml b/code/parachain/runtime/picasso/Cargo.toml index 04f258e9f7a..b6d4c5ee1dd 100644 --- a/code/parachain/runtime/picasso/Cargo.toml +++ b/code/parachain/runtime/picasso/Cargo.toml @@ -26,46 +26,46 @@ normal = [ ] [dependencies] -executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # primitives -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # modules -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } smallvec = "1.6.1" -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } log = { version = "0.4.14", default-features = false } @@ -86,8 +86,8 @@ primitives = { path = "../primitives", default-features = false } vesting = { package = "pallet-vesting", path = "../../frame/vesting", default-features = false } # Used for the node template's RPCs -system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local RPCs assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } @@ -98,40 +98,37 @@ pablo-runtime-api = { path = '../../frame/pablo/runtime-api', default-features = codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive", ] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.27" } +system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities -collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } -session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +session-benchmarking = { package = "cumulus-pallet-session-benchmarking", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -# simnode support -simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.27" } - [features] builtin-wasm = [] default = ["std"] @@ -167,7 +164,8 @@ runtime-benchmarks = [ "vesting/runtime-benchmarks", "bonded-finance/runtime-benchmarks", "common/runtime-benchmarks", - "asset-tx-payment/runtime-benchmarks", + # FIXUP(hussein) + # "asset-tx-payment/runtime-benchmarks", "proxy/runtime-benchmarks", "pablo/runtime-benchmarks", ] @@ -239,7 +237,6 @@ std = [ "transaction-payment-rpc-runtime-api/std", "assets-runtime-api/std", "crowdloan-rewards-runtime-api/std", - "simnode-apis/std", "asset-tx-payment/std", "proxy/std", "pablo/std", diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index 2e29627e400..d2cb5e96de5 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -1146,40 +1146,6 @@ impl_runtime_apis! { } - impl simnode_apis::CreateTransactionApi for Runtime - where - Call: Codec, - AccountId: Codec + EncodeLike + Into + Clone+ PartialEq + TypeInfo + Debug, - { - fn create_transaction(call: Call, signer: AccountId) -> Vec { - use sp_runtime::{ - generic::Era, MultiSignature, - traits::StaticLookup, - }; - use sp_core::sr25519; - let nonce = frame_system::Pallet::::account_nonce(signer.clone()); - let extra = ( - system::CheckNonZeroSender::::new(), - system::CheckSpecVersion::::new(), - system::CheckTxVersion::::new(), - system::CheckGenesis::::new(), - system::CheckEra::::from(Era::Immortal), - system::CheckNonce::::from(nonce), - system::CheckWeight::::new(), - asset_tx_payment::ChargeAssetTxPayment::::from(0, None), - ); - let signature = MultiSignature::from(sr25519::Signature([0_u8;64])); - let address = AccountIdLookup::unlookup(signer.into()); - let ext = generic::UncheckedExtrinsic::::new_signed( - call, - address, - signature, - extra, - ); - ext.encode() - } - } - #[cfg(feature = "runtime-benchmarks")] impl frame_benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( diff --git a/code/parachain/runtime/primitives/Cargo.toml b/code/parachain/runtime/primitives/Cargo.toml index 4be4ea71df2..8c80dd1aa85 100644 --- a/code/parachain/runtime/primitives/Cargo.toml +++ b/code/parachain/runtime/primitives/Cargo.toml @@ -13,15 +13,15 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = ] } composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } -frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +frame-support = { package = "frame-support", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } lazy_static = { version = "1.4.0", features = ["spin_no_std"] } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } serde = { version = '1.0.136', optional = true, features = ['derive'] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.27" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } [features] default = ["std"] diff --git a/code/simnode/common/Cargo.toml b/code/simnode/common/Cargo.toml index e93175846f2..10e400ab52b 100644 --- a/code/simnode/common/Cargo.toml +++ b/code/simnode/common/Cargo.toml @@ -4,26 +4,26 @@ name = "simnode-common" version = "0.1.0" [dependencies] -simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.27" } -substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.27" } +simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.30" } +substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.27" } +asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } common = { path = "../../parachain/runtime/common" } composable-runtime = { path = "../../parachain/runtime/composable" } @@ -31,7 +31,7 @@ dali-runtime = { path = "../../parachain/runtime/dali" } node = { package = "composable-node", path = "../../parachain/node", features = [ "dali", ] } -parachain-inherent = { package = "cumulus-primitives-parachain-inherent", git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } +parachain-inherent = { package = "cumulus-primitives-parachain-inherent", git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } picasso-runtime = { path = "../../parachain/runtime/picasso" } derive_more = "0.99.17" diff --git a/code/simnode/simnode-node/Cargo.toml b/code/simnode/simnode-node/Cargo.toml index 0badb18867c..537cd243ac1 100644 --- a/code/simnode/simnode-node/Cargo.toml +++ b/code/simnode/simnode-node/Cargo.toml @@ -10,6 +10,6 @@ common = { package = "simnode-common", path = "../parachain/common" } node = { package = "composable-node", path = "../../parachain/node", features = [ "dali", ] } -substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.27" } +substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.30" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/simnode/simnode-tests/Cargo.toml b/code/simnode/simnode-tests/Cargo.toml index 362d813647e..64417f17013 100644 --- a/code/simnode/simnode-tests/Cargo.toml +++ b/code/simnode/simnode-tests/Cargo.toml @@ -6,27 +6,27 @@ version = "0.1.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.27" } -substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.27" } +simnode-apis = { package = "simnode-runtime-apis", git = "https://github.com/polytope-labs/substrate-simnode", default-features = false, branch = "polkadot-v0.9.30" } +substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.27" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +parachain-info = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -parachain-system = { package = "cumulus-pallet-parachain-system", git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +parachain-system = { package = "cumulus-pallet-parachain-system", git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } common = { path = "../../parachain/runtime/common" } composable-runtime = { path = "../../parachain/runtime/composable" } @@ -41,7 +41,7 @@ simnode-common = { path = "../common" } codec = { package = "parity-scale-codec", version = "3.0.0" } hex = "0.4.3" num-traits = "0.2.14" -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] builtin-wasm = [ diff --git a/code/utils/common/Cargo.toml b/code/utils/common/Cargo.toml index e371928805d..d064ac8a9b9 100644 --- a/code/utils/common/Cargo.toml +++ b/code/utils/common/Cargo.toml @@ -10,7 +10,7 @@ composable-runtime = { path = "../../parachain/runtime/composable" } dali-runtime = { path = "../../parachain/runtime/dali" } derive_more = "0.99.17" picasso-runtime = { path = "../../parachain/runtime/picasso" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/utils/composable-subxt/Cargo.toml b/code/utils/composable-subxt/Cargo.toml index 63876caf46b..0ff98e32ea4 100644 --- a/code/utils/composable-subxt/Cargo.toml +++ b/code/utils/composable-subxt/Cargo.toml @@ -15,17 +15,17 @@ hex = "0.4.3" scale-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive", ] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", features = [ +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ "std", "full_crypto", ] } subxt = { git = "https://github.com/paritytech/subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } [build-dependencies] diff --git a/code/utils/price-feed/Cargo.toml b/code/utils/price-feed/Cargo.toml index f3c7103ecf6..f5256969a71 100644 --- a/code/utils/price-feed/Cargo.toml +++ b/code/utils/price-feed/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = '1.0.136', features = ["derive"] } serde_json = "1.0.79" signal-hook = "0.3.13" signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } subxt = "0.22.0" tokio = { version = "1.18.0", features = ["full"] } tokio-stream = "0.1.8" diff --git a/code/utils/wasm-optimizer/Cargo.toml b/code/utils/wasm-optimizer/Cargo.toml index db5b324e249..20099288f8f 100644 --- a/code/utils/wasm-optimizer/Cargo.toml +++ b/code/utils/wasm-optimizer/Cargo.toml @@ -7,5 +7,5 @@ authors = ["Hussein Ait Lahcen "] [dependencies] clap = { version = "3.2", features = ["derive"] } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } wasm-gc-api = "0.1.11" diff --git a/code/utils/xcmp/Cargo.toml b/code/utils/xcmp/Cargo.toml index 8136454f8e5..de684202288 100644 --- a/code/utils/xcmp/Cargo.toml +++ b/code/utils/xcmp/Cargo.toml @@ -13,20 +13,20 @@ hex = "0.4.3" scale-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive", ] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", features = [ +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ "std", "full_crypto", ] } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", features = [ +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ "std", ] } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } subxt = { git = "https://github.com/paritytech/subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } diff --git a/docs/docs/internal/runtime-upgrades-and-versioning.md b/docs/docs/internal/runtime-upgrades-and-versioning.md index f76710ac950..8b923e2917d 100644 --- a/docs/docs/internal/runtime-upgrades-and-versioning.md +++ b/docs/docs/internal/runtime-upgrades-and-versioning.md @@ -27,8 +27,8 @@ cloud "Shared security (and versioning)" { } } - node "Kusama Node v0.9.27" as kusama { - artifact "Upgradable runtime (WASM) Kusama v0.9.27" as kusama_runtime + node "Kusama Node v0.9.30" as kusama { + artifact "Upgradable runtime (WASM) Kusama v0.9.30" as kusama_runtime } } From 980cf4eab12f0213dc303cfbe9230d9fc863bf91 Mon Sep 17 00:00:00 2001 From: hussein Date: Wed, 11 Jan 2023 12:05:19 +0100 Subject: [PATCH 02/44] chore: intermediate update for weight v1->v2 --- .../frame/assets-registry/src/weights.rs | 6 +- code/parachain/frame/assets/src/weights.rs | 120 +-- .../frame/call-filter/src/weights.rs | 12 +- code/parachain/frame/cosmwasm/src/weights.rs | 818 +++++++++--------- .../frame/crowdloan-rewards/src/weights.rs | 36 +- .../frame/currency-factory/src/weights.rs | 6 +- .../parachain/frame/dex-router/src/weights.rs | 2 +- .../frame/dutch-auction/src/weights.rs | 32 +- .../frame/governance-registry/src/weights.rs | 36 +- code/parachain/frame/lending/src/weights.rs | 66 +- .../frame/liquidations/src/weights.rs | 16 +- code/parachain/frame/mosaic/src/weights.rs | 2 +- code/parachain/frame/oracle/src/weights.rs | 120 +-- code/parachain/frame/pablo/src/weights.rs | 2 +- code/parachain/frame/vault/src/weights.rs | 96 +- code/parachain/frame/vesting/src/weights.rs | 28 +- .../composable/src/weights/balances.rs | 42 +- .../src/weights/collator_selection.rs | 50 +- .../composable/src/weights/collective.rs | 104 +-- .../src/weights/currency_factory.rs | 12 +- .../composable/src/weights/democracy.rs | 198 ++--- .../composable/src/weights/frame_system.rs | 32 +- .../runtime/composable/src/weights/indices.rs | 30 +- .../composable/src/weights/membership.rs | 54 +- .../composable/src/weights/scheduler.rs | 144 +-- .../runtime/composable/src/weights/session.rs | 12 +- .../composable/src/weights/timestamp.rs | 8 +- .../runtime/composable/src/weights/tokens.rs | 30 +- .../composable/src/weights/treasury.rs | 40 +- .../runtime/composable/src/weights/utility.rs | 16 +- .../dali/src/weights/asset_tx_payment.rs | 6 +- .../dali/src/weights/assets_registry.rs | 18 +- .../runtime/dali/src/weights/balances.rs | 42 +- .../dali/src/weights/bonded_finance.rs | 18 +- .../dali/src/weights/collator_selection.rs | 50 +- .../runtime/dali/src/weights/collective.rs | 104 +-- .../runtime/dali/src/weights/cosmwasm.rs | 398 ++++----- .../dali/src/weights/crowdloan_rewards.rs | 36 +- .../dali/src/weights/currency_factory.rs | 10 +- .../runtime/dali/src/weights/democracy.rs | 198 ++--- .../runtime/dali/src/weights/dex_router.rs | 30 +- .../runtime/dali/src/weights/dutch_auction.rs | 34 +- .../runtime/dali/src/weights/frame_system.rs | 32 +- .../runtime/dali/src/weights/identity.rs | 152 ++-- .../runtime/dali/src/weights/indices.rs | 30 +- .../runtime/dali/src/weights/lending.rs | 84 +- .../runtime/dali/src/weights/liquidations.rs | 16 +- .../runtime/dali/src/weights/membership.rs | 54 +- .../runtime/dali/src/weights/mosaic.rs | 80 +- .../runtime/dali/src/weights/multisig.rs | 88 +- .../runtime/dali/src/weights/oracle.rs | 60 +- .../runtime/dali/src/weights/pablo.rs | 36 +- .../src/weights/pallet_staking_rewards.rs | 72 +- .../runtime/dali/src/weights/proxy.rs | 76 +- .../runtime/dali/src/weights/scheduler.rs | 144 +-- .../runtime/dali/src/weights/session.rs | 12 +- .../runtime/dali/src/weights/timestamp.rs | 8 +- .../runtime/dali/src/weights/tokens.rs | 30 +- .../runtime/dali/src/weights/treasury.rs | 40 +- .../runtime/dali/src/weights/utility.rs | 24 +- .../runtime/dali/src/weights/vault.rs | 48 +- .../runtime/dali/src/weights/vesting.rs | 30 +- .../picasso/src/weights/asset_tx_payment.rs | 6 +- .../picasso/src/weights/assets_registry.rs | 18 +- .../runtime/picasso/src/weights/balances.rs | 42 +- .../picasso/src/weights/bonded_finance.rs | 18 +- .../picasso/src/weights/collator_selection.rs | 50 +- .../runtime/picasso/src/weights/collective.rs | 104 +-- .../picasso/src/weights/crowdloan_rewards.rs | 36 +- .../picasso/src/weights/currency_factory.rs | 10 +- .../runtime/picasso/src/weights/democracy.rs | 198 ++--- .../picasso/src/weights/frame_system.rs | 32 +- .../runtime/picasso/src/weights/identity.rs | 150 ++-- .../runtime/picasso/src/weights/indices.rs | 30 +- .../runtime/picasso/src/weights/membership.rs | 54 +- .../runtime/picasso/src/weights/multisig.rs | 88 +- .../runtime/picasso/src/weights/pablo.rs | 36 +- .../runtime/picasso/src/weights/proxy.rs | 82 +- .../runtime/picasso/src/weights/scheduler.rs | 144 +-- .../runtime/picasso/src/weights/session.rs | 12 +- .../runtime/picasso/src/weights/timestamp.rs | 8 +- .../runtime/picasso/src/weights/tokens.rs | 30 +- .../runtime/picasso/src/weights/treasury.rs | 40 +- .../runtime/picasso/src/weights/utility.rs | 24 +- .../runtime/picasso/src/weights/vesting.rs | 30 +- 85 files changed, 2736 insertions(+), 2736 deletions(-) diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index 5393e09c5c9..6a6ff0a5e71 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -30,12 +30,12 @@ impl WeightInfo for () { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register_asset() -> Weight { - (9_958_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } fn update_asset() -> Weight { - (9_958_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } fn set_min_fee() -> Weight { - (9_958_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/frame/assets/src/weights.rs b/code/parachain/frame/assets/src/weights.rs index 57b00f1f6fd..d6644e9e888 100644 --- a/code/parachain/frame/assets/src/weights.rs +++ b/code/parachain/frame/assets/src/weights.rs @@ -23,121 +23,121 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn transfer_all() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn transfer_all_native() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn transfer() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn transfer_native() -> Weight { - (70_665_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(70_665_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn force_transfer() -> Weight { - (81_458_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn force_transfer_native() -> Weight { - (81_458_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn mint_initialize() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn set_administrator() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn mint_into() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn burn_from() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } } // For backwards compatibility and tests impl WeightInfo for () { fn transfer_native() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn force_transfer_native() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all_native() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn force_transfer() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn mint_initialize() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn set_administrator() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn mint_into() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn burn_from() -> Weight { - (81_458_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(81_458_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/frame/call-filter/src/weights.rs b/code/parachain/frame/call-filter/src/weights.rs index 7fde12e245f..8b095ad78c2 100644 --- a/code/parachain/frame/call-filter/src/weights.rs +++ b/code/parachain/frame/call-filter/src/weights.rs @@ -15,13 +15,13 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { fn disable() -> Weight { - (25_798_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_798_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn enable() -> Weight { - (25_355_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_355_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/frame/cosmwasm/src/weights.rs b/code/parachain/frame/cosmwasm/src/weights.rs index f351be93bb5..78bf3331872 100644 --- a/code/parachain/frame/cosmwasm/src/weights.rs +++ b/code/parachain/frame/cosmwasm/src/weights.rs @@ -27,7 +27,7 @@ #![allow(trivial_numeric_casts)] #![allow(non_snake_case)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; /// Weight functions needed for cosmwasm. @@ -142,11 +142,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - (288_447_000 as Weight) + Weight::from_ref_time(288_447_000 as u64) // Standard Error: 0 - .saturating_add((45_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + .saturating_add(Weight::from_ref_time(45_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -158,13 +158,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn instantiate(n: u32, ) -> Weight { - (671_760_000 as Weight) + Weight::from_ref_time(671_760_000 as u64) // Standard Error: 43_000 - .saturating_add((23_111_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(23_111_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -175,13 +175,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn execute(n: u32, ) -> Weight { - (662_248_000 as Weight) + Weight::from_ref_time(662_248_000 as u64) // Standard Error: 48_000 - .saturating_add((22_792_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(22_792_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -192,9 +192,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - (793_332_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(793_332_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -202,88 +202,88 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - (224_958_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(224_958_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - (7_708_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(7_708_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - (7_625_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(7_625_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - (8_167_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(8_167_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn db_scan() -> Weight { - (3_708_000 as Weight) + Weight::from_ref_time(3_708_000 as u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - (16_541_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(16_541_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - (4_958_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(4_958_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - (2_792_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(2_792_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn transfer(n: u32, ) -> Weight { - (9_198_000 as Weight) + Weight::from_ref_time(9_198_000 as u64) // Standard Error: 23_000 - .saturating_add((21_063_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(21_063_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - (5_625_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(5_625_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn running_contract_meta() -> Weight { - (3_584_000 as Weight) + Weight::from_ref_time(3_584_000 as u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - (3_958_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(3_958_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } fn addr_validate() -> Weight { - (750_000 as Weight) + Weight::from_ref_time(750_000 as u64) } fn addr_canonicalize() -> Weight { - (750_000 as Weight) + Weight::from_ref_time(750_000 as u64) } fn addr_humanize() -> Weight { - (167_000 as Weight) + Weight::from_ref_time(167_000 as u64) } fn secp256k1_recover_pubkey() -> Weight { - (34_166_000 as Weight) + Weight::from_ref_time(34_166_000 as u64) } fn secp256k1_verify() -> Weight { - (34_166_000 as Weight) + Weight::from_ref_time(34_166_000 as u64) } fn ed25519_verify() -> Weight { - (37_333_000 as Weight) + Weight::from_ref_time(37_333_000 as u64) } fn ed25519_batch_verify() -> Weight { - (152_458_000 as Weight) + Weight::from_ref_time(152_458_000 as u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -294,454 +294,454 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn continue_instantiate(n: u32, ) -> Weight { - (650_499_000 as Weight) + Weight::from_ref_time(650_499_000 as u64) // Standard Error: 55_000 - .saturating_add((21_625_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(21_625_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 23]`. fn continue_execute(n: u32, ) -> Weight { - (622_227_000 as Weight) + Weight::from_ref_time(622_227_000 as u64) // Standard Error: 14_000 - .saturating_add((528_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - (545_749_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(545_749_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_query() -> Weight { - (533_416_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(533_416_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_reply() -> Weight { - (537_248_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(537_248_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - (10_834_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(10_834_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - (11_917_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(11_917_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - (86_021_000 as Weight) + Weight::from_ref_time(86_021_000 as u64) // Standard Error: 1_000 - .saturating_add((493_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(493_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 1_000 - .saturating_add((491_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - (85_840_000 as Weight) + Weight::from_ref_time(85_840_000 as u64) // Standard Error: 2_000 - .saturating_add((1_860_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_860_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - (85_954_000 as Weight) + Weight::from_ref_time(85_954_000 as u64) // Standard Error: 1_000 - .saturating_add((1_853_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_853_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - (86_250_000 as Weight) + Weight::from_ref_time(86_250_000 as u64) // Standard Error: 2_000 - .saturating_add((1_786_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_786_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - (85_839_000 as Weight) + Weight::from_ref_time(85_839_000 as u64) // Standard Error: 4_000 - .saturating_add((1_804_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_804_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - (86_133_000 as Weight) + Weight::from_ref_time(86_133_000 as u64) // Standard Error: 2_000 - .saturating_add((1_065_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - (85_860_000 as Weight) + Weight::from_ref_time(85_860_000 as u64) // Standard Error: 1_000 - .saturating_add((870_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(870_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - (86_085_000 as Weight) + Weight::from_ref_time(86_085_000 as u64) // Standard Error: 2_000 - .saturating_add((1_058_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - (86_209_000 as Weight) + Weight::from_ref_time(86_209_000 as u64) // Standard Error: 3_000 - .saturating_add((1_064_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - (86_150_000 as Weight) + Weight::from_ref_time(86_150_000 as u64) // Standard Error: 2_000 - .saturating_add((1_055_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - (86_678_000 as Weight) + Weight::from_ref_time(86_678_000 as u64) // Standard Error: 3_000 - .saturating_add((1_042_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_042_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - (86_166_000 as Weight) + Weight::from_ref_time(86_166_000 as u64) // Standard Error: 2_000 - .saturating_add((1_054_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - (86_364_000 as Weight) + Weight::from_ref_time(86_364_000 as u64) // Standard Error: 6_000 - .saturating_add((857_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(857_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - (85_914_000 as Weight) + Weight::from_ref_time(85_914_000 as u64) // Standard Error: 0 - .saturating_add((866_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(866_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - (85_996_000 as Weight) + Weight::from_ref_time(85_996_000 as u64) // Standard Error: 0 - .saturating_add((862_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - (86_224_000 as Weight) + Weight::from_ref_time(86_224_000 as u64) // Standard Error: 2_000 - .saturating_add((1_052_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_052_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Sub(r: u32, ) -> Weight { - (86_126_000 as Weight) + Weight::from_ref_time(86_126_000 as u64) // Standard Error: 2_000 - .saturating_add((1_068_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - (86_389_000 as Weight) + Weight::from_ref_time(86_389_000 as u64) // Standard Error: 3_000 - .saturating_add((1_056_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_056_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - (85_985_000 as Weight) + Weight::from_ref_time(85_985_000 as u64) // Standard Error: 4_000 - .saturating_add((1_126_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_126_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - (86_128_000 as Weight) + Weight::from_ref_time(86_128_000 as u64) // Standard Error: 2_000 - .saturating_add((1_069_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - (86_232_000 as Weight) + Weight::from_ref_time(86_232_000 as u64) // Standard Error: 2_000 - .saturating_add((1_104_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_104_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - (86_414_000 as Weight) + Weight::from_ref_time(86_414_000 as u64) // Standard Error: 3_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - (86_296_000 as Weight) + Weight::from_ref_time(86_296_000 as u64) // Standard Error: 2_000 - .saturating_add((1_051_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_051_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - (86_279_000 as Weight) + Weight::from_ref_time(86_279_000 as u64) // Standard Error: 2_000 - .saturating_add((1_053_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - (86_156_000 as Weight) + Weight::from_ref_time(86_156_000 as u64) // Standard Error: 2_000 - .saturating_add((1_058_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - (86_356_000 as Weight) + Weight::from_ref_time(86_356_000 as u64) // Standard Error: 4_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - (86_241_000 as Weight) + Weight::from_ref_time(86_241_000 as u64) // Standard Error: 2_000 - .saturating_add((1_054_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 2_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - (86_047_000 as Weight) + Weight::from_ref_time(86_047_000 as u64) // Standard Error: 1_000 - .saturating_add((862_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - (86_022_000 as Weight) + Weight::from_ref_time(86_022_000 as u64) // Standard Error: 1_000 - .saturating_add((861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - (86_081_000 as Weight) + Weight::from_ref_time(86_081_000 as u64) // Standard Error: 2_000 - .saturating_add((1_065_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - (86_285_000 as Weight) + Weight::from_ref_time(86_285_000 as u64) // Standard Error: 2_000 - .saturating_add((1_053_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 2_000 - .saturating_add((1_066_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - (86_207_000 as Weight) + Weight::from_ref_time(86_207_000 as u64) // Standard Error: 3_000 - .saturating_add((1_061_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - (86_349_000 as Weight) + Weight::from_ref_time(86_349_000 as u64) // Standard Error: 2_000 - .saturating_add((1_068_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - (86_191_000 as Weight) + Weight::from_ref_time(86_191_000 as u64) // Standard Error: 2_000 - .saturating_add((1_061_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - (85_991_000 as Weight) + Weight::from_ref_time(85_991_000 as u64) // Standard Error: 1_000 - .saturating_add((895_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(895_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - (86_036_000 as Weight) + Weight::from_ref_time(86_036_000 as u64) // Standard Error: 1_000 - .saturating_add((861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - (86_010_000 as Weight) + Weight::from_ref_time(86_010_000 as u64) // Standard Error: 0 - .saturating_add((941_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(941_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - (86_101_000 as Weight) + Weight::from_ref_time(86_101_000 as u64) // Standard Error: 1_000 - .saturating_add((929_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(929_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - (85_978_000 as Weight) + Weight::from_ref_time(85_978_000 as u64) // Standard Error: 0 - .saturating_add((926_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - (86_017_000 as Weight) + Weight::from_ref_time(86_017_000 as u64) // Standard Error: 2_000 - .saturating_add((1_123_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_123_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - (85_956_000 as Weight) + Weight::from_ref_time(85_956_000 as u64) // Standard Error: 0 - .saturating_add((926_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - (86_242_000 as Weight) + Weight::from_ref_time(86_242_000 as u64) // Standard Error: 3_000 - .saturating_add((1_066_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - (85_989_000 as Weight) + Weight::from_ref_time(85_989_000 as u64) // Standard Error: 3_000 - .saturating_add((1_077_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_077_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - (86_007_000 as Weight) + Weight::from_ref_time(86_007_000 as u64) // Standard Error: 2_000 - .saturating_add((1_069_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 3_000 - .saturating_add((1_071_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_071_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - (86_028_000 as Weight) + Weight::from_ref_time(86_028_000 as u64) // Standard Error: 1_000 - .saturating_add((1_179_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_179_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - (86_050_000 as Weight) + Weight::from_ref_time(86_050_000 as u64) // Standard Error: 0 - .saturating_add((1_177_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_177_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 3_000 - .saturating_add((1_064_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - (86_056_000 as Weight) + Weight::from_ref_time(86_056_000 as u64) // Standard Error: 0 - .saturating_add((1_260_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_260_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - (85_880_000 as Weight) + Weight::from_ref_time(85_880_000 as u64) // Standard Error: 2_000 - .saturating_add((528_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - (85_871_000 as Weight) + Weight::from_ref_time(85_871_000 as u64) // Standard Error: 0 - .saturating_add((842_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(842_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - (86_297_000 as Weight) + Weight::from_ref_time(86_297_000 as u64) // Standard Error: 2_000 - .saturating_add((547_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(547_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - (85_933_000 as Weight) + Weight::from_ref_time(85_933_000 as u64) // Standard Error: 0 - .saturating_add((529_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(529_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - (86_007_000 as Weight) + Weight::from_ref_time(86_007_000 as u64) // Standard Error: 2_000 - .saturating_add((1_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(_r: u32, ) -> Weight { - (85_923_000 as Weight) + Weight::from_ref_time(85_923_000 as u64) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(_r: u32, ) -> Weight { - (85_975_000 as Weight) + Weight::from_ref_time(85_975_000 as u64) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - (85_875_000 as Weight) + Weight::from_ref_time(85_875_000 as u64) // Standard Error: 0 - .saturating_add((587_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(587_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 28_951_000 - .saturating_add((1_478_646_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_478_646_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - (85_873_000 as Weight) + Weight::from_ref_time(85_873_000 as u64) // Standard Error: 0 - .saturating_add((262_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(262_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - (85_877_000 as Weight) + Weight::from_ref_time(85_877_000 as u64) // Standard Error: 1_000 - .saturating_add((514_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 2_000 - .saturating_add((1_114_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_114_000 as u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(s: u32, ) -> Weight { - (87_175_000 as Weight) + Weight::from_ref_time(87_175_000 as u64) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(s as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - (86_587_000 as Weight) + Weight::from_ref_time(86_587_000 as u64) // Standard Error: 4_000 - .saturating_add((6_861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(6_861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CallIndirect(r: u32, ) -> Weight { - (86_709_000 as Weight) + Weight::from_ref_time(86_709_000 as u64) // Standard Error: 2_000 - .saturating_add((8_256_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(8_256_000 as u64).saturating_mul(r as u64)) } } @@ -755,11 +755,11 @@ impl WeightInfo for () { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - (288_447_000 as Weight) + Weight::from_ref_time(288_447_000 as u64) // Standard Error: 0 - .saturating_add((45_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + .saturating_add(Weight::from_ref_time(45_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(6 as u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -771,13 +771,13 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn instantiate(n: u32, ) -> Weight { - (671_760_000 as Weight) + Weight::from_ref_time(671_760_000 as u64) // Standard Error: 43_000 - .saturating_add((23_111_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads(6 as Weight)) - .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(23_111_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(6 as u64)) + .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) + .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -788,13 +788,13 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn execute(n: u32, ) -> Weight { - (662_248_000 as Weight) + Weight::from_ref_time(662_248_000 as u64) // Standard Error: 48_000 - .saturating_add((22_792_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(22_792_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) + .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -805,9 +805,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - (793_332_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(8 as Weight)) - .saturating_add(RocksDbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(793_332_000 as u64) + .saturating_add(RocksDbWeight::get().reads(8 as u64)) + .saturating_add(RocksDbWeight::get().writes(7 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -815,88 +815,88 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - (224_958_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(224_958_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - (7_708_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(7_708_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - (7_625_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(7_625_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - (8_167_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(8_167_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn db_scan() -> Weight { - (3_708_000 as Weight) + Weight::from_ref_time(3_708_000 as u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - (16_541_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(16_541_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - (4_958_000 as Weight) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(4_958_000 as u64) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - (2_792_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(2_792_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn transfer(n: u32, ) -> Weight { - (9_198_000 as Weight) + Weight::from_ref_time(9_198_000 as u64) // Standard Error: 23_000 - .saturating_add((21_063_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(21_063_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - (5_625_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(5_625_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn running_contract_meta() -> Weight { - (3_584_000 as Weight) + Weight::from_ref_time(3_584_000 as u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - (3_958_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(3_958_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) } fn addr_validate() -> Weight { - (750_000 as Weight) + Weight::from_ref_time(750_000 as u64) } fn addr_canonicalize() -> Weight { - (750_000 as Weight) + Weight::from_ref_time(750_000 as u64) } fn addr_humanize() -> Weight { - (167_000 as Weight) + Weight::from_ref_time(167_000 as u64) } fn secp256k1_recover_pubkey() -> Weight { - (34_166_000 as Weight) + Weight::from_ref_time(34_166_000 as u64) } fn secp256k1_verify() -> Weight { - (34_166_000 as Weight) + Weight::from_ref_time(34_166_000 as u64) } fn ed25519_verify() -> Weight { - (37_333_000 as Weight) + Weight::from_ref_time(37_333_000 as u64) } fn ed25519_batch_verify() -> Weight { - (152_458_000 as Weight) + Weight::from_ref_time(152_458_000 as u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -907,453 +907,453 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn continue_instantiate(n: u32, ) -> Weight { - (650_499_000 as Weight) + Weight::from_ref_time(650_499_000 as u64) // Standard Error: 55_000 - .saturating_add((21_625_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(21_625_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) + .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 23]`. fn continue_execute(n: u32, ) -> Weight { - (622_227_000 as Weight) + Weight::from_ref_time(622_227_000 as u64) // Standard Error: 14_000 - .saturating_add((528_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - (545_749_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(545_749_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_query() -> Weight { - (533_416_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(533_416_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_reply() -> Weight { - (537_248_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(537_248_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - (10_834_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(10_834_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - (11_917_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(11_917_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - (86_021_000 as Weight) + Weight::from_ref_time(86_021_000 as u64) // Standard Error: 1_000 - .saturating_add((493_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(493_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 1_000 - .saturating_add((491_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - (85_840_000 as Weight) + Weight::from_ref_time(85_840_000 as u64) // Standard Error: 2_000 - .saturating_add((1_860_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_860_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - (85_954_000 as Weight) + Weight::from_ref_time(85_954_000 as u64) // Standard Error: 1_000 - .saturating_add((1_853_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_853_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - (86_250_000 as Weight) + Weight::from_ref_time(86_250_000 as u64) // Standard Error: 2_000 - .saturating_add((1_786_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_786_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - (85_839_000 as Weight) + Weight::from_ref_time(85_839_000 as u64) // Standard Error: 4_000 - .saturating_add((1_804_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_804_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - (86_133_000 as Weight) + Weight::from_ref_time(86_133_000 as u64) // Standard Error: 2_000 - .saturating_add((1_065_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - (85_860_000 as Weight) + Weight::from_ref_time(85_860_000 as u64) // Standard Error: 1_000 - .saturating_add((870_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(870_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - (86_085_000 as Weight) + Weight::from_ref_time(86_085_000 as u64) // Standard Error: 2_000 - .saturating_add((1_058_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - (86_209_000 as Weight) + Weight::from_ref_time(86_209_000 as u64) // Standard Error: 3_000 - .saturating_add((1_064_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - (86_150_000 as Weight) + Weight::from_ref_time(86_150_000 as u64) // Standard Error: 2_000 - .saturating_add((1_055_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - (86_678_000 as Weight) + Weight::from_ref_time(86_678_000 as u64) // Standard Error: 3_000 - .saturating_add((1_042_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_042_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - (86_166_000 as Weight) + Weight::from_ref_time(86_166_000 as u64) // Standard Error: 2_000 - .saturating_add((1_054_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - (86_364_000 as Weight) + Weight::from_ref_time(86_364_000 as u64) // Standard Error: 6_000 - .saturating_add((857_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(857_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - (85_914_000 as Weight) + Weight::from_ref_time(85_914_000 as u64) // Standard Error: 0 - .saturating_add((866_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(866_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - (85_996_000 as Weight) + Weight::from_ref_time(85_996_000 as u64) // Standard Error: 0 - .saturating_add((862_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - (86_224_000 as Weight) + Weight::from_ref_time(86_224_000 as u64) // Standard Error: 2_000 - .saturating_add((1_052_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_052_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Sub(r: u32, ) -> Weight { - (86_126_000 as Weight) + Weight::from_ref_time(86_126_000 as u64) // Standard Error: 2_000 - .saturating_add((1_068_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - (86_389_000 as Weight) + Weight::from_ref_time(86_389_000 as u64) // Standard Error: 3_000 - .saturating_add((1_056_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_056_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - (85_985_000 as Weight) + Weight::from_ref_time(85_985_000 as u64) // Standard Error: 4_000 - .saturating_add((1_126_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_126_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - (86_128_000 as Weight) + Weight::from_ref_time(86_128_000 as u64) // Standard Error: 2_000 - .saturating_add((1_069_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - (86_232_000 as Weight) + Weight::from_ref_time(86_232_000 as u64) // Standard Error: 2_000 - .saturating_add((1_104_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_104_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - (86_414_000 as Weight) + Weight::from_ref_time(86_414_000 as u64) // Standard Error: 3_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - (86_296_000 as Weight) + Weight::from_ref_time(86_296_000 as u64) // Standard Error: 2_000 - .saturating_add((1_051_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_051_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - (86_279_000 as Weight) + Weight::from_ref_time(86_279_000 as u64) // Standard Error: 2_000 - .saturating_add((1_053_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - (86_156_000 as Weight) + Weight::from_ref_time(86_156_000 as u64) // Standard Error: 2_000 - .saturating_add((1_058_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - (86_356_000 as Weight) + Weight::from_ref_time(86_356_000 as u64) // Standard Error: 4_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - (86_241_000 as Weight) + Weight::from_ref_time(86_241_000 as u64) // Standard Error: 2_000 - .saturating_add((1_054_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 2_000 - .saturating_add((1_057_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - (86_047_000 as Weight) + Weight::from_ref_time(86_047_000 as u64) // Standard Error: 1_000 - .saturating_add((862_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - (86_022_000 as Weight) + Weight::from_ref_time(86_022_000 as u64) // Standard Error: 1_000 - .saturating_add((861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - (86_081_000 as Weight) + Weight::from_ref_time(86_081_000 as u64) // Standard Error: 2_000 - .saturating_add((1_065_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - (86_285_000 as Weight) + Weight::from_ref_time(86_285_000 as u64) // Standard Error: 2_000 - .saturating_add((1_053_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 2_000 - .saturating_add((1_066_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - (86_207_000 as Weight) + Weight::from_ref_time(86_207_000 as u64) // Standard Error: 3_000 - .saturating_add((1_061_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - (86_349_000 as Weight) + Weight::from_ref_time(86_349_000 as u64) // Standard Error: 2_000 - .saturating_add((1_068_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - (86_191_000 as Weight) + Weight::from_ref_time(86_191_000 as u64) // Standard Error: 2_000 - .saturating_add((1_061_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - (85_991_000 as Weight) + Weight::from_ref_time(85_991_000 as u64) // Standard Error: 1_000 - .saturating_add((895_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(895_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - (86_036_000 as Weight) + Weight::from_ref_time(86_036_000 as u64) // Standard Error: 1_000 - .saturating_add((861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - (86_010_000 as Weight) + Weight::from_ref_time(86_010_000 as u64) // Standard Error: 0 - .saturating_add((941_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(941_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - (86_101_000 as Weight) + Weight::from_ref_time(86_101_000 as u64) // Standard Error: 1_000 - .saturating_add((929_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(929_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - (85_978_000 as Weight) + Weight::from_ref_time(85_978_000 as u64) // Standard Error: 0 - .saturating_add((926_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - (86_017_000 as Weight) + Weight::from_ref_time(86_017_000 as u64) // Standard Error: 2_000 - .saturating_add((1_123_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_123_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - (85_956_000 as Weight) + Weight::from_ref_time(85_956_000 as u64) // Standard Error: 0 - .saturating_add((926_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - (86_242_000 as Weight) + Weight::from_ref_time(86_242_000 as u64) // Standard Error: 3_000 - .saturating_add((1_066_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - (85_989_000 as Weight) + Weight::from_ref_time(85_989_000 as u64) // Standard Error: 3_000 - .saturating_add((1_077_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_077_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - (86_007_000 as Weight) + Weight::from_ref_time(86_007_000 as u64) // Standard Error: 2_000 - .saturating_add((1_069_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 3_000 - .saturating_add((1_071_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_071_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - (86_028_000 as Weight) + Weight::from_ref_time(86_028_000 as u64) // Standard Error: 1_000 - .saturating_add((1_179_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_179_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - (86_050_000 as Weight) + Weight::from_ref_time(86_050_000 as u64) // Standard Error: 0 - .saturating_add((1_177_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_177_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - (86_113_000 as Weight) + Weight::from_ref_time(86_113_000 as u64) // Standard Error: 3_000 - .saturating_add((1_064_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - (86_056_000 as Weight) + Weight::from_ref_time(86_056_000 as u64) // Standard Error: 0 - .saturating_add((1_260_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_260_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - (85_880_000 as Weight) + Weight::from_ref_time(85_880_000 as u64) // Standard Error: 2_000 - .saturating_add((528_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - (85_871_000 as Weight) + Weight::from_ref_time(85_871_000 as u64) // Standard Error: 0 - .saturating_add((842_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(842_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - (86_297_000 as Weight) + Weight::from_ref_time(86_297_000 as u64) // Standard Error: 2_000 - .saturating_add((547_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(547_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - (85_933_000 as Weight) + Weight::from_ref_time(85_933_000 as u64) // Standard Error: 0 - .saturating_add((529_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(529_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - (86_007_000 as Weight) + Weight::from_ref_time(86_007_000 as u64) // Standard Error: 2_000 - .saturating_add((1_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(_r: u32, ) -> Weight { - (85_923_000 as Weight) + Weight::from_ref_time(85_923_000 as u64) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(_r: u32, ) -> Weight { - (85_975_000 as Weight) + Weight::from_ref_time(85_975_000 as u64) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - (85_875_000 as Weight) + Weight::from_ref_time(85_875_000 as u64) // Standard Error: 0 - .saturating_add((587_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(587_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 28_951_000 - .saturating_add((1_478_646_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_478_646_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - (85_873_000 as Weight) + Weight::from_ref_time(85_873_000 as u64) // Standard Error: 0 - .saturating_add((262_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(262_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - (85_877_000 as Weight) + Weight::from_ref_time(85_877_000 as u64) // Standard Error: 1_000 - .saturating_add((514_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - (86_084_000 as Weight) + Weight::from_ref_time(86_084_000 as u64) // Standard Error: 2_000 - .saturating_add((1_114_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_114_000 as u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(s: u32, ) -> Weight { - (87_175_000 as Weight) + Weight::from_ref_time(87_175_000 as u64) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(s as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - (86_587_000 as Weight) + Weight::from_ref_time(86_587_000 as u64) // Standard Error: 4_000 - .saturating_add((6_861_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(6_861_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CallIndirect(r: u32, ) -> Weight { - (86_709_000 as Weight) + Weight::from_ref_time(86_709_000 as u64) // Standard Error: 2_000 - .saturating_add((8_256_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(8_256_000 as u64).saturating_mul(r as u64)) } } diff --git a/code/parachain/frame/crowdloan-rewards/src/weights.rs b/code/parachain/frame/crowdloan-rewards/src/weights.rs index 9776a98c273..98b22e0c4b7 100644 --- a/code/parachain/frame/crowdloan-rewards/src/weights.rs +++ b/code/parachain/frame/crowdloan-rewards/src/weights.rs @@ -23,21 +23,21 @@ impl WeightInfo for () { // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 109_000 - .saturating_add((6_792_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(x as Weight))) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(x as Weight))) + .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(x as u64))) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) + .saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32) -> Weight { - (33_355_000 as Weight) + Weight::from_ref_time(33_355_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -45,11 +45,11 @@ impl WeightInfo for () { // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32) -> Weight { - (169_323_000 as Weight) + Weight::from_ref_time(169_323_000 as u64) // Standard Error: 1_000 - .saturating_add((8_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -57,11 +57,11 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32) -> Weight { - (94_034_000 as Weight) + Weight::from_ref_time(94_034_000 as u64) // Standard Error: 1_000 - .saturating_add((31_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn unlock_rewards_for(x: u32) -> Weight { diff --git a/code/parachain/frame/currency-factory/src/weights.rs b/code/parachain/frame/currency-factory/src/weights.rs index a95ffdcacaa..6d5f8074ce5 100644 --- a/code/parachain/frame/currency-factory/src/weights.rs +++ b/code/parachain/frame/currency-factory/src/weights.rs @@ -14,9 +14,9 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn add_range() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn set_metadata() -> Weight { diff --git a/code/parachain/frame/dex-router/src/weights.rs b/code/parachain/frame/dex-router/src/weights.rs index d93370c3a80..1488e675a1d 100644 --- a/code/parachain/frame/dex-router/src/weights.rs +++ b/code/parachain/frame/dex-router/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { diff --git a/code/parachain/frame/dutch-auction/src/weights.rs b/code/parachain/frame/dutch-auction/src/weights.rs index 3e59fa99681..9eab59f456b 100644 --- a/code/parachain/frame/dutch-auction/src/weights.rs +++ b/code/parachain/frame/dutch-auction/src/weights.rs @@ -17,7 +17,7 @@ pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { // Storage: DutchAuction Configurations (r:0 w:1) fn add_configuration() -> Weight { - (8_434_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (8_434_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: DutchAuction OrdersIndex (r:1 w:1) // Storage: System Account (r:1 w:1) @@ -25,26 +25,26 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn ask() -> Weight { - (36_854_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(36_854_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: DutchAuction SellOrders (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction Takes (r:1 w:1) fn take() -> Weight { - (21_406_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(21_406_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn liquidate() -> Weight { - (33_038_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(33_038_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1) // Storage: DutchAuction Configurations (r:1 w:0) @@ -55,9 +55,9 @@ impl WeightInfo for SubstrateWeight { // Storage: DutchAuction LocalOrderIdToRemote (r:0 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn xcm_sell() -> Weight { - (44_295_000 as Weight) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(44_295_000 as u64) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: DutchAuction Takes (r:2 w:1) // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1) @@ -65,8 +65,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) // Storage: DutchAuction LocalOrderIdToRemote (r:1 w:1) fn known_overhead_for_on_finalize() -> Weight { - (37_057_000 as Weight) - .saturating_add(T::DbWeight::get().reads(7 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(37_057_000 as u64) + .saturating_add(T::DbWeight::get().reads(7 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } } diff --git a/code/parachain/frame/governance-registry/src/weights.rs b/code/parachain/frame/governance-registry/src/weights.rs index dd7f40a9d65..943a023e5b1 100644 --- a/code/parachain/frame/governance-registry/src/weights.rs +++ b/code/parachain/frame/governance-registry/src/weights.rs @@ -16,41 +16,41 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn set() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn grant_root() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } fn remove() -> Weight { - (83_205_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } // TODO: remove, really it is not needed impl WeightInfo for () { fn set() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn grant_root() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn remove() -> Weight { - (83_205_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(83_205_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/frame/lending/src/weights.rs b/code/parachain/frame/lending/src/weights.rs index 06ff59c64ef..93d7f6b2133 100644 --- a/code/parachain/frame/lending/src/weights.rs +++ b/code/parachain/frame/lending/src/weights.rs @@ -29,21 +29,21 @@ pub trait WeightInfo { impl WeightInfo for () { fn create_market() -> Weight { - (96_881_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(11 as Weight)) + Weight::from_ref_time(96_881_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(11 as u64)) } // same as vaults deposit plus 1 more read fn vault_deposit() -> Weight { - (140_947_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(10 as Weight)) - .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(140_947_000 as u64) + .saturating_add(RocksDbWeight::get().reads(10 as u64)) + .saturating_add(RocksDbWeight::get().writes(5 as u64)) } // same as vaults withdraw plus 1 more read fn vault_withdraw() -> Weight { - (112_296_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(9 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(112_296_000 as u64) + .saturating_add(RocksDbWeight::get().reads(9 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn deposit_collateral() -> Weight { 123_789_000_u64 @@ -56,47 +56,47 @@ impl WeightInfo for () { .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn borrow() -> Weight { - (332_730_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(19 as Weight)) - .saturating_add(RocksDbWeight::get().writes(9 as Weight)) + Weight::from_ref_time(332_730_000 as u64) + .saturating_add(RocksDbWeight::get().reads(19 as u64)) + .saturating_add(RocksDbWeight::get().writes(9 as u64)) } fn repay_borrow() -> Weight { - (209_694_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(13 as Weight)) - .saturating_add(RocksDbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(209_694_000 as u64) + .saturating_add(RocksDbWeight::get().reads(13 as u64)) + .saturating_add(RocksDbWeight::get().writes(6 as u64)) } fn liquidate(b: u32) -> Weight { - (25_879_000 as Weight) - .saturating_add((7_877_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(RocksDbWeight::get().reads(7 as Weight)) + Weight::from_ref_time(25_879_000 as u64) + .saturating_add(Weight::from_ref_time(7_877_000 as u64).saturating_mul(b as u64)) + .saturating_add(RocksDbWeight::get().reads(7 as u64)) } fn now() -> Weight { - (4_744_000 as Weight).saturating_add(RocksDbWeight::get().reads(1 as Weight)) + (4_744_000 as u64).saturating_add(RocksDbWeight::get().reads(1 as u64)) } fn accrue_interest(_x: u32) -> Weight { - (76_626_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(8 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(76_626_000 as u64) + .saturating_add(RocksDbWeight::get().reads(8 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn account_id() -> Weight { - (3_126_000 as Weight) + Weight::from_ref_time(3_126_000 as u64) } fn available_funds() -> Weight { - (16_450_000 as Weight).saturating_add(RocksDbWeight::get().reads(2 as Weight)) + (16_450_000 as u64).saturating_add(RocksDbWeight::get().reads(2 as u64)) } fn handle_withdrawable() -> Weight { - (20_716_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_716_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn handle_depositable() -> Weight { - (40_066_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(40_066_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn handle_must_liquidate() -> Weight { - (38_744_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(38_744_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/frame/liquidations/src/weights.rs b/code/parachain/frame/liquidations/src/weights.rs index 234035ad908..4a7254504c3 100644 --- a/code/parachain/frame/liquidations/src/weights.rs +++ b/code/parachain/frame/liquidations/src/weights.rs @@ -17,9 +17,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Liquidations StrategyIndex (r:1 w:1) // Storage: Liquidations Strategies (r:0 w:1) fn add_liquidation_strategy() -> Weight { - (3_127_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(3_127_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Liquidations Strategies (r:2 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -28,11 +28,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn sell(x: u32) -> Weight { - (43_980_000 as Weight) + Weight::from_ref_time(43_980_000 as u64) // Standard Error: 27_000 - .saturating_add((1_758_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(x as Weight))) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(1_758_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/frame/mosaic/src/weights.rs b/code/parachain/frame/mosaic/src/weights.rs index 08b644836ba..54f638d5f23 100644 --- a/code/parachain/frame/mosaic/src/weights.rs +++ b/code/parachain/frame/mosaic/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { diff --git a/code/parachain/frame/oracle/src/weights.rs b/code/parachain/frame/oracle/src/weights.rs index 590e83627af..9bb07ca575b 100644 --- a/code/parachain/frame/oracle/src/weights.rs +++ b/code/parachain/frame/oracle/src/weights.rs @@ -22,111 +22,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn add_asset_and_info() -> Weight { - (33_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(33_000_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } fn set_signer() -> Weight { - (134_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(134_000_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } fn adjust_rewards() -> Weight { - (134_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(134_000_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } fn add_stake() -> Weight { - (219_457_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(219_457_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } fn remove_stake() -> Weight { - (42_512_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(42_512_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } fn reclaim_stake() -> Weight { - (51_245_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(51_245_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } fn submit_price(p: u32) -> Weight { - (85_274_000 as Weight) + Weight::from_ref_time(85_274_000 as u64) // Standard Error: 148_000 - .saturating_add((254_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn update_pre_prices(p: u32) -> Weight { - (11_336_000 as Weight) + Weight::from_ref_time(11_336_000 as u64) // Standard Error: 7_000 - .saturating_add((238_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(238_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn update_price(p: u32) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 2_426_000 - .saturating_add((22_017_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(22_017_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } // For backwards compatibility and tests impl WeightInfo for () { fn add_asset_and_info() -> Weight { - (33_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(33_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn set_signer() -> Weight { - (134_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(134_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn adjust_rewards() -> Weight { - (134_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(134_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn add_stake() -> Weight { - (219_457_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(219_457_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn remove_stake() -> Weight { - (42_512_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(42_512_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn reclaim_stake() -> Weight { - (51_245_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(51_245_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn submit_price(p: u32) -> Weight { - (85_274_000 as Weight) + Weight::from_ref_time(85_274_000 as u64) // Standard Error: 148_000 - .saturating_add((254_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn update_pre_prices(p: u32) -> Weight { - (11_336_000 as Weight) + Weight::from_ref_time(11_336_000 as u64) // Standard Error: 7_000 - .saturating_add((238_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(238_000 as u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } fn update_price(p: u32) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 2_426_000 - .saturating_add((22_017_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(22_017_000 as u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/frame/pablo/src/weights.rs b/code/parachain/frame/pablo/src/weights.rs index e99740ae294..9dc1fc742fa 100644 --- a/code/parachain/frame/pablo/src/weights.rs +++ b/code/parachain/frame/pablo/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { diff --git a/code/parachain/frame/vault/src/weights.rs b/code/parachain/frame/vault/src/weights.rs index 70aca3bb0d3..c71048dcb3a 100644 --- a/code/parachain/frame/vault/src/weights.rs +++ b/code/parachain/frame/vault/src/weights.rs @@ -29,9 +29,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Vault Allocations (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - (144_989_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(144_989_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -39,52 +39,52 @@ impl WeightInfo for SubstrateWeight { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - (140_947_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(140_947_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - (112_296_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(112_296_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - (25_497_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_497_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - (25_388_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_388_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - (77_802_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(77_802_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - (70_839_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(70_839_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - (25_030_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(25_030_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } @@ -96,9 +96,9 @@ impl WeightInfo for () { // Storage: Vault Allocations (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - (144_989_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(144_989_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(7 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -106,51 +106,51 @@ impl WeightInfo for () { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - (140_947_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(9 as Weight)) - .saturating_add(RocksDbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(140_947_000 as u64) + .saturating_add(RocksDbWeight::get().reads(9 as u64)) + .saturating_add(RocksDbWeight::get().writes(5 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - (112_296_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(8 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(112_296_000 as u64) + .saturating_add(RocksDbWeight::get().reads(8 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - (25_497_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_497_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - (25_388_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(1 as Weight)) - .saturating_add(RocksDbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(25_388_000 as u64) + .saturating_add(RocksDbWeight::get().reads(1 as u64)) + .saturating_add(RocksDbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - (77_802_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(77_802_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - (70_839_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(70_839_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - (25_030_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(25_030_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/frame/vesting/src/weights.rs b/code/parachain/frame/vesting/src/weights.rs index e912d823572..da601381920 100644 --- a/code/parachain/frame/vesting/src/weights.rs +++ b/code/parachain/frame/vesting/src/weights.rs @@ -25,7 +25,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; /// Weight functions needed for orml_vesting. @@ -39,28 +39,28 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn vested_transfer() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn claim(i: u32, ) -> Weight { - (31_747_000 as Weight) + Weight::from_ref_time(31_747_000 as u64) // Standard Error: 4_000 - .saturating_add((63_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(63_000 as u64).saturating_mul(i as u64)) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(2 as u64)) } fn update_vesting_schedules(i: u32, ) -> Weight { - (29_457_000 as Weight) + Weight::from_ref_time(29_457_000 as u64) // Standard Error: 4_000 - .saturating_add((117_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(RocksDbWeight::get().reads(2 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(117_000 as u64).saturating_mul(i as u64)) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn claim_for(i: u32, ) -> Weight { - (31_747_000 as Weight) + Weight::from_ref_time(31_747_000 as u64) // Standard Error: 4_000 - .saturating_add((63_000 as Weight).saturating_mul(i as Weight)) + .saturating_add(Weight::from_ref_time(63_000 as u64).saturating_mul(i as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/balances.rs b/code/parachain/runtime/composable/src/weights/balances.rs index 2a12c172e06..433061ce5d2 100644 --- a/code/parachain/runtime/composable/src/weights/balances.rs +++ b/code/parachain/runtime/composable/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (125_213_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(125_213_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (80_379_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(80_379_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (54_186_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(54_186_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (61_035_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(61_035_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (128_888_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(128_888_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (99_649_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(99_649_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (49_408_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(49_408_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/collator_selection.rs b/code/parachain/runtime/composable/src/weights/collator_selection.rs index 5f09c49dbc6..d7bddeada89 100644 --- a/code/parachain/runtime/composable/src/weights/collator_selection.rs +++ b/code/parachain/runtime/composable/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (19_184_000 as Weight) + Weight::from_ref_time(19_184_000 as u64) // Standard Error: 9_000 - .saturating_add((7_232_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(7_232_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (17_944_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(17_944_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (18_325_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(18_325_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (117_065_000 as Weight) + Weight::from_ref_time(117_065_000 as u64) // Standard Error: 2_000 - .saturating_add((219_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(219_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (125_020_000 as Weight) + Weight::from_ref_time(125_020_000 as u64) // Standard Error: 5_000 - .saturating_add((202_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(202_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (75_977_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(75_977_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 3_255_000 - .saturating_add((19_013_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(19_013_000 as u64).saturating_mul(r as u64)) // Standard Error: 3_255_000 - .saturating_add((89_734_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) + .saturating_add(Weight::from_ref_time(89_734_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/collective.rs b/code/parachain/runtime/composable/src/weights/collective.rs index f2d4090d29f..e0d8043a456 100644 --- a/code/parachain/runtime/composable/src/weights/collective.rs +++ b/code/parachain/runtime/composable/src/weights/collective.rs @@ -38,40 +38,40 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 23_000 - .saturating_add((20_718_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(20_718_000 as u64).saturating_mul(m as u64)) // Standard Error: 23_000 - .saturating_add((365_000 as Weight).saturating_mul(n as Weight)) + .saturating_add(Weight::from_ref_time(365_000 as u64).saturating_mul(n as u64)) // Standard Error: 23_000 - .saturating_add((27_666_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(27_666_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - (42_954_000 as Weight) + Weight::from_ref_time(42_954_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) // Standard Error: 2_000 - .saturating_add((88_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(88_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - (47_049_000 as Weight) + Weight::from_ref_time(47_049_000 as u64) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(b as u64)) // Standard Error: 2_000 - .saturating_add((170_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(Weight::from_ref_time(170_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -82,25 +82,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - (64_124_000 as Weight) + Weight::from_ref_time(64_124_000 as u64) // Standard Error: 0 - .saturating_add((10_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(10_000 as u64).saturating_mul(b as u64)) // Standard Error: 6_000 - .saturating_add((104_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(104_000 as u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add((533_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(533_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - (76_824_000 as Weight) + Weight::from_ref_time(76_824_000 as u64) // Standard Error: 9_000 - .saturating_add((257_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(257_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -109,13 +109,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - (74_717_000 as Weight) + Weight::from_ref_time(74_717_000 as u64) // Standard Error: 6_000 - .saturating_add((159_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(159_000 as u64).saturating_mul(m as u64)) // Standard Error: 5_000 - .saturating_add((460_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(460_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -125,15 +125,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - (88_068_000 as Weight) + Weight::from_ref_time(88_068_000 as u64) // Standard Error: 0 - .saturating_add((7_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(b as u64)) // Standard Error: 6_000 - .saturating_add((199_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(199_000 as u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add((531_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(531_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -143,13 +143,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - (78_225_000 as Weight) + Weight::from_ref_time(78_225_000 as u64) // Standard Error: 6_000 - .saturating_add((186_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(186_000 as u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add((451_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(451_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -160,25 +160,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - (91_125_000 as Weight) + Weight::from_ref_time(91_125_000 as u64) // Standard Error: 0 - .saturating_add((9_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(9_000 as u64).saturating_mul(b as u64)) // Standard Error: 7_000 - .saturating_add((203_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(203_000 as u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add((548_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(548_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - (47_091_000 as Weight) + Weight::from_ref_time(47_091_000 as u64) // Standard Error: 5_000 - .saturating_add((588_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(588_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/currency_factory.rs b/code/parachain/runtime/composable/src/weights/currency_factory.rs index 471c3e14875..5798ee4d4d9 100644 --- a/code/parachain/runtime/composable/src/weights/currency_factory.rs +++ b/code/parachain/runtime/composable/src/weights/currency_factory.rs @@ -9,14 +9,14 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn add_range() -> Weight { - (99_095_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(99_095_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:1 w:1) fn set_metadata() -> Weight { - (59_284_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(59_284_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/democracy.rs b/code/parachain/runtime/composable/src/weights/democracy.rs index 3239420db6a..f99aea9eee4 100644 --- a/code/parachain/runtime/composable/src/weights/democracy.rs +++ b/code/parachain/runtime/composable/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (98_845_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(98_845_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - (59_255_000 as Weight) + Weight::from_ref_time(59_255_000 as u64) // Standard Error: 9_000 - .saturating_add((254_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - (71_268_000 as Weight) + Weight::from_ref_time(71_268_000 as u64) // Standard Error: 4_000 - .saturating_add((383_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(383_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - (72_294_000 as Weight) + Weight::from_ref_time(72_294_000 as u64) // Standard Error: 4_000 - .saturating_add((357_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(357_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (32_689_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(32_689_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - (112_279_000 as Weight) + Weight::from_ref_time(112_279_000 as u64) // Standard Error: 10_000 - .saturating_add((666_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + .saturating_add(Weight::from_ref_time(666_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - (16_742_000 as Weight) + Weight::from_ref_time(16_742_000 as u64) // Standard Error: 0 - .saturating_add((56_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(56_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (3_388_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_388_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (3_365_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_365_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (33_963_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(33_963_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - (36_141_000 as Weight) + Weight::from_ref_time(36_141_000 as u64) // Standard Error: 1_000 - .saturating_add((83_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(83_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - (82_770_000 as Weight) + Weight::from_ref_time(82_770_000 as u64) // Standard Error: 6_000 - .saturating_add((566_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(566_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (20_600_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_600_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - (35_919_000 as Weight) + Weight::from_ref_time(35_919_000 as u64) // Standard Error: 20_000 - .saturating_add((2_128_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_128_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - (28_277_000 as Weight) + Weight::from_ref_time(28_277_000 as u64) // Standard Error: 24_000 - .saturating_add((6_694_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(6_694_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - (14_827_000 as Weight) + Weight::from_ref_time(14_827_000 as u64) // Standard Error: 13_000 - .saturating_add((6_985_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(6_985_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - (69_506_000 as Weight) + Weight::from_ref_time(69_506_000 as u64) // Standard Error: 12_000 - .saturating_add((9_264_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_264_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - (33_886_000 as Weight) + Weight::from_ref_time(33_886_000 as u64) // Standard Error: 11_000 - .saturating_add((9_246_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_246_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_051_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(4_051_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - (53_641_000 as Weight) + Weight::from_ref_time(53_641_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - (34_779_000 as Weight) + Weight::from_ref_time(34_779_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - (50_048_000 as Weight) + Weight::from_ref_time(50_048_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - (47_429_000 as Weight) + Weight::from_ref_time(47_429_000 as u64) // Standard Error: 2_000 - .saturating_add((150_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(150_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - (45_173_000 as Weight) + Weight::from_ref_time(45_173_000 as u64) // Standard Error: 3_000 - .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(289_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - (26_608_000 as Weight) + Weight::from_ref_time(26_608_000 as u64) // Standard Error: 3_000 - .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(289_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - (26_339_000 as Weight) + Weight::from_ref_time(26_339_000 as u64) // Standard Error: 3_000 - .saturating_add((298_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(298_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/frame_system.rs b/code/parachain/runtime/composable/src/weights/frame_system.rs index 6510661d026..17a0acdc25b 100644 --- a/code/parachain/runtime/composable/src/weights/frame_system.rs +++ b/code/parachain/runtime/composable/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - (4_067_000 as Weight) + Weight::from_ref_time(4_067_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (15_638_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(15_638_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 5_000 - .saturating_add((1_527_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_527_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 4_000 - .saturating_add((1_211_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_211_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 7_000 - .saturating_add((2_178_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(2_178_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/indices.rs b/code/parachain/runtime/composable/src/weights/indices.rs index 25b55c10f0f..2dbf82feb47 100644 --- a/code/parachain/runtime/composable/src/weights/indices.rs +++ b/code/parachain/runtime/composable/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (69_943_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(69_943_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (77_530_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(77_530_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (65_682_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(65_682_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (68_237_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(68_237_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (80_167_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(80_167_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/membership.rs b/code/parachain/runtime/composable/src/weights/membership.rs index 13bd742016d..2c58c83f6d8 100644 --- a/code/parachain/runtime/composable/src/weights/membership.rs +++ b/code/parachain/runtime/composable/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - (36_659_000 as Weight) + Weight::from_ref_time(36_659_000 as u64) // Standard Error: 2_000 - .saturating_add((179_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(179_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - (41_444_000 as Weight) + Weight::from_ref_time(41_444_000 as u64) // Standard Error: 3_000 - .saturating_add((195_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - (42_253_000 as Weight) + Weight::from_ref_time(42_253_000 as u64) // Standard Error: 2_000 - .saturating_add((210_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(210_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - (43_169_000 as Weight) + Weight::from_ref_time(43_169_000 as u64) // Standard Error: 4_000 - .saturating_add((401_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(401_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - (44_426_000 as Weight) + Weight::from_ref_time(44_426_000 as u64) // Standard Error: 2_000 - .saturating_add((190_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(190_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - (12_589_000 as Weight) + Weight::from_ref_time(12_589_000 as u64) // Standard Error: 0 - .saturating_add((82_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(82_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - (4_782_000 as Weight) + Weight::from_ref_time(4_782_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/scheduler.rs b/code/parachain/runtime/composable/src/weights/scheduler.rs index b783dba56b9..a4e5f439645 100644 --- a/code/parachain/runtime/composable/src/weights/scheduler.rs +++ b/code/parachain/runtime/composable/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (25_833_000 as Weight) + Weight::from_ref_time(25_833_000 as u64) // Standard Error: 78_000 - .saturating_add((55_570_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(55_570_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - (30_243_000 as Weight) + Weight::from_ref_time(30_243_000 as u64) // Standard Error: 55_000 - .saturating_add((43_140_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(43_140_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (29_618_000 as Weight) + Weight::from_ref_time(29_618_000 as u64) // Standard Error: 64_000 - .saturating_add((47_304_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(47_304_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - (29_946_000 as Weight) + Weight::from_ref_time(29_946_000 as u64) // Standard Error: 50_000 - .saturating_add((39_758_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(39_758_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - (22_282_000 as Weight) + Weight::from_ref_time(22_282_000 as u64) // Standard Error: 41_000 - .saturating_add((15_931_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(15_931_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - (20_548_000 as Weight) + Weight::from_ref_time(20_548_000 as u64) // Standard Error: 23_000 - .saturating_add((8_918_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(8_918_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - (36_435_000 as Weight) + Weight::from_ref_time(36_435_000 as u64) // Standard Error: 52_000 - .saturating_add((28_752_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(28_752_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - (36_127_000 as Weight) + Weight::from_ref_time(36_127_000 as u64) // Standard Error: 46_000 - .saturating_add((21_339_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(21_339_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - (36_519_000 as Weight) + Weight::from_ref_time(36_519_000 as u64) // Standard Error: 35_000 - .saturating_add((16_970_000 as Weight).saturating_mul(s 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(s as Weight))) + .saturating_add(Weight::from_ref_time(16_970_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - (35_236_000 as Weight) + Weight::from_ref_time(35_236_000 as u64) // Standard Error: 26_000 - .saturating_add((14_029_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(14_029_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (47_067_000 as Weight) + Weight::from_ref_time(47_067_000 as u64) // Standard Error: 7_000 - .saturating_add((191_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(191_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (46_357_000 as Weight) + Weight::from_ref_time(46_357_000 as u64) // Standard Error: 12_000 - .saturating_add((1_890_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(1_890_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (56_723_000 as Weight) + Weight::from_ref_time(56_723_000 as u64) // Standard Error: 9_000 - .saturating_add((214_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(214_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (49_893_000 as Weight) + Weight::from_ref_time(49_893_000 as u64) // Standard Error: 13_000 - .saturating_add((1_948_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(1_948_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/session.rs b/code/parachain/runtime/composable/src/weights/session.rs index 1e7969ff5bf..4400d05be26 100644 --- a/code/parachain/runtime/composable/src/weights/session.rs +++ b/code/parachain/runtime/composable/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (44_501_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(44_501_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (36_298_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(36_298_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/timestamp.rs b/code/parachain/runtime/composable/src/weights/timestamp.rs index 7a20010af35..638642adfd9 100644 --- a/code/parachain/runtime/composable/src/weights/timestamp.rs +++ b/code/parachain/runtime/composable/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (23_303_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(23_303_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn on_finalize() -> Weight { - (7_705_000 as Weight) + Weight::from_ref_time(7_705_000 as u64) } } diff --git a/code/parachain/runtime/composable/src/weights/tokens.rs b/code/parachain/runtime/composable/src/weights/tokens.rs index 56806851601..1e66692a5b5 100644 --- a/code/parachain/runtime/composable/src/weights/tokens.rs +++ b/code/parachain/runtime/composable/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_keep_alive() -> Weight { - (38_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(38_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn force_transfer() -> Weight { - (45_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(45_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn set_balance() -> Weight { - (34_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(34_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/treasury.rs b/code/parachain/runtime/composable/src/weights/treasury.rs index 928d1603ab6..4d38b30c317 100644 --- a/code/parachain/runtime/composable/src/weights/treasury.rs +++ b/code/parachain/runtime/composable/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - (589_000 as Weight) + Weight::from_ref_time(589_000 as u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (67_476_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(67_476_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (97_021_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(97_021_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - (29_230_000 as Weight) + Weight::from_ref_time(29_230_000 as u64) // Standard Error: 14_000 - .saturating_add((341_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(341_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - (20_076_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_076_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - (77_938_000 as Weight) + Weight::from_ref_time(77_938_000 as u64) // Standard Error: 165_000 - .saturating_add((76_281_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(76_281_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/utility.rs b/code/parachain/runtime/composable/src/weights/utility.rs index de8d95aff3a..37f36556d78 100644 --- a/code/parachain/runtime/composable/src/weights/utility.rs +++ b/code/parachain/runtime/composable/src/weights/utility.rs @@ -32,26 +32,26 @@ pub struct WeightInfo(PhantomData); impl utility::WeightInfo for WeightInfo { /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - (34_796_000 as Weight) + Weight::from_ref_time(34_796_000 as u64) // Standard Error: 5_000 - .saturating_add((8_531_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(Weight::from_ref_time(8_531_000 as u64).saturating_mul(c as u64)) } fn as_derivative() -> Weight { - (15_550_000 as Weight) + Weight::from_ref_time(15_550_000 as u64) } /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - (45_171_000 as Weight) + Weight::from_ref_time(45_171_000 as u64) // Standard Error: 3_000 - .saturating_add((8_913_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(Weight::from_ref_time(8_913_000 as u64).saturating_mul(c as u64)) } fn dispatch_as() -> Weight { - (32_513_000 as Weight) + Weight::from_ref_time(32_513_000 as u64) } /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - (42_000_000 as Weight) + Weight::from_ref_time(42_000_000 as u64) // Standard Error: 5_000 - .saturating_add((8_526_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(Weight::from_ref_time(8_526_000 as u64).saturating_mul(c as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs b/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs index 76a608fd5c3..ecbf13ccce2 100644 --- a/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs +++ b/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs @@ -32,8 +32,8 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl asset_tx_payment::WeightInfo for WeightInfo { fn set_payment_asset() -> Weight { - (26_387_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(26_387_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/assets_registry.rs b/code/parachain/runtime/dali/src/weights/assets_registry.rs index 06bb01b3a20..0e0eaaa5e6a 100644 --- a/code/parachain/runtime/dali/src/weights/assets_registry.rs +++ b/code/parachain/runtime/dali/src/weights/assets_registry.rs @@ -35,22 +35,22 @@ impl assets_registry::WeightInfo for WeightInfo { // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) fn register_asset() -> Weight { - (63_771_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(63_771_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) // Storage: AssetsRegistry ForeignToLocal (r:0 w:1) fn update_asset() -> Weight { - (49_298_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(49_298_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: AssetsRegistry MinFeeAmounts (r:1 w:1) fn set_min_fee() -> Weight { - (43_550_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(43_550_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/balances.rs b/code/parachain/runtime/dali/src/weights/balances.rs index 7206b78eb77..e63423ef937 100644 --- a/code/parachain/runtime/dali/src/weights/balances.rs +++ b/code/parachain/runtime/dali/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (135_510_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(135_510_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (88_015_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(88_015_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (62_658_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(62_658_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (67_586_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(67_586_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (138_204_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(138_204_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (104_739_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(104_739_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (52_747_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(52_747_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/bonded_finance.rs b/code/parachain/runtime/dali/src/weights/bonded_finance.rs index 7ca08932580..fc150c200b1 100644 --- a/code/parachain/runtime/dali/src/weights/bonded_finance.rs +++ b/code/parachain/runtime/dali/src/weights/bonded_finance.rs @@ -35,9 +35,9 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: BondedFinance BondOffers (r:0 w:1) fn offer() -> Weight { - (165_046_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(165_046_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: Tokens Accounts (r:4 w:4) @@ -46,15 +46,15 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Vesting VestingSchedules (r:2 w:2) // Storage: Tokens Locks (r:2 w:2) fn bond() -> Weight { - (392_203_000 as Weight) - .saturating_add(T::DbWeight::get().reads(12 as Weight)) - .saturating_add(T::DbWeight::get().writes(12 as Weight)) + Weight::from_ref_time(392_203_000 as u64) + .saturating_add(T::DbWeight::get().reads(12 as u64)) + .saturating_add(T::DbWeight::get().writes(12 as u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel() -> Weight { - (114_123_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(114_123_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/collator_selection.rs b/code/parachain/runtime/dali/src/weights/collator_selection.rs index a1dde9dcd9d..a715b31eb65 100644 --- a/code/parachain/runtime/dali/src/weights/collator_selection.rs +++ b/code/parachain/runtime/dali/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (20_415_000 as Weight) + Weight::from_ref_time(20_415_000 as u64) // Standard Error: 9_000 - .saturating_add((7_309_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(7_309_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (20_211_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_211_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (20_212_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_212_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (115_663_000 as Weight) + Weight::from_ref_time(115_663_000 as u64) // Standard Error: 2_000 - .saturating_add((239_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(239_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (111_893_000 as Weight) + Weight::from_ref_time(111_893_000 as u64) // Standard Error: 2_000 - .saturating_add((244_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(244_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (76_971_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(76_971_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 3_529_000 - .saturating_add((21_666_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(21_666_000 as u64).saturating_mul(r as u64)) // Standard Error: 3_529_000 - .saturating_add((96_527_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) + .saturating_add(Weight::from_ref_time(96_527_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/collective.rs b/code/parachain/runtime/dali/src/weights/collective.rs index aefc363a3b0..fc5d5438832 100644 --- a/code/parachain/runtime/dali/src/weights/collective.rs +++ b/code/parachain/runtime/dali/src/weights/collective.rs @@ -38,29 +38,29 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 51_000 - .saturating_add((20_177_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(20_177_000 as u64).saturating_mul(m as u64)) // Standard Error: 51_000 - .saturating_add((131_000 as Weight).saturating_mul(n as Weight)) + .saturating_add(Weight::from_ref_time(131_000 as u64).saturating_mul(n as u64)) // Standard Error: 51_000 - .saturating_add((27_668_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(27_668_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - (49_648_000 as Weight) + Weight::from_ref_time(49_648_000 as u64) // Standard Error: 0 - .saturating_add((7_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(b as u64)) // Standard Error: 8_000 - .saturating_add((111_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(Weight::from_ref_time(111_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) @@ -68,12 +68,12 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - (58_035_000 as Weight) + Weight::from_ref_time(58_035_000 as u64) // Standard Error: 1_000 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) // Standard Error: 9_000 - .saturating_add((189_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(Weight::from_ref_time(189_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -84,25 +84,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - (71_236_000 as Weight) + Weight::from_ref_time(71_236_000 as u64) // Standard Error: 1_000 - .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(b as u64)) // Standard Error: 10_000 - .saturating_add((78_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(78_000 as u64).saturating_mul(m as u64)) // Standard Error: 10_000 - .saturating_add((492_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(492_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - (75_685_000 as Weight) + Weight::from_ref_time(75_685_000 as u64) // Standard Error: 11_000 - .saturating_add((216_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(216_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -111,13 +111,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - (88_658_000 as Weight) + Weight::from_ref_time(88_658_000 as u64) // Standard Error: 11_000 - .saturating_add((84_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(84_000 as u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add((397_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(397_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -128,15 +128,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - (99_765_000 as Weight) + Weight::from_ref_time(99_765_000 as u64) // Standard Error: 1_000 - .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(b as u64)) // Standard Error: 12_000 - .saturating_add((196_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(196_000 as u64).saturating_mul(m as u64)) // Standard Error: 12_000 - .saturating_add((488_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(488_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -146,13 +146,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - (87_559_000 as Weight) + Weight::from_ref_time(87_559_000 as u64) // Standard Error: 12_000 - .saturating_add((154_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(154_000 as u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add((433_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(433_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -164,25 +164,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - (96_304_000 as Weight) + Weight::from_ref_time(96_304_000 as u64) // Standard Error: 1_000 - .saturating_add((13_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(13_000 as u64).saturating_mul(b as u64)) // Standard Error: 12_000 - .saturating_add((264_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add((539_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(539_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - (54_053_000 as Weight) + Weight::from_ref_time(54_053_000 as u64) // Standard Error: 9_000 - .saturating_add((514_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/cosmwasm.rs b/code/parachain/runtime/dali/src/weights/cosmwasm.rs index 489f3e7b40b..046dc6b526e 100644 --- a/code/parachain/runtime/dali/src/weights/cosmwasm.rs +++ b/code/parachain/runtime/dali/src/weights/cosmwasm.rs @@ -38,11 +38,11 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - (683_853_000 as Weight) + Weight::from_ref_time(683_853_000 as u64) // Standard Error: 0 - .saturating_add((146_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + .saturating_add(Weight::from_ref_time(146_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -54,13 +54,13 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn instantiate(n: u32, ) -> Weight { - (1_201_802_000 as Weight) + Weight::from_ref_time(1_201_802_000 as u64) // Standard Error: 685_000 - .saturating_add((54_049_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(54_049_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -71,13 +71,13 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn execute(n: u32, ) -> Weight { - (1_194_812_000 as Weight) + Weight::from_ref_time(1_194_812_000 as u64) // Standard Error: 699_000 - .saturating_add((50_621_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(50_621_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -88,9 +88,9 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - (1_567_144_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(1_567_144_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -98,88 +98,88 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - (534_505_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(534_505_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - (25_963_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(25_963_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - (25_743_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(25_743_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - (28_603_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(28_603_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn db_scan() -> Weight { - (11_417_000 as Weight) + Weight::from_ref_time(11_417_000 as u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - (119_411_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(119_411_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - (17_259_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(17_259_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - (7_817_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(7_817_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn transfer(n: u32, ) -> Weight { - (41_147_000 as Weight) + Weight::from_ref_time(41_147_000 as u64) // Standard Error: 327_000 - .saturating_add((46_316_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(46_316_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - (18_119_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(18_119_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn running_contract_meta() -> Weight { - (10_973_000 as Weight) + Weight::from_ref_time(10_973_000 as u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - (12_953_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(12_953_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } fn addr_validate() -> Weight { - (2_307_000 as Weight) + Weight::from_ref_time(2_307_000 as u64) } fn addr_canonicalize() -> Weight { - (2_317_000 as Weight) + Weight::from_ref_time(2_317_000 as u64) } fn addr_humanize() -> Weight { - (431_000 as Weight) + Weight::from_ref_time(431_000 as u64) } fn secp256k1_recover_pubkey() -> Weight { - (61_485_000 as Weight) + Weight::from_ref_time(61_485_000 as u64) } fn secp256k1_verify() -> Weight { - (74_985_000 as Weight) + Weight::from_ref_time(74_985_000 as u64) } fn ed25519_verify() -> Weight { - (94_174_000 as Weight) + Weight::from_ref_time(94_174_000 as u64) } fn ed25519_batch_verify() -> Weight { - (265_682_000 as Weight) + Weight::from_ref_time(265_682_000 as u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -190,436 +190,436 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn continue_instantiate(n: u32, ) -> Weight { - (1_167_956_000 as Weight) + Weight::from_ref_time(1_167_956_000 as u64) // Standard Error: 785_000 - .saturating_add((48_486_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) + .saturating_add(Weight::from_ref_time(48_486_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 22]`. fn continue_execute(n: u32, ) -> Weight { - (1_078_364_000 as Weight) + Weight::from_ref_time(1_078_364_000 as u64) // Standard Error: 520_000 - .saturating_add((1_089_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(Weight::from_ref_time(1_089_000 as u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - (1_022_172_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(1_022_172_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - (32_179_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(32_179_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn query_continuation() -> Weight { - (992_771_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + Weight::from_ref_time(992_771_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - (36_625_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(36_625_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - (121_199_000 as Weight) + Weight::from_ref_time(121_199_000 as u64) // Standard Error: 60_000 - .saturating_add((1_885_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_885_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - (122_825_000 as Weight) + Weight::from_ref_time(122_825_000 as u64) // Standard Error: 48_000 - .saturating_add((1_758_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_758_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - (125_799_000 as Weight) + Weight::from_ref_time(125_799_000 as u64) // Standard Error: 66_000 - .saturating_add((5_682_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(5_682_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - (125_748_000 as Weight) + Weight::from_ref_time(125_748_000 as u64) // Standard Error: 51_000 - .saturating_add((5_547_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(5_547_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - (120_716_000 as Weight) + Weight::from_ref_time(120_716_000 as u64) // Standard Error: 56_000 - .saturating_add((5_757_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(5_757_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - (122_091_000 as Weight) + Weight::from_ref_time(122_091_000 as u64) // Standard Error: 64_000 - .saturating_add((5_769_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(5_769_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - (119_919_000 as Weight) + Weight::from_ref_time(119_919_000 as u64) // Standard Error: 55_000 - .saturating_add((3_913_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_913_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - (125_674_000 as Weight) + Weight::from_ref_time(125_674_000 as u64) // Standard Error: 50_000 - .saturating_add((2_578_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_578_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - (118_228_000 as Weight) + Weight::from_ref_time(118_228_000 as u64) // Standard Error: 66_000 - .saturating_add((3_693_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_693_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - (122_012_000 as Weight) + Weight::from_ref_time(122_012_000 as u64) // Standard Error: 57_000 - .saturating_add((3_690_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_690_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - (120_007_000 as Weight) + Weight::from_ref_time(120_007_000 as u64) // Standard Error: 59_000 - .saturating_add((3_617_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_617_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - (118_954_000 as Weight) + Weight::from_ref_time(118_954_000 as u64) // Standard Error: 61_000 - .saturating_add((3_876_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_876_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - (121_310_000 as Weight) + Weight::from_ref_time(121_310_000 as u64) // Standard Error: 54_000 - .saturating_add((3_672_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_672_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - (120_485_000 as Weight) + Weight::from_ref_time(120_485_000 as u64) // Standard Error: 46_000 - .saturating_add((2_653_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_653_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - (122_052_000 as Weight) + Weight::from_ref_time(122_052_000 as u64) // Standard Error: 55_000 - .saturating_add((2_677_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_677_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - (121_016_000 as Weight) + Weight::from_ref_time(121_016_000 as u64) // Standard Error: 46_000 - .saturating_add((2_628_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_628_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - (123_235_000 as Weight) + Weight::from_ref_time(123_235_000 as u64) // Standard Error: 44_000 - .saturating_add((3_420_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_420_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - (117_593_000 as Weight) + Weight::from_ref_time(117_593_000 as u64) // Standard Error: 60_000 - .saturating_add((3_807_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_807_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - (122_927_000 as Weight) + Weight::from_ref_time(122_927_000 as u64) // Standard Error: 59_000 - .saturating_add((4_869_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_869_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - (118_071_000 as Weight) + Weight::from_ref_time(118_071_000 as u64) // Standard Error: 66_000 - .saturating_add((4_634_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_634_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - (124_946_000 as Weight) + Weight::from_ref_time(124_946_000 as u64) // Standard Error: 67_000 - .saturating_add((4_839_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_839_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - (123_587_000 as Weight) + Weight::from_ref_time(123_587_000 as u64) // Standard Error: 56_000 - .saturating_add((3_518_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_518_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - (124_215_000 as Weight) + Weight::from_ref_time(124_215_000 as u64) // Standard Error: 59_000 - .saturating_add((3_607_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_607_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - (119_872_000 as Weight) + Weight::from_ref_time(119_872_000 as u64) // Standard Error: 83_000 - .saturating_add((3_891_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_891_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - (122_452_000 as Weight) + Weight::from_ref_time(122_452_000 as u64) // Standard Error: 50_000 - .saturating_add((3_633_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_633_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - (121_092_000 as Weight) + Weight::from_ref_time(121_092_000 as u64) // Standard Error: 48_000 - .saturating_add((3_667_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_667_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - (120_266_000 as Weight) + Weight::from_ref_time(120_266_000 as u64) // Standard Error: 50_000 - .saturating_add((3_695_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_695_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - (122_018_000 as Weight) + Weight::from_ref_time(122_018_000 as u64) // Standard Error: 50_000 - .saturating_add((3_512_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_512_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - (119_367_000 as Weight) + Weight::from_ref_time(119_367_000 as u64) // Standard Error: 42_000 - .saturating_add((2_669_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_669_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - (120_878_000 as Weight) + Weight::from_ref_time(120_878_000 as u64) // Standard Error: 44_000 - .saturating_add((2_650_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_650_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - (126_360_000 as Weight) + Weight::from_ref_time(126_360_000 as u64) // Standard Error: 54_000 - .saturating_add((3_475_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_475_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - (119_615_000 as Weight) + Weight::from_ref_time(119_615_000 as u64) // Standard Error: 62_000 - .saturating_add((3_803_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_803_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - (120_877_000 as Weight) + Weight::from_ref_time(120_877_000 as u64) // Standard Error: 54_000 - .saturating_add((3_696_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_696_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - (119_923_000 as Weight) + Weight::from_ref_time(119_923_000 as u64) // Standard Error: 59_000 - .saturating_add((3_808_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_808_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - (121_427_000 as Weight) + Weight::from_ref_time(121_427_000 as u64) // Standard Error: 54_000 - .saturating_add((3_801_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_801_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - (115_328_000 as Weight) + Weight::from_ref_time(115_328_000 as u64) // Standard Error: 50_000 - .saturating_add((4_002_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_002_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - (125_795_000 as Weight) + Weight::from_ref_time(125_795_000 as u64) // Standard Error: 49_000 - .saturating_add((2_726_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_726_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - (121_105_000 as Weight) + Weight::from_ref_time(121_105_000 as u64) // Standard Error: 51_000 - .saturating_add((2_730_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_730_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - (122_684_000 as Weight) + Weight::from_ref_time(122_684_000 as u64) // Standard Error: 51_000 - .saturating_add((2_840_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_840_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - (119_894_000 as Weight) + Weight::from_ref_time(119_894_000 as u64) // Standard Error: 47_000 - .saturating_add((2_857_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_857_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - (126_095_000 as Weight) + Weight::from_ref_time(126_095_000 as u64) // Standard Error: 47_000 - .saturating_add((2_658_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_658_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - (123_045_000 as Weight) + Weight::from_ref_time(123_045_000 as u64) // Standard Error: 49_000 - .saturating_add((3_334_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_334_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - (117_412_000 as Weight) + Weight::from_ref_time(117_412_000 as u64) // Standard Error: 39_000 - .saturating_add((3_032_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_032_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - (125_923_000 as Weight) + Weight::from_ref_time(125_923_000 as u64) // Standard Error: 56_000 - .saturating_add((3_440_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_440_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - (124_278_000 as Weight) + Weight::from_ref_time(124_278_000 as u64) // Standard Error: 57_000 - .saturating_add((3_507_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_507_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - (118_591_000 as Weight) + Weight::from_ref_time(118_591_000 as u64) // Standard Error: 54_000 - .saturating_add((3_751_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_751_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - (121_785_000 as Weight) + Weight::from_ref_time(121_785_000 as u64) // Standard Error: 48_000 - .saturating_add((3_640_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_640_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - (115_012_000 as Weight) + Weight::from_ref_time(115_012_000 as u64) // Standard Error: 97_000 - .saturating_add((4_392_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_392_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - (123_869_000 as Weight) + Weight::from_ref_time(123_869_000 as u64) // Standard Error: 57_000 - .saturating_add((3_709_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_709_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - (120_220_000 as Weight) + Weight::from_ref_time(120_220_000 as u64) // Standard Error: 46_000 - .saturating_add((3_520_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_520_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - (120_112_000 as Weight) + Weight::from_ref_time(120_112_000 as u64) // Standard Error: 67_000 - .saturating_add((4_654_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(4_654_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - (122_517_000 as Weight) + Weight::from_ref_time(122_517_000 as u64) // Standard Error: 46_000 - .saturating_add((1_802_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_802_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - (119_003_000 as Weight) + Weight::from_ref_time(119_003_000 as u64) // Standard Error: 45_000 - .saturating_add((3_068_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_068_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - (121_435_000 as Weight) + Weight::from_ref_time(121_435_000 as u64) // Standard Error: 45_000 - .saturating_add((1_993_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_993_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - (122_967_000 as Weight) + Weight::from_ref_time(122_967_000 as u64) // Standard Error: 44_000 - .saturating_add((1_926_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_926_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - (118_984_000 as Weight) + Weight::from_ref_time(118_984_000 as u64) // Standard Error: 27_000 - .saturating_add((87_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(87_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(r: u32, ) -> Weight { - (123_678_000 as Weight) + Weight::from_ref_time(123_678_000 as u64) // Standard Error: 41_000 - .saturating_add((25_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(25_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(r: u32, ) -> Weight { - (122_151_000 as Weight) + Weight::from_ref_time(122_151_000 as u64) // Standard Error: 35_000 - .saturating_add((43_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(43_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - (123_606_000 as Weight) + Weight::from_ref_time(123_606_000 as u64) // Standard Error: 46_000 - .saturating_add((1_973_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_973_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 141_750_000 - .saturating_add((3_313_834_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(3_313_834_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - (120_424_000 as Weight) + Weight::from_ref_time(120_424_000 as u64) // Standard Error: 43_000 - .saturating_add((1_198_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_198_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - (118_321_000 as Weight) + Weight::from_ref_time(118_321_000 as u64) // Standard Error: 56_000 - .saturating_add((2_175_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_175_000 as u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - (121_236_000 as Weight) + Weight::from_ref_time(121_236_000 as u64) // Standard Error: 77_000 - .saturating_add((2_838_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_838_000 as u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(_s: u32, ) -> Weight { - (125_276_000 as Weight) + Weight::from_ref_time(125_276_000 as u64) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - (130_253_000 as Weight) + Weight::from_ref_time(130_253_000 as u64) // Standard Error: 102_000 - .saturating_add((20_810_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(20_810_000 as u64).saturating_mul(r as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs index f961d633499..12373b6dbff 100644 --- a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs @@ -32,21 +32,21 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 109_000 - .saturating_add((6_792_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(x as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(x as Weight))) + .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32, ) -> Weight { - (33_355_000 as Weight) + Weight::from_ref_time(33_355_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -54,11 +54,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32, ) -> Weight { - (169_323_000 as Weight) + Weight::from_ref_time(169_323_000 as u64) // Standard Error: 1_000 - .saturating_add((8_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -66,11 +66,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32, ) -> Weight { - (94_034_000 as Weight) + Weight::from_ref_time(94_034_000 as u64) // Standard Error: 1_000 - .saturating_add((31_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } fn unlock_rewards_for(x: u32) -> Weight { diff --git a/code/parachain/runtime/dali/src/weights/currency_factory.rs b/code/parachain/runtime/dali/src/weights/currency_factory.rs index 367b980ddbd..29b1f5c125b 100644 --- a/code/parachain/runtime/dali/src/weights/currency_factory.rs +++ b/code/parachain/runtime/dali/src/weights/currency_factory.rs @@ -32,13 +32,13 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) fn add_range() -> Weight { - (40_775_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(40_775_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CurrencyFactory AssetMetadata (r:0 w:1) fn set_metadata() -> Weight { - (5_343_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(5_343_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/democracy.rs b/code/parachain/runtime/dali/src/weights/democracy.rs index 873f553afeb..989cd4bcc1a 100644 --- a/code/parachain/runtime/dali/src/weights/democracy.rs +++ b/code/parachain/runtime/dali/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (97_523_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(97_523_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - (61_117_000 as Weight) + Weight::from_ref_time(61_117_000 as u64) // Standard Error: 8_000 - .saturating_add((274_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(274_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - (74_651_000 as Weight) + Weight::from_ref_time(74_651_000 as u64) // Standard Error: 4_000 - .saturating_add((370_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(370_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - (75_377_000 as Weight) + Weight::from_ref_time(75_377_000 as u64) // Standard Error: 4_000 - .saturating_add((358_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(358_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (38_084_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(38_084_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - (117_345_000 as Weight) + Weight::from_ref_time(117_345_000 as u64) // Standard Error: 9_000 - .saturating_add((623_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + .saturating_add(Weight::from_ref_time(623_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - (17_920_000 as Weight) + Weight::from_ref_time(17_920_000 as u64) // Standard Error: 0 - .saturating_add((51_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(51_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (3_534_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_534_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (3_607_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_607_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (36_442_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(36_442_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - (38_034_000 as Weight) + Weight::from_ref_time(38_034_000 as u64) // Standard Error: 1_000 - .saturating_add((82_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(82_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - (86_834_000 as Weight) + Weight::from_ref_time(86_834_000 as u64) // Standard Error: 5_000 - .saturating_add((581_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(581_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (23_341_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(23_341_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - (44_035_000 as Weight) + Weight::from_ref_time(44_035_000 as u64) // Standard Error: 7_000 - .saturating_add((3_103_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_103_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - (4_747_000 as Weight) + Weight::from_ref_time(4_747_000 as u64) // Standard Error: 7_000 - .saturating_add((7_094_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(7_094_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - (14_702_000 as Weight) + Weight::from_ref_time(14_702_000 as u64) // Standard Error: 8_000 - .saturating_add((7_135_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(7_135_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - (73_009_000 as Weight) + Weight::from_ref_time(73_009_000 as u64) // Standard Error: 11_000 - .saturating_add((9_195_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_195_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - (33_943_000 as Weight) + Weight::from_ref_time(33_943_000 as u64) // Standard Error: 11_000 - .saturating_add((9_193_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_193_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_017_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(4_017_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - (56_488_000 as Weight) + Weight::from_ref_time(56_488_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - (35_732_000 as Weight) + Weight::from_ref_time(35_732_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - (53_132_000 as Weight) + Weight::from_ref_time(53_132_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - (49_361_000 as Weight) + Weight::from_ref_time(49_361_000 as u64) // Standard Error: 4_000 - .saturating_add((150_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(150_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - (45_088_000 as Weight) + Weight::from_ref_time(45_088_000 as u64) // Standard Error: 3_000 - .saturating_add((333_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(333_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - (28_268_000 as Weight) + Weight::from_ref_time(28_268_000 as u64) // Standard Error: 13_000 - .saturating_add((315_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(315_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - (26_741_000 as Weight) + Weight::from_ref_time(26_741_000 as u64) // Standard Error: 3_000 - .saturating_add((281_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(281_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/dex_router.rs b/code/parachain/runtime/dali/src/weights/dex_router.rs index c7d0ad42947..afaec13cf99 100644 --- a/code/parachain/runtime/dali/src/weights/dex_router.rs +++ b/code/parachain/runtime/dali/src/weights/dex_router.rs @@ -33,9 +33,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: Pablo Pools (r:4 w:0) // Storage: DexRouter DexRoutes (r:2 w:1) fn update_route() -> Weight { - (96_642_000 as Weight) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(96_642_000 as u64) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: DexRouter DexRoutes (r:2 w:0) // Storage: Pablo Pools (r:4 w:0) @@ -43,9 +43,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:4 w:0) // Storage: Pablo PriceCumulativeState (r:4 w:4) fn swap() -> Weight { - (656_289_000 as Weight) - .saturating_add(T::DbWeight::get().reads(27 as Weight)) - .saturating_add(T::DbWeight::get().writes(17 as Weight)) + Weight::from_ref_time(656_289_000 as u64) + .saturating_add(T::DbWeight::get().reads(27 as u64)) + .saturating_add(T::DbWeight::get().writes(17 as u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:4 w:0) @@ -53,9 +53,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:4 w:0) // Storage: Pablo PriceCumulativeState (r:4 w:4) fn buy() -> Weight { - (651_013_000 as Weight) - .saturating_add(T::DbWeight::get().reads(26 as Weight)) - .saturating_add(T::DbWeight::get().writes(17 as Weight)) + Weight::from_ref_time(651_013_000 as u64) + .saturating_add(T::DbWeight::get().reads(26 as u64)) + .saturating_add(T::DbWeight::get().writes(17 as u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:1 w:0) @@ -64,9 +64,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - (322_811_000 as Weight) - .saturating_add(T::DbWeight::get().reads(10 as Weight)) - .saturating_add(T::DbWeight::get().writes(8 as Weight)) + Weight::from_ref_time(322_811_000 as u64) + .saturating_add(T::DbWeight::get().reads(10 as u64)) + .saturating_add(T::DbWeight::get().writes(8 as u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:1 w:0) @@ -74,8 +74,8 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:3 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - (164_497_000 as Weight) - .saturating_add(T::DbWeight::get().reads(7 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(164_497_000 as u64) + .saturating_add(T::DbWeight::get().reads(7 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/dutch_auction.rs b/code/parachain/runtime/dali/src/weights/dutch_auction.rs index 2f7efb33cac..ae5e2fffd42 100644 --- a/code/parachain/runtime/dali/src/weights/dutch_auction.rs +++ b/code/parachain/runtime/dali/src/weights/dutch_auction.rs @@ -32,8 +32,8 @@ pub struct WeightInfo(PhantomData); impl dutch_auction::WeightInfo for WeightInfo { // Storage: DutchAuction Configurations (r:0 w:1) fn add_configuration() -> Weight { - (40_626_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(40_626_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: DutchAuction OrdersIndex (r:1 w:1) // Storage: System Account (r:1 w:1) @@ -41,26 +41,26 @@ impl dutch_auction::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn ask() -> Weight { - (122_685_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(122_685_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: DutchAuction SellOrders (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction Takes (r:1 w:1) fn take() -> Weight { - (82_652_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(82_652_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn liquidate() -> Weight { - (121_448_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(121_448_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: DutchAuction Configurations (r:1 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -70,17 +70,17 @@ impl dutch_auction::WeightInfo for WeightInfo { // Storage: DutchAuction LocalOrderIdToRemote (r:0 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn xcm_sell() -> Weight { - (148_705_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(148_705_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // Storage: DutchAuction Takes (r:2 w:1) // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) // Storage: DutchAuction LocalOrderIdToRemote (r:1 w:1) fn known_overhead_for_on_finalize() -> Weight { - (123_237_000 as Weight) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(123_237_000 as u64) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/frame_system.rs b/code/parachain/runtime/dali/src/weights/frame_system.rs index 2f5e675d62a..b1d9fdd1994 100644 --- a/code/parachain/runtime/dali/src/weights/frame_system.rs +++ b/code/parachain/runtime/dali/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (19_355_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(19_355_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 6_000 - .saturating_add((1_554_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_554_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 6_000 - .saturating_add((1_228_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_228_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - (11_074_000 as Weight) + Weight::from_ref_time(11_074_000 as u64) // Standard Error: 6_000 - .saturating_add((2_118_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(2_118_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/identity.rs b/code/parachain/runtime/dali/src/weights/identity.rs index e7bf44b02e9..13092334ce0 100644 --- a/code/parachain/runtime/dali/src/weights/identity.rs +++ b/code/parachain/runtime/dali/src/weights/identity.rs @@ -33,48 +33,48 @@ impl identity::WeightInfo for WeightInfo { // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn add_registrar(r: u32, ) -> Weight { - (43_709_000 as Weight) + Weight::from_ref_time(43_709_000 as u64) // Standard Error: 289_000 - .saturating_add((755_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(755_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn set_identity(r: u32, x: u32, ) -> Weight { - (86_108_000 as Weight) + Weight::from_ref_time(86_108_000 as u64) // Standard Error: 396_000 - .saturating_add((491_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) // Standard Error: 67_000 - .saturating_add((1_147_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_147_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn set_subs_new(s: u32, ) -> Weight { - (71_034_000 as Weight) + Weight::from_ref_time(71_034_000 as u64) // Standard Error: 48_000 - .saturating_add((8_197_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(8_197_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:1) /// The range of component `p` is `[1, 32]`. fn set_subs_old(p: u32, ) -> Weight { - (75_813_000 as Weight) + Weight::from_ref_time(75_813_000 as u64) // Standard Error: 63_000 - .saturating_add((2_857_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(2_857_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -83,79 +83,79 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight { - (91_020_000 as Weight) + Weight::from_ref_time(91_020_000 as u64) // Standard Error: 405_000 - .saturating_add((638_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(638_000 as u64).saturating_mul(r as u64)) // Standard Error: 61_000 - .saturating_add((2_894_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(2_894_000 as u64).saturating_mul(s as u64)) // Standard Error: 61_000 - .saturating_add((496_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(496_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn request_judgement(r: u32, x: u32, ) -> Weight { - (79_938_000 as Weight) + Weight::from_ref_time(79_938_000 as u64) // Standard Error: 422_000 - .saturating_add((2_075_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(2_075_000 as u64).saturating_mul(r as u64)) // Standard Error: 71_000 - .saturating_add((1_187_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_187_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn cancel_request(_r: u32, x: u32, ) -> Weight { - (95_051_000 as Weight) + Weight::from_ref_time(95_051_000 as u64) // Standard Error: 55_000 - .saturating_add((1_006_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_006_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fee(r: u32, ) -> Weight { - (22_284_000 as Weight) + Weight::from_ref_time(22_284_000 as u64) // Standard Error: 306_000 - .saturating_add((876_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(876_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_account_id(r: u32, ) -> Weight { - (22_998_000 as Weight) + Weight::from_ref_time(22_998_000 as u64) // Standard Error: 163_000 - .saturating_add((767_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(767_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fields(r: u32, ) -> Weight { - (23_994_000 as Weight) + Weight::from_ref_time(23_994_000 as u64) // Standard Error: 236_000 - .saturating_add((528_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 7]`. /// The range of component `x` is `[1, 32]`. fn provide_judgement(r: u32, x: u32, ) -> Weight { - (60_069_000 as Weight) + Weight::from_ref_time(60_069_000 as u64) // Standard Error: 370_000 - .saturating_add((651_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(651_000 as u64).saturating_mul(r as u64)) // Standard Error: 51_000 - .saturating_add((1_244_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_244_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -165,57 +165,57 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight { - (113_694_000 as Weight) + Weight::from_ref_time(113_694_000 as u64) // Standard Error: 400_000 - .saturating_add((702_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(702_000 as u64).saturating_mul(r as u64)) // Standard Error: 61_000 - .saturating_add((3_005_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(3_005_000 as u64).saturating_mul(s as u64)) // Standard Error: 61_000 - .saturating_add((134_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(134_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn add_sub(s: u32, ) -> Weight { - (99_260_000 as Weight) + Weight::from_ref_time(99_260_000 as u64) // Standard Error: 64_000 - .saturating_add((206_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(206_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn rename_sub(s: u32, ) -> Weight { - (36_583_000 as Weight) + Weight::from_ref_time(36_583_000 as u64) // Standard Error: 31_000 - .saturating_add((181_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(181_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn remove_sub(s: u32, ) -> Weight { - (96_454_000 as Weight) + Weight::from_ref_time(96_454_000 as u64) // Standard Error: 51_000 - .saturating_add((347_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(347_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn quit_sub(s: u32, ) -> Weight { - (66_854_000 as Weight) + Weight::from_ref_time(66_854_000 as u64) // Standard Error: 41_000 - .saturating_add((390_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(390_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/indices.rs b/code/parachain/runtime/dali/src/weights/indices.rs index e2c72ad3e02..b8c23795079 100644 --- a/code/parachain/runtime/dali/src/weights/indices.rs +++ b/code/parachain/runtime/dali/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (69_087_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(69_087_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (84_460_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(84_460_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (68_933_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(68_933_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (72_087_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(72_087_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (77_437_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(77_437_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/lending.rs b/code/parachain/runtime/dali/src/weights/lending.rs index ca6b3fddd86..8b71e9c4a63 100644 --- a/code/parachain/runtime/dali/src/weights/lending.rs +++ b/code/parachain/runtime/dali/src/weights/lending.rs @@ -33,15 +33,15 @@ impl lending::WeightInfo for WeightInfo { // same as vaults deposit plus 1 more read // TODO: Please impl benchmarks fn vault_deposit() -> Weight { - (140_947_000 as Weight) - .saturating_add(T::DbWeight::get().reads(10 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(140_947_000 as u64) + .saturating_add(T::DbWeight::get().reads(10 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // same as vaults withdraw plus 1 more read fn vault_withdraw() -> Weight { - (112_296_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(112_296_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Oracle Prices (r:2 w:0) // Storage: Lending LendingCount (r:1 w:1) @@ -56,18 +56,18 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowIndex (r:0 w:1) // Storage: Lending Markets (r:0 w:1) fn create_market() -> Weight { - (193_469_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(12 as Weight)) + Weight::from_ref_time(193_469_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(12 as u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Lending AccountCollateral (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn deposit_collateral() -> Weight { - (124_740_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(124_740_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Lending AccountCollateral (r:1 w:1) @@ -78,9 +78,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Oracle Prices (r:2 w:0) // Storage: Tokens Accounts (r:2 w:2) fn withdraw_collateral() -> Weight { - (156_615_000 as Weight) - .saturating_add(T::DbWeight::get().reads(11 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(156_615_000 as u64) + .saturating_add(T::DbWeight::get().reads(11 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Vault Vaults (r:1 w:0) @@ -98,9 +98,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending LastBlockTimestamp (r:1 w:0) // Storage: Lending BorrowRent (r:1 w:1) fn borrow() -> Weight { - (419_169_000 as Weight) - .saturating_add(T::DbWeight::get().reads(21 as Weight)) - .saturating_add(T::DbWeight::get().writes(8 as Weight)) + Weight::from_ref_time(419_169_000 as u64) + .saturating_add(T::DbWeight::get().reads(21 as u64)) + .saturating_add(T::DbWeight::get().writes(8 as u64)) } // Storage: Lending BorrowTimestamp (r:1 w:1) // Storage: Lending LastBlockTimestamp (r:1 w:0) @@ -114,9 +114,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowRent (r:1 w:0) // Storage: System Account (r:1 w:1) fn repay_borrow() -> Weight { - (301_514_000 as Weight) - .saturating_add(T::DbWeight::get().reads(14 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(301_514_000 as u64) + .saturating_add(T::DbWeight::get().reads(14 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Vault Vaults (r:1 w:0) @@ -127,15 +127,15 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending DebtIndex (r:1 w:0) /// The range of component `b` is `[1, 1000]`. fn liquidate(b: u32, ) -> Weight { - (577_340_000 as Weight) + Weight::from_ref_time(577_340_000 as u64) // Standard Error: 266_000 - .saturating_add((35_069_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) + .saturating_add(Weight::from_ref_time(35_069_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(9 as u64)) } // Storage: Timestamp Now (r:1 w:0) fn now() -> Weight { - (4_457_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(4_457_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: Lending DebtTokenForMarket (r:1 w:0) // Storage: Tokens Accounts (r:2 w:0) @@ -146,45 +146,45 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowIndex (r:1 w:1) /// The range of component `x` is `[1, 1000]`. fn accrue_interest(x: u32, ) -> Weight { - (89_649_000 as Weight) + Weight::from_ref_time(89_649_000 as u64) // Standard Error: 1_000 - .saturating_add((7_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } fn account_id() -> Weight { - (1_760_000 as Weight) + Weight::from_ref_time(1_760_000 as u64) } // Storage: Vault Vaults (r:1 w:0) // Storage: Vault CapitalStructure (r:1 w:0) fn available_funds() -> Weight { - (19_563_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(19_563_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) fn handle_withdrawable() -> Weight { - (72_570_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(72_570_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: System Account (r:1 w:1) fn handle_depositable() -> Weight { - (125_535_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(125_535_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: System Account (r:1 w:1) fn handle_must_liquidate() -> Weight { - (112_571_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(112_571_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/liquidations.rs b/code/parachain/runtime/dali/src/weights/liquidations.rs index d7ae4c82030..668f402983f 100644 --- a/code/parachain/runtime/dali/src/weights/liquidations.rs +++ b/code/parachain/runtime/dali/src/weights/liquidations.rs @@ -33,9 +33,9 @@ impl liquidations::WeightInfo for WeightInfo { // Storage: Liquidations StrategyIndex (r:1 w:1) // Storage: Liquidations Strategies (r:0 w:1) fn add_liquidation_strategy() -> Weight { - (20_015_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(20_015_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Liquidations Strategies (r:2 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -45,11 +45,11 @@ impl liquidations::WeightInfo for WeightInfo { // Storage: DutchAuction SellOrders (r:0 w:1) /// The range of component `x` is `[1, 9]`. fn sell(x: u32, ) -> Weight { - (145_970_000 as Weight) + Weight::from_ref_time(145_970_000 as u64) // Standard Error: 323_000 - .saturating_add((4_431_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(x as Weight))) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(4_431_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/membership.rs b/code/parachain/runtime/dali/src/weights/membership.rs index ed07e3ea611..529aa0f5597 100644 --- a/code/parachain/runtime/dali/src/weights/membership.rs +++ b/code/parachain/runtime/dali/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - (41_331_000 as Weight) + Weight::from_ref_time(41_331_000 as u64) // Standard Error: 8_000 - .saturating_add((211_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - (47_040_000 as Weight) + Weight::from_ref_time(47_040_000 as u64) // Standard Error: 6_000 - .saturating_add((195_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - (47_699_000 as Weight) + Weight::from_ref_time(47_699_000 as u64) // Standard Error: 7_000 - .saturating_add((212_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(212_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - (47_567_000 as Weight) + Weight::from_ref_time(47_567_000 as u64) // Standard Error: 8_000 - .saturating_add((436_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(436_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - (51_033_000 as Weight) + Weight::from_ref_time(51_033_000 as u64) // Standard Error: 8_000 - .saturating_add((198_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - (13_061_000 as Weight) + Weight::from_ref_time(13_061_000 as u64) // Standard Error: 2_000 - .saturating_add((93_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(93_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - (4_966_000 as Weight) + Weight::from_ref_time(4_966_000 as u64) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/mosaic.rs b/code/parachain/runtime/dali/src/weights/mosaic.rs index 1aa67f00c56..c76a6717a5c 100644 --- a/code/parachain/runtime/dali/src/weights/mosaic.rs +++ b/code/parachain/runtime/dali/src/weights/mosaic.rs @@ -32,27 +32,27 @@ pub struct WeightInfo(PhantomData); impl mosaic::WeightInfo for WeightInfo { // Storage: Mosaic Relayer (r:0 w:1) fn set_relayer() -> Weight { - (39_459_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(39_459_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic Relayer (r:1 w:1) fn rotate_relayer() -> Weight { - (46_172_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(46_172_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic NetworkInfos (r:0 w:1) fn set_network() -> Weight { - (49_641_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(49_641_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic AssetsInfo (r:1 w:1) fn set_budget() -> Weight { - (50_164_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(50_164_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic AssetsInfo (r:1 w:0) // Storage: Mosaic LocalToRemoteAsset (r:1 w:0) @@ -62,25 +62,25 @@ impl mosaic::WeightInfo for WeightInfo { // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: Mosaic Nonce (r:1 w:1) fn transfer_to() -> Weight { - (165_301_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(165_301_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: System Account (r:1 w:1) fn accept_transfer() -> Weight { - (108_775_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(108_775_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: System Account (r:2 w:2) fn claim_stale_to() -> Weight { - (131_694_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(131_694_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) @@ -88,49 +88,49 @@ impl mosaic::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Mosaic IncomingTransactions (r:1 w:1) fn timelocked_mint() -> Weight { - (139_184_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(139_184_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Mosaic TimeLockPeriod (r:0 w:1) fn set_timelock_duration() -> Weight { - (14_200_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(14_200_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) // Storage: Mosaic IncomingTransactions (r:1 w:1) // Storage: System Account (r:1 w:1) fn rescind_timelocked_mint() -> Weight { - (107_275_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(107_275_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Mosaic IncomingTransactions (r:1 w:1) // Storage: System Account (r:2 w:2) fn claim_to() -> Weight { - (149_121_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(149_121_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Mosaic NetworkInfos (r:1 w:0) // Storage: Mosaic LocalToRemoteAsset (r:1 w:1) // Storage: Mosaic RemoteToLocalAsset (r:0 w:1) fn update_asset_mapping() -> Weight { - (58_422_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(58_422_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Mosaic RemoteAmmWhitelist (r:1 w:1) fn add_remote_amm_id() -> Weight { - (22_066_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(22_066_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Mosaic RemoteAmmWhitelist (r:1 w:1) fn remove_remote_amm_id() -> Weight { - (23_674_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(23_674_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/multisig.rs b/code/parachain/runtime/dali/src/weights/multisig.rs index 0730ef23b17..7b1d146896d 100644 --- a/code/parachain/runtime/dali/src/weights/multisig.rs +++ b/code/parachain/runtime/dali/src/weights/multisig.rs @@ -33,23 +33,23 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `z` is `[0, 10000]`. fn as_multi_threshold_1(z: u32, ) -> Weight { - (56_529_000 as Weight) + Weight::from_ref_time(56_529_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create(s: u32, z: u32, ) -> Weight { - (96_827_000 as Weight) + Weight::from_ref_time(96_827_000 as u64) // Standard Error: 13_000 - .saturating_add((286_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(286_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -57,38 +57,38 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - (111_267_000 as Weight) + Weight::from_ref_time(111_267_000 as u64) // Standard Error: 13_000 - .saturating_add((264_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve(s: u32, z: u32, ) -> Weight { - (65_226_000 as Weight) + Weight::from_ref_time(65_226_000 as u64) // Standard Error: 8_000 - .saturating_add((290_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(290_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - (109_124_000 as Weight) + Weight::from_ref_time(109_124_000 as u64) // Standard Error: 13_000 - .saturating_add((287_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(287_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -97,33 +97,33 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(s: u32, z: u32, ) -> Weight { - (130_334_000 as Weight) + Weight::from_ref_time(130_334_000 as u64) // Standard Error: 16_000 - .saturating_add((572_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(572_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create(s: u32, ) -> Weight { - (95_894_000 as Weight) + Weight::from_ref_time(95_894_000 as u64) // Standard Error: 15_000 - .saturating_add((299_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(299_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - (57_287_000 as Weight) + Weight::from_ref_time(57_287_000 as u64) // Standard Error: 8_000 - .saturating_add((364_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(364_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -131,20 +131,20 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_complete(s: u32, ) -> Weight { - (165_669_000 as Weight) + Weight::from_ref_time(165_669_000 as u64) // Standard Error: 20_000 - .saturating_add((642_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(642_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[2, 100]`. fn cancel_as_multi(s: u32, ) -> Weight { - (132_300_000 as Weight) + Weight::from_ref_time(132_300_000 as u64) // Standard Error: 14_000 - .saturating_add((352_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(352_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/oracle.rs b/code/parachain/runtime/dali/src/weights/oracle.rs index 6b6484926cf..efe4d01e04a 100644 --- a/code/parachain/runtime/dali/src/weights/oracle.rs +++ b/code/parachain/runtime/dali/src/weights/oracle.rs @@ -34,49 +34,49 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle RewardTrackerStore (r:1 w:1) // Storage: Oracle AssetsInfo (r:1 w:1) fn add_asset_and_info() -> Weight { - (44_953_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(44_953_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Timestamp Now (r:1 w:0) // Storage: Oracle RewardTrackerStore (r:1 w:1) fn adjust_rewards() -> Weight { - (45_098_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(45_098_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Oracle ControllerToSigner (r:1 w:1) // Storage: Oracle SignerToController (r:1 w:1) // Storage: Oracle OracleStake (r:1 w:1) fn set_signer() -> Weight { - (141_691_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(141_691_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Oracle ControllerToSigner (r:1 w:0) // Storage: Oracle OracleStake (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_stake() -> Weight { - (132_493_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(132_493_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Oracle ControllerToSigner (r:1 w:0) // Storage: Oracle OracleStake (r:1 w:1) // Storage: Oracle DeclaredWithdraws (r:0 w:1) fn remove_stake() -> Weight { - (56_074_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(56_074_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Oracle ControllerToSigner (r:1 w:1) // Storage: Oracle DeclaredWithdraws (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Oracle SignerToController (r:0 w:1) fn reclaim_stake() -> Weight { - (65_348_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(65_348_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Oracle OracleStake (r:1 w:0) // Storage: Oracle Prices (r:1 w:0) @@ -85,21 +85,21 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle PrePrices (r:1 w:1) /// The range of component `p` is `[1, 25]`. fn submit_price(p: u32, ) -> Weight { - (80_629_000 as Weight) + Weight::from_ref_time(80_629_000 as u64) // Standard Error: 88_000 - .saturating_add((385_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(385_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Oracle PrePrices (r:1 w:1) // Storage: Oracle AnswerInTransit (r:1 w:1) /// The range of component `p` is `[1, 25]`. fn update_pre_prices(p: u32, ) -> Weight { - (18_698_000 as Weight) + Weight::from_ref_time(18_698_000 as u64) // Standard Error: 31_000 - .saturating_add((392_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(392_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Oracle PriceHistory (r:1 w:1) // Storage: Oracle SignerToController (r:1 w:0) @@ -109,10 +109,10 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle PrePrices (r:0 w:1) /// The range of component `p` is `[1, 25]`. fn update_price(p: u32, ) -> Weight { - (45_137_000 as Weight) + Weight::from_ref_time(45_137_000 as u64) // Standard Error: 118_000 - .saturating_add((6_024_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(6_024_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/pablo.rs b/code/parachain/runtime/dali/src/weights/pablo.rs index 4a82ebec119..ebcb651a429 100644 --- a/code/parachain/runtime/dali/src/weights/pablo.rs +++ b/code/parachain/runtime/dali/src/weights/pablo.rs @@ -34,9 +34,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn create() -> Weight { - (72_652_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(72_652_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:5 w:5) @@ -44,9 +44,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - (403_307_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(8 as Weight)) + Weight::from_ref_time(403_307_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(8 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens TotalIssuance (r:1 w:1) @@ -54,34 +54,34 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - (232_273_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(232_273_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn buy() -> Weight { - (198_738_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(198_738_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn swap() -> Weight { - (199_547_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(199_547_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn do_create_pool() -> Weight { - (58_314_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(58_314_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs b/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs index 895e77a2c40..eedd66434aa 100644 --- a/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs +++ b/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs @@ -35,11 +35,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Fnft Collection (r:1 w:1) /// The range of component `r` is `[1, 10]`. fn create_reward_pool(r: u32, ) -> Weight { - (88_726_000 as Weight) + Weight::from_ref_time(88_726_000 as u64) // Standard Error: 372_000 - .saturating_add((1_054_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: Tokens Accounts (r:3 w:3) @@ -55,11 +55,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: StakingRewards Stakes (r:0 w:1) /// The range of component `r` is `[1, 10]`. fn stake(r: u32, ) -> Weight { - (346_706_000 as Weight) + Weight::from_ref_time(346_706_000 as u64) // Standard Error: 921_000 - .saturating_add((1_005_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(15 as Weight)) - .saturating_add(T::DbWeight::get().writes(13 as Weight)) + .saturating_add(Weight::from_ref_time(1_005_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(15 as u64)) + .saturating_add(T::DbWeight::get().writes(13 as u64)) } // Storage: Fnft Instance (r:1 w:0) // Storage: StakingRewards Stakes (r:1 w:1) @@ -70,11 +70,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Timestamp Now (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn extend(r: u32, ) -> Weight { - (244_934_000 as Weight) + Weight::from_ref_time(244_934_000 as u64) // Standard Error: 615_000 - .saturating_add((706_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(11 as Weight)) - .saturating_add(T::DbWeight::get().writes(8 as Weight)) + .saturating_add(Weight::from_ref_time(706_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11 as u64)) + .saturating_add(T::DbWeight::get().writes(8 as u64)) } // Storage: Fnft Instance (r:1 w:1) // Storage: StakingRewards Stakes (r:1 w:1) @@ -87,11 +87,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Fnft OwnerInstances (r:1 w:1) /// The range of component `r` is `[1, 10]`. fn unstake(r: u32, ) -> Weight { - (343_031_000 as Weight) + Weight::from_ref_time(343_031_000 as u64) // Standard Error: 964_000 - .saturating_add((11_617_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(14 as Weight)) - .saturating_add(T::DbWeight::get().writes(13 as Weight)) + .saturating_add(Weight::from_ref_time(11_617_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(14 as u64)) + .saturating_add(T::DbWeight::get().writes(13 as u64)) } // Storage: Fnft Instance (r:2 w:1) // Storage: StakingRewards Stakes (r:1 w:2) @@ -105,33 +105,33 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: System Account (r:2 w:1) /// The range of component `r` is `[1, 10]`. fn split(r: u32, ) -> Weight { - (434_367_000 as Weight) + Weight::from_ref_time(434_367_000 as u64) // Standard Error: 990_000 - .saturating_add((1_461_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(18 as Weight)) - .saturating_add(T::DbWeight::get().writes(15 as Weight)) + .saturating_add(Weight::from_ref_time(1_461_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(18 as u64)) + .saturating_add(T::DbWeight::get().writes(15 as u64)) } // Storage: System Account (r:1 w:0) // Storage: StakingRewards RewardsPotIsEmpty (r:1 w:1) fn reward_accumulation_hook_reward_update_calculation() -> Weight { - (42_797_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(42_797_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Timestamp Now (r:1 w:0) fn unix_time_now() -> Weight { - (6_073_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(6_073_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn update_rewards_pool(r: u32, ) -> Weight { - (66_443_000 as Weight) + Weight::from_ref_time(66_443_000 as u64) // Standard Error: 342_000 - .saturating_add((1_434_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_434_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Fnft Instance (r:1 w:0) // Storage: StakingRewards Stakes (r:1 w:1) @@ -139,19 +139,19 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Tokens TotalIssuance (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn claim(r: u32, ) -> Weight { - (97_667_000 as Weight) + Weight::from_ref_time(97_667_000 as u64) // Standard Error: 411_000 - .saturating_add((4_084_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(4_084_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: StakingRewards RewardsPotIsEmpty (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn add_to_rewards_pot() -> Weight { - (147_772_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(147_772_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/proxy.rs b/code/parachain/runtime/dali/src/weights/proxy.rs index e85f1d998ba..2f9dbd001ae 100644 --- a/code/parachain/runtime/dali/src/weights/proxy.rs +++ b/code/parachain/runtime/dali/src/weights/proxy.rs @@ -34,8 +34,8 @@ impl proxy::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `p` is `[1, 3]`. fn proxy(_p: u32, ) -> Weight { - (56_404_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + Weight::from_ref_time(56_404_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -43,87 +43,87 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn proxy_announced(a: u32, _p: u32, ) -> Weight { - (77_364_000 as Weight) + Weight::from_ref_time(77_364_000 as u64) // Standard Error: 60_000 - .saturating_add((506_000 as Weight).saturating_mul(a as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(506_000 as u64).saturating_mul(a as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn remove_announcement(a: u32, p: u32, ) -> Weight { - (21_146_000 as Weight) + Weight::from_ref_time(21_146_000 as u64) // Standard Error: 32_000 - .saturating_add((624_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(624_000 as u64).saturating_mul(a as u64)) // Standard Error: 851_000 - .saturating_add((1_161_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_161_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn reject_announcement(a: u32, p: u32, ) -> Weight { - (21_184_000 as Weight) + Weight::from_ref_time(21_184_000 as u64) // Standard Error: 25_000 - .saturating_add((588_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(588_000 as u64).saturating_mul(a as u64)) // Standard Error: 671_000 - .saturating_add((1_428_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_428_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn announce(a: u32, p: u32, ) -> Weight { - (50_946_000 as Weight) + Weight::from_ref_time(50_946_000 as u64) // Standard Error: 37_000 - .saturating_add((712_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(712_000 as u64).saturating_mul(a as u64)) // Standard Error: 986_000 - .saturating_add((2_348_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_348_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn add_proxy(_p: u32, ) -> Weight { - (49_553_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(49_553_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxy(p: u32, ) -> Weight { - (42_197_000 as Weight) + Weight::from_ref_time(42_197_000 as u64) // Standard Error: 1_302_000 - .saturating_add((3_408_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_408_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxies(_p: u32, ) -> Weight { - (22_690_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(22_690_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn anonymous(_p: u32, ) -> Weight { - (56_123_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(56_123_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[0, 2]`. fn kill_anonymous(p: u32, ) -> Weight { - (31_468_000 as Weight) + Weight::from_ref_time(31_468_000 as u64) // Standard Error: 3_488_000 - .saturating_add((152_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(152_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/scheduler.rs b/code/parachain/runtime/dali/src/weights/scheduler.rs index 10c1a4a441e..42d0f4d6a3b 100644 --- a/code/parachain/runtime/dali/src/weights/scheduler.rs +++ b/code/parachain/runtime/dali/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (33_345_000 as Weight) + Weight::from_ref_time(33_345_000 as u64) // Standard Error: 228_000 - .saturating_add((58_785_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(58_785_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - (31_634_000 as Weight) + Weight::from_ref_time(31_634_000 as u64) // Standard Error: 206_000 - .saturating_add((46_719_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(46_719_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (17_487_000 as Weight) + Weight::from_ref_time(17_487_000 as u64) // Standard Error: 152_000 - .saturating_add((51_249_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(51_249_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - (38_017_000 as Weight) + Weight::from_ref_time(38_017_000 as u64) // Standard Error: 187_000 - .saturating_add((41_698_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(41_698_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - (21_841_000 as Weight) + Weight::from_ref_time(21_841_000 as u64) // Standard Error: 92_000 - .saturating_add((18_072_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(18_072_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - (23_367_000 as Weight) + Weight::from_ref_time(23_367_000 as u64) // Standard Error: 63_000 - .saturating_add((10_135_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(10_135_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - (45_854_000 as Weight) + Weight::from_ref_time(45_854_000 as u64) // Standard Error: 133_000 - .saturating_add((30_909_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(30_909_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - (33_737_000 as Weight) + Weight::from_ref_time(33_737_000 as u64) // Standard Error: 172_000 - .saturating_add((24_459_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(24_459_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - (41_969_000 as Weight) + Weight::from_ref_time(41_969_000 as u64) // Standard Error: 104_000 - .saturating_add((19_111_000 as Weight).saturating_mul(s 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(s as Weight))) + .saturating_add(Weight::from_ref_time(19_111_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - (35_279_000 as Weight) + Weight::from_ref_time(35_279_000 as u64) // Standard Error: 93_000 - .saturating_add((15_971_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(15_971_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (54_184_000 as Weight) + Weight::from_ref_time(54_184_000 as u64) // Standard Error: 21_000 - .saturating_add((203_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(203_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (52_054_000 as Weight) + Weight::from_ref_time(52_054_000 as u64) // Standard Error: 30_000 - .saturating_add((2_440_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_440_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (65_707_000 as Weight) + Weight::from_ref_time(65_707_000 as u64) // Standard Error: 27_000 - .saturating_add((193_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(193_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (56_827_000 as Weight) + Weight::from_ref_time(56_827_000 as u64) // Standard Error: 34_000 - .saturating_add((2_486_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_486_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/session.rs b/code/parachain/runtime/dali/src/weights/session.rs index 70cec07214b..6b7f846d8a4 100644 --- a/code/parachain/runtime/dali/src/weights/session.rs +++ b/code/parachain/runtime/dali/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (47_792_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(47_792_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (38_337_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(38_337_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/timestamp.rs b/code/parachain/runtime/dali/src/weights/timestamp.rs index 6aeaa42d088..a84059d2b83 100644 --- a/code/parachain/runtime/dali/src/weights/timestamp.rs +++ b/code/parachain/runtime/dali/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (23_508_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(23_508_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn on_finalize() -> Weight { - (7_906_000 as Weight) + Weight::from_ref_time(7_906_000 as u64) } } diff --git a/code/parachain/runtime/dali/src/weights/tokens.rs b/code/parachain/runtime/dali/src/weights/tokens.rs index 56806851601..1e66692a5b5 100644 --- a/code/parachain/runtime/dali/src/weights/tokens.rs +++ b/code/parachain/runtime/dali/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_keep_alive() -> Weight { - (38_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(38_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn force_transfer() -> Weight { - (45_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(45_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn set_balance() -> Weight { - (34_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(34_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/treasury.rs b/code/parachain/runtime/dali/src/weights/treasury.rs index ec66cb5e490..320ef15db3c 100644 --- a/code/parachain/runtime/dali/src/weights/treasury.rs +++ b/code/parachain/runtime/dali/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - (577_000 as Weight) + Weight::from_ref_time(577_000 as u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (74_132_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(74_132_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (107_301_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(107_301_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - (33_790_000 as Weight) + Weight::from_ref_time(33_790_000 as u64) // Standard Error: 35_000 - .saturating_add((312_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(312_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - (26_359_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(26_359_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - (80_112_000 as Weight) + Weight::from_ref_time(80_112_000 as u64) // Standard Error: 436_000 - .saturating_add((81_236_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(81_236_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/utility.rs b/code/parachain/runtime/dali/src/weights/utility.rs index 397c99d1d91..355457eeec4 100644 --- a/code/parachain/runtime/dali/src/weights/utility.rs +++ b/code/parachain/runtime/dali/src/weights/utility.rs @@ -33,33 +33,33 @@ impl utility::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - (74_898_000 as Weight) + Weight::from_ref_time(74_898_000 as u64) // Standard Error: 21_000 - .saturating_add((11_752_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_752_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) fn as_derivative() -> Weight { - (22_785_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(22_785_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - (45_812_000 as Weight) + Weight::from_ref_time(45_812_000 as u64) // Standard Error: 28_000 - .saturating_add((12_304_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(12_304_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } fn dispatch_as() -> Weight { - (34_784_000 as Weight) + Weight::from_ref_time(34_784_000 as u64) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - (49_951_000 as Weight) + Weight::from_ref_time(49_951_000 as u64) // Standard Error: 27_000 - .saturating_add((11_721_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_721_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/vault.rs b/code/parachain/runtime/dali/src/weights/vault.rs index 5ffd7c3b5df..79fb999f9fc 100644 --- a/code/parachain/runtime/dali/src/weights/vault.rs +++ b/code/parachain/runtime/dali/src/weights/vault.rs @@ -36,9 +36,9 @@ impl vault::WeightInfo for WeightInfo { // Storage: Vault LpTokensToVaults (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - (204_212_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(204_212_000 as u64) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -46,51 +46,51 @@ impl vault::WeightInfo for WeightInfo { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - (197_850_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + Weight::from_ref_time(197_850_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - (172_128_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(172_128_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - (57_947_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(57_947_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - (44_463_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(44_463_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - (112_857_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(112_857_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - (99_688_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(99_688_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - (42_146_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(42_146_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/vesting.rs b/code/parachain/runtime/dali/src/weights/vesting.rs index bac54578248..28efe65ff18 100644 --- a/code/parachain/runtime/dali/src/weights/vesting.rs +++ b/code/parachain/runtime/dali/src/weights/vesting.rs @@ -36,11 +36,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 100]`. fn claim(s: u32, ) -> Weight { - (108_329_000 as Weight) + Weight::from_ref_time(108_329_000 as u64) // Standard Error: 22_000 - .saturating_add((4_983_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(4_983_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Vesting VestingScheduleNonce (r:1 w:1) // Storage: Vesting VestingSchedules (r:1 w:1) @@ -48,9 +48,9 @@ impl vesting::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:1) // Storage: Tokens Locks (r:1 w:1) fn vested_transfer() -> Weight { - (174_740_000 as Weight) - .saturating_add(T::DbWeight::get().reads(7 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(174_740_000 as u64) + .saturating_add(T::DbWeight::get().reads(7 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Tokens Locks (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) @@ -59,11 +59,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Vesting VestingScheduleNonce (r:1 w:1) /// The range of component `s` is `[0, 100]`. fn update_vesting_schedules(s: u32, ) -> Weight { - (105_639_000 as Weight) + Weight::from_ref_time(105_639_000 as u64) // Standard Error: 34_000 - .saturating_add((3_364_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + .saturating_add(Weight::from_ref_time(3_364_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // Storage: Vesting VestingSchedules (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -71,10 +71,10 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 100]`. fn claim_for(s: u32, ) -> Weight { - (102_377_000 as Weight) + Weight::from_ref_time(102_377_000 as u64) // Standard Error: 24_000 - .saturating_add((4_789_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(4_789_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs b/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs index 76a608fd5c3..ecbf13ccce2 100644 --- a/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs +++ b/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs @@ -32,8 +32,8 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl asset_tx_payment::WeightInfo for WeightInfo { fn set_payment_asset() -> Weight { - (26_387_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(26_387_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/assets_registry.rs b/code/parachain/runtime/picasso/src/weights/assets_registry.rs index 256b1277f54..918ab761fac 100644 --- a/code/parachain/runtime/picasso/src/weights/assets_registry.rs +++ b/code/parachain/runtime/picasso/src/weights/assets_registry.rs @@ -35,22 +35,22 @@ impl assets_registry::WeightInfo for WeightInfo { // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) fn register_asset() -> Weight { - (63_995_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(63_995_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) // Storage: AssetsRegistry ForeignToLocal (r:0 w:1) fn update_asset() -> Weight { - (48_869_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(48_869_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: AssetsRegistry MinFeeAmounts (r:1 w:1) fn set_min_fee() -> Weight { - (42_380_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(42_380_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/balances.rs b/code/parachain/runtime/picasso/src/weights/balances.rs index 8b6e78bae91..ed9a6e40efa 100644 --- a/code/parachain/runtime/picasso/src/weights/balances.rs +++ b/code/parachain/runtime/picasso/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (144_081_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(144_081_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (86_262_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(86_262_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (57_465_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(57_465_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (66_919_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(66_919_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (135_260_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(135_260_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (100_596_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(100_596_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (54_758_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(54_758_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/bonded_finance.rs b/code/parachain/runtime/picasso/src/weights/bonded_finance.rs index 6082238101e..e33da5c0463 100644 --- a/code/parachain/runtime/picasso/src/weights/bonded_finance.rs +++ b/code/parachain/runtime/picasso/src/weights/bonded_finance.rs @@ -35,9 +35,9 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: BondedFinance BondOffers (r:0 w:1) fn offer() -> Weight { - (164_423_000 as Weight) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(164_423_000 as u64) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: Tokens Accounts (r:4 w:4) @@ -46,15 +46,15 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Vesting VestingSchedules (r:2 w:2) // Storage: Tokens Locks (r:2 w:2) fn bond() -> Weight { - (362_546_000 as Weight) - .saturating_add(T::DbWeight::get().reads(12 as Weight)) - .saturating_add(T::DbWeight::get().writes(12 as Weight)) + Weight::from_ref_time(362_546_000 as u64) + .saturating_add(T::DbWeight::get().reads(12 as u64)) + .saturating_add(T::DbWeight::get().writes(12 as u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel() -> Weight { - (103_724_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(103_724_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/collator_selection.rs b/code/parachain/runtime/picasso/src/weights/collator_selection.rs index bcf2cf3dd09..611d7b86398 100644 --- a/code/parachain/runtime/picasso/src/weights/collator_selection.rs +++ b/code/parachain/runtime/picasso/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (22_359_000 as Weight) + Weight::from_ref_time(22_359_000 as u64) // Standard Error: 8_000 - .saturating_add((7_522_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(7_522_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (20_920_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(20_920_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (21_327_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(21_327_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (125_033_000 as Weight) + Weight::from_ref_time(125_033_000 as u64) // Standard Error: 2_000 - .saturating_add((212_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(212_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (130_572_000 as Weight) + Weight::from_ref_time(130_572_000 as u64) // Standard Error: 3_000 - .saturating_add((194_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(194_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (78_876_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(78_876_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 3_157_000 - .saturating_add((16_491_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(16_491_000 as u64).saturating_mul(r as u64)) // Standard Error: 3_157_000 - .saturating_add((86_791_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) + .saturating_add(Weight::from_ref_time(86_791_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/collective.rs b/code/parachain/runtime/picasso/src/weights/collective.rs index b0ccf5a6ba4..41363956bbe 100644 --- a/code/parachain/runtime/picasso/src/weights/collective.rs +++ b/code/parachain/runtime/picasso/src/weights/collective.rs @@ -38,29 +38,29 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 29_000 - .saturating_add((20_303_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(20_303_000 as u64).saturating_mul(m as u64)) // Standard Error: 29_000 - .saturating_add((362_000 as Weight).saturating_mul(n as Weight)) + .saturating_add(Weight::from_ref_time(362_000 as u64).saturating_mul(n as u64)) // Standard Error: 29_000 - .saturating_add((27_188_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(27_188_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - (54_848_000 as Weight) + Weight::from_ref_time(54_848_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) // Standard Error: 3_000 - .saturating_add((90_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(Weight::from_ref_time(90_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) @@ -68,12 +68,12 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - (57_208_000 as Weight) + Weight::from_ref_time(57_208_000 as u64) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(b as u64)) // Standard Error: 4_000 - .saturating_add((183_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(Weight::from_ref_time(183_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -84,25 +84,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - (52_932_000 as Weight) + Weight::from_ref_time(52_932_000 as u64) // Standard Error: 0 - .saturating_add((17_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(17_000 as u64).saturating_mul(b as u64)) // Standard Error: 7_000 - .saturating_add((173_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(173_000 as u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add((653_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(653_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - (85_570_000 as Weight) + Weight::from_ref_time(85_570_000 as u64) // Standard Error: 8_000 - .saturating_add((239_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(239_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -111,13 +111,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - (77_058_000 as Weight) + Weight::from_ref_time(77_058_000 as u64) // Standard Error: 7_000 - .saturating_add((205_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(205_000 as u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add((552_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(552_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -128,15 +128,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - (97_556_000 as Weight) + Weight::from_ref_time(97_556_000 as u64) // Standard Error: 1_000 - .saturating_add((19_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(19_000 as u64).saturating_mul(b as u64)) // Standard Error: 9_000 - .saturating_add((156_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(156_000 as u64).saturating_mul(m as u64)) // Standard Error: 9_000 - .saturating_add((694_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(694_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -146,13 +146,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - (75_407_000 as Weight) + Weight::from_ref_time(75_407_000 as u64) // Standard Error: 8_000 - .saturating_add((280_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(280_000 as u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add((610_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(610_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -164,25 +164,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - (104_731_000 as Weight) + Weight::from_ref_time(104_731_000 as u64) // Standard Error: 1_000 - .saturating_add((8_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(b as u64)) // Standard Error: 10_000 - .saturating_add((310_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(Weight::from_ref_time(310_000 as u64).saturating_mul(m as u64)) // Standard Error: 10_000 - .saturating_add((692_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(692_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - (48_967_000 as Weight) + Weight::from_ref_time(48_967_000 as u64) // Standard Error: 6_000 - .saturating_add((715_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(715_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs index f961d633499..12373b6dbff 100644 --- a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs @@ -32,21 +32,21 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 109_000 - .saturating_add((6_792_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(x as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(x as Weight))) + .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32, ) -> Weight { - (33_355_000 as Weight) + Weight::from_ref_time(33_355_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -54,11 +54,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32, ) -> Weight { - (169_323_000 as Weight) + Weight::from_ref_time(169_323_000 as u64) // Standard Error: 1_000 - .saturating_add((8_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -66,11 +66,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32, ) -> Weight { - (94_034_000 as Weight) + Weight::from_ref_time(94_034_000 as u64) // Standard Error: 1_000 - .saturating_add((31_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } fn unlock_rewards_for(x: u32) -> Weight { diff --git a/code/parachain/runtime/picasso/src/weights/currency_factory.rs b/code/parachain/runtime/picasso/src/weights/currency_factory.rs index 2f1892bb376..300e949336f 100644 --- a/code/parachain/runtime/picasso/src/weights/currency_factory.rs +++ b/code/parachain/runtime/picasso/src/weights/currency_factory.rs @@ -32,13 +32,13 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) fn add_range() -> Weight { - (40_303_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(40_303_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: CurrencyFactory AssetMetadata (r:0 w:1) fn set_metadata() -> Weight { - (5_008_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(5_008_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/democracy.rs b/code/parachain/runtime/picasso/src/weights/democracy.rs index 0ef9f674fec..b4286144feb 100644 --- a/code/parachain/runtime/picasso/src/weights/democracy.rs +++ b/code/parachain/runtime/picasso/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (98_784_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(98_784_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - (60_043_000 as Weight) + Weight::from_ref_time(60_043_000 as u64) // Standard Error: 4_000 - .saturating_add((264_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - (74_274_000 as Weight) + Weight::from_ref_time(74_274_000 as u64) // Standard Error: 4_000 - .saturating_add((350_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(350_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - (75_255_000 as Weight) + Weight::from_ref_time(75_255_000 as u64) // Standard Error: 7_000 - .saturating_add((347_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(347_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (34_560_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(34_560_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - (112_280_000 as Weight) + Weight::from_ref_time(112_280_000 as u64) // Standard Error: 38_000 - .saturating_add((888_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + .saturating_add(Weight::from_ref_time(888_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - (17_427_000 as Weight) + Weight::from_ref_time(17_427_000 as u64) // Standard Error: 0 - .saturating_add((54_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(54_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (3_287_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_287_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (3_388_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(3_388_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (36_128_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(36_128_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - (38_292_000 as Weight) + Weight::from_ref_time(38_292_000 as u64) // Standard Error: 1_000 - .saturating_add((77_000 as Weight).saturating_mul(v as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(77_000 as u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - (85_834_000 as Weight) + Weight::from_ref_time(85_834_000 as u64) // Standard Error: 6_000 - .saturating_add((599_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(599_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (22_653_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(22_653_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - (42_418_000 as Weight) + Weight::from_ref_time(42_418_000 as u64) // Standard Error: 6_000 - .saturating_add((3_149_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_149_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - (7_913_000 as Weight) + Weight::from_ref_time(7_913_000 as u64) // Standard Error: 7_000 - .saturating_add((6_869_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(6_869_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - (16_163_000 as Weight) + Weight::from_ref_time(16_163_000 as u64) // Standard Error: 7_000 - .saturating_add((6_918_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(6_918_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - (68_631_000 as Weight) + Weight::from_ref_time(68_631_000 as u64) // Standard Error: 13_000 - .saturating_add((9_136_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_136_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - (31_738_000 as Weight) + Weight::from_ref_time(31_738_000 as u64) // Standard Error: 10_000 - .saturating_add((9_156_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(Weight::from_ref_time(9_156_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_047_000 as Weight) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(4_047_000 as u64) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - (54_012_000 as Weight) + Weight::from_ref_time(54_012_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - (35_977_000 as Weight) + Weight::from_ref_time(35_977_000 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - (52_999_000 as Weight) + Weight::from_ref_time(52_999_000 as u64) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - (49_665_000 as Weight) + Weight::from_ref_time(49_665_000 as u64) // Standard Error: 5_000 - .saturating_add((130_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(130_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - (45_073_000 as Weight) + Weight::from_ref_time(45_073_000 as u64) // Standard Error: 4_000 - .saturating_add((330_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(330_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - (27_479_000 as Weight) + Weight::from_ref_time(27_479_000 as u64) // Standard Error: 3_000 - .saturating_add((243_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(243_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - (27_224_000 as Weight) + Weight::from_ref_time(27_224_000 as u64) // Standard Error: 3_000 - .saturating_add((255_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(255_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/frame_system.rs b/code/parachain/runtime/picasso/src/weights/frame_system.rs index 8fe97bd57b3..7b49982497a 100644 --- a/code/parachain/runtime/picasso/src/weights/frame_system.rs +++ b/code/parachain/runtime/picasso/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - (4_071_000 as Weight) + Weight::from_ref_time(4_071_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (17_632_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(17_632_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 4_000 - .saturating_add((1_506_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_506_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 3_000 - .saturating_add((1_203_000 as Weight).saturating_mul(i as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) + .saturating_add(Weight::from_ref_time(1_203_000 as u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - (0 as Weight) + Weight::from_ref_time(0 as u64) // Standard Error: 6_000 - .saturating_add((2_209_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(2_209_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/identity.rs b/code/parachain/runtime/picasso/src/weights/identity.rs index bb43a913b67..9f5063f8116 100644 --- a/code/parachain/runtime/picasso/src/weights/identity.rs +++ b/code/parachain/runtime/picasso/src/weights/identity.rs @@ -33,48 +33,48 @@ impl identity::WeightInfo for WeightInfo { // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn add_registrar(r: u32, ) -> Weight { - (41_932_000 as Weight) + Weight::from_ref_time(41_932_000 as u64) // Standard Error: 175_000 - .saturating_add((1_049_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_049_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn set_identity(r: u32, x: u32, ) -> Weight { - (82_246_000 as Weight) + Weight::from_ref_time(82_246_000 as u64) // Standard Error: 277_000 - .saturating_add((837_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(837_000 as u64).saturating_mul(r as u64)) // Standard Error: 46_000 - .saturating_add((1_132_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_132_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn set_subs_new(s: u32, ) -> Weight { - (76_453_000 as Weight) + Weight::from_ref_time(76_453_000 as u64) // Standard Error: 64_000 - .saturating_add((8_170_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(8_170_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:1) /// The range of component `p` is `[1, 32]`. fn set_subs_old(p: u32, ) -> Weight { - (74_449_000 as Weight) + Weight::from_ref_time(74_449_000 as u64) // Standard Error: 31_000 - .saturating_add((2_882_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(2_882_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -83,81 +83,81 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight { - (82_866_000 as Weight) + Weight::from_ref_time(82_866_000 as u64) // Standard Error: 231_000 - .saturating_add((1_254_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(1_254_000 as u64).saturating_mul(r as u64)) // Standard Error: 35_000 - .saturating_add((3_020_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(3_020_000 as u64).saturating_mul(s as u64)) // Standard Error: 35_000 - .saturating_add((552_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(552_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn request_judgement(r: u32, x: u32, ) -> Weight { - (91_504_000 as Weight) + Weight::from_ref_time(91_504_000 as u64) // Standard Error: 186_000 - .saturating_add((326_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(326_000 as u64).saturating_mul(r as u64)) // Standard Error: 31_000 - .saturating_add((1_150_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_150_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn cancel_request(r: u32, x: u32, ) -> Weight { - (85_352_000 as Weight) + Weight::from_ref_time(85_352_000 as u64) // Standard Error: 162_000 - .saturating_add((232_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(232_000 as u64).saturating_mul(r as u64)) // Standard Error: 27_000 - .saturating_add((1_082_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_082_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fee(r: u32, ) -> Weight { - (21_692_000 as Weight) + Weight::from_ref_time(21_692_000 as u64) // Standard Error: 156_000 - .saturating_add((981_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(981_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_account_id(r: u32, ) -> Weight { - (22_687_000 as Weight) + Weight::from_ref_time(22_687_000 as u64) // Standard Error: 92_000 - .saturating_add((663_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(663_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fields(r: u32, ) -> Weight { - (23_213_000 as Weight) + Weight::from_ref_time(23_213_000 as u64) // Standard Error: 207_000 - .saturating_add((710_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(710_000 as u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 7]`. /// The range of component `x` is `[1, 32]`. fn provide_judgement(r: u32, x: u32, ) -> Weight { - (60_463_000 as Weight) + Weight::from_ref_time(60_463_000 as u64) // Standard Error: 186_000 - .saturating_add((908_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(Weight::from_ref_time(908_000 as u64).saturating_mul(r as u64)) // Standard Error: 26_000 - .saturating_add((1_055_000 as Weight).saturating_mul(x as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -167,53 +167,53 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight { - (128_164_000 as Weight) + Weight::from_ref_time(128_164_000 as u64) // Standard Error: 36_000 - .saturating_add((2_976_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(2_976_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn add_sub(s: u32, ) -> Weight { - (94_819_000 as Weight) + Weight::from_ref_time(94_819_000 as u64) // Standard Error: 41_000 - .saturating_add((408_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(408_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn rename_sub(s: u32, ) -> Weight { - (36_368_000 as Weight) + Weight::from_ref_time(36_368_000 as u64) // Standard Error: 22_000 - .saturating_add((223_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(223_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn remove_sub(s: u32, ) -> Weight { - (95_261_000 as Weight) + Weight::from_ref_time(95_261_000 as u64) // Standard Error: 28_000 - .saturating_add((408_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(408_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn quit_sub(s: u32, ) -> Weight { - (67_477_000 as Weight) + Weight::from_ref_time(67_477_000 as u64) // Standard Error: 30_000 - .saturating_add((411_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(411_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/indices.rs b/code/parachain/runtime/picasso/src/weights/indices.rs index 28d42e9e570..30ecd1580be 100644 --- a/code/parachain/runtime/picasso/src/weights/indices.rs +++ b/code/parachain/runtime/picasso/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (68_112_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(68_112_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (84_937_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(84_937_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (70_776_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(70_776_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (72_052_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(72_052_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (79_057_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(79_057_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/membership.rs b/code/parachain/runtime/picasso/src/weights/membership.rs index b125347c080..8dc23143620 100644 --- a/code/parachain/runtime/picasso/src/weights/membership.rs +++ b/code/parachain/runtime/picasso/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - (39_607_000 as Weight) + Weight::from_ref_time(39_607_000 as u64) // Standard Error: 3_000 - .saturating_add((193_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(193_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - (44_834_000 as Weight) + Weight::from_ref_time(44_834_000 as u64) // Standard Error: 2_000 - .saturating_add((195_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - (45_826_000 as Weight) + Weight::from_ref_time(45_826_000 as u64) // Standard Error: 2_000 - .saturating_add((211_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - (46_940_000 as Weight) + Weight::from_ref_time(46_940_000 as u64) // Standard Error: 5_000 - .saturating_add((414_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(414_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - (48_299_000 as Weight) + Weight::from_ref_time(48_299_000 as u64) // Standard Error: 3_000 - .saturating_add((202_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) + .saturating_add(Weight::from_ref_time(202_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(4 as u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - (12_536_000 as Weight) + Weight::from_ref_time(12_536_000 as u64) // Standard Error: 1_000 - .saturating_add((87_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(87_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - (5_071_000 as Weight) + Weight::from_ref_time(5_071_000 as u64) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/multisig.rs b/code/parachain/runtime/picasso/src/weights/multisig.rs index 60982de5896..ff807168d76 100644 --- a/code/parachain/runtime/picasso/src/weights/multisig.rs +++ b/code/parachain/runtime/picasso/src/weights/multisig.rs @@ -33,23 +33,23 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `z` is `[0, 10000]`. fn as_multi_threshold_1(z: u32, ) -> Weight { - (61_608_000 as Weight) + Weight::from_ref_time(61_608_000 as u64) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create(s: u32, z: u32, ) -> Weight { - (97_466_000 as Weight) + Weight::from_ref_time(97_466_000 as u64) // Standard Error: 8_000 - .saturating_add((351_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(351_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -57,38 +57,38 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - (104_050_000 as Weight) + Weight::from_ref_time(104_050_000 as u64) // Standard Error: 9_000 - .saturating_add((451_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(451_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve(s: u32, z: u32, ) -> Weight { - (65_459_000 as Weight) + Weight::from_ref_time(65_459_000 as u64) // Standard Error: 6_000 - .saturating_add((319_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(319_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - (108_024_000 as Weight) + Weight::from_ref_time(108_024_000 as u64) // Standard Error: 9_000 - .saturating_add((331_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(331_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -97,33 +97,33 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(s: u32, z: u32, ) -> Weight { - (115_065_000 as Weight) + Weight::from_ref_time(115_065_000 as u64) // Standard Error: 9_000 - .saturating_add((817_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(Weight::from_ref_time(817_000 as u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(z as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create(s: u32, ) -> Weight { - (89_056_000 as Weight) + Weight::from_ref_time(89_056_000 as u64) // Standard Error: 8_000 - .saturating_add((398_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(398_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - (58_807_000 as Weight) + Weight::from_ref_time(58_807_000 as u64) // Standard Error: 6_000 - .saturating_add((377_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(377_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -131,20 +131,20 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_complete(s: u32, ) -> Weight { - (163_338_000 as Weight) + Weight::from_ref_time(163_338_000 as u64) // Standard Error: 12_000 - .saturating_add((772_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(772_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[2, 100]`. fn cancel_as_multi(s: u32, ) -> Weight { - (126_595_000 as Weight) + Weight::from_ref_time(126_595_000 as u64) // Standard Error: 8_000 - .saturating_add((425_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(425_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/pablo.rs b/code/parachain/runtime/picasso/src/weights/pablo.rs index 11ad2bfd5a2..6c6db7187d8 100644 --- a/code/parachain/runtime/picasso/src/weights/pablo.rs +++ b/code/parachain/runtime/picasso/src/weights/pablo.rs @@ -34,9 +34,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn create() -> Weight { - (62_554_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(62_554_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:5 w:5) @@ -44,9 +44,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - (347_743_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(8 as Weight)) + Weight::from_ref_time(347_743_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(8 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens TotalIssuance (r:1 w:1) @@ -54,34 +54,34 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - (222_190_000 as Weight) - .saturating_add(T::DbWeight::get().reads(9 as Weight)) - .saturating_add(T::DbWeight::get().writes(7 as Weight)) + Weight::from_ref_time(222_190_000 as u64) + .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(T::DbWeight::get().writes(7 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn buy() -> Weight { - (191_476_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(191_476_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn swap() -> Weight { - (184_948_000 as Weight) - .saturating_add(T::DbWeight::get().reads(8 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(184_948_000 as u64) + .saturating_add(T::DbWeight::get().reads(8 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn do_create_pool() -> Weight { - (54_928_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(54_928_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/proxy.rs b/code/parachain/runtime/picasso/src/weights/proxy.rs index 3a489ccf715..cc30d2a6454 100644 --- a/code/parachain/runtime/picasso/src/weights/proxy.rs +++ b/code/parachain/runtime/picasso/src/weights/proxy.rs @@ -34,10 +34,10 @@ impl proxy::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `p` is `[1, 3]`. fn proxy(p: u32, ) -> Weight { - (56_751_000 as Weight) + Weight::from_ref_time(56_751_000 as u64) // Standard Error: 1_424_000 - .saturating_add((144_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(Weight::from_ref_time(144_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -46,37 +46,37 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn proxy_announced(a: u32, p: u32, ) -> Weight { - (100_739_000 as Weight) + Weight::from_ref_time(100_739_000 as u64) // Standard Error: 33_000 - .saturating_add((679_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(679_000 as u64).saturating_mul(a as u64)) // Standard Error: 898_000 - .saturating_add((132_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(132_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn remove_announcement(a: u32, _p: u32, ) -> Weight { - (78_628_000 as Weight) + Weight::from_ref_time(78_628_000 as u64) // Standard Error: 39_000 - .saturating_add((850_000 as Weight).saturating_mul(a as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(850_000 as u64).saturating_mul(a as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn reject_announcement(a: u32, p: u32, ) -> Weight { - (65_887_000 as Weight) + Weight::from_ref_time(65_887_000 as u64) // Standard Error: 28_000 - .saturating_add((574_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(574_000 as u64).saturating_mul(a as u64)) // Standard Error: 750_000 - .saturating_add((1_493_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(1_493_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -84,56 +84,56 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn announce(a: u32, p: u32, ) -> Weight { - (85_432_000 as Weight) + Weight::from_ref_time(85_432_000 as u64) // Standard Error: 24_000 - .saturating_add((569_000 as Weight).saturating_mul(a as Weight)) + .saturating_add(Weight::from_ref_time(569_000 as u64).saturating_mul(a as u64)) // Standard Error: 648_000 - .saturating_add((917_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(917_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn add_proxy(p: u32, ) -> Weight { - (72_349_000 as Weight) + Weight::from_ref_time(72_349_000 as u64) // Standard Error: 1_118_000 - .saturating_add((2_417_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(2_417_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxy(p: u32, ) -> Weight { - (72_690_000 as Weight) + Weight::from_ref_time(72_690_000 as u64) // Standard Error: 669_000 - .saturating_add((1_046_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_046_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxies(p: u32, ) -> Weight { - (63_884_000 as Weight) + Weight::from_ref_time(63_884_000 as u64) // Standard Error: 292_000 - .saturating_add((11_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn anonymous(_p: u32, ) -> Weight { - (84_617_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(84_617_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[0, 2]`. fn kill_anonymous(p: u32, ) -> Weight { - (65_477_000 as Weight) + Weight::from_ref_time(65_477_000 as u64) // Standard Error: 986_000 - .saturating_add((1_022_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(1_022_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/scheduler.rs b/code/parachain/runtime/picasso/src/weights/scheduler.rs index eb4bbad8fe9..f1c556e7980 100644 --- a/code/parachain/runtime/picasso/src/weights/scheduler.rs +++ b/code/parachain/runtime/picasso/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - (24_601_000 as Weight) + Weight::from_ref_time(24_601_000 as u64) // Standard Error: 85_000 - .saturating_add((57_188_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(57_188_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - (29_522_000 as Weight) + Weight::from_ref_time(29_522_000 as u64) // Standard Error: 67_000 - .saturating_add((44_660_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(44_660_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - (24_914_000 as Weight) + Weight::from_ref_time(24_914_000 as u64) // Standard Error: 86_000 - .saturating_add((49_059_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(49_059_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - (29_908_000 as Weight) + Weight::from_ref_time(29_908_000 as u64) // Standard Error: 97_000 - .saturating_add((41_390_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(41_390_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - (24_531_000 as Weight) + Weight::from_ref_time(24_531_000 as u64) // Standard Error: 39_000 - .saturating_add((17_162_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(17_162_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - (19_184_000 as Weight) + Weight::from_ref_time(19_184_000 as u64) // Standard Error: 29_000 - .saturating_add((10_036_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(10_036_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - (39_705_000 as Weight) + Weight::from_ref_time(39_705_000 as u64) // Standard Error: 54_000 - .saturating_add((30_654_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(30_654_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - (35_357_000 as Weight) + Weight::from_ref_time(35_357_000 as u64) // Standard Error: 47_000 - .saturating_add((23_082_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(s as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(s as Weight))) + .saturating_add(Weight::from_ref_time(23_082_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - (40_179_000 as Weight) + Weight::from_ref_time(40_179_000 as u64) // Standard Error: 43_000 - .saturating_add((18_404_000 as Weight).saturating_mul(s 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(s as Weight))) + .saturating_add(Weight::from_ref_time(18_404_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - (39_906_000 as Weight) + Weight::from_ref_time(39_906_000 as u64) // Standard Error: 39_000 - .saturating_add((15_266_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(15_266_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - (50_228_000 as Weight) + Weight::from_ref_time(50_228_000 as u64) // Standard Error: 11_000 - .saturating_add((221_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(221_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - (47_930_000 as Weight) + Weight::from_ref_time(47_930_000 as u64) // Standard Error: 17_000 - .saturating_add((2_454_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_454_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - (60_652_000 as Weight) + Weight::from_ref_time(60_652_000 as u64) // Standard Error: 12_000 - .saturating_add((211_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - (52_149_000 as Weight) + Weight::from_ref_time(52_149_000 as u64) // Standard Error: 18_000 - .saturating_add((2_473_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + .saturating_add(Weight::from_ref_time(2_473_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/session.rs b/code/parachain/runtime/picasso/src/weights/session.rs index d650dc52bf6..9b7d931493c 100644 --- a/code/parachain/runtime/picasso/src/weights/session.rs +++ b/code/parachain/runtime/picasso/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (47_886_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(47_886_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (38_464_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(38_464_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/timestamp.rs b/code/parachain/runtime/picasso/src/weights/timestamp.rs index 421116d3456..89ab6885a14 100644 --- a/code/parachain/runtime/picasso/src/weights/timestamp.rs +++ b/code/parachain/runtime/picasso/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (24_117_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(24_117_000 as u64) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } fn on_finalize() -> Weight { - (7_790_000 as Weight) + Weight::from_ref_time(7_790_000 as u64) } } diff --git a/code/parachain/runtime/picasso/src/weights/tokens.rs b/code/parachain/runtime/picasso/src/weights/tokens.rs index 56806851601..1e66692a5b5 100644 --- a/code/parachain/runtime/picasso/src/weights/tokens.rs +++ b/code/parachain/runtime/picasso/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_all() -> Weight { - (69_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(5 as Weight)) - .saturating_add(RocksDbWeight::get().writes(4 as Weight)) + Weight::from_ref_time(69_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(5 as u64)) + .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn transfer_keep_alive() -> Weight { - (38_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(38_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn force_transfer() -> Weight { - (45_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(4 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(45_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(4 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } fn set_balance() -> Weight { - (34_000_000 as Weight) - .saturating_add(RocksDbWeight::get().reads(3 as Weight)) - .saturating_add(RocksDbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(34_000_000 as u64) + .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(RocksDbWeight::get().writes(3 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/treasury.rs b/code/parachain/runtime/picasso/src/weights/treasury.rs index 853a7f4901d..a621194e99b 100644 --- a/code/parachain/runtime/picasso/src/weights/treasury.rs +++ b/code/parachain/runtime/picasso/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - (563_000 as Weight) + Weight::from_ref_time(563_000 as u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (71_290_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + Weight::from_ref_time(71_290_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(2 as u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (100_117_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + Weight::from_ref_time(100_117_000 as u64) + .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - (30_247_000 as Weight) + Weight::from_ref_time(30_247_000 as u64) // Standard Error: 19_000 - .saturating_add((460_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(Weight::from_ref_time(460_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - (21_056_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + Weight::from_ref_time(21_056_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - (80_249_000 as Weight) + Weight::from_ref_time(80_249_000 as u64) // Standard Error: 115_000 - .saturating_add((77_193_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - .saturating_add(T::DbWeight::get().writes((3 as Weight).saturating_mul(p as Weight))) + .saturating_add(Weight::from_ref_time(77_193_000 as u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/utility.rs b/code/parachain/runtime/picasso/src/weights/utility.rs index 94cbaac530a..d60e964be5f 100644 --- a/code/parachain/runtime/picasso/src/weights/utility.rs +++ b/code/parachain/runtime/picasso/src/weights/utility.rs @@ -33,33 +33,33 @@ impl utility::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - (44_973_000 as Weight) + Weight::from_ref_time(44_973_000 as u64) // Standard Error: 9_000 - .saturating_add((11_193_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_193_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) fn as_derivative() -> Weight { - (22_271_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + Weight::from_ref_time(22_271_000 as u64) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - (55_138_000 as Weight) + Weight::from_ref_time(55_138_000 as u64) // Standard Error: 14_000 - .saturating_add((11_670_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_670_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } fn dispatch_as() -> Weight { - (35_508_000 as Weight) + Weight::from_ref_time(35_508_000 as u64) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - (17_121_000 as Weight) + Weight::from_ref_time(17_121_000 as u64) // Standard Error: 14_000 - .saturating_add((11_256_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(Weight::from_ref_time(11_256_000 as u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1 as u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/vesting.rs b/code/parachain/runtime/picasso/src/weights/vesting.rs index 27b49a05545..fa4c851d8f1 100644 --- a/code/parachain/runtime/picasso/src/weights/vesting.rs +++ b/code/parachain/runtime/picasso/src/weights/vesting.rs @@ -36,11 +36,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 128]`. fn claim(s: u32, ) -> Weight { - (106_646_000 as Weight) + Weight::from_ref_time(106_646_000 as u64) // Standard Error: 14_000 - .saturating_add((4_437_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(4_437_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } // Storage: Vesting VestingScheduleNonce (r:1 w:1) // Storage: Vesting VestingSchedules (r:1 w:1) @@ -48,9 +48,9 @@ impl vesting::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:1) // Storage: Tokens Locks (r:1 w:1) fn vested_transfer() -> Weight { - (162_725_000 as Weight) - .saturating_add(T::DbWeight::get().reads(7 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) + Weight::from_ref_time(162_725_000 as u64) + .saturating_add(T::DbWeight::get().reads(7 as u64)) + .saturating_add(T::DbWeight::get().writes(6 as u64)) } // Storage: Tokens Locks (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) @@ -59,11 +59,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Vesting VestingScheduleNonce (r:1 w:1) /// The range of component `s` is `[0, 128]`. fn update_vesting_schedules(s: u32, ) -> Weight { - (104_345_000 as Weight) + Weight::from_ref_time(104_345_000 as u64) // Standard Error: 13_000 - .saturating_add((2_866_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(5 as Weight)) + .saturating_add(Weight::from_ref_time(2_866_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(5 as u64)) } // Storage: Vesting VestingSchedules (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -71,10 +71,10 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 128]`. fn claim_for(s: u32, ) -> Weight { - (105_194_000 as Weight) + Weight::from_ref_time(105_194_000 as u64) // Standard Error: 14_000 - .saturating_add((4_213_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) + .saturating_add(Weight::from_ref_time(4_213_000 as u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4 as u64)) + .saturating_add(T::DbWeight::get().writes(3 as u64)) } } From f57a6a82a6ff75ebc7d5533f083e5e73834c1ea8 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 12:06:45 +0100 Subject: [PATCH 03/44] chore: continue migration to v0.9.30 --- code/Cargo.lock | 231 +++++++----------- .../local-integration-tests/Cargo.toml | 8 +- code/parachain/frame/airdrop/src/lib.rs | 4 +- code/parachain/frame/airdrop/src/mocks.rs | 10 +- .../frame/assets-registry/src/lib.rs | 6 +- .../frame/assets-registry/src/runtime.rs | 10 +- .../frame/assets-registry/src/weights.rs | 12 +- code/parachain/frame/assets/Cargo.toml | 4 +- code/parachain/frame/assets/src/lib.rs | 6 +- code/parachain/frame/assets/src/mocks.rs | 12 +- .../parachain/frame/bonded-finance/Cargo.toml | 4 +- .../parachain/frame/bonded-finance/src/lib.rs | 4 +- .../frame/bonded-finance/src/mock.rs | 12 +- .../frame/bonded-finance/src/weights.rs | 6 +- code/parachain/frame/call-filter/src/lib.rs | 10 +- code/parachain/frame/call-filter/src/mock.rs | 10 +- code/parachain/frame/call-filter/src/tests.rs | 2 +- .../counter/test_storage_counter.rs | 6 +- .../abstractions/nonce/test_storage_nonce.rs | 6 +- code/parachain/frame/cosmwasm/Cargo.toml | 4 +- code/parachain/frame/cosmwasm/src/lib.rs | 2 +- code/parachain/frame/cosmwasm/src/mock.rs | 14 +- .../frame/crowdloan-rewards/src/lib.rs | 4 +- .../frame/crowdloan-rewards/src/mocks.rs | 10 +- .../frame/crowdloan-rewards/src/weights.rs | 5 +- .../frame/currency-factory/src/lib.rs | 4 +- .../frame/currency-factory/src/mocks.rs | 8 +- .../frame/currency-factory/src/weights.rs | 6 +- code/parachain/frame/dex-router/Cargo.toml | 4 +- code/parachain/frame/dex-router/src/lib.rs | 4 +- code/parachain/frame/dex-router/src/mock.rs | 18 +- code/parachain/frame/dutch-auction/Cargo.toml | 6 +- .../frame/dutch-auction/src/benchmarking.rs | 2 +- code/parachain/frame/dutch-auction/src/lib.rs | 6 +- .../frame/dutch-auction/src/mock/runtime.rs | 16 +- code/parachain/frame/fnft/src/lib.rs | 2 +- code/parachain/frame/fnft/src/test/mock.rs | 12 +- .../frame/governance-registry/Cargo.toml | 2 +- .../frame/governance-registry/src/lib.rs | 2 +- .../frame/governance-registry/src/mock.rs | 10 +- code/parachain/frame/lending/Cargo.toml | 4 +- .../frame/lending/src/benchmarking/setup.rs | 2 +- code/parachain/frame/lending/src/lib.rs | 2 +- .../frame/lending/src/mocks/general.rs | 22 +- .../frame/lending/src/mocks/offchain.rs | 24 +- code/parachain/frame/lending/src/tests/mod.rs | 2 +- code/parachain/frame/liquidations/Cargo.toml | 6 +- code/parachain/frame/liquidations/src/lib.rs | 7 +- .../frame/liquidations/src/mock/runtime.rs | 16 +- code/parachain/frame/mosaic/Cargo.toml | 4 +- code/parachain/frame/mosaic/src/lib.rs | 4 +- code/parachain/frame/mosaic/src/mock.rs | 10 +- .../oracle/design/rewards/rewards-design.md | 2 +- .../frame/oracle/src/benchmarking.rs | 2 +- code/parachain/frame/oracle/src/lib.rs | 14 +- code/parachain/frame/oracle/src/mock.rs | 10 +- code/parachain/frame/pablo/Cargo.toml | 4 +- code/parachain/frame/pablo/src/lib.rs | 10 +- code/parachain/frame/pablo/src/mock.rs | 14 +- code/parachain/frame/pablo/src/weights.rs | 26 +- code/parachain/frame/privilege/src/lib.rs | 2 +- .../frame/staking-rewards/Cargo.toml | 6 +- .../frame/staking-rewards/src/benchmarking.rs | 2 +- .../frame/staking-rewards/src/lib.rs | 6 +- .../frame/staking-rewards/src/runtime.rs | 20 +- .../frame/staking-rewards/src/test_helpers.rs | 20 +- code/parachain/frame/vault/Cargo.toml | 4 +- .../parachain/frame/vault/src/benchmarking.rs | 2 +- code/parachain/frame/vault/src/lib.rs | 2 +- .../frame/vault/src/mocks/currency_factory.rs | 2 +- .../frame/vault/src/mocks/strategy.rs | 2 +- code/parachain/frame/vault/src/mocks/tests.rs | 16 +- code/parachain/frame/vesting/Cargo.toml | 4 +- code/parachain/frame/vesting/src/lib.rs | 6 +- code/parachain/frame/vesting/src/mock.rs | 10 +- code/parachain/frame/vesting/src/weights.rs | 2 +- code/parachain/node/Cargo.toml | 1 - code/parachain/runtime/common/Cargo.toml | 4 +- code/parachain/runtime/common/src/fees.rs | 2 +- code/parachain/runtime/common/src/lib.rs | 6 +- code/parachain/runtime/common/src/rewards.rs | 20 +- code/parachain/runtime/common/src/xcmp.rs | 14 +- code/parachain/runtime/composable/Cargo.toml | 10 +- code/parachain/runtime/composable/src/lib.rs | 122 ++++----- code/parachain/runtime/composable/src/xcmp.rs | 40 +-- code/parachain/runtime/dali/Cargo.toml | 10 +- code/parachain/runtime/dali/src/governance.rs | 20 +- code/parachain/runtime/dali/src/lib.rs | 84 +++---- code/parachain/runtime/dali/src/xcmp.rs | 18 +- code/parachain/runtime/picasso/Cargo.toml | 10 +- .../runtime/picasso/src/governance.rs | 34 ++- code/parachain/runtime/picasso/src/lib.rs | 152 ++++++------ .../runtime/picasso/src/migrations.rs | 36 +-- .../picasso/src/weights/asset_tx_payment.rs | 39 --- .../picasso/src/weights/crowdloan_rewards.rs | 5 +- .../runtime/picasso/src/weights/mod.rs | 1 - .../runtime/picasso/src/weights/proxy.rs | 19 +- code/parachain/runtime/picasso/src/xcmp.rs | 54 ++-- .../src/tests/runtime_upgrade.rs | 8 +- 99 files changed, 706 insertions(+), 798 deletions(-) delete mode 100644 code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs diff --git a/code/Cargo.lock b/code/Cargo.lock index bbde1d9d5c6..559f1706e96 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -1635,9 +1635,9 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -1808,7 +1808,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vault", - "pallet-xcm 0.9.30", + "pallet-xcm", "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", "polkadot-parachain 0.9.30", @@ -1826,9 +1826,9 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -1913,7 +1913,7 @@ dependencies = [ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -2699,8 +2699,8 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", - "xcm-executor 0.9.30", + "xcm", + "xcm-executor", ] [[package]] @@ -2731,7 +2731,7 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -2773,7 +2773,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -2790,8 +2790,8 @@ dependencies = [ "scale-info", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", - "xcm-executor 0.9.30", + "xcm", + "xcm-executor", ] [[package]] @@ -2877,9 +2877,9 @@ dependencies = [ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -3337,7 +3337,7 @@ dependencies = [ "pallet-utility", "pallet-vault", "pallet-vesting 1.0.0", - "pallet-xcm 0.9.30", + "pallet-xcm", "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", "polkadot-parachain 0.9.30", @@ -3355,9 +3355,9 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -6407,7 +6407,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm 0.9.30", + "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives 0.9.30", @@ -6437,9 +6437,9 @@ dependencies = [ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -8132,98 +8132,98 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-traits", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm", ] [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-xcm-support", "parity-scale-codec", "scale-info", "serde", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-traits", "parity-scale-codec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", - "xcm-executor 0.9.27", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm", + "xcm-executor", ] [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=504d11bd1af3613a0e66b47b99713675e9b6bd10#504d11bd1af3613a0e66b47b99713675e9b6bd10" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "orml-traits", "orml-xcm-support", - "pallet-xcm 0.9.27", + "pallet-xcm", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", - "xcm-executor 0.9.27", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "xcm", + "xcm-executor", ] [[package]] @@ -8397,7 +8397,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -8870,7 +8870,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -9246,7 +9246,7 @@ dependencies = [ "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -9280,7 +9280,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -9374,7 +9374,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -9982,23 +9982,6 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-xcm" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", - "xcm-executor 0.9.27", -] - [[package]] name = "pallet-xcm" version = "0.9.30" @@ -10013,8 +9996,8 @@ dependencies = [ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", - "xcm-executor 0.9.30", + "xcm", + "xcm-executor", ] [[package]] @@ -10030,8 +10013,8 @@ dependencies = [ "scale-info", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", - "xcm-executor 0.9.30", + "xcm", + "xcm-executor", ] [[package]] @@ -10437,7 +10420,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting 1.0.0", - "pallet-xcm 0.9.30", + "pallet-xcm", "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", "polkadot-parachain 0.9.30", @@ -10455,9 +10438,9 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -11496,7 +11479,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm 0.9.30", + "pallet-xcm", "parity-scale-codec", "polkadot-primitives 0.9.30", "polkadot-runtime-common", @@ -11525,9 +11508,9 @@ dependencies = [ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -11574,7 +11557,7 @@ dependencies = [ "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -11640,8 +11623,8 @@ dependencies = [ "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", - "xcm 0.9.30", - "xcm-executor 0.9.30", + "xcm", + "xcm-executor", ] [[package]] @@ -11899,7 +11882,7 @@ dependencies = [ "serde", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", + "xcm", ] [[package]] @@ -12803,7 +12786,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm 0.9.30", + "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-parachain 0.9.30", @@ -12832,9 +12815,9 @@ dependencies = [ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "substrate-wasm-builder", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -18658,7 +18641,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", - "pallet-xcm 0.9.30", + "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-parachain 0.9.30", @@ -18688,9 +18671,9 @@ dependencies = [ "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-wasm-builder", "westend-runtime-constants", - "xcm 0.9.30", + "xcm", "xcm-builder", - "xcm-executor 0.9.30", + "xcm-executor", ] [[package]] @@ -18956,20 +18939,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "xcm" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm-procedural 0.9.27", -] - [[package]] name = "xcm" version = "0.9.30" @@ -18981,7 +18950,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm-procedural 0.9.30", + "xcm-procedural", ] [[package]] @@ -19000,25 +18969,8 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", - "xcm-executor 0.9.30", -] - -[[package]] -name = "xcm-executor" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "xcm 0.9.27", + "xcm", + "xcm-executor", ] [[package]] @@ -19036,18 +18988,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "xcm 0.9.30", -] - -[[package]] -name = "xcm-procedural" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "Inflector", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", + "xcm", ] [[package]] diff --git a/code/integration-tests/local-integration-tests/Cargo.toml b/code/integration-tests/local-integration-tests/Cargo.toml index 1c4ee99e611..e79601d7fbf 100644 --- a/code/integration-tests/local-integration-tests/Cargo.toml +++ b/code/integration-tests/local-integration-tests/Cargo.toml @@ -45,10 +45,10 @@ collective = { package = "pallet-collective", git = "https://github.com/parityte democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/airdrop/src/lib.rs b/code/parachain/frame/airdrop/src/lib.rs index 0ee28af90ee..6fab9523751 100644 --- a/code/parachain/frame/airdrop/src/lib.rs +++ b/code/parachain/frame/airdrop/src/lib.rs @@ -121,7 +121,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Airdrop ID type AirdropId: Copy @@ -968,7 +968,7 @@ pub mod pallet { /// * The recipient has funds to claim #[pallet::validate_unsigned] impl ValidateUnsigned for Pallet { - type Call = Call; + type RuntimeCall = RuntimeCall; fn validate_unsigned(_: TransactionSource, call: &Self::Call) -> TransactionValidity { if let Call::claim { airdrop_id, reward_account, proof } = call { diff --git a/code/parachain/frame/airdrop/src/mocks.rs b/code/parachain/frame/airdrop/src/mocks.rs index 2bc52647cc6..d048bd58d82 100644 --- a/code/parachain/frame/airdrop/src/mocks.rs +++ b/code/parachain/frame/airdrop/src/mocks.rs @@ -40,16 +40,16 @@ parameter_types! { } impl system::Config for MockRuntime { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = BlockNumber; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = sp_runtime::generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -68,7 +68,7 @@ impl system::Config for MockRuntime { impl pallet_balances::Config for MockRuntime { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = (); type AccountStore = System; @@ -89,7 +89,7 @@ impl pallet_airdrop::Config for MockRuntime { type AirdropId = AirdropId; type Balance = Balance; type Convert = ConvertInto; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Moment = Moment; type RelayChainAccountId = RelayChainAccountId; type RecipientFundAsset = Balances; diff --git a/code/parachain/frame/assets-registry/src/lib.rs b/code/parachain/frame/assets-registry/src/lib.rs index f41751aa5eb..c868d6b0635 100644 --- a/code/parachain/frame/assets-registry/src/lib.rs +++ b/code/parachain/frame/assets-registry/src/lib.rs @@ -49,7 +49,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Identifier for the class of local asset. type LocalAssetId: FullCodec @@ -75,9 +75,9 @@ pub mod pallet { + TypeInfo; /// The origin which may set local and foreign admins. - type UpdateAssetRegistryOrigin: EnsureOrigin; + type UpdateAssetRegistryOrigin: EnsureOrigin; /// really can be governance of this chain or remote parachain origin - type ParachainOrGovernanceOrigin: EnsureOrigin; + type ParachainOrGovernanceOrigin: EnsureOrigin; type WeightInfo: WeightInfo; type Balance: BalanceLike; type CurrencyFactory: CurrencyFactory; diff --git a/code/parachain/frame/assets-registry/src/runtime.rs b/code/parachain/frame/assets-registry/src/runtime.rs index 91c52c17726..1906fdcea84 100644 --- a/code/parachain/frame/assets-registry/src/runtime.rs +++ b/code/parachain/frame/assets-registry/src/runtime.rs @@ -38,7 +38,7 @@ parameter_types! { } impl pallet_currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = Balance; type AddOrigin = EnsureOneOf< @@ -53,8 +53,8 @@ impl system::Config for Runtime { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -62,7 +62,7 @@ impl system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -82,7 +82,7 @@ ord_parameter_types! { type AssetId = u128; impl pallet_assets_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocalAssetId = AssetId; type Balance = Balance; type CurrencyFactory = CurrencyFactory; diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index 6a6ff0a5e71..2e0ee94d50a 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -14,15 +14,15 @@ pub trait WeightInfo { impl WeightInfo for () { fn register_asset() -> Weight { - 0 + Weight::from_ref_time(10_0000) } fn update_asset() -> Weight { - 0 + Weight::from_ref_time(10_0000) } fn set_min_fee() -> Weight { - 0 + Weight::from_ref_time(10_0000) } } @@ -30,12 +30,12 @@ impl WeightInfo for () { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register_asset() -> Weight { - (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } fn update_asset() -> Weight { - (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } fn set_min_fee() -> Weight { - (9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } } diff --git a/code/parachain/frame/assets/Cargo.toml b/code/parachain/frame/assets/Cargo.toml index 09abb5c0a89..27676dbbc6c 100644 --- a/code/parachain/frame/assets/Cargo.toml +++ b/code/parachain/frame/assets/Cargo.toml @@ -25,7 +25,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } @@ -40,7 +40,7 @@ num-traits = { version = "0.2.14", default-features = false } composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } governance-registry = { package = "pallet-governance-registry", path = "../governance-registry" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" diff --git a/code/parachain/frame/assets/src/lib.rs b/code/parachain/frame/assets/src/lib.rs index ca2b5f6621c..21b169441d2 100644 --- a/code/parachain/frame/assets/src/lib.rs +++ b/code/parachain/frame/assets/src/lib.rs @@ -106,13 +106,13 @@ pub mod pallet { use num_traits::Zero; use orml_traits::GetByKey; use primitives::currency::ValidateCurrencyId; - use sp_runtime::DispatchError; + use sp_runtime::{DispatchError, FixedPointOperand}; #[pallet::config] pub trait Config: frame_system::Config { /// currency id type AssetId: AssetIdLike; - type Balance: BalanceLike; + type Balance: BalanceLike + FixedPointOperand; #[pallet::constant] type NativeAssetId: Get; type GenerateCurrencyId: CurrencyFactory; @@ -122,7 +122,7 @@ pub mod pallet { + GovernanceRegistry; type WeightInfo: WeightInfo; /// origin of admin of this pallet - type AdminOrigin: EnsureOrigin; + type AdminOrigin: EnsureOrigin; type CurrencyValidator: Validate; } diff --git a/code/parachain/frame/assets/src/mocks.rs b/code/parachain/frame/assets/src/mocks.rs index 0deac88c6a7..7342e28b421 100644 --- a/code/parachain/frame/assets/src/mocks.rs +++ b/code/parachain/frame/assets/src/mocks.rs @@ -108,7 +108,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; @@ -126,7 +126,7 @@ impl orml_tokens::Config for Test { impl governance_registry::Config for Test { type AssetId = AssetId; type WeightInfo = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; } parameter_types! { @@ -139,8 +139,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -148,7 +148,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -167,7 +167,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; diff --git a/code/parachain/frame/bonded-finance/Cargo.toml b/code/parachain/frame/bonded-finance/Cargo.toml index d5645b23918..b295adb5c57 100644 --- a/code/parachain/frame/bonded-finance/Cargo.toml +++ b/code/parachain/frame/bonded-finance/Cargo.toml @@ -30,12 +30,12 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { default-features = false, path = "../composable-support" } composable-traits = { path = "../../frame/composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } composable-traits = { path = "../../frame/composable-traits" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-vesting = { path = "../../frame/vesting" } proptest = "1.0" diff --git a/code/parachain/frame/bonded-finance/src/lib.rs b/code/parachain/frame/bonded-finance/src/lib.rs index 1431321f0a5..c9978a1c841 100644 --- a/code/parachain/frame/bonded-finance/src/lib.rs +++ b/code/parachain/frame/bonded-finance/src/lib.rs @@ -113,7 +113,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The native currency, used for the stake required to create an offer. type NativeCurrency: fungible::Mutate> @@ -163,7 +163,7 @@ pub mod pallet { type MinReward: Get>; /// The origin that is allowed to cancel bond offers. - type AdminOrigin: EnsureOrigin; + type AdminOrigin: EnsureOrigin; /// Weights type WeightInfo: WeightInfo; diff --git a/code/parachain/frame/bonded-finance/src/mock.rs b/code/parachain/frame/bonded-finance/src/mock.rs index 6da33ae1cab..42d5f38edb3 100644 --- a/code/parachain/frame/bonded-finance/src/mock.rs +++ b/code/parachain/frame/bonded-finance/src/mock.rs @@ -63,8 +63,8 @@ parameter_types! { } impl frame_system::Config for Runtime { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -72,7 +72,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -119,7 +119,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = MockCurrencyId; @@ -151,7 +151,7 @@ parameter_types! { } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Tokens; type MinVestedTransfer = MinVestedTransfer; type VestedTransferOrigin = EnsureRoot; @@ -172,7 +172,7 @@ parameter_types! { } impl Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type NativeCurrency = CurrencyAdapter; type Currency = Tokens; type Vesting = Vesting; diff --git a/code/parachain/frame/bonded-finance/src/weights.rs b/code/parachain/frame/bonded-finance/src/weights.rs index 19636b4d353..8209be44b67 100644 --- a/code/parachain/frame/bonded-finance/src/weights.rs +++ b/code/parachain/frame/bonded-finance/src/weights.rs @@ -13,12 +13,12 @@ pub trait WeightInfo { impl WeightInfo for () { fn offer() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn bond() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn cancel() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } } diff --git a/code/parachain/frame/call-filter/src/lib.rs b/code/parachain/frame/call-filter/src/lib.rs index d00cce73609..3f54c9864ed 100644 --- a/code/parachain/frame/call-filter/src/lib.rs +++ b/code/parachain/frame/call-filter/src/lib.rs @@ -41,10 +41,10 @@ pub mod pallet { #[pallet::config] pub trait Config: system::Config { /// Overarching event type - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The origin which may set, update or remove filter. - type UpdateOrigin: EnsureOrigin; + type UpdateOrigin: EnsureOrigin; // NOTE: can match by binary prefix which is much more efficient than string comparison. #[pallet::constant] @@ -164,11 +164,11 @@ pub mod pallet { } } - impl Contains for Pallet + impl Contains for Pallet where - ::Call: GetCallMetadata, + ::RuntimeCall: GetCallMetadata, { - fn contains(call: &T::Call) -> bool { + fn contains(call: &T::RuntimeCall) -> bool { let CallMetadata { function_name, pallet_name } = call.get_call_metadata(); match ( BoundedVec::try_from(pallet_name.as_bytes().to_vec()), diff --git a/code/parachain/frame/call-filter/src/mock.rs b/code/parachain/frame/call-filter/src/mock.rs index 9fe834d5590..a0992f14211 100644 --- a/code/parachain/frame/call-filter/src/mock.rs +++ b/code/parachain/frame/call-filter/src/mock.rs @@ -19,16 +19,16 @@ parameter_types! { } impl system::Config for Runtime { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -53,7 +53,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = NativeTokenExistentialDeposit; type AccountStore = System; type MaxLocks = (); @@ -75,7 +75,7 @@ impl Get for MaxStringSize { } impl Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UpdateOrigin = EnsureSignedBy; type Hook = (); type WeightInfo = (); diff --git a/code/parachain/frame/call-filter/src/tests.rs b/code/parachain/frame/call-filter/src/tests.rs index 3a37dee5f54..f48cd75ab45 100644 --- a/code/parachain/frame/call-filter/src/tests.rs +++ b/code/parachain/frame/call-filter/src/tests.rs @@ -5,7 +5,7 @@ use mock::{Event, *}; use sp_runtime::traits::BadOrigin; use support::{assert_noop, assert_ok}; -const BALANCE_TRANSFER: &::Call = +const BALANCE_TRANSFER: &::RuntimeCall = &mock::Call::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 }); #[test] fn pause_transaction_work() { diff --git a/code/parachain/frame/composable-support/src/abstractions/counter/test_storage_counter.rs b/code/parachain/frame/composable-support/src/abstractions/counter/test_storage_counter.rs index dcb247a18c6..0cda5be97ba 100644 --- a/code/parachain/frame/composable-support/src/abstractions/counter/test_storage_counter.rs +++ b/code/parachain/frame/composable-support/src/abstractions/counter/test_storage_counter.rs @@ -214,8 +214,8 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -223,7 +223,7 @@ impl frame_system::Config for Test { type AccountId = AccountId32; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); type Version = (); diff --git a/code/parachain/frame/composable-support/src/abstractions/nonce/test_storage_nonce.rs b/code/parachain/frame/composable-support/src/abstractions/nonce/test_storage_nonce.rs index 6035fc7df0e..22a558c6110 100644 --- a/code/parachain/frame/composable-support/src/abstractions/nonce/test_storage_nonce.rs +++ b/code/parachain/frame/composable-support/src/abstractions/nonce/test_storage_nonce.rs @@ -230,8 +230,8 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -239,7 +239,7 @@ impl frame_system::Config for Test { type AccountId = AccountId32; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); type Version = (); diff --git a/code/parachain/frame/cosmwasm/Cargo.toml b/code/parachain/frame/cosmwasm/Cargo.toml index bf008c1f013..71104c9d33d 100644 --- a/code/parachain/frame/cosmwasm/Cargo.toml +++ b/code/parachain/frame/cosmwasm/Cargo.toml @@ -69,8 +69,8 @@ lazy_static = { version = "1.4.0", default-features = false, features = [ "spin_no_std", ] } num-traits = { version = "0.2.14", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } rand = { version = "0.8.5", default-features = false, features = [ "alloc", diff --git a/code/parachain/frame/cosmwasm/src/lib.rs b/code/parachain/frame/cosmwasm/src/lib.rs index f4fc517bb64..f3fdbd294e5 100644 --- a/code/parachain/frame/cosmwasm/src/lib.rs +++ b/code/parachain/frame/cosmwasm/src/lib.rs @@ -207,7 +207,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config> + Debug { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type AccountIdExtended: Parameter + Member diff --git a/code/parachain/frame/cosmwasm/src/mock.rs b/code/parachain/frame/cosmwasm/src/mock.rs index 46f543f0120..b67b541b672 100644 --- a/code/parachain/frame/cosmwasm/src/mock.rs +++ b/code/parachain/frame/cosmwasm/src/mock.rs @@ -55,8 +55,8 @@ impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u32; type Hash = H256; @@ -64,7 +64,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -81,7 +81,7 @@ impl frame_system::Config for Test { impl governance_registry::Config for Test { type AssetId = CurrencyId; type WeightInfo = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; } parameter_types! { @@ -96,7 +96,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -114,7 +114,7 @@ impl orml_tokens::Config for Test { impl pallet_balances::Config for Test { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type MaxLocks = ConstU32<50>; @@ -260,7 +260,7 @@ impl ibc_primitives::IbcHandler> for IbcLoopback { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AccountIdExtended = AccountId; type PalletId = CosmwasmPalletId; type MaxFrames = MaxFrames; diff --git a/code/parachain/frame/crowdloan-rewards/src/lib.rs b/code/parachain/frame/crowdloan-rewards/src/lib.rs index 83790d91eaf..56e3ae6338d 100644 --- a/code/parachain/frame/crowdloan-rewards/src/lib.rs +++ b/code/parachain/frame/crowdloan-rewards/src/lib.rs @@ -146,7 +146,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; #[allow(missing_docs)] type Balance: Default @@ -175,7 +175,7 @@ pub mod pallet { type Time: Time; /// The origin that is allowed to `initialize` the pallet. - type AdminOrigin: EnsureOrigin; + type AdminOrigin: EnsureOrigin; /// A conversion function from `Self::Moment` to `Self::Balance` type Convert: Convert; diff --git a/code/parachain/frame/crowdloan-rewards/src/mocks.rs b/code/parachain/frame/crowdloan-rewards/src/mocks.rs index aaca8bdd353..3f47537fc46 100644 --- a/code/parachain/frame/crowdloan-rewards/src/mocks.rs +++ b/code/parachain/frame/crowdloan-rewards/src/mocks.rs @@ -45,16 +45,16 @@ parameter_types! { } impl system::Config for Test { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = BlockNumber; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = sp_runtime::generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -73,7 +73,7 @@ impl system::Config for Test { impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = (); type AccountStore = System; @@ -94,7 +94,7 @@ parameter_types! { } impl pallet_crowdloan_rewards::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RewardAsset = Balances; type Balance = Balance; type Convert = ConvertInto; diff --git a/code/parachain/frame/crowdloan-rewards/src/weights.rs b/code/parachain/frame/crowdloan-rewards/src/weights.rs index 98b22e0c4b7..f77c7c0756d 100644 --- a/code/parachain/frame/crowdloan-rewards/src/weights.rs +++ b/code/parachain/frame/crowdloan-rewards/src/weights.rs @@ -64,7 +64,8 @@ impl WeightInfo for () { .saturating_add(RocksDbWeight::get().writes(3 as u64)) } - fn unlock_rewards_for(x: u32) -> Weight { - x as _ + fn unlock_rewards_for(_x: u32) -> Weight { + // TODO(hussein-aitlahcen): extrinsic added without benchmark + Weight::from_ref_time(10_000 as u64) } } diff --git a/code/parachain/frame/currency-factory/src/lib.rs b/code/parachain/frame/currency-factory/src/lib.rs index 275acf36006..d8065786ffe 100644 --- a/code/parachain/frame/currency-factory/src/lib.rs +++ b/code/parachain/frame/currency-factory/src/lib.rs @@ -80,7 +80,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The currency which can be created from thin air. type AssetId: AssetIdLike @@ -95,7 +95,7 @@ pub mod pallet { type Balance: BalanceLike; /// can add new ranges or assign metadata - type AddOrigin: EnsureOrigin; + type AddOrigin: EnsureOrigin; type WeightInfo: WeightInfo; } diff --git a/code/parachain/frame/currency-factory/src/mocks.rs b/code/parachain/frame/currency-factory/src/mocks.rs index 0f990371274..b5673b09fa2 100644 --- a/code/parachain/frame/currency-factory/src/mocks.rs +++ b/code/parachain/frame/currency-factory/src/mocks.rs @@ -27,7 +27,7 @@ frame_support::construct_runtime!( ); impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = u128; type AddOrigin = EnsureRoot; @@ -44,8 +44,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -53,7 +53,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; diff --git a/code/parachain/frame/currency-factory/src/weights.rs b/code/parachain/frame/currency-factory/src/weights.rs index 6d5f8074ce5..531c5e28c04 100644 --- a/code/parachain/frame/currency-factory/src/weights.rs +++ b/code/parachain/frame/currency-factory/src/weights.rs @@ -20,16 +20,16 @@ impl WeightInfo for SubstrateWeight { } fn set_metadata() -> Weight { - 10_000 + Weight::from_ref_time(10_0000) } } impl WeightInfo for () { fn add_range() -> Weight { - 10_000 + Weight::from_ref_time(10_0000) } fn set_metadata() -> Weight { - 10_000 + Weight::from_ref_time(10_0000) } } diff --git a/code/parachain/frame/dex-router/Cargo.toml b/code/parachain/frame/dex-router/Cargo.toml index 85d02bb3b8b..5e701d1f720 100644 --- a/code/parachain/frame/dex-router/Cargo.toml +++ b/code/parachain/frame/dex-router/Cargo.toml @@ -37,8 +37,8 @@ version = "3.0.0" [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { version = "1.0.0", path = "../currency-factory" } pallet-pablo = { path = "../pablo" } diff --git a/code/parachain/frame/dex-router/src/lib.rs b/code/parachain/frame/dex-router/src/lib.rs index 5eb48ae0881..61ea197c1ed 100644 --- a/code/parachain/frame/dex-router/src/lib.rs +++ b/code/parachain/frame/dex-router/src/lib.rs @@ -49,7 +49,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type AssetId: FullCodec + MaxEncodedLen + Eq @@ -91,7 +91,7 @@ pub mod pallet { >; /// Required origin to update route operations. - type UpdateRouteOrigin: EnsureOrigin; + type UpdateRouteOrigin: EnsureOrigin; #[pallet::constant] type PalletId: Get; diff --git a/code/parachain/frame/dex-router/src/mock.rs b/code/parachain/frame/dex-router/src/mock.rs index 14646d5b270..9e5e5edc376 100644 --- a/code/parachain/frame/dex-router/src/mock.rs +++ b/code/parachain/frame/dex-router/src/mock.rs @@ -65,7 +65,7 @@ frame_support::construct_runtime!( ); impl pallet_currency_factory::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -82,8 +82,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -91,7 +91,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -112,7 +112,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -128,7 +128,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; @@ -181,7 +181,7 @@ parameter_types! { } impl pallet_staking_rewards::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type AssetId = AssetId; type Assets = Tokens; @@ -208,7 +208,7 @@ impl pallet_staking_rewards::Config for Test { } impl pallet_pablo::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = Balance; type CurrencyFactory = LpTokenFactory; @@ -232,7 +232,7 @@ parameter_types! { } impl dex_router::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = Balance; type MaxHopsInRoute = MaxHopsCount; diff --git a/code/parachain/frame/dutch-auction/Cargo.toml b/code/parachain/frame/dutch-auction/Cargo.toml index a7fb443ed94..5b96b958eda 100644 --- a/code/parachain/frame/dutch-auction/Cargo.toml +++ b/code/parachain/frame/dutch-auction/Cargo.toml @@ -29,8 +29,8 @@ frame-support = { default-features = false, git = "https://github.com/paritytech frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2.14", default-features = false } -orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", @@ -48,7 +48,7 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-assets = { path = '../assets' } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/dutch-auction/src/benchmarking.rs b/code/parachain/frame/dutch-auction/src/benchmarking.rs index 4500a708932..27f17afee2a 100644 --- a/code/parachain/frame/dutch-auction/src/benchmarking.rs +++ b/code/parachain/frame/dutch-auction/src/benchmarking.rs @@ -68,7 +68,7 @@ benchmarks! { T::NativeCurrency: Currency, T::AccountId: UncheckedFrom, T::CurrencyId: From, - T::Origin: From, + T::Origin: From, } add_configuration { let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); diff --git a/code/parachain/frame/dutch-auction/src/lib.rs b/code/parachain/frame/dutch-auction/src/lib.rs index fdb9119401e..0e3a75aed2c 100644 --- a/code/parachain/frame/dutch-auction/src/lib.rs +++ b/code/parachain/frame/dutch-auction/src/lib.rs @@ -130,7 +130,7 @@ pub mod pallet { #[pallet::config] #[pallet::disable_frame_system_supertrait_check] pub trait Config: DeFiComposableConfig + frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type UnixTime: UnixTime; type OrderId: OrderIdLike + WrappingNext + Zero + One; type MultiCurrency: MultiCurrency< @@ -151,10 +151,10 @@ pub mod pallet { #[pallet::constant] type PositionExistentialDeposit: Get; - type XcmOrigin: From<::Origin> + type XcmOrigin: From<::RuntimeOrigin> + Into::XcmOrigin>>; /// origin of admin of this pallet - type AdminOrigin: EnsureOrigin<::Origin>; + type AdminOrigin: EnsureOrigin<::RuntimeOrigin>; type XcmSender: SendXcm; } diff --git a/code/parachain/frame/dutch-auction/src/mock/runtime.rs b/code/parachain/frame/dutch-auction/src/mock/runtime.rs index 22a6577a558..92955800b9f 100644 --- a/code/parachain/frame/dutch-auction/src/mock/runtime.rs +++ b/code/parachain/frame/dutch-auction/src/mock/runtime.rs @@ -61,8 +61,8 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -70,7 +70,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -90,7 +90,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; @@ -121,7 +121,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -159,7 +159,7 @@ impl pallet_assets::Config for Runtime { } impl pallet_currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -178,7 +178,7 @@ impl DeFiComposableConfig for Runtime { } impl pallet_dutch_auction::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type OrderId = OrderId; type MultiCurrency = Assets; @@ -192,7 +192,7 @@ impl pallet_dutch_auction::Config for Runtime { } impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = (); } diff --git a/code/parachain/frame/fnft/src/lib.rs b/code/parachain/frame/fnft/src/lib.rs index 9d51210aa97..243bd084956 100644 --- a/code/parachain/frame/fnft/src/lib.rs +++ b/code/parachain/frame/fnft/src/lib.rs @@ -110,7 +110,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type MaxProperties: Get; diff --git a/code/parachain/frame/fnft/src/test/mock.rs b/code/parachain/frame/fnft/src/test/mock.rs index 428b17d1cfe..630f3f67f4d 100644 --- a/code/parachain/frame/fnft/src/test/mock.rs +++ b/code/parachain/frame/fnft/src/test/mock.rs @@ -51,7 +51,7 @@ impl FnftAccountProxyTypeSelector for MockFnftAccountProxyType { type AccountProxyWrapperInstance = AccountProxyWrapper; impl crate::Config for MockRuntime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxProperties = ConstU32<16>; type FinancialNftCollectionId = u128; type FinancialNftInstanceId = u64; @@ -77,8 +77,8 @@ parameter_types! { } impl pallet_proxy::Config for MockRuntime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = (); type ProxyType = ProxyType; type ProxyDepositBase = ProxyPrice; @@ -101,8 +101,8 @@ impl system::Config for MockRuntime { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -110,7 +110,7 @@ impl system::Config for MockRuntime { type AccountId = AccountId32; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; diff --git a/code/parachain/frame/governance-registry/Cargo.toml b/code/parachain/frame/governance-registry/Cargo.toml index 5dd986f29fb..ab35edbc41e 100644 --- a/code/parachain/frame/governance-registry/Cargo.toml +++ b/code/parachain/frame/governance-registry/Cargo.toml @@ -20,7 +20,7 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-traits = { path = "../composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } diff --git a/code/parachain/frame/governance-registry/src/lib.rs b/code/parachain/frame/governance-registry/src/lib.rs index 924e9f67e4e..de88a54dba5 100644 --- a/code/parachain/frame/governance-registry/src/lib.rs +++ b/code/parachain/frame/governance-registry/src/lib.rs @@ -44,7 +44,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type AssetId: AssetIdLike + Decode + MaxEncodedLen + Clone + core::fmt::Debug + Default; type WeightInfo: WeightInfo; } diff --git a/code/parachain/frame/governance-registry/src/mock.rs b/code/parachain/frame/governance-registry/src/mock.rs index 980b8ee58a6..f97ff512857 100644 --- a/code/parachain/frame/governance-registry/src/mock.rs +++ b/code/parachain/frame/governance-registry/src/mock.rs @@ -28,7 +28,7 @@ frame_support::construct_runtime!( impl Config for Test { type AssetId = AssetId; type WeightInfo = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; } parameter_types! { @@ -43,8 +43,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -52,7 +52,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -71,7 +71,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; diff --git a/code/parachain/frame/lending/Cargo.toml b/code/parachain/frame/lending/Cargo.toml index 165d5be29ef..cdf7e4517de 100644 --- a/code/parachain/frame/lending/Cargo.toml +++ b/code/parachain/frame/lending/Cargo.toml @@ -56,8 +56,8 @@ frame-executive = { default-features = false, git = "https://github.com/parityte ], branch = "polkadot-v0.9.30" } hex-literal = "0.3.3" once_cell = "1.8.0" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/lending/src/benchmarking/setup.rs b/code/parachain/frame/lending/src/benchmarking/setup.rs index e1256ca3d19..59027e5d132 100644 --- a/code/parachain/frame/lending/src/benchmarking/setup.rs +++ b/code/parachain/frame/lending/src/benchmarking/setup.rs @@ -42,7 +42,7 @@ pub(crate) fn produce_block( #[allow(dead_code)] pub(crate) fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/code/parachain/frame/lending/src/lib.rs b/code/parachain/frame/lending/src/lib.rs index 4241502a4f1..b5edc4112fc 100644 --- a/code/parachain/frame/lending/src/lib.rs +++ b/code/parachain/frame/lending/src/lib.rs @@ -123,7 +123,7 @@ pub mod pallet { pub trait Config: CreateSignedTransaction> + frame_system::Config + DeFiComposableConfig { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Oracle: Oracle< AssetId = ::MayBeAssetId, diff --git a/code/parachain/frame/lending/src/mocks/general.rs b/code/parachain/frame/lending/src/mocks/general.rs index d97a636d0df..940648acfdb 100644 --- a/code/parachain/frame/lending/src/mocks/general.rs +++ b/code/parachain/frame/lending/src/mocks/general.rs @@ -94,8 +94,8 @@ impl frame_system::Config for Runtime { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -103,7 +103,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -122,7 +122,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -146,7 +146,7 @@ impl pallet_timestamp::Config for Runtime { } impl pallet_currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -165,7 +165,7 @@ parameter_types! { } impl pallet_vault::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Tokens; type AssetId = CurrencyId; type Balance = Balance; @@ -196,7 +196,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -265,7 +265,7 @@ impl LocalAssets for Decimals { } impl pallet_oracle::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Assets; type AssetId = CurrencyId; type PriceValue = Balance; @@ -338,7 +338,7 @@ impl SendXcm for XcmFake { } impl pallet_dutch_auction::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type OrderId = OrderId; type MultiCurrency = Assets; @@ -352,7 +352,7 @@ impl pallet_dutch_auction::Config for Runtime { } impl pallet_liquidations::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type DutchAuction = DutchAuction; type LiquidationStrategyId = LiquidationStrategyId; @@ -424,7 +424,7 @@ impl pallet_lending::Config for Runtime { type VaultId = VaultId; type Vault = Vault; type VaultLender = Vault; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type NativeCurrency = Balances; type MultiCurrency = Tokens; type CurrencyFactory = LpTokenFactory; diff --git a/code/parachain/frame/lending/src/mocks/offchain.rs b/code/parachain/frame/lending/src/mocks/offchain.rs index a613fda305c..3b91f09e8d9 100644 --- a/code/parachain/frame/lending/src/mocks/offchain.rs +++ b/code/parachain/frame/lending/src/mocks/offchain.rs @@ -111,8 +111,8 @@ impl frame_system::Config for Runtime { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -120,7 +120,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -139,7 +139,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -163,7 +163,7 @@ impl pallet_timestamp::Config for Runtime { } impl pallet_currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -182,7 +182,7 @@ parameter_types! { } impl pallet_vault::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Tokens; type AssetId = CurrencyId; type Balance = Balance; @@ -213,7 +213,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -278,7 +278,7 @@ impl LocalAssets for Decimals { } impl pallet_oracle::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Assets; type AssetId = CurrencyId; type PriceValue = Balance; @@ -350,7 +350,7 @@ impl SendXcm for XcmFake { } impl pallet_dutch_auction::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type OrderId = OrderId; type MultiCurrency = Assets; @@ -364,7 +364,7 @@ impl pallet_dutch_auction::Config for Runtime { } impl pallet_liquidations::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type DutchAuction = DutchAuction; type LiquidationStrategyId = LiquidationStrategyId; @@ -434,7 +434,7 @@ impl pallet_lending::Config for Runtime { type VaultId = VaultId; type Vault = Vault; type VaultLender = Vault; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type NativeCurrency = Balances; type MultiCurrency = Tokens; type CurrencyFactory = LpTokenFactory; @@ -513,7 +513,7 @@ impl MockedExtension { impl SignedExtension for MockedExtension { type AccountId = AccountId; - type Call = Call; + type RuntimeCall = RuntimeCall; type AdditionalSigned = (); type Pre = (); const IDENTIFIER: &'static str = "MockedExtension"; diff --git a/code/parachain/frame/lending/src/tests/mod.rs b/code/parachain/frame/lending/src/tests/mod.rs index ac87dd53936..3d5599f71f8 100644 --- a/code/parachain/frame/lending/src/tests/mod.rs +++ b/code/parachain/frame/lending/src/tests/mod.rs @@ -36,7 +36,7 @@ pub const DEFAULT_MARKET_VAULT_STRATEGY_SHARE: Perquintill = Perquintill::from_p type SystemAccountIdOf = ::AccountId; type SystemOriginOf = ::Origin; -type SystemEventOf = ::Event; +type SystemEventOf = ::RuntimeEvent; pub type TestBoundedVec = BoundedVec; // Bounds for configuration generic type, used in create market helpers. diff --git a/code/parachain/frame/liquidations/Cargo.toml b/code/parachain/frame/liquidations/Cargo.toml index 54849201dc4..fd6fa452a17 100644 --- a/code/parachain/frame/liquidations/Cargo.toml +++ b/code/parachain/frame/liquidations/Cargo.toml @@ -32,7 +32,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } log = "0.4" -orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-assets = { default-features = false, path = "../assets" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-dutch-auction = { default-features = false, path = "../dutch-auction" } @@ -48,8 +48,8 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/liquidations/src/lib.rs b/code/parachain/frame/liquidations/src/lib.rs index ab7b2106568..d30f0f17cc0 100644 --- a/code/parachain/frame/liquidations/src/lib.rs +++ b/code/parachain/frame/liquidations/src/lib.rs @@ -82,7 +82,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + DeFiComposableConfig { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type UnixTime: UnixTime; @@ -108,13 +108,14 @@ pub mod pallet { type PalletId: Get; // /// when called, engine pops latest order to liquidate and pushes back result - // type Liquidate: Parameter + Dispatchable + From>; + // type Liquidate: Parameter + Dispatchable + + // From>; type WeightInfo: WeightInfo; /// is used to talk to external liquidation engines type XcmSender: xcm::latest::SendXcm; - type CanModifyStrategies: EnsureOrigin; + type CanModifyStrategies: EnsureOrigin; type MaxLiquidationStrategiesAmount: Get; } diff --git a/code/parachain/frame/liquidations/src/mock/runtime.rs b/code/parachain/frame/liquidations/src/mock/runtime.rs index f21c9ca8a8b..6ea7ca5aa57 100644 --- a/code/parachain/frame/liquidations/src/mock/runtime.rs +++ b/code/parachain/frame/liquidations/src/mock/runtime.rs @@ -64,8 +64,8 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -73,7 +73,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); type Version = (); @@ -93,7 +93,7 @@ parameter_types! { impl pallet_balances::Config for Runtime { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; @@ -124,7 +124,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -164,7 +164,7 @@ impl pallet_assets::Config for Runtime { } impl pallet_currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -220,7 +220,7 @@ impl SendXcm for XcmFake { } impl pallet_dutch_auction::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type OrderId = OrderId; type MultiCurrency = Assets; @@ -239,7 +239,7 @@ parameter_types! { type LiquidationStrategyId = u32; impl pallet_liquidations::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type OrderId = OrderId; type WeightInfo = SubstrateWeight; diff --git a/code/parachain/frame/mosaic/Cargo.toml b/code/parachain/frame/mosaic/Cargo.toml index 088d54cab92..7a4fa110e78 100644 --- a/code/parachain/frame/mosaic/Cargo.toml +++ b/code/parachain/frame/mosaic/Cargo.toml @@ -45,8 +45,8 @@ scale-info = { version = "2.1.1", default-features = false, features = [ [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" diff --git a/code/parachain/frame/mosaic/src/lib.rs b/code/parachain/frame/mosaic/src/lib.rs index 3e14e5a06c2..64efcf4c15d 100644 --- a/code/parachain/frame/mosaic/src/lib.rs +++ b/code/parachain/frame/mosaic/src/lib.rs @@ -64,7 +64,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type PalletId: Get; @@ -108,7 +108,7 @@ pub mod pallet { /// Origin capable of setting the relayer and AMM IDs. Intended to be RootOrHalfCouncil, as /// it is also used as the origin capable of stopping attackers. - type ControlOrigin: EnsureOrigin; + type ControlOrigin: EnsureOrigin; /// Weight implementation used for extrinsics. type WeightInfo: WeightInfo; diff --git a/code/parachain/frame/mosaic/src/mock.rs b/code/parachain/frame/mosaic/src/mock.rs index 07f44b12baf..515bf892981 100644 --- a/code/parachain/frame/mosaic/src/mock.rs +++ b/code/parachain/frame/mosaic/src/mock.rs @@ -55,8 +55,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -64,7 +64,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -85,7 +85,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; @@ -107,7 +107,7 @@ parameter_types! { } impl pallet_mosaic::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = MosaicPalletId; type Assets = Tokens; type MinimumTTL = MinimumTTL; diff --git a/code/parachain/frame/oracle/design/rewards/rewards-design.md b/code/parachain/frame/oracle/design/rewards/rewards-design.md index 8ae1255b991..27ccaf2c4e5 100644 --- a/code/parachain/frame/oracle/design/rewards/rewards-design.md +++ b/code/parachain/frame/oracle/design/rewards/rewards-design.md @@ -100,7 +100,7 @@ distribution ratio, + treasury::Config>, ::AccountId: From, ::AccountId: Into, - ::Event: From>, + ::RuntimeEvent: From>, ::Balance: From, { fn on_nonzero_unbalanced(amount: NegativeImbalance) { diff --git a/code/parachain/frame/oracle/src/benchmarking.rs b/code/parachain/frame/oracle/src/benchmarking.rs index fb07776d009..c7b05666524 100644 --- a/code/parachain/frame/oracle/src/benchmarking.rs +++ b/code/parachain/frame/oracle/src/benchmarking.rs @@ -23,7 +23,7 @@ const SEED: u32 = 0; fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/code/parachain/frame/oracle/src/lib.rs b/code/parachain/frame/oracle/src/lib.rs index 74e96f1b629..4004fc422b9 100644 --- a/code/parachain/frame/oracle/src/lib.rs +++ b/code/parachain/frame/oracle/src/lib.rs @@ -49,16 +49,14 @@ pub mod pallet { time::MS_PER_YEAR_NAIVE, }; use frame_support::{ - dispatch::{DispatchResult, DispatchResultWithPostInfo}, + dispatch::{DispatchClass, DispatchResult, DispatchResultWithPostInfo, Pays}, pallet_prelude::*, traits::{ BalanceStatus, Currency, EnsureOrigin, ExistenceRequirement::{AllowDeath, KeepAlive}, ReservableCurrency, Time, }, - transactional, - weights::{DispatchClass::Operational, Pays}, - PalletId, + transactional, PalletId, }; use frame_system::{ offchain::{ @@ -120,7 +118,7 @@ pub mod pallet { #[pallet::config] pub trait Config: CreateSignedTransaction> + frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Balance: BalanceLike + From; /// The currency mechanism. type Currency: ReservableCurrency; @@ -157,9 +155,9 @@ pub mod pallet { /// Blocks until price is considered stale type StalePrice: Get; /// Origin to add new price types - type AddOracle: EnsureOrigin; + type AddOracle: EnsureOrigin; /// Origin to manage rewards - type RewardOrigin: EnsureOrigin; + type RewardOrigin: EnsureOrigin; /// Upper bound for max answers for a price type MaxAnswerBound: Get; /// Upper bound for total assets available for the oracle @@ -705,7 +703,7 @@ pub mod pallet { /// - `asset_id`: id for the asset /// /// Emits `PriceSubmitted` event when successful. - #[pallet::weight((T::WeightInfo::submit_price(T::MaxAnswerBound::get()), Operational))] + #[pallet::weight((T::WeightInfo::submit_price(T::MaxAnswerBound::get()), DispatchClass::Operational))] pub fn submit_price( origin: OriginFor, price: T::PriceValue, diff --git a/code/parachain/frame/oracle/src/mock.rs b/code/parachain/frame/oracle/src/mock.rs index dfb90eaff1d..4795777cd06 100644 --- a/code/parachain/frame/oracle/src/mock.rs +++ b/code/parachain/frame/oracle/src/mock.rs @@ -62,8 +62,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -71,7 +71,7 @@ impl system::Config for Test { type AccountId = sp_core::sr25519::Public; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -91,7 +91,7 @@ parameter_types! { pub type Balance = u128; impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -157,7 +157,7 @@ parameter_types! { } impl pallet_oracle::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AuthorityId = crypto::BathurstStId; type Currency = Balances; type AssetId = AssetId; diff --git a/code/parachain/frame/pablo/Cargo.toml b/code/parachain/frame/pablo/Cargo.toml index f1cecac466b..5f727afb369 100644 --- a/code/parachain/frame/pablo/Cargo.toml +++ b/code/parachain/frame/pablo/Cargo.toml @@ -36,8 +36,8 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-currency-factory = { path = "../currency-factory" } pallet-staking-rewards = { path = "../staking-rewards" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/pablo/src/lib.rs b/code/parachain/frame/pablo/src/lib.rs index 43934c07eef..4785fe2330f 100644 --- a/code/parachain/frame/pablo/src/lib.rs +++ b/code/parachain/frame/pablo/src/lib.rs @@ -226,7 +226,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Type representing the unique ID of an asset. type AssetId: FullCodec @@ -281,10 +281,10 @@ pub mod pallet { type LocalAssets: LocalAssets>; /// Required origin for pool creation. - type PoolCreationOrigin: EnsureOrigin; + type PoolCreationOrigin: EnsureOrigin; /// Required origin to enable TWAP on pool. - type EnableTwapOrigin: EnsureOrigin; + type EnableTwapOrigin: EnsureOrigin; /// Time provider. type Time: Time; @@ -449,7 +449,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks for Pallet { fn on_initialize(_block_number: T::BlockNumber) -> Weight { - let mut weight: Weight = 0; + let mut weight: Weight = Weight::from_ref_time(0); let twap_enabled_pools: Vec = PriceCumulativeState::::iter_keys().collect(); for pool_id in twap_enabled_pools { @@ -473,7 +473,7 @@ pub mod pallet { }, ); if result.is_ok() { - weight += 1; + weight = weight.saturating_add(Weight::from_ref_time(1)); if let Some(updated_twap) = TWAPState::::get(pool_id) { #[allow(deprecated)] if let Ok(assets) = Self::pool_ordered_pair(pool_id) { diff --git a/code/parachain/frame/pablo/src/mock.rs b/code/parachain/frame/pablo/src/mock.rs index 0532ab77545..f040ce2955f 100644 --- a/code/parachain/frame/pablo/src/mock.rs +++ b/code/parachain/frame/pablo/src/mock.rs @@ -51,7 +51,7 @@ frame_support::construct_runtime!( ); impl pallet_currency_factory::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -81,8 +81,8 @@ impl system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; @@ -90,7 +90,7 @@ impl system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -116,7 +116,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; @@ -168,7 +168,7 @@ parameter_types! { } impl pallet_staking_rewards::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type AssetId = CurrencyId; type FinancialNft = pablo::mock_fnft::MockFnft; @@ -199,7 +199,7 @@ ord_parameter_types! { } impl pablo::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = AssetId; type Balance = Balance; type CurrencyFactory = LpTokenFactory; diff --git a/code/parachain/frame/pablo/src/weights.rs b/code/parachain/frame/pablo/src/weights.rs index 9dc1fc742fa..83ca11ad48d 100644 --- a/code/parachain/frame/pablo/src/weights.rs +++ b/code/parachain/frame/pablo/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { @@ -17,10 +17,22 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { - fn create() -> Weight {10_000} - fn add_liquidity() -> Weight {10_000} - fn remove_liquidity() -> Weight {10_000} - fn buy() -> Weight {10_000} - fn swap() -> Weight {10_000} - fn do_create_pool() -> Weight {10_000} + fn create() -> Weight { + Weight::from_ref_time(10_000 ) + } + fn add_liquidity() -> Weight { + Weight::from_ref_time(10_000 ) + } + fn remove_liquidity() -> Weight { + Weight::from_ref_time(10_000 ) + } + fn buy() -> Weight { + Weight::from_ref_time(10_000 ) + } + fn swap() -> Weight { + Weight::from_ref_time(10_000 ) + } + fn do_create_pool() -> Weight { + Weight::from_ref_time(10_000 ) + } } diff --git a/code/parachain/frame/privilege/src/lib.rs b/code/parachain/frame/privilege/src/lib.rs index 80c161bb36e..aa7058db633 100644 --- a/code/parachain/frame/privilege/src/lib.rs +++ b/code/parachain/frame/privilege/src/lib.rs @@ -84,7 +84,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type AccountId: Parameter + Member diff --git a/code/parachain/frame/staking-rewards/Cargo.toml b/code/parachain/frame/staking-rewards/Cargo.toml index b3e3ba5481d..a64d44327ca 100644 --- a/code/parachain/frame/staking-rewards/Cargo.toml +++ b/code/parachain/frame/staking-rewards/Cargo.toml @@ -17,7 +17,7 @@ frame-benchmarking = { default-features = false, optional = true, git = "https:/ frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = "0.4.17" -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } parity-scale-codec = { default-features = false, features = [ "derive", ], version = "3.0.0" } @@ -34,8 +34,8 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr env_logger = "0.9.0" frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } log = "0.4.17" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/staking-rewards/src/benchmarking.rs b/code/parachain/frame/staking-rewards/src/benchmarking.rs index 2c9d911e7dd..57be1d25f81 100644 --- a/code/parachain/frame/staking-rewards/src/benchmarking.rs +++ b/code/parachain/frame/staking-rewards/src/benchmarking.rs @@ -74,7 +74,7 @@ fn reward_config( fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/code/parachain/frame/staking-rewards/src/lib.rs b/code/parachain/frame/staking-rewards/src/lib.rs index a6ee012ab78..39b691d2bd1 100644 --- a/code/parachain/frame/staking-rewards/src/lib.rs +++ b/code/parachain/frame/staking-rewards/src/lib.rs @@ -290,7 +290,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The reward balance type. type Balance: Parameter @@ -374,10 +374,10 @@ pub mod pallet { type MaxRewardConfigsPerPool: Get; /// Required origin for reward pool creation. - type RewardPoolCreationOrigin: EnsureOrigin; + type RewardPoolCreationOrigin: EnsureOrigin; /// Required origin for reward pool creation. - type RewardPoolUpdateOrigin: EnsureOrigin; + type RewardPoolUpdateOrigin: EnsureOrigin; #[pallet::constant] type PicaAssetId: Get; diff --git a/code/parachain/frame/staking-rewards/src/runtime.rs b/code/parachain/frame/staking-rewards/src/runtime.rs index 7c4a63cf769..fad4a2dbfaa 100644 --- a/code/parachain/frame/staking-rewards/src/runtime.rs +++ b/code/parachain/frame/staking-rewards/src/runtime.rs @@ -79,8 +79,8 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -88,7 +88,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -107,7 +107,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -131,7 +131,7 @@ impl pallet_timestamp::Config for Test { } impl pallet_currency_factory::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRoot; type Balance = Balance; @@ -146,7 +146,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -204,7 +204,7 @@ parameter_types! { type AccountProxyWrapperInstance = AccountProxyWrapper; impl pallet_fnft::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxProperties = ConstU32<16>; type FinancialNftCollectionId = CurrencyId; type FinancialNftInstanceId = FinancialNftInstanceId; @@ -223,8 +223,8 @@ parameter_types! { } impl pallet_proxy::Config for Test { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = (); type ProxyType = ProxyType; type ProxyDepositBase = ProxyPrice; @@ -253,7 +253,7 @@ parameter_types! { } impl crate::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type AssetId = CurrencyId; type FinancialNft = FinancialNft; diff --git a/code/parachain/frame/staking-rewards/src/test_helpers.rs b/code/parachain/frame/staking-rewards/src/test_helpers.rs index 9e9dc2a8057..14e12165964 100644 --- a/code/parachain/frame/staking-rewards/src/test_helpers.rs +++ b/code/parachain/frame/staking-rewards/src/test_helpers.rs @@ -33,13 +33,14 @@ pub(crate) fn add_to_rewards_pot_and_assert( should_resume: bool, ) where Runtime: crate::Config + RuntimeTrait>, - ::Event: Parameter + ::RuntimeEvent: Parameter + Member + Debug + Clone + TryInto> + From>, - <::Event as TryInto>>::Error: Debug, + <::RuntimeEvent as TryInto>>::Error: + Debug, ::Origin: OriginTrait::AccountId>, { @@ -77,13 +78,14 @@ pub fn stake_and_assert( ) -> ::FinancialNftInstanceId where Runtime: crate::Config + RuntimeTrait>, - ::Event: Parameter + ::RuntimeEvent: Parameter + Member + Debug + Clone + TryInto> + From>, - <::Event as TryInto>>::Error: Debug, + <::RuntimeEvent as TryInto>>::Error: + Debug, ::Origin: OriginTrait::AccountId>, { @@ -129,13 +131,14 @@ pub fn unstake_and_assert( should_be_early_unstake: bool, ) where Runtime: crate::Config + RuntimeTrait>, - ::Event: Parameter + ::RuntimeEvent: Parameter + Member + Debug + Clone + TryInto> + From>, - <::Event as TryInto>>::Error: Debug, + <::RuntimeEvent as TryInto>>::Error: + Debug, ::Origin: OriginTrait::AccountId>, { @@ -522,13 +525,14 @@ pub fn split_and_assert( ) -> FinancialNftInstanceIdOf where Runtime: crate::Config + RuntimeTrait>, - ::Event: Parameter + ::RuntimeEvent: Parameter + Member + Debug + Clone + TryInto> + From>, - <::Event as TryInto>>::Error: Debug, + <::RuntimeEvent as TryInto>>::Error: + Debug, ::Origin: OriginTrait::AccountId>, { diff --git a/code/parachain/frame/vault/Cargo.toml b/code/parachain/frame/vault/Cargo.toml index da830394ba6..4a6a953ddef 100644 --- a/code/parachain/frame/vault/Cargo.toml +++ b/code/parachain/frame/vault/Cargo.toml @@ -40,8 +40,8 @@ scale-info = { version = "2.1.1", default-features = false, features = [ composable-tests-helpers = { version = "1.0.0", path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } once_cell = "1.8.0" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" serde = { version = '1.0.136' } diff --git a/code/parachain/frame/vault/src/benchmarking.rs b/code/parachain/frame/vault/src/benchmarking.rs index 6e64d47abaa..b99237ebc24 100644 --- a/code/parachain/frame/vault/src/benchmarking.rs +++ b/code/parachain/frame/vault/src/benchmarking.rs @@ -15,7 +15,7 @@ use sp_std::prelude::*; fn assert_last_event(generic_event: ::Event) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); let EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); } diff --git a/code/parachain/frame/vault/src/lib.rs b/code/parachain/frame/vault/src/lib.rs index 4b72a856ed1..d8657d1e02a 100644 --- a/code/parachain/frame/vault/src/lib.rs +++ b/code/parachain/frame/vault/src/lib.rs @@ -123,7 +123,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The Balance type used by the pallet for bookkeeping. `Config::Convert` is used for /// conversions to `u128`, which are used in the computations. diff --git a/code/parachain/frame/vault/src/mocks/currency_factory.rs b/code/parachain/frame/vault/src/mocks/currency_factory.rs index 4bff1cfa976..aa3e23843fb 100644 --- a/code/parachain/frame/vault/src/mocks/currency_factory.rs +++ b/code/parachain/frame/vault/src/mocks/currency_factory.rs @@ -60,7 +60,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Balance: Default; } diff --git a/code/parachain/frame/vault/src/mocks/strategy.rs b/code/parachain/frame/vault/src/mocks/strategy.rs index 9ff8196b44a..ecea98b1140 100644 --- a/code/parachain/frame/vault/src/mocks/strategy.rs +++ b/code/parachain/frame/vault/src/mocks/strategy.rs @@ -34,7 +34,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { #[allow(missing_docs)] - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Vault used to obtain funds from, report balances and return funds to. type Vault: ReportableStrategicVault< diff --git a/code/parachain/frame/vault/src/mocks/tests.rs b/code/parachain/frame/vault/src/mocks/tests.rs index 1315d7cc4f7..c42018f0d5b 100644 --- a/code/parachain/frame/vault/src/mocks/tests.rs +++ b/code/parachain/frame/vault/src/mocks/tests.rs @@ -34,16 +34,16 @@ parameter_types! { } impl system::Config for Test { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = BlockNumber; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -66,7 +66,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = BalanceExistentialDeposit; type AccountStore = System; @@ -91,7 +91,7 @@ parameter_types! { } impl pallet_vault::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Tokens; type AssetId = MockCurrencyId; type Balance = Balance; @@ -118,7 +118,7 @@ parameter_type_with_key! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = MockCurrencyId; @@ -134,12 +134,12 @@ impl orml_tokens::Config for Test { } impl crate::mocks::currency_factory::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; } impl crate::mocks::strategy::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Vault = Vaults; type Currency = Tokens; type PalletId = StrategyTestPalletID; diff --git a/code/parachain/frame/vesting/Cargo.toml b/code/parachain/frame/vesting/Cargo.toml index 6b82876b933..79c346edea7 100644 --- a/code/parachain/frame/vesting/Cargo.toml +++ b/code/parachain/frame/vesting/Cargo.toml @@ -25,10 +25,10 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur composable-support = { path = "../composable-support", default-features = false } composable-traits = { version = "1.0.0", path = "../../frame/composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } [dev-dependencies] -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/vesting/src/lib.rs b/code/parachain/frame/vesting/src/lib.rs index 778eece0945..1763106b609 100644 --- a/code/parachain/frame/vesting/src/lib.rs +++ b/code/parachain/frame/vesting/src/lib.rs @@ -119,7 +119,7 @@ pub mod module { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: MultiLockableCurrency; @@ -128,10 +128,10 @@ pub mod module { type MinVestedTransfer: Get>; /// Required origin for vested transfer. - type VestedTransferOrigin: EnsureOrigin; + type VestedTransferOrigin: EnsureOrigin; /// Required origin for updating schedules. - type UpdateSchedulesOrigin: EnsureOrigin; + type UpdateSchedulesOrigin: EnsureOrigin; /// Weight information for extrinsics in this module. type WeightInfo: WeightInfo; diff --git a/code/parachain/frame/vesting/src/mock.rs b/code/parachain/frame/vesting/src/mock.rs index 2e3af146081..6d1c8ec6773 100644 --- a/code/parachain/frame/vesting/src/mock.rs +++ b/code/parachain/frame/vesting/src/mock.rs @@ -55,8 +55,8 @@ parameter_types! { } impl frame_system::Config for Runtime { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -64,7 +64,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); type BlockLength = (); @@ -134,7 +134,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = MockCurrencyId; @@ -155,7 +155,7 @@ parameter_types! { } impl Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Tokens; type MinVestedTransfer = MinVestedTransfer; type VestedTransferOrigin = EnsureRoot; diff --git a/code/parachain/frame/vesting/src/weights.rs b/code/parachain/frame/vesting/src/weights.rs index da601381920..8e5efc5bbcf 100644 --- a/code/parachain/frame/vesting/src/weights.rs +++ b/code/parachain/frame/vesting/src/weights.rs @@ -25,7 +25,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; /// Weight functions needed for orml_vesting. diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index 73948889ebe..56fb533c4b6 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -133,6 +133,5 @@ runtime-benchmarks = [ ] std = ["picasso-runtime/std", "composable-runtime/std", "dali-runtime/std"] - [package.metadata.cargo-udeps.ignore] normal = ["pallet-bonded-finance"] diff --git a/code/parachain/runtime/common/Cargo.toml b/code/parachain/runtime/common/Cargo.toml index 34ade515250..078211c745f 100644 --- a/code/parachain/runtime/common/Cargo.toml +++ b/code/parachain/runtime/common/Cargo.toml @@ -40,7 +40,7 @@ treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/s composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } num-traits = { version = "0.2.14", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } primitives = { path = "../primitives", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", @@ -49,7 +49,7 @@ smallvec = "1.7.0" [dev-dependencies] authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } serde = { version = "1.0.136" } sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/common/src/fees.rs b/code/parachain/runtime/common/src/fees.rs index f7d86c7a187..fac08281e4c 100644 --- a/code/parachain/runtime/common/src/fees.rs +++ b/code/parachain/runtime/common/src/fees.rs @@ -24,7 +24,7 @@ impl WeightToFeePolynomial for WeightToFeeConverter { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { let p = CurrencyId::milli::(); - let q = 10 * Balance::from(ExtrinsicBaseWeight::get()); + let q = 10 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); smallvec::smallvec![WeightToFeeCoefficient { degree: 1, negative: false, diff --git a/code/parachain/runtime/common/src/lib.rs b/code/parachain/runtime/common/src/lib.rs index 9bb2f94e862..f7cd52f5d6f 100644 --- a/code/parachain/runtime/common/src/lib.rs +++ b/code/parachain/runtime/common/src/lib.rs @@ -135,12 +135,12 @@ mod constants { pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 2 seconds of compute with a 6 second average block time. - pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2; + pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND.saturating_div(2); } parameter_types! { - pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; - pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); + pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); } parameter_types! { diff --git a/code/parachain/runtime/common/src/rewards.rs b/code/parachain/runtime/common/src/rewards.rs index fd5b3e097de..bfab665c406 100644 --- a/code/parachain/runtime/common/src/rewards.rs +++ b/code/parachain/runtime/common/src/rewards.rs @@ -14,7 +14,7 @@ where + treasury::Config>, ::AccountId: From, ::AccountId: Into, - ::Event: From>, + ::RuntimeEvent: From>, ::Balance: From, { fn on_nonzero_unbalanced(amount: NegativeImbalance) { @@ -82,16 +82,16 @@ mod tests { impl frame_system::Config for Test { type BaseCallFilter = Everything; - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; type BlockNumber = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = BlockLength; type BlockWeights = (); @@ -113,7 +113,7 @@ mod tests { impl balances::Config for Test { type Balance = u128; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -148,7 +148,7 @@ mod tests { } impl collator_selection::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type UpdateOrigin = EnsureRoot; type PotId = PotId; @@ -171,7 +171,7 @@ mod tests { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -198,8 +198,8 @@ mod tests { } impl sudo::Config for Test { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } parameter_types! { @@ -220,7 +220,7 @@ mod tests { type Currency = Balances; type ApproveOrigin = EnsureRoot; type RejectOrigin = EnsureRoot; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; diff --git a/code/parachain/runtime/common/src/xcmp.rs b/code/parachain/runtime/common/src/xcmp.rs index be3ab41b746..65dbb534846 100644 --- a/code/parachain/runtime/common/src/xcmp.rs +++ b/code/parachain/runtime/common/src/xcmp.rs @@ -30,11 +30,11 @@ match_types! { } parameter_types! { - pub const BaseXcmWeight: Weight = 100_000_000; + pub const BaseXcmWeight: u64 = 100_000_000; pub const XcmMaxAssetsForTransfer: usize = 2; pub RelayNativeLocation: MultiLocation = MultiLocation::parent(); pub RelayOrigin: cumulus_pallet_xcm::Origin = cumulus_pallet_xcm::Origin::Relay; - pub const UnitWeightCost: Weight = 200_000_000; + pub const UnitWeightCost: u64 = 200_000_000; pub const MaxInstructions: u32 = 100; } pub struct ThisChain(PhantomData); @@ -71,10 +71,10 @@ impl< > TransactionFeePoolTrader { pub fn weight_to_asset( - weight: Weight, + weight: u64, asset_id: CurrencyId, ) -> Result<(Balance, Balance), XcmError> { - let fee = WeightToFeeConverter::weight_to_fee(&weight); + let fee = WeightToFeeConverter::weight_to_fee(&Weight::from_ref_time(weight)); log::trace!(target : "xcmp::weight_to_asset", "required payment in native token is: {:?}", fee ); let price = PriceConverter::to_asset_balance(fee, asset_id).map_err(|_| XcmError::TooExpensive)?; @@ -101,7 +101,7 @@ impl< } } - fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result { + fn buy_weight(&mut self, weight: u64, payment: Assets) -> Result { if weight.is_zero() { return Ok(payment) } @@ -132,9 +132,9 @@ impl< Err(XcmError::TooExpensive) } - fn refund_weight(&mut self, weight: Weight) -> Option { + fn refund_weight(&mut self, weight: u64) -> Option { if let Some(ref asset_location) = self.asset_location { - let fee = WeightToFeeConverter::weight_to_fee(&weight); + let fee = WeightToFeeConverter::weight_to_fee(&Weight::from_ref_time(weight)); let fee = self.fee.min(fee); let price = fee.saturating_mul(self.price) / self.fee; self.price = self.price.saturating_sub(price); diff --git a/code/parachain/runtime/composable/Cargo.toml b/code/parachain/runtime/composable/Cargo.toml index db3e2da59ff..401a52e9a99 100644 --- a/code/parachain/runtime/composable/Cargo.toml +++ b/code/parachain/runtime/composable/Cargo.toml @@ -51,8 +51,8 @@ crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/ democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -115,9 +115,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } [features] builtin-wasm = [] diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index 50d9890121c..17559c3a370 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -24,11 +24,13 @@ pub const WASM_BINARY_V2: Option<&[u8]> = None; mod weights; mod xcmp; + use common::{ rewards::StakingPot, AccountId, AccountIndex, Address, Amount, AuraId, Balance, BlockNumber, ForeignAssetId, Hash, Moment, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MILLISECS_PER_BLOCK, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; +use composable_support::rpc_helpers::SafeRpcWrapper; use composable_traits::assets::Asset; use orml_traits::parameter_type_with_key; use primitives::currency::{CurrencyId, ValidateCurrencyId}; @@ -40,46 +42,40 @@ use sp_runtime::{ transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, }; - -use composable_support::rpc_helpers::SafeRpcWrapper; use sp_std::prelude::*; #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; - // A few exports that help ease life for downstream crates. +use codec::Encode; pub use frame_support::{ - construct_runtime, parameter_types, + construct_runtime, + pallet_prelude::DispatchClass, + parameter_types, traits::{ Contains, EitherOfDiverse, Everything, KeyOwnerProofSystem, LockIdentifier, Nothing, Randomness, StorageInfo, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, + IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, PalletId, StorageValue, }; - -use codec::{Codec, Encode, EncodeLike}; use frame_support::{ traits::{EqualPrivilegeOnly, OnRuntimeUpgrade}, weights::ConstantMultiplier, }; use frame_system as system; -use scale_info::TypeInfo; -use sp_runtime::AccountId32; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; -use sp_std::fmt::Debug; use system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, }; use transaction_payment::{Multiplier, TargetedFeeAdjustment}; - pub type CouncilInstance = collective::Instance1; pub type EnsureRootOrHalfCouncil = EitherOfDiverse< EnsureRoot, @@ -173,7 +169,7 @@ impl system::Config for Runtime { /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The aggregated dispatch type that is available for extrinsics. - type Call = Call; + type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. @@ -187,9 +183,9 @@ impl system::Config for Runtime { /// The header type. type Header = generic::Header; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; /// The weight of database operations that the runtime can invoke. @@ -262,7 +258,7 @@ impl balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = Treasury; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -293,7 +289,7 @@ impl WeightToFeePolynomial for WeightToFee { type Balance = Balance; fn polynomial() -> WeightToFeeCoefficients { let p = CurrencyId::milli::(); - let q = 10 * Balance::from(ExtrinsicBaseWeight::get()); + let q = 10 * Balance::from(ExtrinsicBaseWeight::get().ref_time()); smallvec::smallvec![WeightToFeeCoefficient { degree: 1, negative: false, @@ -306,7 +302,7 @@ impl WeightToFeePolynomial for WeightToFee { type NativeTreasury = treasury::Instance1; impl transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = transaction_payment::CurrencyAdapter>; type WeightToFee = WeightToFee; @@ -317,8 +313,8 @@ impl transaction_payment::Config for Runtime { } impl sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } parameter_types! { @@ -327,25 +323,28 @@ parameter_types! { } impl indices::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; type WeightInfo = weights::indices::WeightInfo; } -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; impl system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: AccountIndex, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<( + RuntimeCall, + ::SignaturePayload, + )> { use sp_runtime::{ generic::{Era, SignedPayload}, traits::StaticLookup, @@ -390,9 +389,9 @@ impl system::offchain::SigningTypes for Runtime { impl system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } @@ -412,13 +411,13 @@ parameter_types! { // See https://github.com/paritytech/cumulus/blob/polkadot-v0.9.8/polkadot-parachains/rococo/src/lib.rs for details. parameter_types! { /// 1/4 of block weight is reserved for XCMP - pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); /// 1/4 of block weight is reserved for handling Downward messages - pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); } impl cumulus_pallet_parachain_system::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; @@ -448,7 +447,7 @@ parameter_types! { } impl session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = ::AccountId; // we don't have stash and controller, thus we don't need the convert as well. type ValidatorIdOf = collator_selection::IdentityCollator; @@ -473,7 +472,7 @@ parameter_types! { } impl collator_selection::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type UpdateOrigin = EnsureRootOrHalfCouncil; type PotId = PotId; @@ -523,7 +522,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -536,6 +535,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = DustRemovalWhitelist; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { @@ -556,7 +558,7 @@ impl treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrHalfCouncil; type RejectOrigin = EnsureRootOrHalfCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -578,7 +580,7 @@ parameter_types! { } impl membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRootOrHalfCouncil; type RemoveOrigin = EnsureRootOrHalfCouncil; type SwapOrigin = EnsureRootOrHalfCouncil; @@ -591,9 +593,9 @@ impl membership::Config for Runtime { } impl collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -609,10 +611,10 @@ parameter_types! { } impl scheduler::Config for Runtime { - type Event = Event; - type Origin = Origin; + type RuntimeEvent = RuntimeEvent; + type RuntimeOrigin = RuntimeOrigin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type OriginPrivilegeCmp = EqualPrivilegeOnly; @@ -629,7 +631,7 @@ parameter_types! { impl preimage::Config for Runtime { type WeightInfo = preimage::weights::SubstrateWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -638,20 +640,20 @@ impl preimage::Config for Runtime { } impl utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::utility::WeightInfo; } impl governance_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type WeightInfo = (); } impl currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRootOrHalfCouncil; type WeightInfo = weights::currency_factory::WeightInfo; @@ -672,12 +674,12 @@ parameter_types! { pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; pub const DemocracyId: LockIdentifier = *b"democrac"; - pub RootOrigin: Origin = frame_system::RawOrigin::Root.into(); + pub RootOrigin: RuntimeOrigin = frame_system::RawOrigin::Root.into(); } -impl democracy::Config for Runtime { - type Proposal = Call; - type Event = Event; +impl democracy::Config for Runtime { + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type LaunchPeriod = LaunchPeriod; @@ -710,10 +712,6 @@ impl democracy::Config for Runtime { type PreimageByteDeposit = PreimageByteDeposit; type Scheduler = Scheduler; type WeightInfo = weights::democracy::WeightInfo; - type EnsureRoot = EnsureRoot; - type DemocracyId = DemocracyId; - type Origin = Origin; - type ProtocolRoot = RootOrigin; } parameter_types! { @@ -727,7 +725,7 @@ parameter_types! { } impl crowdloan_rewards::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type RewardAsset = Assets; type AdminOrigin = EnsureRootOrHalfCouncil; @@ -759,10 +757,13 @@ parameter_types! { /// The calls we permit to be executed by extrinsics pub struct BaseCallFilter; -impl Contains for BaseCallFilter { - fn contains(call: &Call) -> bool { +impl Contains for BaseCallFilter { + fn contains(call: &RuntimeCall) -> bool { // TODO: not up to date as whole composable setup - !matches!(call, Call::Tokens(_) | Call::Indices(_) | Call::Democracy(_) | Call::Treasury(_)) + !matches!( + call, + RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | /*RuntimeCall::Democracy(_) |*/ RuntimeCall::Treasury(_) + ) } } @@ -796,7 +797,7 @@ construct_runtime!( Council: collective:: = 30, CouncilMembership: membership:: = 31, Treasury: treasury:: = 32, - Democracy: democracy:: = 33, + Democracy: democracy = 33, Scheduler: scheduler = 34, Utility: utility = 35, Preimage: preimage = 36, @@ -834,9 +835,10 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; -// Migration for scheduler pallet to move from a plain Call to a CallOrHash. +// Migration for scheduler pallet to move from a plain RuntimeCall to a CallOrHash. pub struct SchedulerMigrationV3; impl OnRuntimeUpgrade for SchedulerMigrationV3 { fn on_runtime_upgrade() -> frame_support::weights::Weight { diff --git a/code/parachain/runtime/composable/src/xcmp.rs b/code/parachain/runtime/composable/src/xcmp.rs index 143c1e1bc6a..c7b6765ac37 100644 --- a/code/parachain/runtime/composable/src/xcmp.rs +++ b/code/parachain/runtime/composable/src/xcmp.rs @@ -19,7 +19,7 @@ use frame_support::{ }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, + IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, PalletId, @@ -54,7 +54,7 @@ use xcm_executor::{ parameter_types! { // pub const RelayLocation: MultiLocation = MultiLocation::X1(Junction::Parent); pub const RelayNetwork: NetworkId = NetworkId::Kusama; - pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); + pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); } @@ -108,21 +108,21 @@ pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for // foreign chains who want to have a local sovereign account on this chain which they control. - SovereignSignedViaLocation, + SovereignSignedViaLocation, // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when // recognized. - RelayChainAsNative, + RelayChainAsNative, // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when // recognized. - SiblingParachainAsNative, + SiblingParachainAsNative, // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a // transaction from the Root origin. - xcm_builder::ParentAsSuperuser, + xcm_builder::ParentAsSuperuser, // Native signed account converter; this just converts an `AccountId32` origin into a normal // `Origin::Signed` origin of the same 32-byte value. - SignedAccountId32AsNative, + SignedAccountId32AsNative, // Xcm origins can be represented natively under the Xcm pallet's Xcm origin. - XcmPassthrough, + XcmPassthrough, ); #[cfg(feature = "develop")] @@ -138,13 +138,13 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< >; parameter_types! { - pub const BaseXcmWeight: Weight = 0; + pub const BaseXcmWeight: u64 = 0; pub const MaxInstructions: u32 = 10_000; } pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; #[cfg(not(feature = "develop"))] @@ -158,7 +158,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); // <- should be enough to allow teleportation of PICA type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = (); @@ -181,31 +181,31 @@ impl Convert for AccountIdToMultiLocation { } impl pallet_xcm::Config for Runtime { - type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; + type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; /// https://medium.com/kusama-network/kusamas-governance-thwarts-would-be-attacker-9023180f6fb type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type LocationInverter = LocationInverter; - type Weigher = FixedWeightBounds; - type Origin = Origin; - type Call = Call; + type Weigher = FixedWeightBounds; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } impl cumulus_pallet_xcmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type VersionWrapper = (); type ChannelInfo = ParachainSystem; @@ -216,7 +216,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { } impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRootOrHalfCouncil; } diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 913fcbecc57..736c436d6c5 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -52,8 +52,8 @@ identity = { package = "pallet-identity", git = "https://github.com/paritytech/s indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -137,9 +137,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } # IBC support ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } diff --git a/code/parachain/runtime/dali/src/governance.rs b/code/parachain/runtime/dali/src/governance.rs index 947de9b1aab..d09faf5afe9 100644 --- a/code/parachain/runtime/dali/src/governance.rs +++ b/code/parachain/runtime/dali/src/governance.rs @@ -16,7 +16,7 @@ parameter_types! { } impl membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRootOrHalfNativeCouncil; type RemoveOrigin = EnsureRootOrHalfNativeCouncil; type SwapOrigin = EnsureRootOrHalfNativeCouncil; @@ -29,9 +29,9 @@ impl membership::Config for Runtime { } impl collective::Config for Runtime { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -40,7 +40,7 @@ impl collective::Config for Runtime { } impl membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRootOrHalfNativeCouncilOrTechnical; type RemoveOrigin = EnsureRootOrHalfNativeCouncilOrTechnical; @@ -55,9 +55,9 @@ impl membership::Config for Runtime { } impl collective::Config for Runtime { - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -87,7 +87,7 @@ parameter_types! { impl democracy::Config for Runtime { type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type LaunchPeriod = LaunchPeriod; @@ -123,7 +123,7 @@ impl democracy::Config for Runtime { type WeightInfo = weights::democracy::WeightInfo; type EnsureRoot = EnsureRoot; type DemocracyId = DemocracyId; - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type ProtocolRoot = RootOrigin; } @@ -133,7 +133,7 @@ impl treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrHalfNativeCouncil; type RejectOrigin = EnsureRootOrHalfNativeCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -149,7 +149,7 @@ impl treasury::Config for Runtime { } impl governance_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type WeightInfo = governance_registry::weights::SubstrateWeight; } diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index bcf7808a71a..65b18a83a36 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -200,7 +200,7 @@ impl system::Config for Runtime { /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The aggregated dispatch type that is available for extrinsics. - type Call = Call; + type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. @@ -214,9 +214,9 @@ impl system::Config for Runtime { /// The header type. type Header = generic::Header; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; /// The weight of database operations that the runtime can invoke. @@ -270,7 +270,7 @@ parameter_types! { impl identity::Config for Runtime { type BasicDeposit = BasicDeposit; type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type FieldDeposit = FieldDeposit; type ForceOrigin = EnsureRoot; type MaxAdditionalFields = MaxAdditionalFields; @@ -289,11 +289,11 @@ parameter_types! { } impl multisig::Config for Runtime { - type Call = Call; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxSignatories = MaxSignatories; type WeightInfo = weights::multisig::WeightInfo; } @@ -326,7 +326,7 @@ impl balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = Treasury; type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; @@ -353,7 +353,7 @@ parameter_types! { } impl transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = transaction_payment::CurrencyAdapter>; type OperationalFeeMultiplier = OperationalFeeMultiplier; @@ -396,8 +396,8 @@ impl asset_tx_payment::Config for Runtime { } impl sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } parameter_types! { @@ -406,7 +406,7 @@ parameter_types! { } impl indices::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; @@ -493,7 +493,7 @@ parameter_types! { } impl oracle::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Currency = Balances; type AssetId = CurrencyId; @@ -528,7 +528,7 @@ parameter_types! { } impl cumulus_pallet_parachain_system::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; @@ -559,7 +559,7 @@ parameter_types! { } impl session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = ::AccountId; // we don't have stash and controller, thus we don't need the convert as well. type ValidatorIdOf = collator_selection::IdentityCollator; @@ -584,7 +584,7 @@ parameter_types! { } impl collator_selection::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type UpdateOrigin = EnsureRootOrHalfNativeCouncil; type PotId = PotId; @@ -614,7 +614,7 @@ parameter_types! { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -656,10 +656,10 @@ parameter_types! { } impl scheduler::Config for Runtime { - type Event = Event; - type Origin = Origin; + type RuntimeEvent = RuntimeEvent; + type RuntimeOrigin = RuntimeOrigin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type OriginPrivilegeCmp = EqualPrivilegeOnly; @@ -670,8 +670,8 @@ impl scheduler::Config for Runtime { } impl utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::utility::WeightInfo; } @@ -710,8 +710,8 @@ parameter_types! { } impl proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Assets; type ProxyType = ProxyType; type ProxyDepositBase = ProxyPrice; @@ -730,7 +730,7 @@ parameter_types! { } impl pallet_fnft::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxProperties = ConstU32<16>; type FinancialNftCollectionId = CurrencyId; type FinancialNftInstanceId = FinancialNftInstanceId; @@ -748,7 +748,7 @@ parameter_types! { impl preimage::Config for Runtime { type WeightInfo = preimage::weights::SubstrateWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -769,7 +769,7 @@ parameter_types! { } impl vault::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type CurrencyFactory = CurrencyFactory; type AssetId = CurrencyId; @@ -789,7 +789,7 @@ impl vault::Config for Runtime { } impl currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRootOrHalfNativeCouncil; type WeightInfo = weights::currency_factory::WeightInfo; @@ -797,7 +797,7 @@ impl currency_factory::Config for Runtime { } impl assets_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocalAssetId = CurrencyId; type CurrencyFactory = CurrencyFactory; type ForeignAssetId = composable_traits::xcm::assets::XcmAssetLocation; @@ -831,7 +831,7 @@ parameter_types! { } impl crowdloan_rewards::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type RewardAsset = Assets; type AdminOrigin = EnsureRootOrHalfNativeCouncil; @@ -863,7 +863,7 @@ parameter_types! { } impl pallet_staking_rewards::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type AssetId = CurrencyId; type Assets = Assets; @@ -901,7 +901,7 @@ impl Contains for BaseCallFilter { } impl call_filter::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UpdateOrigin = EnsureRootOrOneThirdNativeTechnical; type Hook = (); type WeightInfo = (); @@ -915,7 +915,7 @@ parameter_types! { impl vesting::Config for Runtime { type Currency = Assets; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxVestingSchedules = MaxVestingSchedule; type MinVestedTransfer = MinVestedTransfer; type VestedTransferOrigin = EnsureRootOrHalfNativeCouncil; @@ -938,7 +938,7 @@ impl bonded_finance::Config for Runtime { type BondOfferId = BondOfferId; type Convert = sp_runtime::traits::ConvertInto; type Currency = Assets; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MinReward = MinReward; type NativeCurrency = Balances; type PalletId = BondedFinanceId; @@ -958,7 +958,7 @@ impl composable_traits::defi::DeFiComposableConfig for Runtime { impl dutch_auction::Config for Runtime { type NativeCurrency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MultiCurrency = Assets; type PalletId = DutchAuctionId; type OrderId = u128; @@ -977,7 +977,7 @@ parameter_types! { } impl mosaic::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type PalletId = MosaicId; type Assets = Assets; type MinimumTTL = MinimumTTL; @@ -999,7 +999,7 @@ parameter_types! { } impl liquidations::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UnixTime = Timestamp; type DutchAuction = DutchAuction; type LiquidationStrategyId = LiquidationStrategyId; @@ -1019,7 +1019,7 @@ parameter_types! { } impl lending::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Oracle = Oracle; type VaultId = u64; type Vault = Vault; @@ -1045,7 +1045,7 @@ parameter_types! { } impl pablo::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type Balance = Balance; type Convert = ConvertInto; @@ -1069,7 +1069,7 @@ parameter_types! { } impl dex_router::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type Balance = Balance; type MaxHopsInRoute = MaxHopsCount; @@ -1143,7 +1143,7 @@ parameter_types! { } impl cosmwasm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AccountIdExtended = AccountId; type PalletId = CosmwasmPalletId; type MaxFrames = MaxFrames; @@ -1275,7 +1275,7 @@ impl DenomToAssetId for IbcDenomToAssetIdConversion { impl pallet_ibc::Config for Runtime { type TimeProvider = Timestamp; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type NativeCurrency = Balances; type Balance = Balance; type AssetId = CurrencyId; @@ -1298,7 +1298,7 @@ impl pallet_ibc::Config for Runtime { } impl pallet_ibc_ping::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type IbcHandler = Ibc; } diff --git a/code/parachain/runtime/dali/src/xcmp.rs b/code/parachain/runtime/dali/src/xcmp.rs index e1f03db934a..bf9eae2dacb 100644 --- a/code/parachain/runtime/dali/src/xcmp.rs +++ b/code/parachain/runtime/dali/src/xcmp.rs @@ -192,7 +192,7 @@ pub type CaptureAssetTrap = CaptureDropAssets< pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToTransactDispatchOrigin; @@ -236,7 +236,7 @@ parameter_type_with_key! { } impl orml_xtokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type CurrencyId = CurrencyId; type CurrencyIdConvert = AssetsIdConverter; @@ -253,7 +253,7 @@ impl orml_xtokens::Config for Runtime { } impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; } parameter_types! { @@ -319,7 +319,7 @@ impl Contains<(MultiLocation, Xcm)> for RootExecuteFilter { } impl pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmRouter = XcmRouter; type SendXcmOrigin = EnsureXcmOrigin; type ExecuteXcmOrigin = EnsureXcmOrigin; @@ -329,20 +329,20 @@ impl pallet_xcm::Config for Runtime { type XcmReserveTransferFilter = Everything; type LocationInverter = LocationInverter; type Weigher = FixedWeightBounds; - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = VERSION_DISCOVERY_QUEUE_SIZE; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } impl cumulus_pallet_xcmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type VersionWrapper = RelayerXcm; type ChannelInfo = ParachainSystem; @@ -353,7 +353,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { } impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRootOrHalfNativeCouncil; } diff --git a/code/parachain/runtime/picasso/Cargo.toml b/code/parachain/runtime/picasso/Cargo.toml index b6d4c5ee1dd..120857f8ae3 100644 --- a/code/parachain/runtime/picasso/Cargo.toml +++ b/code/parachain/runtime/picasso/Cargo.toml @@ -54,8 +54,8 @@ identity = { package = "pallet-identity", git = "https://github.com/paritytech/s indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -125,9 +125,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "504d11bd1af3613a0e66b47b99713675e9b6bd10", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } [features] builtin-wasm = [] diff --git a/code/parachain/runtime/picasso/src/governance.rs b/code/parachain/runtime/picasso/src/governance.rs index 1af7d0ab0d4..3589d16bc07 100644 --- a/code/parachain/runtime/picasso/src/governance.rs +++ b/code/parachain/runtime/picasso/src/governance.rs @@ -4,7 +4,7 @@ use super::*; use common::governance::native::*; use frame_support::traits::LockIdentifier; -pub type NativeDemocracy = democracy::Instance1; +// pub type NativeDemocracy = democracy::Instance1; pub type NativeCouncilMembership = membership::Instance1; pub type NativeTechnicalMembership = membership::Instance2; @@ -16,7 +16,7 @@ parameter_types! { } impl membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRootOrTwoThirdNativeCouncil; type RemoveOrigin = EnsureRootOrTwoThirdNativeCouncil; type SwapOrigin = EnsureRootOrTwoThirdNativeCouncil; @@ -29,9 +29,9 @@ impl membership::Config for Runtime { } impl collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -40,7 +40,7 @@ impl collective::Config for Runtime { } impl membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureRootOrTwoThirdNativeCouncilOrTechnical; type RemoveOrigin = EnsureRootOrTwoThirdNativeCouncilOrTechnical; type SwapOrigin = EnsureRootOrTwoThirdNativeCouncilOrTechnical; @@ -53,9 +53,9 @@ impl membership::Config for Runtime { } impl collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; @@ -82,12 +82,12 @@ parameter_types! { pub const MaxProposals: u32 = 100; // cspell:disable-next pub const DemocracyId: LockIdentifier = *b"democrac"; - pub RootOrigin: Origin = frame_system::RawOrigin::Root.into(); + pub RootOrigin: RuntimeOrigin = frame_system::RawOrigin::Root.into(); } -impl democracy::Config for Runtime { - type Proposal = Call; - type Event = Event; +impl democracy::Config for Runtime { + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type LaunchPeriod = LaunchPeriod; @@ -122,10 +122,6 @@ impl democracy::Config for Runtime { type PreimageByteDeposit = PreimageByteDeposit; type Scheduler = Scheduler; type WeightInfo = weights::democracy::WeightInfo; - type EnsureRoot = EnsureRoot; - type DemocracyId = DemocracyId; - type Origin = Origin; - type ProtocolRoot = RootOrigin; } parameter_types! { @@ -146,7 +142,7 @@ impl treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = EnsureRootOrTwoThirdNativeCouncil; type RejectOrigin = EnsureRootOrTwoThirdNativeCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; @@ -162,7 +158,7 @@ impl treasury::Config for Runtime { } impl governance_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type WeightInfo = (); } diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index d2cb5e96de5..154ca91621f 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -32,9 +32,6 @@ pub mod xcmp; pub use common::xcmp::{MaxInstructions, UnitWeightCost}; pub use xcmp::XcmConfig; -use governance::*; -use prelude::*; - use common::{ fees::{ multi_existential_deposits, NativeExistentialDeposit, PriceConverter, WeightToFeeConverter, @@ -47,12 +44,14 @@ use common::{ Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MILLISECS_PER_BLOCK, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; - +use composable_support::rpc_helpers::SafeRpcWrapper; use composable_traits::{ assets::Asset, dex::{Amm, PriceAggregate}, xcm::assets::RemoteAssetRegistryInspect, }; +use governance::*; +use prelude::*; use primitives::currency::{CurrencyId, ValidateCurrencyId}; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; @@ -62,36 +61,30 @@ use sp_runtime::{ transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, }; - -use composable_support::rpc_helpers::SafeRpcWrapper; -use sp_std::{collections::btree_map::BTreeMap, fmt::Debug, vec::Vec}; - +use sp_std::{collections::btree_map::BTreeMap, vec::Vec}; #[cfg(feature = "std")] use sp_version::NativeVersion; use sp_version::RuntimeVersion; - // A few exports that help ease life for downstream crates. +use codec::Encode; +use frame_support::traits::{fungibles, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade}; pub use frame_support::{ - construct_runtime, parameter_types, + construct_runtime, + pallet_prelude::DispatchClass, + parameter_types, traits::{ ConstBool, ConstU128, ConstU16, ConstU32, Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - ConstantMultiplier, DispatchClass, IdentityFee, Weight, WeightToFeeCoefficient, - WeightToFeeCoefficients, WeightToFeePolynomial, + ConstantMultiplier, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, + WeightToFeePolynomial, }, PalletId, StorageValue, }; - -pub use governance::TreasuryAccount; - -use codec::{Codec, Encode, EncodeLike}; -use frame_support::traits::{fungibles, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade}; use frame_system as system; -use scale_info::TypeInfo; -use sp_runtime::AccountId32; +pub use governance::TreasuryAccount; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; @@ -197,7 +190,7 @@ impl system::Config for Runtime { /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The aggregated dispatch type that is available for extrinsics. - type Call = Call; + type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. @@ -211,9 +204,9 @@ impl system::Config for Runtime { /// The header type. type Header = generic::Header; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; /// The weight of database operations that the runtime can invoke. @@ -247,7 +240,7 @@ parameter_types! { } impl assets_registry::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocalAssetId = CurrencyId; type Balance = Balance; type ForeignAssetId = composable_traits::xcm::assets::XcmAssetLocation; @@ -263,7 +256,7 @@ parameter_types! { } impl pablo::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type Balance = Balance; type Convert = sp_runtime::traits::ConvertInto; @@ -317,7 +310,7 @@ parameter_types! { impl identity::Config for Runtime { type BasicDeposit = BasicDeposit; type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type FieldDeposit = FieldDeposit; type ForceOrigin = EnsureRoot; type MaxAdditionalFields = MaxAdditionalFields; @@ -336,11 +329,11 @@ parameter_types! { } impl multisig::Config for Runtime { - type Call = Call; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxSignatories = MaxSignatories; type WeightInfo = weights::multisig::WeightInfo; } @@ -373,7 +366,7 @@ impl balances::Config for Runtime { /// The type for recording an account's balance. type Balance = Balance; /// The ubiquitous event type. - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = Treasury; type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; @@ -400,7 +393,7 @@ parameter_types! { } impl transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = transaction_payment::CurrencyAdapter>; type WeightToFee = WeightToFeeConverter; @@ -421,30 +414,31 @@ impl asset_tx_payment::HandleCredit for TransferToTreasuryOrD } impl asset_tx_payment::Config for Runtime { + type RuntimeEvent = RuntimeEvent; type Fungibles = Tokens; type OnChargeAssetTransaction = asset_tx_payment::FungiblesAdapter< PriceConverter, TransferToTreasuryOrDrop, >; - type UseUserConfiguration = ConstBool; + // type UseUserConfiguration = ConstBool; - type WeightInfo = weights::asset_tx_payment::WeightInfo; + // type WeightInfo = weights::asset_tx_payment::WeightInfo; - type ConfigurationOrigin = EnsureRootOrTwoThirdNativeCouncil; + // type ConfigurationOrigin = EnsureRootOrTwoThirdNativeCouncil; - type ConfigurationExistentialDeposit = NativeExistentialDeposit; + // type ConfigurationExistentialDeposit = NativeExistentialDeposit; - type PayableCall = Call; + // type PayableCall = Call; - type Lock = Assets; + // type Lock = Assets; - type BalanceConverter = PriceConverter; + // type BalanceConverter = PriceConverter; } impl sudo::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; } parameter_types! { @@ -453,25 +447,28 @@ parameter_types! { } impl indices::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AccountIndex = AccountIndex; type Currency = Balances; type Deposit = IndexDeposit; type WeightInfo = weights::indices::WeightInfo; } -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; impl system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: AccountIndex, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<( + RuntimeCall, + ::SignaturePayload, + )> { use sp_runtime::{ generic::{Era, SignedPayload}, traits::StaticLookup, @@ -516,14 +513,14 @@ impl system::offchain::SigningTypes for Runtime { impl system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } impl cumulus_pallet_parachain_system::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; @@ -553,7 +550,7 @@ parameter_types! { } impl session::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = ::AccountId; // we don't have stash and controller, thus we don't need the convert as well. type ValidatorIdOf = collator_selection::IdentityCollator; @@ -578,7 +575,7 @@ parameter_types! { } impl collator_selection::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type UpdateOrigin = EnsureRootOrTwoThirdNativeCouncil; type PotId = PotId; @@ -604,7 +601,7 @@ impl Contains for DustRemovalWhitelist { type ReserveIdentifier = [u8; 8]; impl orml_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = Amount; type CurrencyId = CurrencyId; @@ -617,6 +614,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = DustRemovalWhitelist; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnTransfer = (); + type OnDeposit = (); } parameter_types! { @@ -627,10 +627,10 @@ parameter_types! { } impl scheduler::Config for Runtime { - type Event = Event; - type Origin = Origin; + type RuntimeEvent = RuntimeEvent; + type RuntimeOrigin = RuntimeOrigin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; type OriginPrivilegeCmp = EqualPrivilegeOnly; @@ -647,7 +647,7 @@ parameter_types! { impl preimage::Config for Runtime { type WeightInfo = preimage::weights::SubstrateWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; type MaxSize = PreimageMaxSize; @@ -656,14 +656,14 @@ impl preimage::Config for Runtime { } impl utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::utility::WeightInfo; } impl currency_factory::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AssetId = CurrencyId; type AddOrigin = EnsureRootOrTwoThirdNativeCouncil; type WeightInfo = weights::currency_factory::WeightInfo; @@ -680,18 +680,20 @@ parameter_types! { pub const LockCrowdloanRewards: bool = true; } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::Treasury(..) | Call::Utility(..) + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | + RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { - matches!(c, Call::Proxy(proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(proxy::Call::reject_announcement { .. })) }, } } @@ -713,8 +715,8 @@ parameter_types! { pub type ProxyPrice = NativeExistentialDeposit; impl proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Assets; type ProxyType = ProxyType; type ProxyDepositBase = ProxyPrice; @@ -728,7 +730,7 @@ impl proxy::Config for Runtime { } impl crowdloan_rewards::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type RewardAsset = Assets; type AdminOrigin = EnsureRootOrTwoThirdNativeCouncil; @@ -753,7 +755,7 @@ parameter_types! { impl vesting::Config for Runtime { type Currency = Assets; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxVestingSchedules = MaxVestingSchedule; type MinVestedTransfer = MinVestedTransfer; type VestedTransferOrigin = EnsureRootOrTwoThirdNativeCouncil; @@ -776,7 +778,7 @@ impl bonded_finance::Config for Runtime { type BondOfferId = BondOfferId; type Convert = sp_runtime::traits::ConvertInto; type Currency = Assets; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MinReward = MinReward; type NativeCurrency = Balances; type PalletId = BondedFinanceId; @@ -787,15 +789,18 @@ impl bonded_finance::Config for Runtime { /// The calls we permit to be executed by extrinsics pub struct BaseCallFilter; -impl Contains for BaseCallFilter { - fn contains(call: &Call) -> bool { +impl Contains for BaseCallFilter { + fn contains(call: &RuntimeCall) -> bool { !(call_filter::Pallet::::contains(call) || - matches!(call, Call::Tokens(_) | Call::Indices(_) | Call::Treasury(_))) + matches!( + call, + RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Treasury(_) + )) } } impl call_filter::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type UpdateOrigin = EnsureRootOrHalfNativeTechnical; type Hook = (); type WeightInfo = (); @@ -835,7 +840,7 @@ construct_runtime!( Council: collective:: = 30, CouncilMembership: membership:: = 31, Treasury: treasury:: = 32, - Democracy: democracy:: = 33, + Democracy: democracy = 33, TechnicalCommittee: collective:: = 72, TechnicalCommitteeMembership: membership:: = 73, @@ -885,7 +890,8 @@ pub type SignedExtra = ( ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = executive::Executive< Runtime, diff --git a/code/parachain/runtime/picasso/src/migrations.rs b/code/parachain/runtime/picasso/src/migrations.rs index 0ccda072305..4803fd4e985 100644 --- a/code/parachain/runtime/picasso/src/migrations.rs +++ b/code/parachain/runtime/picasso/src/migrations.rs @@ -24,21 +24,23 @@ pub fn move_runtime_pallet< >() -> Weight { let new_pallet_name = ::name(); let migrated_storage_version = StorageVersion::new(MIGRATED_STORAGE_VERSION); - if new_pallet_name != OLD_NAME && - NewPallet::on_chain_storage_version() < migrated_storage_version - { - log::info!(target: "migrations", "move_runtime_pallet from {:?} to {:?} as {:?}", OLD_NAME, new_pallet_name, migrated_storage_version); - frame_support::storage::migration::move_pallet( - OLD_NAME.as_bytes(), - new_pallet_name.as_bytes(), - ); - migrated_storage_version.put::(); - // CAUTION: here is conservative estimate for 6 DB read and writes, for big migration should - // measure and parametrise (this is not the case now) - return 100_000_u64 - } - - 0_u64 + Weight::from_ref_time( + if new_pallet_name != OLD_NAME && + NewPallet::on_chain_storage_version() < migrated_storage_version + { + log::info!(target: "migrations", "move_runtime_pallet from {:?} to {:?} as {:?}", OLD_NAME, new_pallet_name, migrated_storage_version); + frame_support::storage::migration::move_pallet( + OLD_NAME.as_bytes(), + new_pallet_name.as_bytes(), + ); + migrated_storage_version.put::(); + // CAUTION: here is conservative estimate for 6 DB read and writes, for big migration + // should measure and parametrise (this is not the case now) + 100_000_u64 + } else { + 0_u64 + }, + ) } impl OnRuntimeUpgrade for TechCollectiveRenameMigration { @@ -90,7 +92,7 @@ pub mod pablo_picasso_init_pools { /// Expects a vec of (pool_init_config, pool_lp_token_id) pub fn add_initial_pools_to_storage(pools: Vec) -> Weight { if !Pablo::pool_count().is_zero() { - return 0 + return Weight::zero() } pools.iter().for_each(|pool_creation_input| { @@ -101,7 +103,7 @@ pub mod pablo_picasso_init_pools { .expect("Pool config is valid; QED"); }); - weights::pablo::WeightInfo::::do_create_pool() * pools.len() as Weight + weights::pablo::WeightInfo::::do_create_pool().saturating_mul(pools.len() as u64) } fn create_two_token_pool_config( diff --git a/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs b/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs deleted file mode 100644 index ecbf13ccce2..00000000000 --- a/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs +++ /dev/null @@ -1,39 +0,0 @@ - -//! Autogenerated weights for `asset_tx_payment` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/release/composable -// benchmark -// pallet -// --chain=dali-dev -// --execution=wasm -// --wasm-execution=compiled -// --wasm-instantiation-strategy=legacy-instance-reuse -// --pallet=* -// --extrinsic=* -// --steps=50 -// --repeat=20 -// --output=runtime/dali/src/weights -// --log -// error - -#![cfg_attr(rustfmt, rustfmt_skip)] -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Weight functions for `currency_factory`. -pub struct WeightInfo(PhantomData); -impl asset_tx_payment::WeightInfo for WeightInfo { - fn set_payment_asset() -> Weight { - Weight::from_ref_time(26_387_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } -} diff --git a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs index 12373b6dbff..117712a383e 100644 --- a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs @@ -72,8 +72,7 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI .saturating_add(T::DbWeight::get().reads(5 as u64)) .saturating_add(T::DbWeight::get().writes(3 as u64)) } - - fn unlock_rewards_for(x: u32) -> Weight { - x as _ + fn unlock_rewards_for(_x: u32) -> Weight { + Weight::from_ref_time(10_000 as u64) } } diff --git a/code/parachain/runtime/picasso/src/weights/mod.rs b/code/parachain/runtime/picasso/src/weights/mod.rs index 932c189eb72..3155845e273 100644 --- a/code/parachain/runtime/picasso/src/weights/mod.rs +++ b/code/parachain/runtime/picasso/src/weights/mod.rs @@ -13,7 +13,6 @@ pub mod indices; pub mod membership; pub mod multisig; // pub mod scheduler; -pub mod asset_tx_payment; pub mod pablo; pub mod proxy; pub mod session; diff --git a/code/parachain/runtime/picasso/src/weights/proxy.rs b/code/parachain/runtime/picasso/src/weights/proxy.rs index cc30d2a6454..ae4f3eeeec3 100644 --- a/code/parachain/runtime/picasso/src/weights/proxy.rs +++ b/code/parachain/runtime/picasso/src/weights/proxy.rs @@ -119,21 +119,10 @@ impl proxy::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - // Storage: Proxy Proxies (r:1 w:1) - /// The range of component `p` is `[1, 3]`. - fn anonymous(_p: u32, ) -> Weight { - Weight::from_ref_time(84_617_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn create_pure(_: u32) -> Weight { + Weight::from_ref_time(10_000 as u64) } - // Storage: Proxy Proxies (r:1 w:1) - /// The range of component `p` is `[0, 2]`. - fn kill_anonymous(p: u32, ) -> Weight { - Weight::from_ref_time(65_477_000 as u64) - // Standard Error: 986_000 - .saturating_add(Weight::from_ref_time(1_022_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn kill_pure(_: u32) -> Weight { + Weight::from_ref_time(10_000 as u64) } } diff --git a/code/parachain/runtime/picasso/src/xcmp.rs b/code/parachain/runtime/picasso/src/xcmp.rs index 271760ded60..acae0badbaf 100644 --- a/code/parachain/runtime/picasso/src/xcmp.rs +++ b/code/parachain/runtime/picasso/src/xcmp.rs @@ -3,13 +3,11 @@ use common::{ fees::{PriceConverter, WeightToFeeConverter}, xcmp::*, }; - use composable_traits::xcm::assets::{RemoteAssetRegistryInspect, XcmAssetLocation}; use cumulus_primitives_core::{IsSystem, ParaId}; use frame_support::{ log, parameter_types, traits::{Everything, Nothing, OriginTrait}, - weights::Weight, }; use orml_traits::{ location::{AbsoluteReserveProvider, RelativeReserveProvider}, @@ -21,8 +19,7 @@ use orml_xcm_support::{ }; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; - -use sp_runtime::traits::{Convert, Zero}; +use sp_runtime::traits::Convert; use sp_std::marker::PhantomData; use xcm::latest::prelude::*; use xcm_builder::{ @@ -36,10 +33,11 @@ use xcm_executor::{ traits::{ConvertOrigin, DropAssets}, Assets, XcmExecutor, }; + parameter_types! { pub KsmLocation: MultiLocation = MultiLocation::parent(); pub const RelayNetwork: NetworkId = NetworkId::Kusama; - pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); + pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); } @@ -50,7 +48,7 @@ pub type Barrier = ( TakeWeightCredit, ); -pub type LocalOriginToLocation = SignedToAccountId32; +pub type LocalOriginToLocation = SignedToAccountId32; /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -80,18 +78,18 @@ pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for // foreign chains who want to have a local sovereign account on this chain which they control. - SovereignSignedViaLocation, + SovereignSignedViaLocation, // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when // recognized. - RelayChainAsNative, + RelayChainAsNative, // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when // recognized. - SiblingParachainAsNative, + SiblingParachainAsNative, // Native signed account converter; this just converts an `AccountId32` origin into a normal // `Origin::Signed` origin of the same 32-byte value. - SignedAccountId32AsNative, + SignedAccountId32AsNative, // Xcm origins can be represented natively under the Xcm pallet's Xcm origin. - XcmPassthrough, + XcmPassthrough, ); pub struct StaticAssetsMap; @@ -133,11 +131,11 @@ impl< AssetConverter: Convert>, > DropAssets for CaptureDropAssets { - fn drop_assets(origin: &MultiLocation, assets: Assets) -> Weight { + fn drop_assets(origin: &MultiLocation, assets: Assets) -> u64 { let multi_assets: Vec = assets.into(); let mut can_return_on_request = vec![]; log::info!(target : "xcmp", "drop_assets"); - let mut weight = Weight::zero(); + let mut weight = 0u64; for asset in multi_assets { if let MultiAsset { id: Concrete(location), fun: Fungible(_amount) } = asset.clone() { if let Some(_converted) = AssetConverter::convert(location) { @@ -164,7 +162,7 @@ pub type CaptureAssetTrap = CaptureDropAssets< pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToTransactDispatchOrigin; @@ -172,7 +170,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = Trader; type AssetTrap = CaptureAssetTrap; @@ -207,7 +205,7 @@ parameter_type_with_key! { } impl orml_xtokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type CurrencyId = CurrencyId; type CurrencyIdConvert = AssetsIdConverter; @@ -216,7 +214,7 @@ impl orml_xtokens::Config for Runtime { type XcmExecutor = XcmExecutor; type MinXcmFee = ParachainMinFee; type MultiLocationsFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; type MaxAssetsForTransfer = XcmMaxAssetsForTransfer; @@ -224,7 +222,7 @@ impl orml_xtokens::Config for Runtime { } impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; } pub fn xcm_asset_fee_estimator(instructions: u8, asset_id: CurrencyId) -> Balance { @@ -235,31 +233,31 @@ pub fn xcm_asset_fee_estimator(instructions: u8, asset_id: CurrencyId) -> Balanc .1 } -pub fn xcm_fee_estimator(instructions: u8) -> Weight { +pub fn xcm_fee_estimator(instructions: u8) -> u64 { assert!((instructions as u32) <= MaxInstructions::get()); UnitWeightCost::get() * instructions as u64 } impl pallet_xcm::Config for Runtime { - type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; + type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing; type XcmReserveTransferFilter = Everything; type LocationInverter = LocationInverter; - type Weigher = FixedWeightBounds; - type Origin = Origin; - type Call = Call; + type Weigher = FixedWeightBounds; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = VERSION_DISCOVERY_QUEUE_SIZE; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } @@ -287,7 +285,7 @@ impl ConvertOrigin for SystemParachainAsSuperuser; type VersionWrapper = RelayerXcm; type ChannelInfo = ParachainSystem; @@ -298,7 +296,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { } impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRootOrTwoThirdNativeCouncil; } diff --git a/code/simnode/simnode-tests/src/tests/runtime_upgrade.rs b/code/simnode/simnode-tests/src/tests/runtime_upgrade.rs index 7fa65adb386..2d6852e8983 100644 --- a/code/simnode/simnode-tests/src/tests/runtime_upgrade.rs +++ b/code/simnode/simnode-tests/src/tests/runtime_upgrade.rs @@ -23,19 +23,19 @@ where T: ChainInfo, ::Runtime: system::Config + sudo::Config + parachain_info::Config, - ::Event: Into + Clone, + ::RuntimeEvent: Into + Clone, >>::RuntimeApi: CreateTransactionApi< T::Block, ::AccountId, - ::Call, + ::RuntimeCall, >, <::Runtime as system::Config>::AccountId: codec::Codec, - <::Runtime as system::Config>::Call: codec::Codec, + <::Runtime as system::Config>::RuntimeCall: codec::Codec, > as CallExecutor< T::Block, >>::Error: std::fmt::Debug, - ::Call: + ::RuntimeCall: From> + From>, ::Call: From>, <::Header as Header>::Number: num_traits::cast::AsPrimitive, From 0a71e4dc6b8aa02f5b5ad18e05eb2766df89c794 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 12:23:21 +0100 Subject: [PATCH 04/44] chore: upgrade jsonrpsee to match v0.9.30 --- code/Cargo.lock | 76 ++----------------- code/parachain/frame/assets/rpc/Cargo.toml | 2 +- code/parachain/frame/cosmwasm/rpc/Cargo.toml | 2 +- .../frame/crowdloan-rewards/rpc/Cargo.toml | 2 +- code/parachain/frame/lending/rpc/Cargo.toml | 2 +- code/parachain/frame/pablo/rpc/Cargo.toml | 2 +- code/parachain/node/Cargo.toml | 2 +- code/simnode/common/Cargo.toml | 2 +- 8 files changed, 15 insertions(+), 75 deletions(-) diff --git a/code/Cargo.lock b/code/Cargo.lock index 559f1706e96..fbcc2d70639 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -236,7 +236,7 @@ dependencies = [ "assets-runtime-api", "composable-support", "composable-traits", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -1693,7 +1693,7 @@ dependencies = [ "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-benchmarking-cli", "hex", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "lending-rpc", "lending-runtime-api", "log 0.4.17", @@ -2084,7 +2084,7 @@ name = "cosmwasm-rpc" version = "1.0.0" dependencies = [ "cosmwasm-runtime-api", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2386,7 +2386,7 @@ dependencies = [ "composable-support", "crowdloan-rewards-runtime-api", "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -5989,11 +5989,6 @@ checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ "jsonrpsee-client-transport 0.14.0", "jsonrpsee-core 0.14.0", - "jsonrpsee-http-server 0.14.0", - "jsonrpsee-proc-macros 0.14.0", - "jsonrpsee-types 0.14.0", - "jsonrpsee-ws-server 0.14.0", - "tracing", ] [[package]] @@ -6004,11 +5999,11 @@ checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ "jsonrpsee-client-transport 0.15.1", "jsonrpsee-core 0.15.1", - "jsonrpsee-http-server 0.15.1", + "jsonrpsee-http-server", "jsonrpsee-proc-macros 0.15.1", "jsonrpsee-types 0.15.1", "jsonrpsee-ws-client", - "jsonrpsee-ws-server 0.15.1", + "jsonrpsee-ws-server", "tracing", ] @@ -6079,27 +6074,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" dependencies = [ "anyhow", - "arrayvec 0.7.2", "async-lock", "async-trait", "beef", "futures-channel", "futures-timer", "futures-util", - "globset", - "hyper 0.14.23", "jsonrpsee-types 0.14.0", - "lazy_static", - "parking_lot 0.12.1", - "rand 0.8.5", "rustc-hash", "serde", "serde_json", - "soketto", "thiserror", "tokio", "tracing", - "unicase 2.6.0", ] [[package]] @@ -6153,23 +6140,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-http-server" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" -dependencies = [ - "futures-channel", - "futures-util", - "hyper 0.14.23", - "jsonrpsee-core 0.14.0", - "jsonrpsee-types 0.14.0", - "serde", - "serde_json", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee-http-server" version = "0.15.1" @@ -6200,18 +6170,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" -dependencies = [ - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "jsonrpsee-proc-macros" version = "0.15.1" @@ -6278,24 +6236,6 @@ dependencies = [ "jsonrpsee-types 0.15.1", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" -dependencies = [ - "futures-channel", - "futures-util", - "jsonrpsee-core 0.14.0", - "jsonrpsee-types 0.14.0", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - [[package]] name = "jsonrpsee-ws-server" version = "0.15.1" @@ -6529,7 +6469,7 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "lending-runtime-api", "parity-scale-codec", "scale-info", @@ -8271,7 +8211,7 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "jsonrpsee 0.14.0", + "jsonrpsee 0.15.1", "pablo-runtime-api", "parity-scale-codec", "scale-info", diff --git a/code/parachain/frame/assets/rpc/Cargo.toml b/code/parachain/frame/assets/rpc/Cargo.toml index 31eaa195486..5a6da49d89a 100644 --- a/code/parachain/frame/assets/rpc/Cargo.toml +++ b/code/parachain/frame/assets/rpc/Cargo.toml @@ -30,4 +30,4 @@ scale-info = { version = "2.1.1", default-features = false, features = [ ] } # rpc -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } diff --git a/code/parachain/frame/cosmwasm/rpc/Cargo.toml b/code/parachain/frame/cosmwasm/rpc/Cargo.toml index d81ad8884a8..b73f30aac51 100644 --- a/code/parachain/frame/cosmwasm/rpc/Cargo.toml +++ b/code/parachain/frame/cosmwasm/rpc/Cargo.toml @@ -28,4 +28,4 @@ scale-info = { version = "2.1.1", default-features = false, features = [ ] } # rpc -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } diff --git a/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml b/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml index 8f90b0ffa83..7d77a4b6227 100644 --- a/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml +++ b/code/parachain/frame/crowdloan-rewards/rpc/Cargo.toml @@ -30,4 +30,4 @@ codec = { features = [ scale-info = { version = "2.1.1", features = ["derive"] } # rpc -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } diff --git a/code/parachain/frame/lending/rpc/Cargo.toml b/code/parachain/frame/lending/rpc/Cargo.toml index eb989cc1f02..8aa4afa2fcf 100644 --- a/code/parachain/frame/lending/rpc/Cargo.toml +++ b/code/parachain/frame/lending/rpc/Cargo.toml @@ -30,4 +30,4 @@ scale-info = { version = "2.1.1", default-features = false, features = [ ] } # rpc -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } diff --git a/code/parachain/frame/pablo/rpc/Cargo.toml b/code/parachain/frame/pablo/rpc/Cargo.toml index 962d96445a4..072786e9f8e 100644 --- a/code/parachain/frame/pablo/rpc/Cargo.toml +++ b/code/parachain/frame/pablo/rpc/Cargo.toml @@ -30,4 +30,4 @@ scale-info = { version = "2.1.1", default-features = false, features = [ ] } # rpc -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index 56fb533c4b6..10f1598ee12 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] clap = "3.1.6" codec = { package = "parity-scale-codec", version = "3.0.0" } -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } log = "0.4.14" once_cell = "1.12.0" serde = { version = "1.0.136", features = ["derive"] } diff --git a/code/simnode/common/Cargo.toml b/code/simnode/common/Cargo.toml index 10e400ab52b..33ec94483ed 100644 --- a/code/simnode/common/Cargo.toml +++ b/code/simnode/common/Cargo.toml @@ -35,4 +35,4 @@ parachain-inherent = { package = "cumulus-primitives-parachain-inherent", git = picasso-runtime = { path = "../../parachain/runtime/picasso" } derive_more = "0.99.17" -jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } From 68d1bdf500dbe01ebe0525d47010d848a3de4615 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 12:25:03 +0100 Subject: [PATCH 05/44] fixup: reintroduce democracy filter --- code/parachain/runtime/composable/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index 17559c3a370..68cf4921dfe 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -762,7 +762,7 @@ impl Contains for BaseCallFilter { // TODO: not up to date as whole composable setup !matches!( call, - RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | /*RuntimeCall::Democracy(_) |*/ RuntimeCall::Treasury(_) + RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Democracy(_) | RuntimeCall::Treasury(_) ) } } From 6d789117ce87b277a78aba901c564a4cd4251eb3 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 16:53:26 +0100 Subject: [PATCH 06/44] chore: upgrade node/dali to v0.9.30 --- code/Cargo.lock | 295 +++++++++++------- .../src/test/helper.rs | 19 +- code/parachain/frame/cosmwasm/src/ibc.rs | 18 +- .../frame/cosmwasm/src/instrument.rs | 18 +- code/parachain/frame/cosmwasm/src/lib.rs | 25 +- .../frame/cosmwasm/src/runtimes/wasmi.rs | 45 +-- code/parachain/frame/cosmwasm/src/weights.rs | 2 +- .../parachain/frame/dex-router/src/weights.rs | 12 +- .../frame/dutch-auction/src/weights.rs | 2 +- code/parachain/frame/lending/src/types.rs | 2 +- code/parachain/frame/lending/src/weights.rs | 9 +- code/parachain/frame/mosaic/src/weights.rs | 30 +- .../frame/staking-rewards/src/weights.rs | 20 +- code/parachain/node/Cargo.toml | 3 +- code/parachain/node/src/command.rs | 74 ++--- code/parachain/node/src/service.rs | 41 ++- code/parachain/runtime/composable/src/lib.rs | 5 +- code/parachain/runtime/dali/Cargo.toml | 10 +- code/parachain/runtime/dali/src/governance.rs | 16 +- code/parachain/runtime/dali/src/lib.rs | 61 ++-- code/parachain/runtime/dali/src/migrations.rs | 4 +- .../dali/src/weights/asset_tx_payment.rs | 39 --- .../dali/src/weights/crowdloan_rewards.rs | 5 +- .../parachain/runtime/dali/src/weights/mod.rs | 1 - .../runtime/dali/src/weights/proxy.rs | 19 +- code/parachain/runtime/dali/src/xcmp.rs | 42 +-- code/parachain/runtime/picasso/src/lib.rs | 14 - 27 files changed, 421 insertions(+), 410 deletions(-) delete mode 100644 code/parachain/runtime/dali/src/weights/asset_tx_payment.rs diff --git a/code/Cargo.lock b/code/Cargo.lock index fbcc2d70639..4604a1ee35a 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -742,24 +742,24 @@ dependencies = [ [[package]] name = "beefy-light-client" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "ckb-merkle-mountain-range", "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "rs_merkle", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -788,17 +788,17 @@ dependencies = [ [[package]] name = "beefy-light-client-primitives" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "ckb-merkle-mountain-range", "derive_more", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", "rs_merkle", "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1702,7 +1702,7 @@ dependencies = [ "pablo-runtime-api", "pallet-assets", "pallet-crowdloan-rewards", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", @@ -1723,6 +1723,7 @@ dependencies = [ "sc-finality-grandpa", "sc-keystore", "sc-network", + "sc-network-common", "sc-rpc", "sc-rpc-api", "sc-service", @@ -3284,8 +3285,8 @@ dependencies = [ "frame-system-rpc-runtime-api", "hex", "hex-literal", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "ibc-runtime-api", "lending-runtime-api", "orml-tokens", @@ -3312,8 +3313,8 @@ dependencies = [ "pallet-dutch-auction", "pallet-fnft", "pallet-governance-registry", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "pallet-identity", "pallet-indices", "pallet-lending", @@ -4844,22 +4845,22 @@ dependencies = [ [[package]] name = "grandpa-light-client-primitives" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -4886,22 +4887,22 @@ dependencies = [ [[package]] name = "grandpa-light-client-verifier" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitive-types", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -5328,6 +5329,33 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ibc" +version = "0.15.0" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +dependencies = [ + "derive_more", + "flex-error", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ics23", + "num-traits", + "parity-scale-codec", + "primitive-types", + "prost 0.11.6", + "safe-regex", + "scale-info", + "serde", + "serde_derive", + "serde_json", + "subtle-encoding", + "tendermint", + "tendermint-proto", + "time 0.3.17", + "tracing", + "uint", +] + [[package]] name = "ibc" version = "0.15.0" @@ -5380,6 +5408,18 @@ dependencies = [ "uint", ] +[[package]] +name = "ibc-derive" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +dependencies = [ + "convert_case 0.6.0", + "proc-macro-crate 1.2.1", + "proc-macro2 1.0.49", + "quote 1.0.23", + "syn 1.0.107", +] + [[package]] name = "ibc-derive" version = "0.1.0" @@ -5404,6 +5444,30 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "ibc-primitives" +version = "0.1.0" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +dependencies = [ + "base58", + "blake2", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "hex", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "parity-scale-codec", + "ripemd", + "scale-info", + "serde", + "sha2 0.10.6", + "sha3", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + [[package]] name = "ibc-primitives" version = "0.1.0" @@ -5416,7 +5480,6 @@ dependencies = [ "parity-scale-codec", "ripemd", "scale-info", - "serde", "sha2 0.10.6", "sha3", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", @@ -5450,6 +5513,18 @@ dependencies = [ "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", ] +[[package]] +name = "ibc-proto" +version = "0.18.0" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +dependencies = [ + "base64 0.13.1", + "bytes 1.3.0", + "prost 0.11.6", + "serde", + "tendermint-proto", +] + [[package]] name = "ibc-proto" version = "0.18.0" @@ -5477,24 +5552,24 @@ dependencies = [ [[package]] name = "ibc-runtime-api" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "ics07-tendermint" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "bytes 1.3.0", "flex-error", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "ics23", "prost 0.11.6", "serde", @@ -5529,26 +5604,26 @@ dependencies = [ [[package]] name = "ics10-grandpa" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitive-types", "prost 0.11.6", "prost-build 0.11.6", "prost-types 0.11.6", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tendermint", "tendermint-proto", ] @@ -5583,27 +5658,27 @@ dependencies = [ [[package]] name = "ics11-beefy" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", - "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "bytes 1.3.0", "derive_more", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitive-types", "prost 0.11.6", "prost-build 0.11.6", "prost-types 0.11.6", "serde", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tendermint", "tendermint-proto", ] @@ -7119,17 +7194,17 @@ dependencies = [ [[package]] name = "light-client-common" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", "derive_more", "hash-db", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "parity-scale-codec", "primitive-types", "serde", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -8969,44 +9044,44 @@ dependencies = [ [[package]] name = "pallet-ibc" version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "derive_more", "finality-grandpa", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "hex", "hex-literal", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "ics23", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "log 0.4.17", - "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", + "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", "parity-scale-codec", "prost 0.11.6", "scale-info", "serde", "serde_json", "sha2 0.10.6", - "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tendermint", "tendermint-light-client-verifier", "tendermint-proto", @@ -9060,19 +9135,19 @@ dependencies = [ [[package]] name = "pallet-ibc-ping" version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", "log 0.4.17", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -14690,7 +14765,7 @@ dependencies = [ [[package]] name = "simple-iavl" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "bytes 1.3.0", "ics23", diff --git a/code/parachain/frame/composable-tests-helpers/src/test/helper.rs b/code/parachain/frame/composable-tests-helpers/src/test/helper.rs index 456dd876949..57124c52034 100644 --- a/code/parachain/frame/composable-tests-helpers/src/test/helper.rs +++ b/code/parachain/frame/composable-tests-helpers/src/test/helper.rs @@ -41,14 +41,14 @@ pub fn default_acceptable_computation_error(x: u128, y: u128) -> Result<(), Fixe acceptable_computation_error(x, y, DEFAULT_PRECISION, DEFAULT_EPSILON) } -type EventRecordOf = EventRecord<::Event, ::Hash>; +type EventRecordOf = EventRecord<::RuntimeEvent, ::Hash>; // NOTE/FIXME(benluelo): These trait bounds can be simplified quite a bit once this issue is // resolved: https://github.com/rust-lang/rust/issues/20671#issuecomment-529752828 pub trait RuntimeTrait: Config< - Event = >::Event, - Origin = >::Origin, + RuntimeEvent = >::Event, + RuntimeOrigin = >::Origin, > where PalletEvent: Clone + Debug + PartialEq, @@ -225,13 +225,14 @@ event checked: {pallet_event:#?} impl RuntimeTrait for Runtime where Runtime: Config, - ::Event: + ::RuntimeEvent: Parameter + Member + Debug + Clone + TryInto + From, - <::Event as TryInto>::Error: Debug, - ::Origin: OriginTrait::AccountId>, + <::RuntimeEvent as TryInto>::Error: Debug, + ::RuntimeOrigin: OriginTrait::AccountId>, PalletEvent: Clone + Debug + PartialEq, { - type Event = ::Event; - type EventTryIntoPalletEventError = <::Event as TryInto>::Error; - type Origin = ::Origin; + type Event = ::RuntimeEvent; + type EventTryIntoPalletEventError = + <::RuntimeEvent as TryInto>::Error; + type Origin = ::RuntimeOrigin; } diff --git a/code/parachain/frame/cosmwasm/src/ibc.rs b/code/parachain/frame/cosmwasm/src/ibc.rs index 14b156b58e4..3405126ca2f 100644 --- a/code/parachain/frame/cosmwasm/src/ibc.rs +++ b/code/parachain/frame/cosmwasm/src/ibc.rs @@ -34,7 +34,7 @@ use sp_runtime::SaturatedConversion; use sp_std::{marker::PhantomData, str::FromStr}; use crate::runtimes::wasmi::InitialStorageMutability; -use frame_support::{ensure, traits::Get, weights::Weight, RuntimeDebug}; +use frame_support::{ensure, traits::Get, RuntimeDebug}; use ibc::{ applications::transfer::{Amount, PrefixedCoin, PrefixedDenom}, core::{ @@ -270,7 +270,7 @@ impl Router { address: T::AccountIdExtended, contract_info: ContractInfoOf, ) -> Result, IbcError> { - let gas = Weight::MAX; + let gas = u64::MAX; let vm = { let runtime = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); @@ -334,7 +334,7 @@ impl Router { ), Addr::unchecked(relayer.to_string()), ); - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (data, _) = cosmwasm_system_entrypoint_serialize::< @@ -473,7 +473,7 @@ impl IbcModule for Router { channel: map_channel(port_id, channel_id, metadata)?, counterparty_version: counterparty_version.to_string(), }; - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< @@ -501,7 +501,7 @@ impl IbcModule for Router { let message = IbcChannelConnectMsg::OpenConfirm { channel: map_channel(port_id, channel_id, metadata)?, }; - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< @@ -538,7 +538,7 @@ impl IbcModule for Router { .to_string(), ), }; - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< @@ -565,7 +565,7 @@ impl IbcModule for Router { let message = IbcChannelCloseMsg::CloseConfirm { channel: map_channel(port_id, channel_id, metadata)?, }; - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< @@ -622,7 +622,7 @@ impl IbcModule for Router { Addr::unchecked(relayer.to_string()), ); - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< @@ -665,7 +665,7 @@ impl IbcModule for Router { Addr::unchecked(relayer.to_string()), ); - let gas = Weight::MAX; + let gas = u64::MAX; let mut vm = >::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); let mut executor = Self::relayer_executor(&mut vm, address, contract_info)?; let (_data, _events) = cosmwasm_system_entrypoint_serialize::< diff --git a/code/parachain/frame/cosmwasm/src/instrument.rs b/code/parachain/frame/cosmwasm/src/instrument.rs index fa4b0a59868..bb59432f6db 100644 --- a/code/parachain/frame/cosmwasm/src/instrument.rs +++ b/code/parachain/frame/cosmwasm/src/instrument.rs @@ -6,7 +6,7 @@ use parity_wasm::elements::{Instruction, Module}; use scale_info::TypeInfo; use wasm_instrument::gas_metering::{self, MemoryGrowCost, Rules}; -pub const INSTRUCTIONS_MULTIPLIER: u32 = 100; +pub const INSTRUCTIONS_MULTIPLIER: u64 = 100; /// Current instrumentation version /// Must be incremented whenever the instrumentation is updated. @@ -51,11 +51,12 @@ type WeightFn = fn(n: u32) -> Weight; fn calculate_weight(weight_fn: WeightFn, n_additional_instrs: u32) -> u32 { (weight_fn(1).saturating_sub(weight_fn(0)).saturating_sub( T::WeightInfo::instruction_I64Const(1) - .saturating_sub(T::WeightInfo::instruction_I64Const(0)) / - 2, - ) as u32) - .saturating_mul(n_additional_instrs) / - INSTRUCTIONS_MULTIPLIER + .saturating_sub(T::WeightInfo::instruction_I64Const(0)) + .saturating_div(2), + )) + .saturating_mul(n_additional_instrs as u64) + .saturating_div(INSTRUCTIONS_MULTIPLIER) + .ref_time() as u32 } /// Calculates a weight that is dependent on other weight. Eg. `else` because it cannot @@ -63,8 +64,9 @@ fn calculate_weight(weight_fn: WeightFn, n_additional_instrs: u32) -> fn calculate_weight_custom(weight_fn: WeightFn, custom_fn: WeightFn) -> u32 { (weight_fn(1) .saturating_sub(weight_fn(0)) - .saturating_sub(custom_fn(1).saturating_sub(custom_fn(0)) / 2) as u32) / - INSTRUCTIONS_MULTIPLIER + .saturating_sub(custom_fn(1).saturating_sub(custom_fn(0)).saturating_div(2))) + .saturating_div(INSTRUCTIONS_MULTIPLIER) + .ref_time() as u32 } #[derive(Encode, Decode, TypeInfo)] diff --git a/code/parachain/frame/cosmwasm/src/lib.rs b/code/parachain/frame/cosmwasm/src/lib.rs index f3fdbd294e5..12cb9832d84 100644 --- a/code/parachain/frame/cosmwasm/src/lib.rs +++ b/code/parachain/frame/cosmwasm/src/lib.rs @@ -415,7 +415,7 @@ pub mod pallet { /// export. /// * `gas` the maximum gas to use, the remaining is refunded at the end of the transaction. #[transactional] - #[pallet::weight(T::WeightInfo::instantiate(funds.len() as u32).saturating_add(*gas))] + #[pallet::weight(T::WeightInfo::instantiate(funds.len() as u32).saturating_add(Weight::from_ref_time(*gas)))] pub fn instantiate( origin: OriginFor, code_identifier: CodeIdentifier, @@ -428,7 +428,9 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let mut shared = Self::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); - let initial_gas = T::WeightInfo::instantiate(funds.len() as u32).saturating_add(gas); + let initial_gas = T::WeightInfo::instantiate(funds.len() as u32) + .saturating_add(Weight::from_ref_time(gas)) + .ref_time(); let outcome = Self::do_instantiate( &mut shared, who, @@ -456,7 +458,7 @@ pub mod pallet { /// export. /// * `gas` the maximum gas to use, the remaining is refunded at the end of the transaction. #[transactional] - #[pallet::weight(T::WeightInfo::execute(funds.len() as u32).saturating_add(*gas))] + #[pallet::weight(T::WeightInfo::execute(funds.len() as u32).saturating_add(Weight::from_ref_time(*gas)))] pub fn execute( origin: OriginFor, contract: AccountIdOf, @@ -466,7 +468,9 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let mut shared = Self::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); - let initial_gas = T::WeightInfo::execute(funds.len() as u32).saturating_add(gas); + let initial_gas = T::WeightInfo::execute(funds.len() as u32) + .saturating_add(Weight::from_ref_time(gas)) + .ref_time(); let outcome = Self::do_execute(&mut shared, who, contract, funds, message); Self::refund_gas(outcome, initial_gas, shared.gas.remaining()) } @@ -485,7 +489,7 @@ pub mod pallet { /// * `gas` the maximum gas to use, the remaining is refunded at the end of the transaction. /// * `message` MigrateMsg, that will be passed to the contract. #[transactional] - #[pallet::weight(T::WeightInfo::migrate().saturating_add(*gas))] + #[pallet::weight(T::WeightInfo::migrate().saturating_add(Weight::from_ref_time(*gas)))] pub fn migrate( origin: OriginFor, contract: AccountIdOf, @@ -495,7 +499,8 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let mut shared = Self::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); - let initial_gas = T::WeightInfo::migrate().saturating_add(gas); + let initial_gas = + T::WeightInfo::migrate().saturating_add(Weight::from_ref_time(gas)).ref_time(); let outcome = Self::do_migrate(&mut shared, who, contract, new_code_identifier, message); Self::refund_gas(outcome, initial_gas, shared.gas.remaining()) @@ -512,7 +517,7 @@ pub mod pallet { /// * `new_admin` new admin of the contract that we want to update to. /// * `gas` the maximum gas to use, the remaining is refunded at the end of the transaction. #[transactional] - #[pallet::weight(T::WeightInfo::update_admin().saturating_add(*gas))] + #[pallet::weight(T::WeightInfo::update_admin().saturating_add(Weight::from_ref_time(*gas)))] pub fn update_admin( origin: OriginFor, contract: AccountIdOf, @@ -521,7 +526,9 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; let mut shared = Self::do_create_vm_shared(gas, InitialStorageMutability::ReadWrite); - let initial_gas = T::WeightInfo::update_admin().saturating_add(gas); + let initial_gas = T::WeightInfo::update_admin() + .saturating_add(Weight::from_ref_time(gas)) + .ref_time(); let outcome = Self::do_update_admin(&mut shared, who, contract.clone(), new_admin.clone()); Self::deposit_event(Event::::AdminUpdated { contract, new_admin }); @@ -651,7 +658,7 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { log::info!(target: "runtime::contracts", "outcome: {:?}", outcome); let post_info = PostDispatchInfo { - actual_weight: Some(initial_gas.saturating_sub(remaining_gas)), + actual_weight: Some(Weight::from_ref_time(initial_gas.saturating_sub(remaining_gas))), pays_fee: Pays::Yes, }; match outcome { diff --git a/code/parachain/frame/cosmwasm/src/runtimes/wasmi.rs b/code/parachain/frame/cosmwasm/src/runtimes/wasmi.rs index 2819c8e97d4..7e0fbb5a1ff 100644 --- a/code/parachain/frame/cosmwasm/src/runtimes/wasmi.rs +++ b/code/parachain/frame/cosmwasm/src/runtimes/wasmi.rs @@ -475,29 +475,30 @@ impl<'a, T: Config> VMBase for CosmwasmVM<'a, T> { fn charge(&mut self, value: VmGas) -> Result<(), Self::Error> { let gas_to_charge = match value { VmGas::Instrumentation { metered } => metered as u64, - VmGas::DbRead => T::WeightInfo::db_read(), - VmGas::DbWrite => T::WeightInfo::db_write(), - VmGas::DbRemove => T::WeightInfo::db_remove(), - VmGas::DbScan => T::WeightInfo::db_scan(), - VmGas::DbNext => T::WeightInfo::db_next(), - VmGas::Balance => T::WeightInfo::balance(), - VmGas::Secp256k1Verify => T::WeightInfo::secp256k1_verify(), - VmGas::Secp256k1RecoverPubkey => T::WeightInfo::secp256k1_recover_pubkey(), - VmGas::Ed25519Verify => T::WeightInfo::ed25519_verify(), - VmGas::Ed25519BatchVerify => T::WeightInfo::ed25519_batch_verify(), - VmGas::AddrValidate => T::WeightInfo::addr_validate(), - VmGas::AddrCanonicalize => T::WeightInfo::addr_canonicalize(), - VmGas::AddrHumanize => T::WeightInfo::addr_humanize(), - VmGas::GetContractMeta => T::WeightInfo::contract_meta(), - VmGas::Transfer { nb_of_coins } => T::WeightInfo::transfer(nb_of_coins), - VmGas::ContinueExecute { nb_of_coins } => T::WeightInfo::continue_execute(nb_of_coins), + VmGas::DbRead => T::WeightInfo::db_read().ref_time(), + VmGas::DbWrite => T::WeightInfo::db_write().ref_time(), + VmGas::DbRemove => T::WeightInfo::db_remove().ref_time(), + VmGas::DbScan => T::WeightInfo::db_scan().ref_time(), + VmGas::DbNext => T::WeightInfo::db_next().ref_time(), + VmGas::Balance => T::WeightInfo::balance().ref_time(), + VmGas::Secp256k1Verify => T::WeightInfo::secp256k1_verify().ref_time(), + VmGas::Secp256k1RecoverPubkey => T::WeightInfo::secp256k1_recover_pubkey().ref_time(), + VmGas::Ed25519Verify => T::WeightInfo::ed25519_verify().ref_time(), + VmGas::Ed25519BatchVerify => T::WeightInfo::ed25519_batch_verify().ref_time(), + VmGas::AddrValidate => T::WeightInfo::addr_validate().ref_time(), + VmGas::AddrCanonicalize => T::WeightInfo::addr_canonicalize().ref_time(), + VmGas::AddrHumanize => T::WeightInfo::addr_humanize().ref_time(), + VmGas::GetContractMeta => T::WeightInfo::contract_meta().ref_time(), + VmGas::Transfer { nb_of_coins } => T::WeightInfo::transfer(nb_of_coins).ref_time(), + VmGas::ContinueExecute { nb_of_coins } => + T::WeightInfo::continue_execute(nb_of_coins).ref_time(), VmGas::ContinueInstantiate { nb_of_coins } => - T::WeightInfo::continue_instantiate(nb_of_coins), - VmGas::ContinueMigrate => T::WeightInfo::continue_migrate(), - VmGas::ContinueQuery => T::WeightInfo::continue_query(), - VmGas::ContinueReply => T::WeightInfo::continue_reply(), - VmGas::QueryRaw => T::WeightInfo::query_raw(), - VmGas::QueryInfo => T::WeightInfo::query_info(), + T::WeightInfo::continue_instantiate(nb_of_coins).ref_time(), + VmGas::ContinueMigrate => T::WeightInfo::continue_migrate().ref_time(), + VmGas::ContinueQuery => T::WeightInfo::continue_query().ref_time(), + VmGas::ContinueReply => T::WeightInfo::continue_reply().ref_time(), + VmGas::QueryRaw => T::WeightInfo::query_raw().ref_time(), + VmGas::QueryInfo => T::WeightInfo::query_info().ref_time(), _ => 1_u64, // NOTE: **Operations that require no charge**: Debug, // NOTE: **Unsupported operations**: diff --git a/code/parachain/frame/cosmwasm/src/weights.rs b/code/parachain/frame/cosmwasm/src/weights.rs index 78bf3331872..98b7415f513 100644 --- a/code/parachain/frame/cosmwasm/src/weights.rs +++ b/code/parachain/frame/cosmwasm/src/weights.rs @@ -27,7 +27,7 @@ #![allow(trivial_numeric_casts)] #![allow(non_snake_case)] -use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; /// Weight functions needed for cosmwasm. diff --git a/code/parachain/frame/dex-router/src/weights.rs b/code/parachain/frame/dex-router/src/weights.rs index 1488e675a1d..83dcbba2a47 100644 --- a/code/parachain/frame/dex-router/src/weights.rs +++ b/code/parachain/frame/dex-router/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { @@ -17,22 +17,22 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { fn update_route() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn buy() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn swap() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn add_liquidity() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn remove_liquidity() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } } diff --git a/code/parachain/frame/dutch-auction/src/weights.rs b/code/parachain/frame/dutch-auction/src/weights.rs index 9eab59f456b..b3d0b72dadf 100644 --- a/code/parachain/frame/dutch-auction/src/weights.rs +++ b/code/parachain/frame/dutch-auction/src/weights.rs @@ -17,7 +17,7 @@ pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { // Storage: DutchAuction Configurations (r:0 w:1) fn add_configuration() -> Weight { - (8_434_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(8_434_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: DutchAuction OrdersIndex (r:1 w:1) // Storage: System Account (r:1 w:1) diff --git a/code/parachain/frame/lending/src/types.rs b/code/parachain/frame/lending/src/types.rs index 0e4e9aab076..75710c59321 100644 --- a/code/parachain/frame/lending/src/types.rs +++ b/code/parachain/frame/lending/src/types.rs @@ -26,7 +26,7 @@ pub(crate) struct InitializeBlockCallCounters { impl InitializeBlockCallCounters { pub(crate) fn calculate_weight(&self) -> Weight { use crate::weights::WeightInfo; - let mut weight: Weight = 0; + let mut weight = Weight::from_ref_time(0); let one_read = T::DbWeight::get().reads(1); weight += u64::from(self.now) * ::WeightInfo::now(); weight += u64::from(self.read_markets) * one_read; diff --git a/code/parachain/frame/lending/src/weights.rs b/code/parachain/frame/lending/src/weights.rs index 93d7f6b2133..cfc821903af 100644 --- a/code/parachain/frame/lending/src/weights.rs +++ b/code/parachain/frame/lending/src/weights.rs @@ -46,12 +46,12 @@ impl WeightInfo for () { .saturating_add(RocksDbWeight::get().writes(4 as u64)) } fn deposit_collateral() -> Weight { - 123_789_000_u64 + Weight::from_ref_time(123_789_000 as u64) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn withdraw_collateral() -> Weight { - 138_802_000_u64 + Weight::from_ref_time(138_802_000 as u64) .saturating_add(RocksDbWeight::get().reads(10_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } @@ -71,7 +71,7 @@ impl WeightInfo for () { .saturating_add(RocksDbWeight::get().reads(7 as u64)) } fn now() -> Weight { - (4_744_000 as u64).saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(4_744_000 as u64).saturating_add(RocksDbWeight::get().reads(1 as u64)) } fn accrue_interest(_x: u32) -> Weight { Weight::from_ref_time(76_626_000 as u64) @@ -82,7 +82,8 @@ impl WeightInfo for () { Weight::from_ref_time(3_126_000 as u64) } fn available_funds() -> Weight { - (16_450_000 as u64).saturating_add(RocksDbWeight::get().reads(2 as u64)) + Weight::from_ref_time(16_450_000 as u64) + .saturating_add(RocksDbWeight::get().reads(2 as u64)) } fn handle_withdrawable() -> Weight { Weight::from_ref_time(20_716_000 as u64) diff --git a/code/parachain/frame/mosaic/src/weights.rs b/code/parachain/frame/mosaic/src/weights.rs index 54f638d5f23..e3d0e1fc743 100644 --- a/code/parachain/frame/mosaic/src/weights.rs +++ b/code/parachain/frame/mosaic/src/weights.rs @@ -3,7 +3,7 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use frame_support::{traits::Get, weights::{RefTimeWeight, Weight, constants::RocksDbWeight}}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; pub trait WeightInfo { @@ -26,58 +26,58 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { fn set_relayer() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn rotate_relayer() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn set_network() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn set_budget() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn transfer_to() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn accept_transfer() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn claim_stale_to() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn timelocked_mint() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn set_timelock_duration() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn rescind_timelocked_mint() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn claim_to() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn update_asset_mapping() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn add_remote_amm_id() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } fn remove_remote_amm_id() -> Weight { - 10_000 as Weight + Weight::from_ref_time(10_000) } } diff --git a/code/parachain/frame/staking-rewards/src/weights.rs b/code/parachain/frame/staking-rewards/src/weights.rs index 29f21d1e929..e678eb9a107 100644 --- a/code/parachain/frame/staking-rewards/src/weights.rs +++ b/code/parachain/frame/staking-rewards/src/weights.rs @@ -15,42 +15,42 @@ pub trait WeightInfo { impl WeightInfo for () { fn create_reward_pool(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn stake(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn extend(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn unstake(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn split(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn reward_accumulation_hook_reward_update_calculation() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn unix_time_now() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn update_rewards_pool(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn claim(_r: u32) -> Weight { - 10_000 + Weight::from_ref_time(10_000) } fn add_to_rewards_pot() -> Weight { - 10_000 + Weight::from_ref_time(10_000) } } diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index 10f1598ee12..2100e51be95 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -38,7 +38,7 @@ lending-runtime-api = { path = "../frame/lending/runtime-api" } pablo-rpc = { path = "../frame/pablo/rpc" } pablo-runtime-api = { path = "../frame/pablo/runtime-api" } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355" } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30" } # FRAME Dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } @@ -60,6 +60,7 @@ sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-service = { git = "https://github.com/paritytech/substrate", features = [ diff --git a/code/parachain/node/src/command.rs b/code/parachain/node/src/command.rs index 49491d40a58..3f318c47f67 100644 --- a/code/parachain/node/src/command.rs +++ b/code/parachain/node/src/command.rs @@ -269,37 +269,43 @@ pub fn run() -> Result<()> { }, id => panic!("Unknown Chain: {}", id), }), - BenchmarkCmd::Storage(cmd) => - runner.sync_run(|config| match config.chain_spec.id() { - id if id.contains("picasso") => { - let partials = new_partial::< - picasso_runtime::RuntimeApi, - PicassoExecutor, - >(&config)?; - let db = partials.backend.expose_db(); - let storage = partials.backend.expose_storage(); - cmd.run(config, partials.client, db, storage) - }, - #[cfg(feature = "dali")] - id if id.contains("dali") => { - let partials = - new_partial::(&config)?; - let db = partials.backend.expose_db(); - let storage = partials.backend.expose_storage(); - cmd.run(config, partials.client, db, storage) - }, - #[cfg(feature = "composable")] - id if id.contains("composable") => { - let partials = new_partial::< - composable_runtime::RuntimeApi, - ComposableExecutor, - >(&config)?; - let db = partials.backend.expose_db(); - let storage = partials.backend.expose_storage(); - cmd.run(config, partials.client, db, storage) - }, - id => panic!("Unknown Chain: {}", id), - }), + #[cfg(not(feature = "runtime-benchmarks"))] + BenchmarkCmd::Storage(_) => + return Err(sc_cli::Error::Input( + "Compile with --features=runtime-benchmarks \ + to enable storage benchmarks." + .into(), + ) + .into()), + #[cfg(feature = "runtime-benchmarks")] + BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| match config.chain_spec.id() { + id if id.contains("picasso") => { + let partials = + new_partial::(&config)?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + cmd.run(config, partials.client, db, storage) + }, + #[cfg(feature = "dali")] + id if id.contains("dali") => { + let partials = + new_partial::(&config)?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + cmd.run(config, partials.client, db, storage) + }, + #[cfg(feature = "composable")] + id if id.contains("composable") => { + let partials = new_partial::< + composable_runtime::RuntimeApi, + ComposableExecutor, + >(&config)?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + cmd.run(config, partials.client, db, storage) + }, + id => panic!("Unknown Chain: {}", id), + }), BenchmarkCmd::Overhead(_) | BenchmarkCmd::Extrinsic(_) | @@ -380,7 +386,7 @@ impl CliConfiguration for RelayChainCli { fn base_path(&self) -> Result> { Ok(self .shared_params() - .base_path() + .base_path()? .or_else(|| self.base_path.clone().map(Into::into))) } @@ -431,10 +437,6 @@ impl CliConfiguration for RelayChainCli { self.base.base.transaction_pool(x) } - fn state_cache_child_ratio(&self) -> Result> { - self.base.base.state_cache_child_ratio() - } - fn rpc_methods(&self) -> Result { self.base.base.rpc_methods() } diff --git a/code/parachain/node/src/service.rs b/code/parachain/node/src/service.rs index 3a6f96405b0..9542b49dee8 100644 --- a/code/parachain/node/src/service.rs +++ b/code/parachain/node/src/service.rs @@ -1,6 +1,5 @@ // std use std::{sync::Arc, time::Duration}; - // Cumulus Imports use common::OpaqueBlock; use cumulus_client_cli::CollatorOptions; @@ -12,20 +11,10 @@ use cumulus_client_service::{ use cumulus_primitives_core::ParaId; use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; +use cumulus_relay_chain_rpc_interface::{create_client_and_start_worker, RelayChainRpcInterface}; use polkadot_service::CollatorPair; - +use sc_network_common::service::NetworkBlock; // Substrate Imports -use sc_client_api::{ExecutorProvider, StateBackendFor}; -use sc_executor::NativeExecutionDispatch; -use sc_service::{Configuration, PartialComponents, TaskManager}; -use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; -use sp_api::{ConstructRuntimeApi, StateBackend}; -#[cfg(feature = "ocw")] -use sp_core::crypto::KeyTypeId; -use sp_runtime::traits::BlakeTwo256; -use sp_trie::PrefixedMemoryDB; - use crate::{ client::{Client, FullBackend, FullClient}, rpc, @@ -35,6 +24,15 @@ use crate::{ pablo::ExtendWithPabloApi, BaseHostRuntimeApis, }, }; +use sc_client_api::{ExecutorProvider, StateBackendFor}; +use sc_executor::NativeExecutionDispatch; +use sc_service::{Configuration, PartialComponents, TaskManager}; +use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +use sp_api::{ConstructRuntimeApi, StateBackend}; +#[cfg(feature = "ocw")] +use sp_core::crypto::KeyTypeId; +use sp_runtime::traits::BlakeTwo256; +use sp_trie::PrefixedMemoryDB; pub struct PicassoExecutor; @@ -337,7 +335,7 @@ where let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); - let (network, system_rpc_tx, start_network) = + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), @@ -384,6 +382,7 @@ where keystore: params.keystore_container.sync_keystore(), backend: backend.clone(), network: network.clone(), + tx_handler_controller, system_rpc_tx, telemetry: telemetry.as_mut(), })?; @@ -438,7 +437,7 @@ where "Failed to create parachain inherent", ) })?; - Ok((time, slot, parachain_inherent)) + Ok((slot, time, parachain_inherent)) } }, block_import: client.clone(), @@ -448,11 +447,11 @@ where keystore, force_authoring, slot_duration, + telemetry: telemetry.as_ref().map(|t| t.handle()), // We got around 500ms for proposing block_proposal_slot_portion: SlotProportion::new(1_f32 / 24_f32), // And a maximum of 750ms if slots are skipped max_block_proposal_slot_portion: Some(SlotProportion::new(1_f32 / 16_f32)), - telemetry: telemetry.as_ref().map(|t| t.handle()), }, ); @@ -520,7 +519,6 @@ where _, _, _, - _, >(cumulus_client_consensus_aura::ImportQueueParams { block_import: client.clone(), client: client.clone(), @@ -533,10 +531,9 @@ where slot_duration, ); - Ok((time, slot)) + Ok((slot, time)) }, registry: config.prometheus_registry(), - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), spawner: &task_manager.spawn_essential_handle(), telemetry, }) @@ -551,8 +548,10 @@ async fn build_relay_chain_interface( collator_options: CollatorOptions, ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => - Ok((Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, None)), + Some(relay_chain_url) => { + let client = create_client_and_start_worker(relay_chain_url, task_manager).await?; + Ok((Arc::new(RelayChainRpcInterface::new(client)) as Arc<_>, None)) + }, None => build_inprocess_relay_chain( polkadot_config, parachain_config, diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index 68cf4921dfe..715673c44d4 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -762,7 +762,10 @@ impl Contains for BaseCallFilter { // TODO: not up to date as whole composable setup !matches!( call, - RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Democracy(_) | RuntimeCall::Treasury(_) + RuntimeCall::Tokens(_) | + RuntimeCall::Indices(_) | + RuntimeCall::Democracy(_) | + RuntimeCall::Treasury(_) ) } } diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 736c436d6c5..28ac9a6fac4 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -142,11 +142,11 @@ orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-modu orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } # IBC support -ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } -ibc-primitives = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } -ibc-runtime-api = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } -pallet-ibc-ping = { git = "https://github.com/ComposableFi/centauri", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } +ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +ibc-primitives = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +ibc-runtime-api = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +pallet-ibc-ping = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } [dev-dependencies] frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/dali/src/governance.rs b/code/parachain/runtime/dali/src/governance.rs index d09faf5afe9..30fcd6c14c2 100644 --- a/code/parachain/runtime/dali/src/governance.rs +++ b/code/parachain/runtime/dali/src/governance.rs @@ -4,8 +4,6 @@ use super::*; use common::governance::native::*; use frame_support::traits::LockIdentifier; -pub type NativeDemocracy = democracy::Instance1; - pub type NativeCouncilMembership = membership::Instance1; pub type NativeTechnicalMembership = membership::Instance2; @@ -30,7 +28,7 @@ impl membership::Config for Runtime { impl collective::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; @@ -56,7 +54,7 @@ impl membership::Config for Runtime { impl collective::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; - type Proposal = Call; + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type MotionDuration = CouncilMotionDuration; type MaxProposals = CouncilMaxProposals; @@ -82,11 +80,11 @@ parameter_types! { pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; pub const DemocracyId: LockIdentifier = *b"democrac"; - pub RootOrigin: Origin = frame_system::RawOrigin::Root.into(); + pub RootOrigin: RuntimeOrigin = frame_system::RawOrigin::Root.into(); } -impl democracy::Config for Runtime { - type Proposal = Call; +impl democracy::Config for Runtime { + type Proposal = RuntimeCall; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; @@ -121,10 +119,6 @@ impl democracy::Config for Runtime { type PreimageByteDeposit = PreimageByteDeposit; type Scheduler = Scheduler; type WeightInfo = weights::democracy::WeightInfo; - type EnsureRoot = EnsureRoot; - type DemocracyId = DemocracyId; - type RuntimeOrigin = RuntimeOrigin; - type ProtocolRoot = RootOrigin; } // NOTE: making it multi via module_cdp_treasury seems fails other pallets diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 65b18a83a36..e41578cf524 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -83,9 +83,10 @@ use sp_std::prelude::*; pub use frame_support::{ construct_runtime, parameter_types, traits::{Contains, Everything, Get, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, + pallet_prelude::DispatchClass, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, + IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, PalletId, StorageValue, @@ -374,25 +375,12 @@ impl asset_tx_payment::HandleCredit for TransferToTreasuryOrD } impl asset_tx_payment::Config for Runtime { + type RuntimeEvent = RuntimeEvent; type Fungibles = Tokens; type OnChargeAssetTransaction = asset_tx_payment::FungiblesAdapter< PriceConverter, TransferToTreasuryOrDrop, >; - - type UseUserConfiguration = ConstBool; - - type WeightInfo = weights::asset_tx_payment::WeightInfo; - - type ConfigurationOrigin = EnsureRootOrHalfNativeCouncil; - - type ConfigurationExistentialDeposit = NativeExistentialDeposit; - - type PayableCall = Call; - - type Lock = Assets; - - type BalanceConverter = PriceConverter; } impl sudo::Config for Runtime { @@ -413,18 +401,18 @@ impl indices::Config for Runtime { type WeightInfo = weights::indices::WeightInfo; } -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; impl system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: AccountIndex, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { use sp_runtime::{ generic::{Era, SignedPayload}, traits::StaticLookup, @@ -469,9 +457,9 @@ impl system::offchain::SigningTypes for Runtime { impl system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } @@ -522,9 +510,9 @@ impl oracle::Config for Runtime { // See https://github.com/paritytech/cumulus/blob/polkadot-v0.9.8/polkadot-parachains/rococo/src/lib.rs for details. parameter_types! { /// 1/4 of block weight is reserved for XCMP - pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); /// 1/4 of block weight is reserved for handling Downward messages - pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); } impl cumulus_pallet_parachain_system::Config for Runtime { @@ -627,6 +615,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = DustRemovalWhitelist; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnTransfer = (); + type OnDeposit = (); } parameter_types! { @@ -676,19 +667,19 @@ impl utility::Config for Runtime { type WeightInfo = weights::utility::WeightInfo; } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::Governance => matches!( c, - Call::Democracy(..) | - Call::Council(..) | Call::TechnicalCommittee(..) | - Call::Treasury(..) | Call::Utility(..) + RuntimeCall::Democracy(..) | + RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::Treasury(..) | RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { // TODO (vim): We might not need this - matches!(c, Call::Proxy(proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(proxy::Call::reject_announcement { .. })) }, } } @@ -893,10 +884,10 @@ impl pallet_staking_rewards::Config for Runtime { // TODO(hussein-aitlahcen): // remove IBC pallets from the call filter once centauri is merged pub struct BaseCallFilter; -impl Contains for BaseCallFilter { - fn contains(call: &Call) -> bool { +impl Contains for BaseCallFilter { + fn contains(call: &RuntimeCall) -> bool { !(call_filter::Pallet::::contains(call) || - matches!(call, Call::Tokens(_) | Call::Indices(_) | Call::Treasury(_))) + matches!(call, RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Treasury(_))) } } @@ -965,7 +956,7 @@ impl dutch_auction::Config for Runtime { type UnixTime = Timestamp; type WeightInfo = weights::dutch_auction::WeightInfo; type PositionExistentialDeposit = NativeExistentialDeposit; - type XcmOrigin = Origin; + type XcmOrigin = RuntimeOrigin; type AdminOrigin = EnsureRootOrHalfNativeCouncil; type XcmSender = XcmRouter; } @@ -1334,7 +1325,7 @@ construct_runtime!( Council: collective:: = 30, CouncilMembership: membership:: = 31, Treasury: treasury:: = 32, - Democracy: democracy:: = 33, + Democracy: democracy = 33, TechnicalCommittee: collective:: = 70, TechnicalCommitteeMembership: membership:: = 71, @@ -1402,7 +1393,7 @@ pub type SignedExtra = ( asset_tx_payment::ChargeAssetTxPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = executive::Executive< diff --git a/code/parachain/runtime/dali/src/migrations.rs b/code/parachain/runtime/dali/src/migrations.rs index 4f6ae14f1e6..0578f2e9823 100644 --- a/code/parachain/runtime/dali/src/migrations.rs +++ b/code/parachain/runtime/dali/src/migrations.rs @@ -55,7 +55,7 @@ pub mod pablo_picasso_init_pools { /// Expects a vec of (pool_init_config, pool_lp_token_id) fn add_initial_pools_to_storage(pools: Vec) -> Weight { if !Pablo::pool_count().is_zero() { - return 0 + return Weight::zero() } pools.iter().for_each(|pool_creation_input| { @@ -66,7 +66,7 @@ pub mod pablo_picasso_init_pools { .expect("Pool config is valid; QED"); }); - weights::pablo::WeightInfo::::do_create_pool() * pools.len() as Weight + weights::pablo::WeightInfo::::do_create_pool().saturating_mul(pools.len() as u64) } fn create_two_token_pool_config( diff --git a/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs b/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs deleted file mode 100644 index ecbf13ccce2..00000000000 --- a/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs +++ /dev/null @@ -1,39 +0,0 @@ - -//! Autogenerated weights for `asset_tx_payment` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/release/composable -// benchmark -// pallet -// --chain=dali-dev -// --execution=wasm -// --wasm-execution=compiled -// --wasm-instantiation-strategy=legacy-instance-reuse -// --pallet=* -// --extrinsic=* -// --steps=50 -// --repeat=20 -// --output=runtime/dali/src/weights -// --log -// error - -#![cfg_attr(rustfmt, rustfmt_skip)] -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Weight functions for `currency_factory`. -pub struct WeightInfo(PhantomData); -impl asset_tx_payment::WeightInfo for WeightInfo { - fn set_payment_asset() -> Weight { - Weight::from_ref_time(26_387_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } -} diff --git a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs index 12373b6dbff..90dfa06df1b 100644 --- a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs @@ -72,8 +72,7 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI .saturating_add(T::DbWeight::get().reads(5 as u64)) .saturating_add(T::DbWeight::get().writes(3 as u64)) } - - fn unlock_rewards_for(x: u32) -> Weight { - x as _ + fn unlock_rewards_for(_: u32) -> Weight { + Weight::from_ref_time(10_000) } } diff --git a/code/parachain/runtime/dali/src/weights/mod.rs b/code/parachain/runtime/dali/src/weights/mod.rs index 1f990eae8dd..60009a6930f 100644 --- a/code/parachain/runtime/dali/src/weights/mod.rs +++ b/code/parachain/runtime/dali/src/weights/mod.rs @@ -1,5 +1,4 @@ #![allow(clippy::unnecessary_cast)] -pub mod asset_tx_payment; pub mod assets_registry; pub mod balances; pub mod bonded_finance; diff --git a/code/parachain/runtime/dali/src/weights/proxy.rs b/code/parachain/runtime/dali/src/weights/proxy.rs index 2f9dbd001ae..e9f01d5e553 100644 --- a/code/parachain/runtime/dali/src/weights/proxy.rs +++ b/code/parachain/runtime/dali/src/weights/proxy.rs @@ -109,21 +109,10 @@ impl proxy::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - // Storage: Proxy Proxies (r:1 w:1) - /// The range of component `p` is `[1, 3]`. - fn anonymous(_p: u32, ) -> Weight { - Weight::from_ref_time(56_123_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn create_pure(_: u32) -> Weight { + Weight::from_ref_time(10_000 as u64) } - // Storage: Proxy Proxies (r:1 w:1) - /// The range of component `p` is `[0, 2]`. - fn kill_anonymous(p: u32, ) -> Weight { - Weight::from_ref_time(31_468_000 as u64) - // Standard Error: 3_488_000 - .saturating_add(Weight::from_ref_time(152_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + fn kill_pure(_: u32) -> Weight { + Weight::from_ref_time(10_000 as u64) } } diff --git a/code/parachain/runtime/dali/src/xcmp.rs b/code/parachain/runtime/dali/src/xcmp.rs index bf9eae2dacb..936b4de0cbe 100644 --- a/code/parachain/runtime/dali/src/xcmp.rs +++ b/code/parachain/runtime/dali/src/xcmp.rs @@ -50,7 +50,7 @@ pub type Barrier = ( TakeWeightCredit, ); -pub type LocalOriginToLocation = SignedToAccountId32; +pub type LocalOriginToLocation = SignedToAccountId32; /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -93,18 +93,18 @@ pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for // foreign chains who want to have a local sovereign account on this chain which they control. - SovereignSignedViaLocation, + SovereignSignedViaLocation, // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when // recognized. - RelayChainAsNative, + RelayChainAsNative, // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when // recognized. - SiblingParachainAsNative, + SiblingParachainAsNative, // Native signed account converter; this just converts an `AccountId32` origin into a normal // `Origin::Signed` origin of the same 32-byte value. - SignedAccountId32AsNative, + SignedAccountId32AsNative, // Xcm origins can be represented natively under the Xcm pallet's Xcm origin. - XcmPassthrough, + XcmPassthrough, ); pub struct StaticAssetsMap; @@ -161,11 +161,11 @@ impl< AssetConverter: Convert>, > DropAssets for CaptureDropAssets { - fn drop_assets(origin: &MultiLocation, assets: Assets) -> Weight { + fn drop_assets(origin: &MultiLocation, assets: Assets) -> u64 { let multi_assets: Vec = assets.into(); let mut can_return_on_request = vec![]; log::info!(target : "xcmp", "drop_assets"); - let mut weight = Weight::zero(); + let mut weight = 0; for asset in multi_assets { if let MultiAsset { id: Concrete(location), fun: Fungible(_amount) } = asset.clone() { if let Some(_converted) = AssetConverter::convert(location) { @@ -200,7 +200,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); // <- should be enough to allow teleportation of PICA type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = Trader; type ResponseHandler = RelayerXcm; @@ -243,7 +243,7 @@ impl orml_xtokens::Config for Runtime { type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = ThisLocal; type XcmExecutor = XcmExecutor; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; type MaxAssetsForTransfer = XcmMaxAssetsForTransfer; @@ -258,7 +258,7 @@ impl orml_unknown_tokens::Config for Runtime { parameter_types! { // One XCM operation is 200_000_000 weight, cross-chain transfer ~= 2x of transfer. - pub const UnitWeightCost: Weight = 200_000_000; + pub const UnitWeightCost: u64 = 200_000_000; pub const MaxInstructions: u32 = 100; } @@ -270,7 +270,7 @@ pub fn xcm_asset_fee_estimator(instructions: u8, asset_id: CurrencyId) -> Balanc .1 } -pub fn xcm_fee_estimator(instructions: u8) -> Weight { +pub fn xcm_fee_estimator(instructions: u8) -> u64 { assert!((instructions as u32) <= MaxInstructions::get()); UnitWeightCost::get() * instructions as u64 } @@ -284,10 +284,10 @@ parameter_types! { } pub type CouncilToPlurality = - BackingToPlurality, CouncilBodyId>; + BackingToPlurality, CouncilBodyId>; -pub struct RootToHereLocation( - PhantomData<(Origin, AccountId, Network)>, +pub struct RootToHereLocation( + PhantomData<(RuntimeOrigin, AccountId, Network)>, ); impl, Network: Get> xcm_executor::traits::Convert @@ -308,12 +308,12 @@ where pub type RootOrNativeCouncilOrSignedLocation = (RootOrNativeCouncilLocation, LocalOriginToLocation); pub type RootOrNativeCouncilLocation = - (CouncilToPlurality, RootToHereLocation); + (CouncilToPlurality, RootToHereLocation); pub struct RootExecuteFilter; -impl Contains<(MultiLocation, Xcm)> for RootExecuteFilter { - fn contains((origin, _call): &(MultiLocation, Xcm)) -> bool { +impl Contains<(MultiLocation, Xcm)> for RootExecuteFilter { + fn contains((origin, _call): &(MultiLocation, Xcm)) -> bool { origin == &MultiLocation { parents: 0, interior: Here } } } @@ -321,14 +321,14 @@ impl Contains<(MultiLocation, Xcm)> for RootExecuteFilter { impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; type XcmRouter = XcmRouter; - type SendXcmOrigin = EnsureXcmOrigin; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type SendXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = RootExecuteFilter; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type LocationInverter = LocationInverter; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index 154ca91621f..b5a23e53326 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -420,20 +420,6 @@ impl asset_tx_payment::Config for Runtime { PriceConverter, TransferToTreasuryOrDrop, >; - - // type UseUserConfiguration = ConstBool; - - // type WeightInfo = weights::asset_tx_payment::WeightInfo; - - // type ConfigurationOrigin = EnsureRootOrTwoThirdNativeCouncil; - - // type ConfigurationExistentialDeposit = NativeExistentialDeposit; - - // type PayableCall = Call; - - // type Lock = Assets; - - // type BalanceConverter = PriceConverter; } impl sudo::Config for Runtime { From 8121ce6a6222bff7f8bae78fc660937a0d614cef Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 17:46:16 +0100 Subject: [PATCH 07/44] chore: more update for v0.9.30 --- code/Cargo.lock | 2689 +++++------------ .../local-integration-tests/Cargo.toml | 8 +- code/parachain/frame/assets/Cargo.toml | 4 +- .../parachain/frame/bonded-finance/Cargo.toml | 4 +- code/parachain/frame/cosmwasm/Cargo.toml | 10 +- code/parachain/frame/cosmwasm/src/ibc.rs | 11 +- code/parachain/frame/dex-router/Cargo.toml | 4 +- code/parachain/frame/dutch-auction/Cargo.toml | 6 +- .../frame/governance-registry/Cargo.toml | 2 +- code/parachain/frame/lending/Cargo.toml | 4 +- code/parachain/frame/liquidations/Cargo.toml | 6 +- code/parachain/frame/mosaic/Cargo.toml | 4 +- code/parachain/frame/pablo/Cargo.toml | 4 +- .../frame/staking-rewards/Cargo.toml | 6 +- code/parachain/frame/vault/Cargo.toml | 4 +- code/parachain/frame/vesting/Cargo.toml | 4 +- code/parachain/runtime/common/Cargo.toml | 4 +- code/parachain/runtime/composable/Cargo.toml | 10 +- code/parachain/runtime/dali/Cargo.toml | 10 +- code/parachain/runtime/picasso/Cargo.toml | 10 +- 20 files changed, 818 insertions(+), 1986 deletions(-) diff --git a/code/Cargo.lock b/code/Cargo.lock index 4604a1ee35a..74e55c0bbc4 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -239,7 +239,7 @@ dependencies = [ "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -252,7 +252,7 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -689,7 +689,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "array-bytes", "async-trait", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "fnv", "futures 0.3.25", "futures-timer", @@ -705,14 +705,14 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", @@ -725,7 +725,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "beefy-gadget", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "futures 0.3.25", "jsonrpsee 0.15.1", "log 0.4.17", @@ -744,109 +744,47 @@ name = "beefy-light-client" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-light-client-primitives", + "beefy-primitives", "ckb-merkle-mountain-range", "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "light-client-common", + "pallet-beefy-mmr", + "pallet-mmr", "parity-scale-codec", "rs_merkle", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "beefy-light-client" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "ckb-merkle-mountain-range", - "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "rs_merkle", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "beefy-light-client-primitives" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "ckb-merkle-mountain-range", "derive_more", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common", "parity-scale-codec", "rs_merkle", "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "beefy-light-client-primitives" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "ckb-merkle-mountain-range", - "derive_more", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "rs_merkle", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - -[[package]] -name = "beefy-merkle-tree" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "beefy-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "beefy-primitives", + "sp-api", ] [[package]] @@ -856,7 +794,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -1612,9 +1550,9 @@ dependencies = [ "composable-support", "composable-traits", "cumulus-pallet-xcm", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "num-traits", "orml-tokens", "orml-traits", @@ -1625,7 +1563,7 @@ dependencies = [ "pallet-sudo", "pallet-treasury", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "primitives", "scale-info", "serde", @@ -1654,8 +1592,8 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-tests-helpers", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "proptest", "rust_decimal", @@ -1684,13 +1622,13 @@ dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-client-service", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "dali-runtime", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-benchmarking-cli", "hex", "jsonrpsee 0.15.1", @@ -1702,14 +1640,14 @@ dependencies = [ "pablo-runtime-api", "pallet-assets", "pallet-crowdloan-rewards", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-ibc", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "picasso-runtime", "polkadot-cli", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "polkadot-service", "primitives", "sc-basic-authorship", @@ -1732,20 +1670,20 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", "sp-transaction-pool", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-build-script-utils", @@ -1768,13 +1706,13 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -1801,32 +1739,32 @@ dependencies = [ "pallet-preimage", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vault", "pallet-xcm", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "primitives", "scale-info", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-consensus-aura", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "xcm", "xcm-builder", "xcm-executor", @@ -1861,8 +1799,8 @@ dependencies = [ name = "composable-support" version = "1.0.0" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "hex", "is_sorted", "num-traits", @@ -1884,9 +1822,9 @@ name = "composable-tests-helpers" version = "1.0.0" dependencies = [ "composable-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", @@ -1901,12 +1839,12 @@ version = "1.0.0" dependencies = [ "bitflags", "composable-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-proxy", "parity-scale-codec", "plotters", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "proptest", "scale-info", "serde", @@ -2088,7 +2026,7 @@ dependencies = [ "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2099,7 +2037,7 @@ name = "cosmwasm-runtime-api" version = "1.0.0" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -2386,11 +2324,11 @@ version = "1.0.0" dependencies = [ "composable-support", "crowdloan-rewards-runtime-api", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "jsonrpsee 0.15.1", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2402,7 +2340,7 @@ version = "1.0.0" dependencies = [ "composable-support", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", ] [[package]] @@ -2524,7 +2462,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1f dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.25", "parity-scale-codec", @@ -2532,9 +2470,9 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2548,7 +2486,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1f dependencies = [ "async-trait", "cumulus-client-consensus-common", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "futures 0.3.25", "parity-scale-codec", "sc-client-api", @@ -2556,14 +2494,14 @@ dependencies = [ "sc-consensus-aura", "sc-consensus-slots", "sc-telemetry", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", @@ -2580,10 +2518,10 @@ dependencies = [ "dyn-clone", "futures 0.3.25", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-client-api", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2604,10 +2542,10 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2621,7 +2559,7 @@ name = "cumulus-client-pov-recovery" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", @@ -2629,11 +2567,11 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "sc-client-api", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2649,18 +2587,18 @@ dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "parking_lot 0.12.1", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-client-api", "sc-consensus", "sc-consensus-babe", "sc-service", "sc-telemetry", "sc-tracing", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2674,8 +2612,8 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-aura", "parity-scale-codec", "scale-info", @@ -2691,9 +2629,9 @@ name = "cumulus-pallet-dmp-queue" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -2711,27 +2649,27 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1f dependencies = [ "bytes 1.3.0", "cumulus-pallet-parachain-system-proc-macro", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log 0.4.17", "pallet-balances", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "scale-info", "serde", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "xcm", ] @@ -2751,10 +2689,10 @@ name = "cumulus-pallet-session-benchmarking" version = "3.0.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", "parity-scale-codec", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2765,9 +2703,9 @@ name = "cumulus-pallet-xcm" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -2782,9 +2720,9 @@ name = "cumulus-pallet-xcmp-queue" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "rand_chacha 0.3.1", @@ -2795,33 +2733,17 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "cumulus-primitives-core" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27#b86cd207fc77af888f223c10363ae4d18a4b63b4" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "polkadot-core-primitives 0.9.27", - "polkadot-parachain 0.9.27", - "polkadot-primitives 0.9.27", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "cumulus-primitives-core" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec", - "polkadot-core-primitives 0.9.30", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-primitives", + "sp-api", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2833,15 +2755,15 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", "parity-scale-codec", "sc-client-api", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2855,12 +2777,12 @@ name = "cumulus-primitives-timestamp" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "futures 0.3.25", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", ] [[package]] @@ -2868,13 +2790,13 @@ name = "cumulus-primitives-utility" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", "log 0.4.17", "parity-scale-codec", - "polkadot-core-primitives 0.9.30", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-core-primitives", + "polkadot-parachain", + "polkadot-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2889,7 +2811,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", @@ -2903,7 +2825,7 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2918,7 +2840,7 @@ version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ "async-trait", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "derive_more", "futures 0.3.25", "jsonrpsee-core 0.15.1", @@ -2927,7 +2849,7 @@ dependencies = [ "polkadot-overseer", "polkadot-service", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2942,7 +2864,7 @@ source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1f dependencies = [ "async-trait", "backoff", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", @@ -2952,7 +2874,7 @@ dependencies = [ "polkadot-service", "sc-client-api", "sc-rpc-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -2967,9 +2889,9 @@ name = "cumulus-test-relay-sproof-builder" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -3274,19 +3196,19 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex", "hex-literal", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", + "ibc-primitives", "ibc-runtime-api", "lending-runtime-api", "orml-tokens", @@ -3313,8 +3235,8 @@ dependencies = [ "pallet-dutch-auction", "pallet-fnft", "pallet-governance-registry", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "pallet-ibc", + "pallet-ibc-ping", "pallet-identity", "pallet-indices", "pallet-lending", @@ -3328,10 +3250,10 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-staking-rewards", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -3339,23 +3261,23 @@ dependencies = [ "pallet-vault", "pallet-vesting 1.0.0", "pallet-xcm", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "primitives", "scale-info", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-consensus-aura", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "xcm", "xcm-builder", "xcm-executor", @@ -4135,42 +4057,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e" -[[package]] -name = "frame-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "linregress", - "log 0.4.17", - "parity-scale-codec", - "paste 1.0.11", - "scale-info", - "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "linregress", "log 0.4.17", "parity-scale-codec", "paste 1.0.11", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4190,9 +4090,9 @@ dependencies = [ "chrono", "clap 3.2.23", "comfy-table", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "gethostname", "handlebars", "hash-db", @@ -4215,12 +4115,12 @@ dependencies = [ "serde", "serde_json", "serde_nanos", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-database", "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4248,8 +4148,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4263,8 +4163,8 @@ name = "frame-executive" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-try-runtime", "parity-scale-codec", "scale-info", @@ -4287,36 +4187,6 @@ dependencies = [ "serde", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "impl-trait-for-tuples", - "k256", - "log 0.4.17", - "once_cell", - "parity-scale-codec", - "paste 1.0.11", - "scale-info", - "serde", - "smallvec 1.10.0", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tt-call", -] - [[package]] name = "frame-support" version = "4.0.0-dev" @@ -4324,7 +4194,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log 0.4.17", @@ -4334,14 +4204,14 @@ dependencies = [ "scale-info", "serde", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4349,18 +4219,6 @@ dependencies = [ "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "Inflector", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -4368,47 +4226,25 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools", "itertools", "proc-macro2 1.0.49", "quote 1.0.23", "syn 1.0.107", ] -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.2.1", "proc-macro2 1.0.49", "quote 1.0.23", "syn 1.0.107", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -4419,29 +4255,12 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -4450,7 +4269,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "sp-weights", ] @@ -4459,9 +4278,9 @@ name = "frame-system-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4475,7 +4294,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", ] [[package]] @@ -4483,9 +4302,9 @@ name = "frame-try-runtime" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -4850,12 +4669,12 @@ dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common", "parity-scale-codec", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4863,27 +4682,6 @@ dependencies = [ "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "grandpa-light-client-primitives" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "anyhow", - "derive_more", - "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "grandpa-light-client-verifier" version = "0.1.0" @@ -4891,13 +4689,13 @@ source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6 dependencies = [ "anyhow", "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "frame-support", + "grandpa-light-client-primitives", "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common", "parity-scale-codec", "primitive-types", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -4905,27 +4703,6 @@ dependencies = [ "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "grandpa-light-client-verifier" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "anyhow", - "finality-grandpa", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "hash-db", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "primitive-types", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "group" version = "0.11.0" @@ -5336,8 +5113,8 @@ source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6 dependencies = [ "derive_more", "flex-error", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-derive", + "ibc-proto", "ics23", "num-traits", "parity-scale-codec", @@ -5356,58 +5133,6 @@ dependencies = [ "uint", ] -[[package]] -name = "ibc" -version = "0.15.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" -dependencies = [ - "derive_more", - "flex-error", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ics23", - "num-traits", - "parity-scale-codec", - "primitive-types", - "prost 0.11.6", - "safe-regex", - "serde", - "serde_derive", - "serde_json", - "subtle-encoding", - "tendermint", - "tendermint-proto", - "time 0.3.17", - "tracing", - "uint", -] - -[[package]] -name = "ibc" -version = "0.15.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "derive_more", - "flex-error", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics23", - "num-traits", - "parity-scale-codec", - "primitive-types", - "prost 0.11.6", - "safe-regex", - "serde", - "serde_derive", - "serde_json", - "subtle-encoding", - "tendermint", - "tendermint-proto", - "time 0.3.17", - "tracing", - "uint", -] - [[package]] name = "ibc-derive" version = "0.1.0" @@ -5420,30 +5145,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "ibc-derive" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" -dependencies = [ - "convert_case 0.6.0", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - -[[package]] -name = "ibc-derive" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "convert_case 0.6.0", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "ibc-primitives" version = "0.1.0" @@ -5451,9 +5152,9 @@ source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6 dependencies = [ "base58", "blake2", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "hex", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", "parity-scale-codec", "ripemd", "scale-info", @@ -5468,51 +5169,6 @@ dependencies = [ "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "ibc-primitives" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" -dependencies = [ - "base58", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "hex", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "parity-scale-codec", - "ripemd", - "scale-info", - "sha2 0.10.6", - "sha3", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - -[[package]] -name = "ibc-primitives" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "base58", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "hex", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "ripemd", - "scale-info", - "serde", - "sha2 0.10.6", - "sha3", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "ibc-proto" version = "0.18.0" @@ -5525,39 +5181,15 @@ dependencies = [ "tendermint-proto", ] -[[package]] -name = "ibc-proto" -version = "0.18.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355#c7d2f2d812074850c3b5ab7e42fa582f72582355" -dependencies = [ - "base64 0.13.1", - "bytes 1.3.0", - "prost 0.11.6", - "serde", - "tendermint-proto", -] - -[[package]] -name = "ibc-proto" -version = "0.18.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "base64 0.13.1", - "bytes 1.3.0", - "prost 0.11.6", - "serde", - "tendermint-proto", -] - [[package]] name = "ibc-runtime-api" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc-primitives", + "pallet-ibc", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -5568,8 +5200,8 @@ source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6 dependencies = [ "bytes 1.3.0", "flex-error", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", + "ibc-proto", "ics23", "prost 0.11.6", "serde", @@ -5582,38 +5214,18 @@ dependencies = [ ] [[package]] -name = "ics07-tendermint" +name = "ics10-grandpa" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "bytes 1.3.0", - "flex-error", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics23", - "prost 0.11.6", - "serde", - "serde_json", - "subtle-encoding", - "tendermint", - "tendermint-light-client-verifier", - "tendermint-proto", - "time 0.3.17", -] - -[[package]] -name = "ics10-grandpa" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", "derive_more", "finality-grandpa", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "grandpa-light-client-primitives", + "grandpa-light-client-verifier", + "ibc", + "ibc-proto", + "light-client-common", "parity-scale-codec", "primitive-types", "prost 0.11.6", @@ -5621,61 +5233,34 @@ dependencies = [ "prost-types 0.11.6", "serde", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tendermint", "tendermint-proto", ] -[[package]] -name = "ics10-grandpa" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "anyhow", - "derive_more", - "finality-grandpa", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "grandpa-light-client-verifier 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "primitive-types", - "prost 0.11.6", - "prost-build 0.11.6", - "prost-types 0.11.6", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tendermint", - "tendermint-proto", -] - [[package]] name = "ics11-beefy" version = "0.1.0" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ "anyhow", - "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-light-client", + "beefy-light-client-primitives", + "beefy-primitives", "bytes 1.3.0", "derive_more", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", + "ibc-proto", + "light-client-common", "parity-scale-codec", "primitive-types", "prost 0.11.6", "prost-build 0.11.6", "prost-types 0.11.6", "serde", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -5683,34 +5268,6 @@ dependencies = [ "tendermint-proto", ] -[[package]] -name = "ics11-beefy" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "anyhow", - "beefy-light-client 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "bytes 1.3.0", - "derive_more", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "primitive-types", - "prost 0.11.6", - "prost-build 0.11.6", - "prost-types 0.11.6", - "serde", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tendermint", - "tendermint-proto", -] - [[package]] name = "ics23" version = "0.8.1" @@ -6368,13 +5925,13 @@ name = "kusama-runtime" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -6410,12 +5967,12 @@ dependencies = [ "pallet-proxy", "pallet-recovery", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-fn", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -6425,7 +5982,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", @@ -6433,23 +5990,23 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -6462,8 +6019,8 @@ name = "kusama-runtime-constants" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "polkadot-primitives 0.9.30", + "frame-support", + "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.10.0", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -6548,7 +6105,7 @@ dependencies = [ "lending-runtime-api", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -6561,7 +6118,7 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", ] [[package]] @@ -7199,7 +6756,7 @@ dependencies = [ "anyhow", "derive_more", "hash-db", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", "parity-scale-codec", "primitive-types", "serde", @@ -7207,22 +6764,6 @@ dependencies = [ "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "light-client-common" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "anyhow", - "derive_more", - "hash-db", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "parity-scale-codec", - "primitive-types", - "serde", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "link-cplusplus" version = "1.0.8" @@ -8147,10 +7688,10 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "orml-traits", "parity-scale-codec", "scale-info", @@ -8162,9 +7703,9 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", @@ -8180,10 +7721,10 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "orml-xcm-support", "parity-scale-codec", "scale-info", @@ -8195,9 +7736,9 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec", "scale-info", "serde", @@ -8209,9 +7750,9 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "orml-traits", "parity-scale-codec", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8223,11 +7764,11 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527#02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "orml-traits", "orml-xcm-support", "pallet-xcm", @@ -8290,7 +7831,7 @@ dependencies = [ "pablo-runtime-api", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8303,7 +7844,7 @@ dependencies = [ "composable-support", "composable-traits", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -8325,16 +7866,16 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "ecdsa", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", "hex-literal", "libsecp256k1", "multihash", "p256", "pallet-balances", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "proptest", "rand_core 0.6.4", @@ -8355,8 +7896,8 @@ name = "pallet-asset-tx-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-transaction-payment", "parity-scale-codec", "scale-info", @@ -8374,9 +7915,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "num-traits", "orml-tokens", "orml-traits", @@ -8386,7 +7927,7 @@ dependencies = [ "primitives", "proptest", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8399,10 +7940,10 @@ name = "pallet-assets-registry" version = "1.0.0" dependencies = [ "composable-traits", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-balances", "pallet-currency-factory", @@ -8420,9 +7961,9 @@ name = "pallet-aura" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8436,13 +7977,13 @@ name = "pallet-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", + "pallet-session", "parity-scale-codec", "scale-info", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -8452,8 +7993,8 @@ name = "pallet-authorship" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", @@ -8467,13 +8008,13 @@ name = "pallet-babe" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authorship", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8481,8 +8022,8 @@ dependencies = [ "sp-consensus-vrf", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -8491,10 +8032,10 @@ name = "pallet-bags-list" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-balances", "parity-scale-codec", @@ -8511,9 +8052,9 @@ name = "pallet-balances" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -8521,31 +8062,15 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-beefy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", + "frame-support", + "frame-system", + "pallet-session", "parity-scale-codec", "scale-info", "serde", @@ -8553,43 +8078,20 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-beefy-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "hex", - "log 0.4.17", - "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "array-bytes", - "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-merkle-tree", + "beefy-primitives", + "frame-support", + "frame-system", "log 0.4.17", - "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-beefy", + "pallet-mmr", + "pallet-session", "parity-scale-codec", "scale-info", "serde", @@ -8606,12 +8108,12 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "orml-tokens", "orml-traits", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-vesting 1.0.0", "parity-scale-codec", "proptest", @@ -8630,9 +8132,9 @@ name = "pallet-bounties" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-treasury", "parity-scale-codec", @@ -8648,8 +8150,8 @@ name = "pallet-call-filter" version = "1.0.0" dependencies = [ "composable-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "scale-info", @@ -8666,9 +8168,9 @@ name = "pallet-child-bounties" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-bounties", "pallet-treasury", @@ -8685,18 +8187,18 @@ name = "pallet-collator-selection" version = "3.0.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authorship", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "parity-scale-codec", "rand 0.8.5", "scale-info", "serde", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -8705,9 +8207,9 @@ name = "pallet-collective" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -8725,12 +8227,12 @@ dependencies = [ "composable-traits", "cosmwasm-vm", "cosmwasm-vm-wasmi", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c7d2f2d812074850c3b5ab7e42fa582f72582355)", + "ibc", + "ibc-primitives", "lazy_static", "libsecp256k1", "log 0.4.17", @@ -8740,8 +8242,8 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-governance-registry", - "pallet-ibc 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-ibc", + "pallet-timestamp", "parity-scale-codec", "parity-wasm 0.45.0", "primitives", @@ -8768,14 +8270,14 @@ dependencies = [ "composable-support", "composable-tests-helpers", "ed25519-dalek", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", "hex-literal", "libsecp256k1", "pallet-balances", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "rustc-hex", "scale-info", @@ -8795,9 +8297,9 @@ version = "1.0.0" dependencies = [ "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-balances", "parity-scale-codec", "proptest", @@ -8814,9 +8316,9 @@ name = "pallet-democracy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -8832,16 +8334,16 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "orml-tokens", "orml-traits", "pallet-balances", "pallet-currency-factory", "pallet-pablo", "pallet-staking-rewards", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", @@ -8860,10 +8362,10 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support", + "frame-system", "hex-literal", "log 0.4.17", "num-traits", @@ -8872,9 +8374,9 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-currency-factory", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "primitives", "proptest", "scale-info", @@ -8893,10 +8395,10 @@ name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-election-provider-support-benchmarking", "parity-scale-codec", @@ -8917,9 +8419,9 @@ name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "parity-scale-codec", "sp-npos-elections", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8930,9 +8432,9 @@ name = "pallet-elections-phragmen" version = "5.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -8948,19 +8450,19 @@ name = "pallet-fast-unstake" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-balances", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -8971,11 +8473,11 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-proxy", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -8990,9 +8492,9 @@ name = "pallet-gilt" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9005,8 +8507,8 @@ name = "pallet-governance-registry" version = "1.0.0" dependencies = [ "composable-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "orml-traits", "pallet-balances", "parity-scale-codec", @@ -9023,21 +8525,21 @@ name = "pallet-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authorship", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "parity-scale-codec", "scale-info", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9046,38 +8548,38 @@ name = "pallet-ibc" version = "0.0.1" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "beefy-light-client-primitives", + "cumulus-primitives-core", "derive_more", "finality-grandpa", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", + "grandpa-light-client-primitives", "hex", "hex-literal", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "ibc", + "ibc-derive", + "ibc-primitives", + "ibc-proto", + "ics07-tendermint", + "ics10-grandpa", + "ics11-beefy", "ics23", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "light-client-common", "log 0.4.17", - "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "pallet-ibc-ping", + "pallet-timestamp", + "parachain-info", "parity-scale-codec", "prost 0.11.6", "scale-info", "serde", "serde_json", "sha2 0.10.6", - "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "simple-iavl", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9087,60 +8589,15 @@ dependencies = [ "tendermint-proto", ] -[[package]] -name = "pallet-ibc" -version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "beefy-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", - "derive_more", - "finality-grandpa", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "grandpa-light-client-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "hex", - "hex-literal", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-derive 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-proto 0.18.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics07-tendermint 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics10-grandpa 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics11-beefy 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ics23", - "light-client-common 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "log 0.4.17", - "pallet-ibc-ping 0.0.1 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "prost 0.11.6", - "scale-info", - "serde_json", - "sha2 0.10.6", - "simple-iavl 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tendermint", - "tendermint-light-client-verifier", - "tendermint-proto", -] - [[package]] name = "pallet-ibc-ping" version = "0.0.1" source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", + "ibc", + "ibc-primitives", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -9150,33 +8607,15 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-ibc-ping" -version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "ibc 0.15.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "ibc-primitives 0.1.0 (git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6)", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-identity" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "enumflags2", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9189,9 +8628,9 @@ name = "pallet-im-online" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authorship", "parity-scale-codec", @@ -9200,7 +8639,7 @@ dependencies = [ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9209,9 +8648,9 @@ name = "pallet-indices" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9229,10 +8668,10 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "hex-literal", "log 0.4.17", "num-traits", @@ -9245,7 +8684,7 @@ dependencies = [ "pallet-dutch-auction", "pallet-liquidations", "pallet-oracle", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-vault", "parity-scale-codec", "primitives", @@ -9272,9 +8711,9 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "cumulus-pallet-xcm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex-literal", "log 0.4.17", "num-traits", @@ -9284,7 +8723,7 @@ dependencies = [ "pallet-balances", "pallet-currency-factory", "pallet-dutch-auction", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "primitives", "proptest", @@ -9303,9 +8742,9 @@ name = "pallet-membership" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -9315,38 +8754,20 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "ckb-merkle-mountain-range", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-mmr" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ckb-merkle-mountain-range", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9359,10 +8780,10 @@ dependencies = [ "jsonrpsee 0.15.1", "parity-scale-codec", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9373,9 +8794,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "num-traits", "orml-tokens", @@ -9397,9 +8818,9 @@ name = "pallet-multisig" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9412,15 +8833,15 @@ name = "pallet-nomination-pools" version = "1.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9429,10 +8850,10 @@ name = "pallet-nomination-pools-benchmarking" version = "1.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-bags-list", "pallet-nomination-pools", "pallet-staking", @@ -9440,7 +8861,7 @@ dependencies = [ "scale-info", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9450,7 +8871,7 @@ version = "1.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9459,15 +8880,15 @@ name = "pallet-offences" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9476,21 +8897,21 @@ name = "pallet-offences-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "pallet-babe", "pallet-balances", "pallet-grandpa", "pallet-im-online", "pallet-offences", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-staking", "parity-scale-codec", "scale-info", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9501,13 +8922,13 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "lite-json", "log 0.4.17", "pallet-balances", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "parking_lot 0.12.1", "proptest", @@ -9529,15 +8950,15 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "orml-tokens", "orml-traits", "pallet-currency-factory", "pallet-staking-rewards", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "proptest", "rust_decimal", @@ -9554,9 +8975,9 @@ name = "pallet-preimage" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9572,8 +8993,8 @@ dependencies = [ "bitflags", "composable-support", "composable-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9588,9 +9009,9 @@ name = "pallet-proxy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9603,8 +9024,8 @@ name = "pallet-randomness-collective-flip" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "safe-mix", "scale-info", @@ -9617,9 +9038,9 @@ name = "pallet-recovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9632,9 +9053,9 @@ name = "pallet-scheduler" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -9643,44 +9064,23 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "impl-trait-for-tuples", - "log 0.4.17", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log 0.4.17", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9690,14 +9090,14 @@ name = "pallet-session-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", "pallet-staking", "rand 0.7.3", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9706,8 +9106,8 @@ name = "pallet-society" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", @@ -9720,13 +9120,13 @@ name = "pallet-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authorship", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", @@ -9734,7 +9134,7 @@ dependencies = [ "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9766,9 +9166,9 @@ dependencies = [ "composable-tests-helpers", "composable-traits", "env_logger 0.9.3", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "orml-tokens", "orml-traits", @@ -9777,7 +9177,7 @@ dependencies = [ "pallet-currency-factory", "pallet-fnft", "pallet-proxy", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "primitives", "proptest", @@ -9794,8 +9194,8 @@ name = "pallet-sudo" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9803,40 +9203,22 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "pallet-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "pallet-timestamp" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", ] [[package]] @@ -9844,9 +9226,9 @@ name = "pallet-tips" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-treasury", "parity-scale-codec", @@ -9863,8 +9245,8 @@ name = "pallet-transaction-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -9882,7 +9264,7 @@ dependencies = [ "jsonrpsee 0.15.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-rpc", @@ -9896,7 +9278,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -9905,9 +9287,9 @@ name = "pallet-treasury" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", @@ -9922,9 +9304,9 @@ name = "pallet-utility" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9941,9 +9323,9 @@ dependencies = [ "composable-support", "composable-tests-helpers", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "num-traits", "once_cell", @@ -9967,12 +9349,12 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "orml-tokens", "orml-traits", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", @@ -9987,9 +9369,9 @@ name = "pallet-vesting" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -10002,8 +9384,8 @@ name = "pallet-xcm" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -10020,9 +9402,9 @@ name = "pallet-xcm-benchmarks" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "parity-scale-codec", "scale-info", @@ -10032,27 +9414,14 @@ dependencies = [ "xcm-executor", ] -[[package]] -name = "parachain-info" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27#b86cd207fc77af888f223c10363ae4d18a4b63b4" -dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.27)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "scale-info", - "serde", -] - [[package]] name = "parachain-info" version = "0.1.0" source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30#7b1fc0ed107fe42bb7e6a5dfefb586f4c3ae4328" dependencies = [ - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -10387,13 +9756,13 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -10427,32 +9796,32 @@ dependencies = [ "pallet-proxy", "pallet-randomness-collective-flip", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", "pallet-utility", "pallet-vesting 1.0.0", "pallet-xcm", - "parachain-info 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.30)", + "parachain-info", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "primitives", "scale-info", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-consensus-aura", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "xcm", "xcm-builder", "xcm-executor", @@ -10600,7 +9969,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "tracing-gum", ] @@ -10614,7 +9983,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "tracing-gum", ] @@ -10634,7 +10003,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -10656,7 +10025,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "sc-network", "thiserror", @@ -10694,16 +10063,16 @@ name = "polkadot-client" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", + "frame-benchmarking", "frame-benchmarking-cli", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "frame-system-rpc-runtime-api", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives 0.9.30", + "polkadot-core-primitives", "polkadot-node-core-parachains-inherent", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-runtime", "polkadot-runtime-common", "rococo-runtime", @@ -10711,22 +10080,22 @@ dependencies = [ "sc-consensus", "sc-executor", "sc-service", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", + "sp-inherents", "sp-keyring", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", "sp-transaction-pool", ] @@ -10743,7 +10112,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -10751,19 +10120,6 @@ dependencies = [ "tracing-gum", ] -[[package]] -name = "polkadot-core-primitives" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "parity-scale-codec", - "parity-util-mem", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "polkadot-core-primitives" version = "0.9.30" @@ -10792,7 +10148,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-network", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -10807,7 +10163,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#0645 dependencies = [ "parity-scale-codec", "polkadot-node-primitives", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "reed-solomon-novelpoly", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -10824,7 +10180,7 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", @@ -10850,7 +10206,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-network", "sc-network-common", "sp-consensus", @@ -10869,7 +10225,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-maybe-compressed-blob", "thiserror", @@ -10894,12 +10250,12 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-keystore", "schnorrkel", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", @@ -10920,7 +10276,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "thiserror", "tracing-gum", ] @@ -10937,7 +10293,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-statement-table", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", @@ -10952,7 +10308,7 @@ dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", @@ -10971,8 +10327,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", ] @@ -10985,7 +10341,7 @@ dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-client-api", "sc-consensus-babe", "sp-blockchain", @@ -11004,7 +10360,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "thiserror", "tracing-gum", ] @@ -11022,7 +10378,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-keystore", "thiserror", "tracing-gum", @@ -11037,9 +10393,9 @@ dependencies = [ "futures 0.3.25", "futures-timer", "polkadot-node-subsystem", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-blockchain", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", @@ -11057,7 +10413,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "thiserror", "tracing-gum", @@ -11076,9 +10432,9 @@ dependencies = [ "futures-timer", "parity-scale-codec", "pin-project", - "polkadot-core-primitives 0.9.30", + "polkadot-core-primitives", "polkadot-node-metrics", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "rand 0.8.5", "rayon", "sc-executor", @@ -11105,7 +10461,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing-gum", @@ -11122,7 +10478,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-consensus-babe", "tracing-gum", ] @@ -11139,7 +10495,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-network", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", @@ -11155,7 +10511,7 @@ dependencies = [ "futures-timer", "log 0.4.17", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "prioritized-metered-channel", "sc-cli", "sc-service", @@ -11177,7 +10533,7 @@ dependencies = [ "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "rand 0.8.5", "sc-authority-discovery", "sc-network", @@ -11195,8 +10551,8 @@ dependencies = [ "bounded-vec", "futures 0.3.25", "parity-scale-codec", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "schnorrkel", "serde", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -11231,12 +10587,12 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-statement-table", "sc-network", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-consensus-babe", "substrate-prometheus-endpoint", "thiserror", @@ -11265,7 +10621,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -11291,40 +10647,23 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing-gum", ] -[[package]] -name = "polkadot-parachain" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.27", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "polkadot-parachain" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.30", + "polkadot-core-primitives", "scale-info", "serde", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -11347,64 +10686,34 @@ dependencies = [ "thiserror", ] -[[package]] -name = "polkadot-primitives" -version = "0.9.27" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.27#b017bad50d360a1c6e3cdf9652bdb85e5f479fea" -dependencies = [ - "bitvec", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "hex-literal", - "parity-scale-codec", - "parity-util-mem", - "polkadot-core-primitives 0.9.27", - "polkadot-parachain 0.9.27", - "scale-info", - "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "polkadot-primitives" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "bitvec", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "hex-literal", "parity-scale-codec", "parity-util-mem", - "polkadot-core-primitives 0.9.30", - "polkadot-parachain 0.9.30", + "polkadot-core-primitives", + "polkadot-parachain", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-authority-discovery", + "sp-consensus-slots", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", ] [[package]] @@ -11417,7 +10726,7 @@ dependencies = [ "jsonrpsee 0.15.1", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", @@ -11428,7 +10737,7 @@ dependencies = [ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -11444,13 +10753,13 @@ name = "polkadot-runtime" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -11483,11 +10792,11 @@ dependencies = [ "pallet-preimage", "pallet-proxy", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -11496,7 +10805,7 @@ dependencies = [ "pallet-vesting 4.0.0-dev", "pallet-xcm", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-constants", "polkadot-runtime-parachains", @@ -11505,22 +10814,22 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -11533,12 +10842,12 @@ name = "polkadot-runtime-common" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "libsecp256k1", "log 0.4.17", @@ -11546,30 +10855,30 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", - "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-beefy-mmr", "pallet-election-provider-multi-phase", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", "pallet-vesting 4.0.0-dev", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", "serde_derive", "slot-range-helper", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-npos-elections", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "xcm", @@ -11580,8 +10889,8 @@ name = "polkadot-runtime-constants" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "polkadot-primitives 0.9.30", + "frame-support", + "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.10.0", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -11594,7 +10903,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#0645 dependencies = [ "bs58", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -11607,35 +10916,35 @@ dependencies = [ "bitflags", "bitvec", "derive_more", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", + "frame-system", "log 0.4.17", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-staking", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-vesting 4.0.0-dev", "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", "xcm", @@ -11649,8 +10958,8 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#0645 dependencies = [ "async-trait", "beefy-gadget", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", + "frame-support", "frame-system-rpc-runtime-api", "futures 0.3.25", "hex-literal", @@ -11691,8 +11000,8 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", "polkadot-runtime-constants", @@ -11722,23 +11031,23 @@ dependencies = [ "sc-transaction-pool", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", "sp-transaction-pool", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", @@ -11761,9 +11070,9 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "thiserror", "tracing-gum", ] @@ -11774,7 +11083,7 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "parity-scale-codec", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -11890,7 +11199,7 @@ version = "1.0.0" dependencies = [ "composable-support", "composable-traits", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "lazy_static", "parity-scale-codec", "scale-info", @@ -12613,7 +11922,7 @@ dependencies = [ "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", ] [[package]] @@ -12756,12 +12065,12 @@ name = "rococo-runtime" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-merkle-tree 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-merkle-tree", + "beefy-primitives", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", @@ -12770,8 +12079,8 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-beefy 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "pallet-beefy-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-bounties", "pallet-child-bounties", "pallet-collective", @@ -12783,18 +12092,18 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-mmr", "pallet-multisig", "pallet-offences", "pallet-preimage", "pallet-proxy", "pallet-recovery", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-society", "pallet-staking", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -12804,8 +12113,8 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", @@ -12813,21 +12122,21 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_assertions", "substrate-wasm-builder", "xcm", @@ -12840,8 +12149,8 @@ name = "rococo-runtime-constants" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "polkadot-primitives 0.9.30", + "frame-support", + "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.10.0", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -13179,8 +12488,8 @@ dependencies = [ "rand 0.7.3", "sc-client-api", "sc-network-common", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -13203,11 +12512,11 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", ] @@ -13219,11 +12528,11 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -13290,7 +12599,7 @@ dependencies = [ "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "thiserror", "tiny-bip39", "tokio", @@ -13310,7 +12619,7 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -13363,7 +12672,7 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -13387,15 +12696,15 @@ dependencies = [ "sc-consensus", "sc-consensus-slots", "sc-telemetry", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", @@ -13426,20 +12735,20 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", "sp-consensus-vrf", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -13455,7 +12764,7 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", @@ -13495,9 +12804,9 @@ dependencies = [ "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", @@ -13515,16 +12824,16 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro", "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tasks", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", "wasmi 0.13.2", @@ -13609,13 +12918,13 @@ dependencies = [ "sc-telemetry", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", @@ -13762,7 +13071,7 @@ dependencies = [ "smallvec 1.10.0", "sp-blockchain", "sp-consensus", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-prometheus-endpoint", "thiserror", @@ -13830,7 +13139,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-finality-grandpa 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-finality-grandpa", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] @@ -13876,7 +13185,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -13925,15 +13234,15 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-offchain", "sp-rpc", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-version", ] [[package]] @@ -13955,7 +13264,7 @@ dependencies = [ "sp-rpc", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "thiserror", ] @@ -14015,24 +13324,24 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", @@ -14131,7 +13440,7 @@ dependencies = [ "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-rpc", @@ -14170,7 +13479,7 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -14773,17 +14082,6 @@ dependencies = [ "tendermint", ] -[[package]] -name = "simple-iavl" -version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri/?rev=c80e2b203ecfb1925b0330aafba0f736c99fa5f6#c80e2b203ecfb1925b0330aafba0f736c99fa5f6" -dependencies = [ - "bytes 1.3.0", - "ics23", - "sha2 0.10.6", - "tendermint", -] - [[package]] name = "simple-mutex" version = "1.1.5" @@ -14911,23 +14209,6 @@ dependencies = [ "sha-1 0.9.8", ] -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "hash-db", - "log 0.4.17", - "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", -] - [[package]] name = "sp-api" version = "4.0.0-dev" @@ -14936,28 +14217,16 @@ dependencies = [ "hash-db", "log 0.4.17", "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api-proc-macro", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "blake2", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" @@ -14984,19 +14253,6 @@ dependencies = [ "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-application-crypto" version = "6.0.0" @@ -15026,21 +14282,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "static_assertions", -] - [[package]] name = "sp-arithmetic" version = "5.0.0" @@ -15056,19 +14297,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" @@ -15076,7 +14304,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -15089,7 +14317,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -15100,8 +14328,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -15116,7 +14344,7 @@ dependencies = [ "lru 0.7.8", "parity-scale-codec", "parking_lot 0.12.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-consensus", "sp-database", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -15135,11 +14363,11 @@ dependencies = [ "log 0.4.17", "parity-scale-codec", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "thiserror", ] @@ -15151,14 +14379,14 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", ] [[package]] @@ -15171,31 +14399,17 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-consensus", - "sp-consensus-slots 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-consensus-slots", "sp-consensus-vrf", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", + "sp-timestamp", ] [[package]] @@ -15209,7 +14423,7 @@ dependencies = [ "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-timestamp", ] [[package]] @@ -15275,61 +14489,15 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "array-bytes", "base58", "bitflags", - "blake2-rfc", + "blake2", "byteorder", "dyn-clonable", - "ed25519-dalek", - "futures 0.3.25", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log 0.4.17", - "merlin", - "num-traits", - "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.12.1", - "primitive-types", - "rand 0.7.3", - "regex", - "scale-info", - "schnorrkel", - "secp256k1 0.24.3", - "secrecy", - "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "wasmi 0.9.1", - "zeroize", -] - -[[package]] -name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" -dependencies = [ - "array-bytes", - "base58", - "bitflags", - "blake2", - "byteorder", - "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra", "futures 0.3.25", "hash-db", "hash256-std-hasher", @@ -15378,20 +14546,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "blake2", - "byteorder", - "digest 0.10.6", - "sha2 0.10.6", - "sha3", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "4.0.0" @@ -15406,17 +14560,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "proc-macro2 1.0.49", - "quote 1.0.23", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "syn 1.0.107", -] - [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" @@ -15448,16 +14591,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "sp-debug-derive" version = "4.0.0" @@ -15480,17 +14613,6 @@ dependencies = [ "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-externalities" version = "0.12.0" @@ -15502,24 +14624,6 @@ dependencies = [ "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "sp-finality-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "finality-grandpa", - "log 0.4.17", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" @@ -15530,7 +14634,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -15538,20 +14642,6 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", -] - [[package]] name = "sp-inherents" version = "4.0.0-dev" @@ -15592,31 +14682,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "futures 0.3.25", - "hash-db", - "libsecp256k1", - "log 0.4.17", - "parity-scale-codec", - "parking_lot 0.12.1", - "secp256k1 0.24.3", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "6.0.0" @@ -15671,23 +14736,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "async-trait", - "futures 0.3.25", - "merlin", - "parity-scale-codec", - "parking_lot 0.12.1", - "schnorrkel", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.12.0" @@ -15714,21 +14762,6 @@ dependencies = [ "zstd", ] -[[package]] -name = "sp-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "log 0.4.17", - "parity-scale-codec", - "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" @@ -15737,7 +14770,7 @@ dependencies = [ "log 0.4.17", "parity-scale-codec", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -15763,7 +14796,7 @@ name = "sp-offchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -15779,16 +14812,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-panic-handler" version = "4.0.0" @@ -15832,28 +14855,6 @@ dependencies = [ "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "parity-util-mem", - "paste 1.0.11", - "rand 0.7.3", - "scale-info", - "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-runtime" version = "6.0.0" @@ -15895,23 +14896,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "6.0.0" @@ -15943,18 +14927,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "Inflector", - "proc-macro-crate 1.2.1", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" @@ -15981,20 +14953,6 @@ dependencies = [ "wasmi 0.13.2", ] -[[package]] -name = "sp-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-session" version = "4.0.0-dev" @@ -16002,24 +14960,13 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-staking" version = "4.0.0-dev" @@ -16055,28 +15002,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "hash-db", - "log 0.4.17", - "num-traits", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.7.3", - "smallvec 1.10.0", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", - "tracing", - "trie-root", -] - [[package]] name = "sp-state-machine" version = "0.12.0" @@ -16105,11 +15030,6 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14804d6069ee7a388240b665f17908d98386ffb0b5d39f89a4099fc7a2a4c03f" -[[package]] -name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" - [[package]] name = "sp-std" version = "4.0.0" @@ -16129,19 +15049,6 @@ dependencies = [ "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", -] - [[package]] name = "sp-storage" version = "6.0.0" @@ -16168,22 +15075,6 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] -[[package]] -name = "sp-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "async-trait", - "futures-timer", - "log 0.4.17", - "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", -] - [[package]] name = "sp-timestamp" version = "4.0.0-dev" @@ -16193,8 +15084,8 @@ dependencies = [ "futures-timer", "log 0.4.17", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", @@ -16213,18 +15104,6 @@ dependencies = [ "tracing-subscriber 0.2.25", ] -[[package]] -name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - [[package]] name = "sp-tracing" version = "5.0.0" @@ -16242,7 +15121,7 @@ name = "sp-transaction-pool" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] @@ -16256,7 +15135,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -16278,22 +15157,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "hash-db", - "memory-db", - "parity-scale-codec", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", - "trie-db 0.23.1", - "trie-root", -] - [[package]] name = "sp-trie" version = "6.0.0" @@ -16317,23 +15180,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm 0.42.2", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "thiserror", -] - [[package]] name = "sp-version" version = "5.0.0" @@ -16344,24 +15190,13 @@ dependencies = [ "parity-wasm 0.45.0", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version-proc-macro", "thiserror", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "parity-scale-codec", - "proc-macro2 1.0.49", - "quote 1.0.23", - "syn 1.0.107", -] - [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" @@ -16386,18 +15221,6 @@ dependencies = [ "wasmi 0.9.1", ] -[[package]] -name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27#5bfdbab8ba28523ef10e365627fed64ef2b77cbf" -dependencies = [ - "impl-trait-for-tuples", - "log 0.4.17", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.27)", - "wasmi 0.9.1", -] - [[package]] name = "sp-wasm-interface" version = "6.0.0" @@ -16687,7 +15510,7 @@ dependencies = [ "sc-rpc-api", "sc-transaction-pool-api", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -17567,7 +16390,7 @@ version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ "polkadot-node-jaeger", - "polkadot-primitives 0.9.30", + "polkadot-primitives", "tracing", "tracing-gum-proc-macro", ] @@ -17754,7 +16577,7 @@ dependencies = [ "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "zstd", ] @@ -17987,7 +16810,7 @@ dependencies = [ "composable-runtime", "dali-runtime", "derive_more", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-system", "pallet-transaction-payment", "picasso-runtime", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -18606,13 +17429,13 @@ name = "westend-runtime" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "beefy-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "beefy-primitives", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -18644,13 +17467,13 @@ dependencies = [ "pallet-proxy", "pallet-recovery", "pallet-scheduler", - "pallet-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-session", "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", "pallet-sudo", - "pallet-timestamp 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-treasury", @@ -18659,8 +17482,8 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain 0.9.30", - "polkadot-primitives 0.9.30", + "polkadot-parachain", + "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", "rustc-hex", @@ -18668,22 +17491,22 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.10.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-authority-discovery 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-mmr-primitives 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-session 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-session", + "sp-staking", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version", "substrate-wasm-builder", "westend-runtime-constants", "xcm", @@ -18696,8 +17519,8 @@ name = "westend-runtime-constants" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "polkadot-primitives 0.9.30", + "frame-support", + "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.10.0", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -18973,12 +17796,12 @@ name = "xcm-builder" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", + "frame-system", "log 0.4.17", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain 0.9.30", + "polkadot-parachain", "scale-info", "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -18993,8 +17816,8 @@ name = "xcm-executor" version = "0.9.30" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-benchmarking", + "frame-support", "impl-trait-for-tuples", "log 0.4.17", "parity-scale-codec", diff --git a/code/integration-tests/local-integration-tests/Cargo.toml b/code/integration-tests/local-integration-tests/Cargo.toml index e79601d7fbf..cbfe119756a 100644 --- a/code/integration-tests/local-integration-tests/Cargo.toml +++ b/code/integration-tests/local-integration-tests/Cargo.toml @@ -45,10 +45,10 @@ collective = { package = "pallet-collective", git = "https://github.com/parityte democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/assets/Cargo.toml b/code/parachain/frame/assets/Cargo.toml index 27676dbbc6c..0692fd2f18a 100644 --- a/code/parachain/frame/assets/Cargo.toml +++ b/code/parachain/frame/assets/Cargo.toml @@ -25,7 +25,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } @@ -40,7 +40,7 @@ num-traits = { version = "0.2.14", default-features = false } composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } governance-registry = { package = "pallet-governance-registry", path = "../governance-registry" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" diff --git a/code/parachain/frame/bonded-finance/Cargo.toml b/code/parachain/frame/bonded-finance/Cargo.toml index b295adb5c57..498c175e867 100644 --- a/code/parachain/frame/bonded-finance/Cargo.toml +++ b/code/parachain/frame/bonded-finance/Cargo.toml @@ -30,12 +30,12 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { default-features = false, path = "../composable-support" } composable-traits = { path = "../../frame/composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } composable-traits = { path = "../../frame/composable-traits" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-vesting = { path = "../../frame/vesting" } proptest = "1.0" diff --git a/code/parachain/frame/cosmwasm/Cargo.toml b/code/parachain/frame/cosmwasm/Cargo.toml index 71104c9d33d..da434d032a6 100644 --- a/code/parachain/frame/cosmwasm/Cargo.toml +++ b/code/parachain/frame/cosmwasm/Cargo.toml @@ -26,8 +26,8 @@ frame-benchmarking = { default-features = false, git = "https://github.com/parit frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex = { version = "0.4", default-features = false, features = ["alloc"] } -ibc = { git = "https://github.com/ComposableFi/centauri/", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false } -ibc-primitives = { git = "https://github.com/ComposableFi/centauri/", rev = "c7d2f2d812074850c3b5ab7e42fa582f72582355", default-features = false, optional = false } +ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +ibc-primitives = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false, optional = false } lazy_static = { version = "1.4.0", optional = true, default-features = false, features = [ "spin_no_std", ] } @@ -36,7 +36,7 @@ libsecp256k1 = { version = "0.7.0", default-features = false } log = { version = "0.4.14", default-features = false } pallet-assets = { default-features = false, path = "../assets" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri/", rev = "c80e2b203ecfb1925b0330aafba0f736c99fa5f6", default-features = false } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } parity-wasm = { version = "0.45.0", default-features = false } primitives = { path = "../../runtime/primitives", default-features = false } rand = { version = "0.8.5", optional = true, default-features = false, features = [ @@ -69,8 +69,8 @@ lazy_static = { version = "1.4.0", default-features = false, features = [ "spin_no_std", ] } num-traits = { version = "0.2.14", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } rand = { version = "0.8.5", default-features = false, features = [ "alloc", diff --git a/code/parachain/frame/cosmwasm/src/ibc.rs b/code/parachain/frame/cosmwasm/src/ibc.rs index 3405126ca2f..329128846da 100644 --- a/code/parachain/frame/cosmwasm/src/ibc.rs +++ b/code/parachain/frame/cosmwasm/src/ibc.rs @@ -374,6 +374,7 @@ impl IbcModule for Router { channel_id: &ChannelId, counterparty: &Counterparty, version: &IbcVersion, + _relayer: &pallet_ibc::Signer, // weight_limit: Weight, https://github.com/ComposableFi/centauri/issues/129 ) -> Result<(), IbcError> { let address = Self::port_to_address(port_id)?; @@ -422,6 +423,7 @@ impl IbcModule for Router { counterparty: &Counterparty, version: &IbcVersion, _counterparty_version: &IbcVersion, + _relayer: &pallet_ibc::Signer, ) -> Result { let address = Self::port_to_address(port_id)?; let contract_info = Self::to_ibc_contract(&address)?; @@ -463,6 +465,7 @@ impl IbcModule for Router { port_id: &PortId, channel_id: &ChannelId, counterparty_version: &IbcVersion, + _relayer: &pallet_ibc::Signer, ) -> Result<(), IbcError> { let metadata = ctx .channel_end(&(port_id.clone(), *channel_id)) @@ -492,6 +495,7 @@ impl IbcModule for Router { _output: &mut ModuleOutputBuilder, port_id: &PortId, channel_id: &ChannelId, + _relayer: &pallet_ibc::Signer, ) -> Result<(), IbcError> { let metadata = ctx .channel_end(&(port_id.clone(), *channel_id)) @@ -519,6 +523,7 @@ impl IbcModule for Router { _output: &mut ModuleOutputBuilder, port_id: &PortId, channel_id: &ChannelId, + _relayer: &pallet_ibc::Signer, ) -> Result<(), IbcError> { let metadata = ctx .channel_end(&(port_id.clone(), *channel_id)) @@ -556,6 +561,7 @@ impl IbcModule for Router { _output: &mut ModuleOutputBuilder, port_id: &PortId, channel_id: &ChannelId, + _relayer: &pallet_ibc::Signer, ) -> Result<(), IbcError> { let metadata = ctx .channel_end(&(port_id.clone(), *channel_id)) @@ -723,7 +729,10 @@ fn map_order(order: Order) -> Result { } impl IbcModuleRouter for Router { - fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn IbcModule> { + fn get_route_mut( + &mut self, + module_id: &ModuleId, + ) -> Option<&mut dyn IbcModule> { if module_id == &into_module_id::() { return Some(self) } diff --git a/code/parachain/frame/dex-router/Cargo.toml b/code/parachain/frame/dex-router/Cargo.toml index 5e701d1f720..f819a9799b6 100644 --- a/code/parachain/frame/dex-router/Cargo.toml +++ b/code/parachain/frame/dex-router/Cargo.toml @@ -37,8 +37,8 @@ version = "3.0.0" [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { version = "1.0.0", path = "../currency-factory" } pallet-pablo = { path = "../pablo" } diff --git a/code/parachain/frame/dutch-auction/Cargo.toml b/code/parachain/frame/dutch-auction/Cargo.toml index 5b96b958eda..723e8d5bd3c 100644 --- a/code/parachain/frame/dutch-auction/Cargo.toml +++ b/code/parachain/frame/dutch-auction/Cargo.toml @@ -29,8 +29,8 @@ frame-support = { default-features = false, git = "https://github.com/paritytech frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2.14", default-features = false } -orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", @@ -48,7 +48,7 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-assets = { path = '../assets' } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/governance-registry/Cargo.toml b/code/parachain/frame/governance-registry/Cargo.toml index ab35edbc41e..2bae3d9789e 100644 --- a/code/parachain/frame/governance-registry/Cargo.toml +++ b/code/parachain/frame/governance-registry/Cargo.toml @@ -20,7 +20,7 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } composable-traits = { path = "../composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", ] } diff --git a/code/parachain/frame/lending/Cargo.toml b/code/parachain/frame/lending/Cargo.toml index cdf7e4517de..c2a19e3aa61 100644 --- a/code/parachain/frame/lending/Cargo.toml +++ b/code/parachain/frame/lending/Cargo.toml @@ -56,8 +56,8 @@ frame-executive = { default-features = false, git = "https://github.com/parityte ], branch = "polkadot-v0.9.30" } hex-literal = "0.3.3" once_cell = "1.8.0" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/liquidations/Cargo.toml b/code/parachain/frame/liquidations/Cargo.toml index fd6fa452a17..94a54ec8c7c 100644 --- a/code/parachain/frame/liquidations/Cargo.toml +++ b/code/parachain/frame/liquidations/Cargo.toml @@ -32,7 +32,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr composable-support = { path = "../composable-support", default-features = false } composable-traits = { path = "../composable-traits", default-features = false } log = "0.4" -orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-assets = { default-features = false, path = "../assets" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-dutch-auction = { default-features = false, path = "../dutch-auction" } @@ -48,8 +48,8 @@ xcm = { git = "https://github.com/paritytech/polkadot", default-features = false composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/mosaic/Cargo.toml b/code/parachain/frame/mosaic/Cargo.toml index 7a4fa110e78..829348edae9 100644 --- a/code/parachain/frame/mosaic/Cargo.toml +++ b/code/parachain/frame/mosaic/Cargo.toml @@ -45,8 +45,8 @@ scale-info = { version = "2.1.1", default-features = false, features = [ [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" diff --git a/code/parachain/frame/pablo/Cargo.toml b/code/parachain/frame/pablo/Cargo.toml index 5f727afb369..ab01b1af7c8 100644 --- a/code/parachain/frame/pablo/Cargo.toml +++ b/code/parachain/frame/pablo/Cargo.toml @@ -36,8 +36,8 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr [dev-dependencies] composable-tests-helpers = { path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } pallet-staking-rewards = { path = "../staking-rewards" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/staking-rewards/Cargo.toml b/code/parachain/frame/staking-rewards/Cargo.toml index a64d44327ca..68eb9769bc5 100644 --- a/code/parachain/frame/staking-rewards/Cargo.toml +++ b/code/parachain/frame/staking-rewards/Cargo.toml @@ -17,7 +17,7 @@ frame-benchmarking = { default-features = false, optional = true, git = "https:/ frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } log = "0.4.17" -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } parity-scale-codec = { default-features = false, features = [ "derive", ], version = "3.0.0" } @@ -34,8 +34,8 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr env_logger = "0.9.0" frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } log = "0.4.17" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } pallet-assets = { path = "../assets" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } pallet-currency-factory = { path = "../currency-factory" } diff --git a/code/parachain/frame/vault/Cargo.toml b/code/parachain/frame/vault/Cargo.toml index 4a6a953ddef..720109a51b4 100644 --- a/code/parachain/frame/vault/Cargo.toml +++ b/code/parachain/frame/vault/Cargo.toml @@ -40,8 +40,8 @@ scale-info = { version = "2.1.1", default-features = false, features = [ composable-tests-helpers = { version = "1.0.0", path = "../composable-tests-helpers" } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } once_cell = "1.8.0" -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } proptest = "1.0" serde = { version = '1.0.136' } diff --git a/code/parachain/frame/vesting/Cargo.toml b/code/parachain/frame/vesting/Cargo.toml index 79c346edea7..01da2ebc543 100644 --- a/code/parachain/frame/vesting/Cargo.toml +++ b/code/parachain/frame/vesting/Cargo.toml @@ -25,10 +25,10 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur composable-support = { path = "../composable-support", default-features = false } composable-traits = { version = "1.0.0", path = "../../frame/composable-traits", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } [dev-dependencies] -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527" } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/common/Cargo.toml b/code/parachain/runtime/common/Cargo.toml index 078211c745f..b8ae7228a15 100644 --- a/code/parachain/runtime/common/Cargo.toml +++ b/code/parachain/runtime/common/Cargo.toml @@ -40,7 +40,7 @@ treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/s composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } num-traits = { version = "0.2.14", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } primitives = { path = "../primitives", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = [ "derive", @@ -49,7 +49,7 @@ smallvec = "1.7.0" [dev-dependencies] authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } serde = { version = "1.0.136" } sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/composable/Cargo.toml b/code/parachain/runtime/composable/Cargo.toml index 401a52e9a99..e625d7007a3 100644 --- a/code/parachain/runtime/composable/Cargo.toml +++ b/code/parachain/runtime/composable/Cargo.toml @@ -51,8 +51,8 @@ crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/ democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -115,9 +115,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } [features] builtin-wasm = [] diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 28ac9a6fac4..a14472fa1b3 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -52,8 +52,8 @@ identity = { package = "pallet-identity", git = "https://github.com/paritytech/s indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -137,9 +137,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } # IBC support ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } diff --git a/code/parachain/runtime/picasso/Cargo.toml b/code/parachain/runtime/picasso/Cargo.toml index 120857f8ae3..ad44542c112 100644 --- a/code/parachain/runtime/picasso/Cargo.toml +++ b/code/parachain/runtime/picasso/Cargo.toml @@ -54,8 +54,8 @@ identity = { package = "pallet-identity", git = "https://github.com/paritytech/s indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } multisig = { package = "pallet-multisig", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } preimage = { package = "pallet-preimage", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -125,9 +125,9 @@ xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.30" } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "02b1462a0e0e7bc06b3cdd6789c0e108f8a2b527", default-features = false } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } [features] builtin-wasm = [] From 0d376e2839542fdcba287f23d2fc70c6026395d8 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 18:11:50 +0100 Subject: [PATCH 08/44] chore: cargo fmt --- code/parachain/frame/cosmwasm/src/ibc.rs | 5 +--- code/parachain/frame/cosmwasm/src/lib.rs | 4 ++- code/parachain/runtime/dali/src/lib.rs | 32 ++++++++++++++++-------- code/parachain/runtime/dali/src/xcmp.rs | 7 ++++-- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/code/parachain/frame/cosmwasm/src/ibc.rs b/code/parachain/frame/cosmwasm/src/ibc.rs index 329128846da..8478544ef48 100644 --- a/code/parachain/frame/cosmwasm/src/ibc.rs +++ b/code/parachain/frame/cosmwasm/src/ibc.rs @@ -729,10 +729,7 @@ fn map_order(order: Order) -> Result { } impl IbcModuleRouter for Router { - fn get_route_mut( - &mut self, - module_id: &ModuleId, - ) -> Option<&mut dyn IbcModule> { + fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn IbcModule> { if module_id == &into_module_id::() { return Some(self) } diff --git a/code/parachain/frame/cosmwasm/src/lib.rs b/code/parachain/frame/cosmwasm/src/lib.rs index 12cb9832d84..19e4498f7e0 100644 --- a/code/parachain/frame/cosmwasm/src/lib.rs +++ b/code/parachain/frame/cosmwasm/src/lib.rs @@ -658,7 +658,9 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { log::info!(target: "runtime::contracts", "outcome: {:?}", outcome); let post_info = PostDispatchInfo { - actual_weight: Some(Weight::from_ref_time(initial_gas.saturating_sub(remaining_gas))), + actual_weight: Some(Weight::from_ref_time( + initial_gas.saturating_sub(remaining_gas), + )), pays_fee: Pays::Yes, }; match outcome { diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index e41578cf524..4691d716e64 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -81,9 +81,10 @@ use sp_std::prelude::*; // A few exports that help ease life for downstream crates. pub use frame_support::{ - construct_runtime, parameter_types, + construct_runtime, + pallet_prelude::DispatchClass, + parameter_types, traits::{Contains, Everything, Get, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, - pallet_prelude::DispatchClass, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, @@ -375,7 +376,7 @@ impl asset_tx_payment::HandleCredit for TransferToTreasuryOrD } impl asset_tx_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; + type RuntimeEvent = RuntimeEvent; type Fungibles = Tokens; type OnChargeAssetTransaction = asset_tx_payment::FungiblesAdapter< PriceConverter, @@ -412,7 +413,10 @@ where public: ::Signer, account: AccountId, nonce: AccountIndex, - ) -> Option<(RuntimeCall, ::SignaturePayload)> { + ) -> Option<( + RuntimeCall, + ::SignaturePayload, + )> { use sp_runtime::{ generic::{Era, SignedPayload}, traits::StaticLookup, @@ -615,9 +619,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = DustRemovalWhitelist; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnTransfer = (); - type OnDeposit = (); + type OnSlash = (); + type OnTransfer = (); + type OnDeposit = (); } parameter_types! { @@ -674,8 +678,10 @@ impl InstanceFilter for ProxyType { ProxyType::Governance => matches!( c, RuntimeCall::Democracy(..) | - RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) | - RuntimeCall::Treasury(..) | RuntimeCall::Utility(..) + RuntimeCall::Council(..) | + RuntimeCall::TechnicalCommittee(..) | + RuntimeCall::Treasury(..) | + RuntimeCall::Utility(..) ), ProxyType::CancelProxy => { // TODO (vim): We might not need this @@ -887,7 +893,10 @@ pub struct BaseCallFilter; impl Contains for BaseCallFilter { fn contains(call: &RuntimeCall) -> bool { !(call_filter::Pallet::::contains(call) || - matches!(call, RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Treasury(_))) + matches!( + call, + RuntimeCall::Tokens(_) | RuntimeCall::Indices(_) | RuntimeCall::Treasury(_) + )) } } @@ -1393,7 +1402,8 @@ pub type SignedExtra = ( asset_tx_payment::ChargeAssetTxPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = executive::Executive< diff --git a/code/parachain/runtime/dali/src/xcmp.rs b/code/parachain/runtime/dali/src/xcmp.rs index 936b4de0cbe..517005ac48e 100644 --- a/code/parachain/runtime/dali/src/xcmp.rs +++ b/code/parachain/runtime/dali/src/xcmp.rs @@ -283,8 +283,11 @@ parameter_types! { pub const CouncilBodyId: BodyId = BodyId::Executive; } -pub type CouncilToPlurality = - BackingToPlurality, CouncilBodyId>; +pub type CouncilToPlurality = BackingToPlurality< + RuntimeOrigin, + collective::Origin, + CouncilBodyId, +>; pub struct RootToHereLocation( PhantomData<(RuntimeOrigin, AccountId, Network)>, From 04c9071b5d54ef17528d73e6928fedc326f555e1 Mon Sep 17 00:00:00 2001 From: hussein Date: Thu, 12 Jan 2023 18:25:18 +0100 Subject: [PATCH 09/44] chore: upgrade polkadot binary to v0.9.30 --- .nix/polkadot/mmr-polkadot-bin.nix | 11 +++++++++++ .nix/polkadot/polkadot-bin.nix | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .nix/polkadot/mmr-polkadot-bin.nix create mode 100644 .nix/polkadot/polkadot-bin.nix diff --git a/.nix/polkadot/mmr-polkadot-bin.nix b/.nix/polkadot/mmr-polkadot-bin.nix new file mode 100644 index 00000000000..007d34f30ad --- /dev/null +++ b/.nix/polkadot/mmr-polkadot-bin.nix @@ -0,0 +1,11 @@ +{ pkgs, rust-nightly }: +pkgs.callPackage ./polkadot-tmpl.nix rec { + inherit pkgs rust-nightly; + name = "mmr-polkadot-v${version}"; + version = "0.9.30"; + repo = "polkadot"; + owner = "ComposableFi"; + rev = "0898082540c42fb241c01fe500715369a33a80de"; + hash = "sha256-dymuSVQXzdZe8iiMm4ykVXPIjIZd2ZcAOK7TLDGOWcU="; + cargoSha256 = "sha256-u/hFRxt3OTMDwONGoJ5l7whC4atgpgIQx+pthe2CJXo="; +} diff --git a/.nix/polkadot/polkadot-bin.nix b/.nix/polkadot/polkadot-bin.nix new file mode 100644 index 00000000000..d2340c3d0ec --- /dev/null +++ b/.nix/polkadot/polkadot-bin.nix @@ -0,0 +1,11 @@ +{ pkgs, rust-nightly }: +pkgs.callPackage ./polkadot-tmpl.nix rec { + inherit pkgs rust-nightly; + name = "polkadot-v${version}"; + version = "0.9.30"; + repo = "polkadot"; + owner = "paritytech"; + rev = "v${version}"; + hash = "sha256-3hmoTTzdvC1s0GsfgEz6vaIh/obx+MHCqjnUJR6NRVk="; + cargoSha256 = "sha256-YzQspHuHDWOeh9xvFIy0BF6xiep3pr8QEiJDK9Vb8fg="; +} From 8f643d3b9df1892e3e2748faf80b0282a7b6a496 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 11:30:26 +0100 Subject: [PATCH 10/44] chore: update centauri --- code/Cargo.lock | 32 ++++++++++++------------ code/parachain/frame/cosmwasm/Cargo.toml | 6 ++--- code/parachain/node/Cargo.toml | 2 +- code/parachain/runtime/dali/Cargo.toml | 10 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/code/Cargo.lock b/code/Cargo.lock index 74e55c0bbc4..6f21f85bb31 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "beefy-light-client" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "beefy-light-client-primitives", "beefy-primitives", @@ -765,7 +765,7 @@ dependencies = [ [[package]] name = "beefy-light-client-primitives" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "beefy-primitives", "ckb-merkle-mountain-range", @@ -4664,7 +4664,7 @@ dependencies = [ [[package]] name = "grandpa-light-client-primitives" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "anyhow", "derive_more", @@ -4685,7 +4685,7 @@ dependencies = [ [[package]] name = "grandpa-light-client-verifier" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "anyhow", "finality-grandpa", @@ -5109,7 +5109,7 @@ dependencies = [ [[package]] name = "ibc" version = "0.15.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "derive_more", "flex-error", @@ -5136,7 +5136,7 @@ dependencies = [ [[package]] name = "ibc-derive" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "convert_case 0.6.0", "proc-macro-crate 1.2.1", @@ -5148,7 +5148,7 @@ dependencies = [ [[package]] name = "ibc-primitives" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "base58", "blake2", @@ -5172,7 +5172,7 @@ dependencies = [ [[package]] name = "ibc-proto" version = "0.18.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "base64 0.13.1", "bytes 1.3.0", @@ -5184,7 +5184,7 @@ dependencies = [ [[package]] name = "ibc-runtime-api" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "ibc-primitives", "pallet-ibc", @@ -5196,7 +5196,7 @@ dependencies = [ [[package]] name = "ics07-tendermint" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "bytes 1.3.0", "flex-error", @@ -5216,7 +5216,7 @@ dependencies = [ [[package]] name = "ics10-grandpa" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "anyhow", "derive_more", @@ -5243,7 +5243,7 @@ dependencies = [ [[package]] name = "ics11-beefy" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "anyhow", "beefy-light-client", @@ -6751,7 +6751,7 @@ dependencies = [ [[package]] name = "light-client-common" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "anyhow", "derive_more", @@ -8546,7 +8546,7 @@ dependencies = [ [[package]] name = "pallet-ibc" version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "beefy-light-client-primitives", "cumulus-primitives-core", @@ -8592,7 +8592,7 @@ dependencies = [ [[package]] name = "pallet-ibc-ping" version = "0.0.1" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "frame-support", "frame-system", @@ -14074,7 +14074,7 @@ dependencies = [ [[package]] name = "simple-iavl" version = "0.1.0" -source = "git+https://github.com/ComposableFi/centauri?branch=polkadot-v0.9.30#6160c518c21b75f9fa5026a3edf5a68f110d093e" +source = "git+https://github.com/ComposableFi/centauri?rev=f0d44fe83c078b2d9fb040337c8152f037ba817d#f0d44fe83c078b2d9fb040337c8152f037ba817d" dependencies = [ "bytes 1.3.0", "ics23", diff --git a/code/parachain/frame/cosmwasm/Cargo.toml b/code/parachain/frame/cosmwasm/Cargo.toml index da434d032a6..699e89c5d96 100644 --- a/code/parachain/frame/cosmwasm/Cargo.toml +++ b/code/parachain/frame/cosmwasm/Cargo.toml @@ -26,8 +26,8 @@ frame-benchmarking = { default-features = false, git = "https://github.com/parit frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex = { version = "0.4", default-features = false, features = ["alloc"] } -ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } -ibc-primitives = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false, optional = false } +ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } +ibc-primitives = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false, optional = false } lazy_static = { version = "1.4.0", optional = true, default-features = false, features = [ "spin_no_std", ] } @@ -36,7 +36,7 @@ libsecp256k1 = { version = "0.7.0", default-features = false } log = { version = "0.4.14", default-features = false } pallet-assets = { default-features = false, path = "../assets" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } parity-wasm = { version = "0.45.0", default-features = false } primitives = { path = "../../runtime/primitives", default-features = false } rand = { version = "0.8.5", optional = true, default-features = false, features = [ diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index 2100e51be95..b6ed45a52f3 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -38,7 +38,7 @@ lending-runtime-api = { path = "../frame/lending/runtime-api" } pablo-rpc = { path = "../frame/pablo/rpc" } pablo-runtime-api = { path = "../frame/pablo/runtime-api" } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30" } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d" } # FRAME Dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index a14472fa1b3..2715523f737 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -142,11 +142,11 @@ orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-modu orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30", default-features = false } # IBC support -ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } -ibc-primitives = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } -ibc-runtime-api = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } -pallet-ibc = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } -pallet-ibc-ping = { git = "https://github.com/ComposableFi/centauri", branch = "polkadot-v0.9.30", default-features = false } +ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } +ibc-primitives = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } +ibc-runtime-api = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } +pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } +pallet-ibc-ping = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d", default-features = false } [dev-dependencies] frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } From 03d7f75cacff81a193afe68a32fcbf6e2b979b4b Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 11:42:58 +0100 Subject: [PATCH 11/44] feat(nix): remove unused files --- .nix/polkadot/mmr-polkadot-bin.nix | 11 ----------- .nix/polkadot/polkadot-bin.nix | 11 ----------- 2 files changed, 22 deletions(-) delete mode 100644 .nix/polkadot/mmr-polkadot-bin.nix delete mode 100644 .nix/polkadot/polkadot-bin.nix diff --git a/.nix/polkadot/mmr-polkadot-bin.nix b/.nix/polkadot/mmr-polkadot-bin.nix deleted file mode 100644 index 007d34f30ad..00000000000 --- a/.nix/polkadot/mmr-polkadot-bin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, rust-nightly }: -pkgs.callPackage ./polkadot-tmpl.nix rec { - inherit pkgs rust-nightly; - name = "mmr-polkadot-v${version}"; - version = "0.9.30"; - repo = "polkadot"; - owner = "ComposableFi"; - rev = "0898082540c42fb241c01fe500715369a33a80de"; - hash = "sha256-dymuSVQXzdZe8iiMm4ykVXPIjIZd2ZcAOK7TLDGOWcU="; - cargoSha256 = "sha256-u/hFRxt3OTMDwONGoJ5l7whC4atgpgIQx+pthe2CJXo="; -} diff --git a/.nix/polkadot/polkadot-bin.nix b/.nix/polkadot/polkadot-bin.nix deleted file mode 100644 index d2340c3d0ec..00000000000 --- a/.nix/polkadot/polkadot-bin.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, rust-nightly }: -pkgs.callPackage ./polkadot-tmpl.nix rec { - inherit pkgs rust-nightly; - name = "polkadot-v${version}"; - version = "0.9.30"; - repo = "polkadot"; - owner = "paritytech"; - rev = "v${version}"; - hash = "sha256-3hmoTTzdvC1s0GsfgEz6vaIh/obx+MHCqjnUJR6NRVk="; - cargoSha256 = "sha256-YzQspHuHDWOeh9xvFIy0BF6xiep3pr8QEiJDK9Vb8fg="; -} From e446b4649b00c2514637d77a538b40c57b2710b6 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 11:43:19 +0100 Subject: [PATCH 12/44] chore: upgrade weights --- code/parachain/frame/fnft/src/weights.rs | 2 +- code/parachain/runtime/dali/src/weights/fnft.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/parachain/frame/fnft/src/weights.rs b/code/parachain/frame/fnft/src/weights.rs index 9569e5446b6..0657950f15e 100644 --- a/code/parachain/frame/fnft/src/weights.rs +++ b/code/parachain/frame/fnft/src/weights.rs @@ -12,5 +12,5 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { - fn transfer() -> Weight {10_000} + fn transfer() -> Weight { Weight::from_ref_time(10_000) } } diff --git a/code/parachain/runtime/dali/src/weights/fnft.rs b/code/parachain/runtime/dali/src/weights/fnft.rs index f0237cb4ab0..9861642b426 100644 --- a/code/parachain/runtime/dali/src/weights/fnft.rs +++ b/code/parachain/runtime/dali/src/weights/fnft.rs @@ -9,6 +9,6 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_fnft::WeightInfo for WeightInfo { fn transfer() -> Weight { - (10_000 as Weight) + Weight::from_ref_time(10_000) } } From 5046e931e40c7b4e8160178c9482438f991c1cc1 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 11:52:19 +0100 Subject: [PATCH 13/44] chore: upgrade statemine --- inputs/paritytech/statemine.nix | 6 +++--- inputs/paritytech/zombienet.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inputs/paritytech/statemine.nix b/inputs/paritytech/statemine.nix index a7b37379dea..8733f9f1ccd 100644 --- a/inputs/paritytech/statemine.nix +++ b/inputs/paritytech/statemine.nix @@ -3,16 +3,16 @@ , systemCommonRust, ... }: { packages = { statemine-node = let - branch = "polkadot-v0.9.27"; + branch = "polkadot-v0.9.30"; paritytech-cumulus = pkgs.fetchFromGitHub { repo = "cumulus"; owner = "paritytech"; rev = branch; - hash = "sha256-nbHdXv/93F6vHXWr/r9+AqvBBa5f9L6tmoIs8EEqiKM="; + hash = "sha256-BoG/t4SAGXNEfL6Hd/DjpnJ33amfQ+YhIAnWEJOOZSA="; }; in pkgs.stdenv.mkDerivation (rec { name = "cumulus-v${version}"; - version = "0.9.27"; + version = "0.9.30"; pname = "polkadot-parachain"; src = paritytech-cumulus; doCheck = false; diff --git a/inputs/paritytech/zombienet.nix b/inputs/paritytech/zombienet.nix index 1b11043eb4b..2552ace6afb 100644 --- a/inputs/paritytech/zombienet.nix +++ b/inputs/paritytech/zombienet.nix @@ -62,7 +62,7 @@ name = "zombienet-rococo-local-dali-dev-statemine"; runtimeInputs = [ pkgs.nodejs paritytech-zombienet ] ++ runtimeDeps; text = '' - cd ${paritytech-zombienet} + cd ${paritytech-zombienet} npm run zombie spawn ${all-dev-local-config} ''; }; @@ -91,7 +91,7 @@ bash --version export DEBUG="zombie*" printf '${builtins.toJSON config}' > /tmp/${name}.json - cd ${paritytech-zombienet} + cd ${paritytech-zombienet} npm run zombie spawn /tmp/${name}.json ''; }; From 6a7853372162b9126e52276b16a3bdf7ede6e6a5 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 11:53:35 +0100 Subject: [PATCH 14/44] chore: upgrade polkadot node --- inputs/paritytech/polkadot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inputs/paritytech/polkadot.nix b/inputs/paritytech/polkadot.nix index 5526bca15ab..34f3517696a 100644 --- a/inputs/paritytech/polkadot.nix +++ b/inputs/paritytech/polkadot.nix @@ -47,12 +47,12 @@ polkadot-node = buildPolkadotNode rec { name = "polkadot-v${version}"; - version = "0.9.27"; + version = "0.9.30"; repo = "polkadot"; owner = "paritytech"; rev = "v${version}"; - hash = "sha256-LEz3OrVgdFTCnVwzU8C6GeEougaOl2qo7jS9qIdMqAM="; - cargoSha256 = "sha256-6y+WK2k1rhqMxMjEJhzJ26WDMKZjXQ+q3ca2hbbeLvA="; + hash = "sha256-3hmoTTzdvC1s0GsfgEz6vaIh/obx+MHCqjnUJR6NRVk="; + cargoSha256 = "sha256-YzQspHuHDWOeh9xvFIy0BF6xiep3pr8QEiJDK9Vb8fg="; }; }; }; From 9967c244cb2de5a02c977220398894457c49ba5a Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 12:03:40 +0100 Subject: [PATCH 15/44] chore: upgrade rococo runtime --- code/runtimes.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/runtimes.nix b/code/runtimes.nix index f7db1ec6550..be09963c997 100644 --- a/code/runtimes.nix +++ b/code/runtimes.nix @@ -89,8 +89,8 @@ dontUnpack = true; src = pkgs.fetchurl { url = - "https://github.com/paritytech/polkadot/releases/download/v0.9.27/rococo_runtime-v9270.compact.compressed.wasm"; - sha256 = "sha256-OK8U58TW4TBsSOudPdpXHw0sjbEHtCQuOBIaNn+WleE="; + "https://github.com/paritytech/polkadot/releases/download/v0.9.30/rococo_runtime-v9300.compact.compressed.wasm"; + sha256 = "sha256-ztquolf/S0YpDhVoejzid5nTJO4N8sv2eHb+g5qignM="; }; installPhase = '' mkdir -p $out/lib From 150a703ec173bc72a90f18013b79c29c211a63d1 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 12:03:49 +0100 Subject: [PATCH 16/44] chore: upgrade subwasm --- inputs/chevdor/subwasm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inputs/chevdor/subwasm.nix b/inputs/chevdor/subwasm.nix index 9ce21cebb55..cfba413e7dd 100644 --- a/inputs/chevdor/subwasm.nix +++ b/inputs/chevdor/subwasm.nix @@ -5,8 +5,8 @@ src = pkgs.fetchFromGitHub { owner = "chevdor"; repo = "subwasm"; - rev = "4d4d789326d65fc23820f70916bd6bd6f499bd0a"; - hash = "sha256-+/yqA6lP/5qyMxZupmaYBCRtbw2MFMBSgkmnxg261P8="; + rev = "d7e74ab5eb3f83773ad7c78fb0edd42fa33f5356"; + hash = "sha256-Zo/wB1W3qp0cI+O0hAv0GfQ7tKXABboPY16ZNhyxmlk="; }; in crane.stable.buildPackage { name = "subwasm"; From 2a7fd7de1f2df11ed12cb65b10756e4b3bb880fc Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 12:12:23 +0100 Subject: [PATCH 17/44] chore: update dictionary --- flake/dictionaries/technical.dic | 1 + 1 file changed, 1 insertion(+) diff --git a/flake/dictionaries/technical.dic b/flake/dictionaries/technical.dic index 3ec1c4dc993..d22ca1b7034 100644 --- a/flake/dictionaries/technical.dic +++ b/flake/dictionaries/technical.dic @@ -314,6 +314,7 @@ protoc PROTOC protos PTRACE +Quickstart radiumblock rebag rebagged From 4aa9963ed67b791b4d262e3172314bcd83b7faa4 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 13:13:45 +0100 Subject: [PATCH 18/44] chore: upgrade benchmarking code --- code/parachain/frame/cosmwasm/src/ibc.rs | 9 ++++----- code/parachain/frame/cosmwasm/src/instrument.rs | 8 ++++---- code/parachain/frame/dutch-auction/src/benchmarking.rs | 2 +- code/parachain/frame/lending/src/benchmarking/setup.rs | 2 +- code/parachain/frame/oracle/src/benchmarking.rs | 2 +- code/parachain/frame/staking-rewards/src/benchmarking.rs | 2 +- code/parachain/frame/staking-rewards/src/test_helpers.rs | 8 ++++---- code/parachain/frame/vault/src/benchmarking.rs | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/code/parachain/frame/cosmwasm/src/ibc.rs b/code/parachain/frame/cosmwasm/src/ibc.rs index 8478544ef48..7b593a3a5fe 100644 --- a/code/parachain/frame/cosmwasm/src/ibc.rs +++ b/code/parachain/frame/cosmwasm/src/ibc.rs @@ -774,16 +774,15 @@ impl ibc_primitives::IbcHandler> for NoRelayer { ) -> Result<(), ibc_primitives::Error> { Err(ibc_primitives::Error::Other { msg: Some("not supported".to_string()) }) } - #[cfg(feature = "runtime-benchmarks")] - fn create_client( - ) -> Result<::ibc::core::ics24_host::identifier::ClientId, ibc_primitives::Error> { + fn create_client() -> Result + { Err(ibc_primitives::Error::Other { msg: Some("not supported".to_string()) }) } #[cfg(feature = "runtime-benchmarks")] fn create_connection( - _client_id: ::ibc::core::ics24_host::identifier::ClientId, - _connection_id: ::ibc::core::ics24_host::identifier::ConnectionId, + _client_id: ibc::core::ics24_host::identifier::ClientId, + _connection_id: ConnectionId, ) -> Result<(), ibc_primitives::Error> { Err(ibc_primitives::Error::Other { msg: Some("not supported".to_string()) }) } diff --git a/code/parachain/frame/cosmwasm/src/instrument.rs b/code/parachain/frame/cosmwasm/src/instrument.rs index bb59432f6db..9c501d02148 100644 --- a/code/parachain/frame/cosmwasm/src/instrument.rs +++ b/code/parachain/frame/cosmwasm/src/instrument.rs @@ -6,7 +6,7 @@ use parity_wasm::elements::{Instruction, Module}; use scale_info::TypeInfo; use wasm_instrument::gas_metering::{self, MemoryGrowCost, Rules}; -pub const INSTRUCTIONS_MULTIPLIER: u64 = 100; +pub const INSTRUCTIONS_MULTIPLIER: u32 = 100; /// Current instrumentation version /// Must be incremented whenever the instrumentation is updated. @@ -54,8 +54,8 @@ fn calculate_weight(weight_fn: WeightFn, n_additional_instrs: u32) -> .saturating_sub(T::WeightInfo::instruction_I64Const(0)) .saturating_div(2), )) - .saturating_mul(n_additional_instrs as u64) - .saturating_div(INSTRUCTIONS_MULTIPLIER) + .saturating_mul(n_additional_instrs.into()) + .saturating_div(INSTRUCTIONS_MULTIPLIER.into()) .ref_time() as u32 } @@ -65,7 +65,7 @@ fn calculate_weight_custom(weight_fn: WeightFn, custom_fn: WeightFn) (weight_fn(1) .saturating_sub(weight_fn(0)) .saturating_sub(custom_fn(1).saturating_sub(custom_fn(0)).saturating_div(2))) - .saturating_div(INSTRUCTIONS_MULTIPLIER) + .saturating_div(INSTRUCTIONS_MULTIPLIER.into()) .ref_time() as u32 } diff --git a/code/parachain/frame/dutch-auction/src/benchmarking.rs b/code/parachain/frame/dutch-auction/src/benchmarking.rs index 27f17afee2a..2d27bffbcbc 100644 --- a/code/parachain/frame/dutch-auction/src/benchmarking.rs +++ b/code/parachain/frame/dutch-auction/src/benchmarking.rs @@ -68,7 +68,7 @@ benchmarks! { T::NativeCurrency: Currency, T::AccountId: UncheckedFrom, T::CurrencyId: From, - T::Origin: From, + T::RuntimeOrigin: From, } add_configuration { let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); diff --git a/code/parachain/frame/lending/src/benchmarking/setup.rs b/code/parachain/frame/lending/src/benchmarking/setup.rs index 59027e5d132..02dc4cacb2d 100644 --- a/code/parachain/frame/lending/src/benchmarking/setup.rs +++ b/code/parachain/frame/lending/src/benchmarking/setup.rs @@ -40,7 +40,7 @@ pub(crate) fn produce_block( } #[allow(dead_code)] -pub(crate) fn assert_last_event(generic_event: ::Event) { +pub(crate) fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record diff --git a/code/parachain/frame/oracle/src/benchmarking.rs b/code/parachain/frame/oracle/src/benchmarking.rs index c7b05666524..b69bfcfa961 100644 --- a/code/parachain/frame/oracle/src/benchmarking.rs +++ b/code/parachain/frame/oracle/src/benchmarking.rs @@ -21,7 +21,7 @@ pub type BalanceOf = const SEED: u32 = 0; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record diff --git a/code/parachain/frame/staking-rewards/src/benchmarking.rs b/code/parachain/frame/staking-rewards/src/benchmarking.rs index 57be1d25f81..9388c21c5bb 100644 --- a/code/parachain/frame/staking-rewards/src/benchmarking.rs +++ b/code/parachain/frame/staking-rewards/src/benchmarking.rs @@ -72,7 +72,7 @@ fn reward_config( .unwrap() } -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record diff --git a/code/parachain/frame/staking-rewards/src/test_helpers.rs b/code/parachain/frame/staking-rewards/src/test_helpers.rs index 14e12165964..0785aeeecde 100644 --- a/code/parachain/frame/staking-rewards/src/test_helpers.rs +++ b/code/parachain/frame/staking-rewards/src/test_helpers.rs @@ -41,7 +41,7 @@ pub(crate) fn add_to_rewards_pot_and_assert( + From>, <::RuntimeEvent as TryInto>>::Error: Debug, - ::Origin: + ::RuntimeOrigin: OriginTrait::AccountId>, { Pallet::::add_to_rewards_pot( @@ -86,7 +86,7 @@ where + From>, <::RuntimeEvent as TryInto>>::Error: Debug, - ::Origin: + ::RuntimeOrigin: OriginTrait::AccountId>, { Runtime::assert_extrinsic_event_with( @@ -139,7 +139,7 @@ pub fn unstake_and_assert( + From>, <::RuntimeEvent as TryInto>>::Error: Debug, - ::Origin: + ::RuntimeOrigin: OriginTrait::AccountId>, { let position_before_unstake = @@ -533,7 +533,7 @@ where + From>, <::RuntimeEvent as TryInto>>::Error: Debug, - ::Origin: + ::RuntimeOrigin: OriginTrait::AccountId>, { let existing_stake_before_split = diff --git a/code/parachain/frame/vault/src/benchmarking.rs b/code/parachain/frame/vault/src/benchmarking.rs index b99237ebc24..6664a4bdabc 100644 --- a/code/parachain/frame/vault/src/benchmarking.rs +++ b/code/parachain/frame/vault/src/benchmarking.rs @@ -13,7 +13,7 @@ use frame_system::{EventRecord, Pallet as System, RawOrigin}; use sp_runtime::Perquintill; use sp_std::prelude::*; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); let system_event: ::RuntimeEvent = generic_event.into(); let EventRecord { event, .. } = &events[events.len() - 1]; From ff130b826c76ca245ff8f3b942082608707d170c Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 14:09:27 +0100 Subject: [PATCH 19/44] chore: remove unused makefile --- Makefile.toml | 80 --------------------------------------------------- 1 file changed, 80 deletions(-) delete mode 100644 Makefile.toml diff --git a/Makefile.toml b/Makefile.toml deleted file mode 100644 index 81d468a3ee1..00000000000 --- a/Makefile.toml +++ /dev/null @@ -1,80 +0,0 @@ -[env] -CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true -NIGHTLY_VERSION = "2022-04-18" - -[tasks.fmt] -script = ''' -cd code -cargo +nightly fmt -''' -workspace = false - -[tasks.build] -script = ''' -cd code -cargo build --release -''' -workspace = false - -[tasks.polkadot] -script = ''' -if [ ! -d "../polkadot" ] ; then - git clone -b v0.9.30 https://github.com/paritytech/polkadot ../polkadot -fi -cd ../polkadot && cargo build --release -''' -workspace = false - -[tasks.start-devnet] -dependencies = ["build", "git-polkadot"] -script = ''' -cd code -cargo run --release -- --version -cd ../polkadot && cargo run --release -- --version && pwd && cd ../composable -cd scripts/polkadot-launch && yarn && yarn composable -''' -workspace = false - -[tasks.start-devnet-docker] -dependencies = [] -script = ''' -docker run --rm -ti -u$(id -u):$(id -g) -p9944:9944 -p9988:9988 -p9998:9998 composablefi/composable-sandbox:latest -''' -workspace = false - -[tasks.remove-composable-sandbox-image] -dependencies = [] -script = ''' -docker rmi composablefi/composable-sandbox:latest -''' -workspace = false - -[tasks.run-unit-tests] -env = { SKIP_WASM_BUILD = 1 } -script = ''' -cd code -cargo test --workspace --locked --release --verbose -''' -workspace = false - -[tasks.style] -script = ''' -make style -''' -workspace = false - -[tasks.check-ci] -env = { SKIP_WASM_BUILD = 1 } -script = ''' -cd code -cargo +nightly-$NIGHTLY_VERSION check --benches --all --features runtime-benchmarks # checks all rust crates with default-features, tests, benchmarks -env -u RUSTFLAGS cargo +nightly-$NIGHTLY_VERSION clippy --all-targets --tests -- -D warnings -''' -workspace = false - -[tasks.build-benchmarks] -script = ''' -cd code -cargo build --release --features runtime-benchmarks -''' -workspace = false From 0e4014ef66eec832d033dd392a0bff8446cc6aa4 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 14:10:45 +0100 Subject: [PATCH 20/44] feat(ci): remove simnode --- .github/workflows/build-test-deploy.yml | 91 +++++-------------------- 1 file changed, 18 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index de19da447a9..4b66331603d 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -284,7 +284,7 @@ jobs: command: nix -- build .#spell-check token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - # This isn't templated, since checkout needs to happen before templating occurs. + # This isn't templated, since checkout needs to happen before templating occurs. docs-check: name: "Docs check" runs-on: @@ -318,10 +318,10 @@ jobs: # Marker status code in case of network failure. STATUS_TRANSIENT_FAILURE=200 # Maximum retries in case of network failures. - RETRIES=5 - CMD="cachix watch-exec --jobs 16 --compression-level $CACHIX_COMPRESSION_LEVEL composable-community nix -- build .#docs-static --no-update-lock-file --show-trace -L 2> >(tee -a $LOG_FILE >&2)" + RETRIES=5 + CMD="cachix watch-exec --jobs 16 --compression-level $CACHIX_COMPRESSION_LEVEL composable-community nix -- build .#docs-static --no-update-lock-file --show-trace -L 2> >(tee -a $LOG_FILE >&2)" # Marker that a network error occurred. - BAD="HTTP error 200 ('')" + BAD="HTTP error 200 ('')" LOG_FILE=/tmp/out.log function run() { @@ -329,8 +329,8 @@ jobs: STATUS_CODE=$? if [[ $STATUS_CODE -ne 0 ]] ; then C=$(grep -c "HTTP error 200" $LOG_FILE) - if [[ $C -gt 0 ]]; then - STATUS_CODE=$STATUS_TRANSIENT_FAILURE + if [[ $C -gt 0 ]]; then + STATUS_CODE=$STATUS_TRANSIENT_FAILURE fi fi } @@ -347,7 +347,7 @@ jobs: ((try=try+1)) done - exit $((STATUS_CODE)) + exit $((STATUS_CODE)) shell: "bash" working-directory: ./docs - uses: FirebaseExtended/action-hosting-deploy@0f248036885ae672f78587669fa2923f0ef6cac2 @@ -539,7 +539,7 @@ jobs: run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel run: | - PREVIEW_URL=$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}) + PREVIEW_URL=$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}) echo "preview-url=${PREVIEW_URL}" >> $GITHUB_OUTPUT id: deploy - name: Comment PR @@ -652,40 +652,6 @@ jobs: command: nix -- run .#benchmarks-once-${{ matrix.runtime }} token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - check-simnode: - name: "Simnode" - needs: package-simnode-tests - runs-on: - - self-hosted - - linux - - x64 - - sre - concurrency: - group: check-simnode-${{ matrix.runtime }}-${{ github.ref }} - cancel-in-progress: true - strategy: - matrix: - runtime: [picasso, composable] - container: - image: niteo/nixpkgs-nixos-22.05:316b762afdb9e142a803f29c49a88b4a47db80ee - steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 - - uses: google-github-actions/setup-gcloud@v0 - with: - service_account_key: ${{ secrets.DEPLOY_DALI }} - export_default_credentials: true - - uses: "./.github/templates/watch-exec" - with: - pre-run: | - FILENAME=$(date -d yesterday +'%m-%d-%Y').zip - GS_BUCKET="${{ matrix.runtime }}-data-store" - gsutil cp gs://$GS_BUCKET/"$FILENAME" . - unzip -o "$FILENAME" -d /tmp/db - command: nix -- run .#simnode-tests-${{ matrix.runtime }} - token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - nix-env: nixpkgs.python3 nixpkgs.unzip - local-integration-tests: name: "Local integration tests" runs-on: @@ -708,25 +674,6 @@ jobs: command: nix -- build .#check-${{ matrix.runtime }}-integration-tests token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - package-simnode-tests: - name: "Package Simnode Tests" - runs-on: - - self-hosted - - linux - - x64 - - sre - concurrency: - group: package-simnode-tests-${{ matrix.runtime }}-${{ github.ref }} - cancel-in-progress: true - container: - image: niteo/nixpkgs-nixos-22.05:316b762afdb9e142a803f29c49a88b4a47db80ee - steps: - - uses: actions/checkout@v3 - - uses: "./.github/templates/watch-exec" - with: - command: nix -- build .#simnode-tests - token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - package-composable-node: name: "Package Composable node" needs: common-deps @@ -794,7 +741,7 @@ jobs: - sre strategy: matrix: - node: [statemine, bifrost] + node: [statemine, bifrost] concurrency: group: ${{ github.workflow }}-package-${{ matrix.node }}-node-${{ github.ref }} cancel-in-progress: true @@ -806,7 +753,7 @@ jobs: with: command: nix -- build .#${{ matrix.node }}-node token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - + package-acala-node: name: "Package Acala node" runs-on: @@ -849,7 +796,7 @@ jobs: name: "Cache devnet all dev local" strategy: matrix: - runtime: [devnet-dali-complete, devnet-picasso-complete, devnet-dali, devnet-centauri] + runtime: [devnet-dali-complete, devnet-picasso-complete, devnet-dali, devnet-centauri] needs: - package-polkadot-node - package-acala-node @@ -907,19 +854,19 @@ jobs: env: CI: true NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - working-directory: frontend + working-directory: frontend - name: Lint Pablo run: yarn --filter=pablo lint working-directory: frontend - name: Test Pablo run: yarn --filter=pablo test - working-directory: frontend + working-directory: frontend - name: Lint Picasso run: yarn --filter=picasso lint working-directory: frontend - name: Test Picasso run: yarn --filter=picasso test - working-directory: frontend + working-directory: frontend cmc-api: name: "Package CMC API" @@ -1010,7 +957,7 @@ jobs: - x64 - sre concurrency: - group: ${{ github.workflow }}-package-zombienet-${{ github.ref }} + group: ${{ github.workflow }}-package-zombienet-${{ github.ref }} cancel-in-progress: true container: image: niteo/nixpkgs-nixos-22.05:316b762afdb9e142a803f29c49a88b4a47db80ee @@ -1115,7 +1062,7 @@ jobs: echo "experimental-features = nix-command flakes" > /etc/nix/nix.conf echo "sandbox = relaxed" >> /etc/nix/nix.conf echo "narinfo-cache-negative-ttl = 0" >> /etc/nix/nix.conf - shell: "bash" + shell: "bash" - uses: cachix/cachix-action@f5f67badd061acb62b5c6e25e763572ca8317004 with: skipPush: true @@ -1127,7 +1074,7 @@ jobs: name: ${{ env.CACHIX_COMPOSABLE }} - run: | nix run .#devnet-integration-tests - + effects-gate: name: "Effect gate, automatically merged if passed" runs-on: @@ -1154,8 +1101,6 @@ jobs: - cargo-fmt-check - taplo-check - prettier-check - # Simnode is flaky, enable once not flaky - # - check-simnode - benchmarks-check - spell-check - docs-check @@ -1275,4 +1220,4 @@ jobs: _For more info on how to use Nix, check out our [Nix docs](https://docs.composable.finance/nix.html)_ Note that the initial build may take about one hour if it has not been cached by our CI yet. Once it is cached, builds should take about one minute. We currently do not provide build caches for ARM machines such as M1 Macs, but building on ARM is supported. tag: 'Nix commands for this PR' - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} From ccc89d1ce455b532a31496d6b26ebe96bb807117 Mon Sep 17 00:00:00 2001 From: cor Date: Mon, 16 Jan 2023 14:50:18 +0100 Subject: [PATCH 21/44] Update code/parachain/frame/assets-registry/src/weights.rs Signed-off-by: cor --- code/parachain/frame/assets-registry/src/weights.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index 2e0ee94d50a..b02d165060b 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -14,7 +14,7 @@ pub trait WeightInfo { impl WeightInfo for () { fn register_asset() -> Weight { - Weight::from_ref_time(10_0000) + Weight::from_ref_time(100_000) } fn update_asset() -> Weight { From 1d3f466d553862e1a23caf50bce5bcf5238f9203 Mon Sep 17 00:00:00 2001 From: cor Date: Mon, 16 Jan 2023 14:50:27 +0100 Subject: [PATCH 22/44] Update code/parachain/frame/assets-registry/src/weights.rs Signed-off-by: cor --- code/parachain/frame/assets-registry/src/weights.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index b02d165060b..c52a8307dc3 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -22,7 +22,7 @@ impl WeightInfo for () { } fn set_min_fee() -> Weight { - Weight::from_ref_time(10_0000) + Weight::from_ref_time(100_000) } } From 84302e0ae8a3f0941c197d7864cb69e07d8767d5 Mon Sep 17 00:00:00 2001 From: cor Date: Mon, 16 Jan 2023 14:50:34 +0100 Subject: [PATCH 23/44] Update code/parachain/frame/assets-registry/src/weights.rs Signed-off-by: cor --- code/parachain/frame/assets-registry/src/weights.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index c52a8307dc3..62425ea6419 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -18,7 +18,7 @@ impl WeightInfo for () { } fn update_asset() -> Weight { - Weight::from_ref_time(10_0000) + Weight::from_ref_time(100_000) } fn set_min_fee() -> Weight { From 73498cbd89df38a443b4bccb05d1b0fa6cb64625 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 14:55:18 +0100 Subject: [PATCH 24/44] chore: upgrade weight after rebase --- code/parachain/frame/staking-rewards/src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/parachain/frame/staking-rewards/src/lib.rs b/code/parachain/frame/staking-rewards/src/lib.rs index 39b691d2bd1..a71c552faf8 100644 --- a/code/parachain/frame/staking-rewards/src/lib.rs +++ b/code/parachain/frame/staking-rewards/src/lib.rs @@ -1626,10 +1626,10 @@ fn accumulate_pool_rewards( now_seconds: u64, ) -> Weight { // If reward pool has not started, do not accumulate rewards or adjust weight - match reward_pool.start_block.cmp(¤t_block) { + Weight::from_ref_time(match reward_pool.start_block.cmp(¤t_block) { // start block < current -> accumulate normally Ordering::Less => - (&mut reward_pool.rewards).into_iter().fold(0, |mut acc, (asset_id, reward)| { + (&mut reward_pool.rewards).into_iter().fold(0u64, |mut acc, (asset_id, reward)| { reward_accumulation_hook_reward_update_calculation::( pool_id, *asset_id, @@ -1638,7 +1638,7 @@ fn accumulate_pool_rewards( ); acc = acc.defensive_saturating_add( - T::WeightInfo::reward_accumulation_hook_reward_update_calculation(), + T::WeightInfo::reward_accumulation_hook_reward_update_calculation().ref_time(), ); acc @@ -1658,7 +1658,7 @@ fn accumulate_pool_rewards( }, // start block > current -> don't accumulate, do nothing Ordering::Greater => 0, - } + }) } fn add_to_rewards_pot( From 2bf8968258227e4b6a2049c1e841c5f977fec817 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 14:57:25 +0100 Subject: [PATCH 25/44] feat(ci): disable integration test until next update --- .github/workflows/build-test-deploy.yml | 45 +++++++++++++------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 4b66331603d..af758373fa2 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -652,27 +652,27 @@ jobs: command: nix -- run .#benchmarks-once-${{ matrix.runtime }} token: "${{ secrets.CACHIX_AUTH_TOKEN }}" - local-integration-tests: - name: "Local integration tests" - runs-on: - - self-hosted - - linux - - x64 - - sre - concurrency: - group: local-integration-tests-${{ matrix.runtime }}-${{ github.ref }} - cancel-in-progress: true - strategy: - matrix: - runtime: [dali, picasso] - container: - image: niteo/nixpkgs-nixos-22.05:316b762afdb9e142a803f29c49a88b4a47db80ee - steps: - - uses: actions/checkout@v3 - - uses: "./.github/templates/watch-exec" - with: - command: nix -- build .#check-${{ matrix.runtime }}-integration-tests - token: "${{ secrets.CACHIX_AUTH_TOKEN }}" + # local-integration-tests: + # name: "Local integration tests" + # runs-on: + # - self-hosted + # - linux + # - x64 + # - sre + # concurrency: + # group: local-integration-tests-${{ matrix.runtime }}-${{ github.ref }} + # cancel-in-progress: true + # strategy: + # matrix: + # runtime: [dali, picasso] + # container: + # image: niteo/nixpkgs-nixos-22.05:316b762afdb9e142a803f29c49a88b4a47db80ee + # steps: + # - uses: actions/checkout@v3 + # - uses: "./.github/templates/watch-exec" + # with: + # command: nix -- build .#check-${{ matrix.runtime }}-integration-tests + # token: "${{ secrets.CACHIX_AUTH_TOKEN }}" package-composable-node: name: "Package Composable node" @@ -1089,7 +1089,8 @@ jobs: - package-polkadot-node - package-composable-node - test-running-of-pallet-benchmarks - - local-integration-tests + # FIXUP(hussein): reenable once v0.9.30 -> v0.9.33 + # - local-integration-tests - unit-tests - check-devnet - check-nix-long From ed47a1c94c154462db2ec6c9c18d1457cbe81776 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 15:02:20 +0100 Subject: [PATCH 26/44] chore: cargo fmt --- .../frame/staking-rewards/src/lib.rs | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/code/parachain/frame/staking-rewards/src/lib.rs b/code/parachain/frame/staking-rewards/src/lib.rs index a71c552faf8..2a900430a65 100644 --- a/code/parachain/frame/staking-rewards/src/lib.rs +++ b/code/parachain/frame/staking-rewards/src/lib.rs @@ -1629,20 +1629,23 @@ fn accumulate_pool_rewards( Weight::from_ref_time(match reward_pool.start_block.cmp(¤t_block) { // start block < current -> accumulate normally Ordering::Less => - (&mut reward_pool.rewards).into_iter().fold(0u64, |mut acc, (asset_id, reward)| { - reward_accumulation_hook_reward_update_calculation::( - pool_id, - *asset_id, - reward, - now_seconds, - ); + (&mut reward_pool.rewards) + .into_iter() + .fold(0u64, |mut acc, (asset_id, reward)| { + reward_accumulation_hook_reward_update_calculation::( + pool_id, + *asset_id, + reward, + now_seconds, + ); - acc = acc.defensive_saturating_add( - T::WeightInfo::reward_accumulation_hook_reward_update_calculation().ref_time(), - ); + acc = acc.defensive_saturating_add( + T::WeightInfo::reward_accumulation_hook_reward_update_calculation() + .ref_time(), + ); - acc - }), + acc + }), // start block == current -> accumulation starts now, but the effects won't be seen until // the next block; set all of the reward's last updated timestamp to `now` so that reward // accumulation starts from this point in time, not when the pool was created. Also notify From afc9b30a02cd02dca49813f3aae59ef730df2f49 Mon Sep 17 00:00:00 2001 From: hussein Date: Mon, 16 Jan 2023 16:27:14 +0100 Subject: [PATCH 27/44] chore: normalize dep names and upgrade more bench --- .github/workflows/build-test-deploy.yml | 1 + code/parachain/runtime/composable/Cargo.toml | 4 ++-- code/parachain/runtime/composable/src/lib.rs | 14 ++++---------- code/parachain/runtime/dali/Cargo.toml | 6 ++---- code/parachain/runtime/dali/src/lib.rs | 9 ++++----- code/parachain/runtime/picasso/Cargo.toml | 4 ++-- code/parachain/runtime/picasso/src/lib.rs | 11 ++++------- 7 files changed, 19 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index af758373fa2..87285c4a357 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -1091,6 +1091,7 @@ jobs: - test-running-of-pallet-benchmarks # FIXUP(hussein): reenable once v0.9.30 -> v0.9.33 # - local-integration-tests + - unit-tests - check-devnet - check-nix-long diff --git a/code/parachain/runtime/composable/Cargo.toml b/code/parachain/runtime/composable/Cargo.toml index e625d7007a3..de9f54fb9ae 100644 --- a/code/parachain/runtime/composable/Cargo.toml +++ b/code/parachain/runtime/composable/Cargo.toml @@ -91,7 +91,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = ] } frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.4", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } +frame-system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } @@ -127,7 +127,7 @@ runtime-benchmarks = [ "balances/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", - "system-benchmarking", + "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "hex-literal", "balances/runtime-benchmarks", diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index 715673c44d4..a55ac554c1f 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -870,8 +870,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO: broken - // [collator_selection, CollatorSelection] + [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] @@ -1015,15 +1014,12 @@ impl_runtime_apis! { ) { use frame_benchmarking::{Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; - use system_benchmarking::Pallet as SystemBench; + use frame_system_benchmarking::Pallet as SystemBench; use session_benchmarking::Pallet as SessionBench; let mut list = Vec::::new(); - list_benchmarks!(list, extra); - let storage_info = AllPalletsWithSystem::storage_info(); - (list, storage_info) } @@ -1032,8 +1028,8 @@ impl_runtime_apis! { ) -> Result, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; - use system_benchmarking::Pallet as SystemBench; - impl system_benchmarking::Config for Runtime {} + use frame_system_benchmarking::Pallet as SystemBench; + impl frame_system_benchmarking::Config for Runtime {} use session_benchmarking::Pallet as SessionBench; impl session_benchmarking::Config for Runtime {} @@ -1053,9 +1049,7 @@ impl_runtime_apis! { let mut batches = Vec::::new(); let params = (&config, &whitelist); - add_benchmarks!(params, batches); - if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 2715523f737..6478d637615 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -112,8 +112,8 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = "derive", ] } frame-benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } +frame-system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } @@ -175,6 +175,7 @@ runtime-benchmarks = [ "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", + "frame-system-benchmarking/runtime-benchmarks", "hex-literal", "identity/runtime-benchmarks", "indices/runtime-benchmarks", @@ -191,7 +192,6 @@ runtime-benchmarks = [ "scheduler/runtime-benchmarks", "session-benchmarking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", - "system-benchmarking", "timestamp/runtime-benchmarks", "treasury/runtime-benchmarks", "utility/runtime-benchmarks", @@ -210,8 +210,6 @@ runtime-benchmarks = [ "common/runtime-benchmarks", "pallet-staking-rewards/runtime-benchmarks", "cosmwasm/runtime-benchmarks", - # FIXUP(hussein) - # "asset-tx-payment/runtime-benchmarks", "pallet-ibc/runtime-benchmarks", ] std = [ diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 4691d716e64..ed522a5f68a 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1427,8 +1427,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO: broken - // [collator_selection, CollatorSelection] + [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] @@ -1732,7 +1731,7 @@ impl_runtime_apis! { ) { use frame_benchmarking::{Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; - use system_benchmarking::Pallet as SystemBench; + use frame_system_benchmarking::Pallet as SystemBench; use session_benchmarking::Pallet as SessionBench; let mut list = Vec::::new(); @@ -1746,8 +1745,8 @@ impl_runtime_apis! { ) -> Result, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; - use system_benchmarking::Pallet as SystemBench; - impl system_benchmarking::Config for Runtime {} + use frame_system_benchmarking::Pallet as SystemBench; + impl frame_system_benchmarking::Config for Runtime {} use session_benchmarking::Pallet as SessionBench; impl session_benchmarking::Config for Runtime {} diff --git a/code/parachain/runtime/picasso/Cargo.toml b/code/parachain/runtime/picasso/Cargo.toml index ad44542c112..2ae053c57a8 100644 --- a/code/parachain/runtime/picasso/Cargo.toml +++ b/code/parachain/runtime/picasso/Cargo.toml @@ -100,7 +100,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = ] } frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.3", optional = true } -system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } +frame-system-benchmarking = { package = "frame-system-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } # Parachain Utilities collator-selection = { package = "pallet-collator-selection", git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.30" } @@ -137,7 +137,7 @@ runtime-benchmarks = [ "balances/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", - "system-benchmarking", + "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "hex-literal", "balances/runtime-benchmarks", diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index b5a23e53326..5ff8464ae1a 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -901,8 +901,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO: broken - // [collator_selection, CollatorSelection] + [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] @@ -1146,14 +1145,12 @@ impl_runtime_apis! { ) { use frame_benchmarking::{Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; - use system_benchmarking::Pallet as SystemBench; + use frame_system_benchmarking::Pallet as SystemBench; use session_benchmarking::Pallet as SessionBench; let mut list = Vec::::new(); list_benchmarks!(list, extra); - let storage_info = AllPalletsWithSystem::storage_info(); - return (list, storage_info) } @@ -1162,8 +1159,8 @@ impl_runtime_apis! { ) -> Result, sp_runtime::RuntimeString> { use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; - use system_benchmarking::Pallet as SystemBench; - impl system_benchmarking::Config for Runtime {} + use frame_system_benchmarking::Pallet as SystemBench; + impl frame_system_benchmarking::Config for Runtime {} use session_benchmarking::Pallet as SessionBench; impl session_benchmarking::Config for Runtime {} From 8b2923c787e81794dd5ddbe3bf042e48a92c21ac Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 10:41:35 +0100 Subject: [PATCH 28/44] chore: upgrade airdrop pallet --- code/parachain/frame/airdrop/src/lib.rs | 2 +- code/parachain/frame/airdrop/src/weights.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/parachain/frame/airdrop/src/lib.rs b/code/parachain/frame/airdrop/src/lib.rs index 6fab9523751..c1de03a0adc 100644 --- a/code/parachain/frame/airdrop/src/lib.rs +++ b/code/parachain/frame/airdrop/src/lib.rs @@ -968,7 +968,7 @@ pub mod pallet { /// * The recipient has funds to claim #[pallet::validate_unsigned] impl ValidateUnsigned for Pallet { - type RuntimeCall = RuntimeCall; + type Call = Call; fn validate_unsigned(_: TransactionSource, call: &Self::Call) -> TransactionValidity { if let Call::claim { airdrop_id, reward_account, proof } = call { diff --git a/code/parachain/frame/airdrop/src/weights.rs b/code/parachain/frame/airdrop/src/weights.rs index b55ad38cd70..08f2140ffdb 100644 --- a/code/parachain/frame/airdrop/src/weights.rs +++ b/code/parachain/frame/airdrop/src/weights.rs @@ -11,26 +11,26 @@ pub trait WeightInfo { impl WeightInfo for () { fn create_airdrop() -> Weight { - 0 + Weight::from_ref_time(10_000) } fn add_recipient(_x: u32) -> Weight { - 0 + Weight::from_ref_time(10_000) } fn remove_recipient() -> Weight { - 0 + Weight::from_ref_time(10_000) } fn enable_airdrop() -> Weight { - 0 + Weight::from_ref_time(10_000) } fn disable_airdrop() -> Weight { - 0 + Weight::from_ref_time(10_000) } fn claim(_x: u32) -> Weight { - 0 + Weight::from_ref_time(10_000) } } From fa329398ad35d1120ca1be35093f1a3d47c3d55d Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 10:41:45 +0100 Subject: [PATCH 29/44] chore: fixup clippy --- code/parachain/frame/staking-rewards/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/parachain/frame/staking-rewards/src/lib.rs b/code/parachain/frame/staking-rewards/src/lib.rs index 2a900430a65..13d9565e4e7 100644 --- a/code/parachain/frame/staking-rewards/src/lib.rs +++ b/code/parachain/frame/staking-rewards/src/lib.rs @@ -1631,7 +1631,7 @@ fn accumulate_pool_rewards( Ordering::Less => (&mut reward_pool.rewards) .into_iter() - .fold(0u64, |mut acc, (asset_id, reward)| { + .fold(0_u64, |mut acc, (asset_id, reward)| { reward_accumulation_hook_reward_update_calculation::( pool_id, *asset_id, From 284e4012306caa32b3c3972df728ce52116879bf Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 10:41:50 +0100 Subject: [PATCH 30/44] chore: upgrade minimum bench steps --- code/benchmarks.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/benchmarks.nix b/code/benchmarks.nix index 253e94d7e61..15bd6e25c8c 100644 --- a/code/benchmarks.nix +++ b/code/benchmarks.nix @@ -13,8 +13,8 @@ --wasm-instantiation-strategy=legacy-instance-reuse \ --pallet="*" \ --extrinsic="*" \ - --steps=1 \ - --repeat=1 + --steps=2 \ + --repeat=2 ''; generate-benchmarks = { chain, steps, repeat }: From 83aae5c9ed547095809699d681d3614b6c5aa1eb Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 11:17:44 +0100 Subject: [PATCH 31/44] chore: revert enabled collator_selection from benchmarking --- code/parachain/runtime/composable/src/lib.rs | 3 ++- code/parachain/runtime/dali/src/lib.rs | 3 ++- code/parachain/runtime/picasso/src/lib.rs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index a55ac554c1f..f5051ce6332 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -870,7 +870,8 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - [collator_selection, CollatorSelection] + // TODO(hussein) Still broken on v0.9.30 + // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index ed522a5f68a..058e48c8fc8 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1427,7 +1427,8 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - [collator_selection, CollatorSelection] + // TODO(hussein) Still broken on v0.9.30 + // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index 5ff8464ae1a..7134c9791ea 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -901,7 +901,8 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - [collator_selection, CollatorSelection] + // TODO(hussein) Still broken on v0.9.30 + // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] [treasury, Treasury] From 38a1d7a10229e8a0ac3e419ff97df74b4cac61a6 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 12:25:55 +0100 Subject: [PATCH 32/44] feat(tools): remove unused, outdated `xcmp` cli --- code/Cargo.lock | 22 ---- code/Cargo.toml | 1 - code/utils/xcmp/Cargo.toml | 32 ----- code/utils/xcmp/README.md | 3 - code/utils/xcmp/src/config.rs | 87 ------------- code/utils/xcmp/src/main.rs | 222 ---------------------------------- 6 files changed, 367 deletions(-) delete mode 100644 code/utils/xcmp/Cargo.toml delete mode 100644 code/utils/xcmp/README.md delete mode 100644 code/utils/xcmp/src/config.rs delete mode 100644 code/utils/xcmp/src/main.rs diff --git a/code/Cargo.lock b/code/Cargo.lock index 6f21f85bb31..640d9b0c278 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -17840,28 +17840,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "xcmp" -version = "0.1.0" -dependencies = [ - "base58", - "clap 3.2.23", - "composable-subxt", - "env_logger 0.9.3", - "hex", - "parity-scale-codec", - "sc-cli", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "subxt 0.23.0", - "tokio", -] - [[package]] name = "xcvm-core" version = "0.1.0" diff --git a/code/Cargo.toml b/code/Cargo.toml index aee89f63ae0..c0d5ac4032a 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -46,7 +46,6 @@ members = [ "utils/composable-subxt", # "simnode/simnode-tests", # "simnode/common", - "utils/xcmp", "utils/wasm-optimizer", "xcvm/lib/*", "xcvm/cosmwasm/contracts/*", diff --git a/code/utils/xcmp/Cargo.toml b/code/utils/xcmp/Cargo.toml deleted file mode 100644 index de684202288..00000000000 --- a/code/utils/xcmp/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -[package] -description = "tool to help with xcmp" -edition = "2021" -name = "xcmp" -version = "0.1.0" - -[dependencies] -base58 = "0.2" -clap = { version = "3.2.5", features = ["derive"] } -composable-subxt = { default-features = false, path = "../composable-subxt" } -env_logger = "0.9.0" -hex = "0.4.3" -scale-codec = { package = "parity-scale-codec", version = "3.0.0", features = [ - "derive", -] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ - "std", - "full_crypto", -] } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } - -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } - -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ - "std", -] } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -subxt = { git = "https://github.com/paritytech/subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } -tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } diff --git a/code/utils/xcmp/README.md b/code/utils/xcmp/README.md deleted file mode 100644 index 23b5d693563..00000000000 --- a/code/utils/xcmp/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Overview - -Client tools. \ No newline at end of file diff --git a/code/utils/xcmp/src/config.rs b/code/utils/xcmp/src/config.rs deleted file mode 100644 index 7adac822693..00000000000 --- a/code/utils/xcmp/src/config.rs +++ /dev/null @@ -1,87 +0,0 @@ -use clap::{clap_derive::ArgEnum, Parser, Subcommand}; - -#[derive(Parser, Debug)] -pub struct Args { - #[clap(subcommand)] - pub command: Command, -} - -#[derive(Subcommand, Debug)] -pub enum Command { - // DISCUSS: move to `subkey` if they are ok with that https://github.com/paritytech/substrate/discussions/12355 - Parachain(Address), - // TODO: unify transfer under single command - // DISCUSS: should we move this to `node` with support for only our chains? (in next PR) - TransferNative(TransferNative), - ReserveTransferNative(ReserveTransferNative), - Sudo(Sudo), -} - -#[derive(Parser, Debug)] -pub struct Sudo { - #[clap(subcommand)] - pub command: SudoCommand, -} - -#[derive(Subcommand, Debug)] -pub enum SudoCommand { - TransferNative(TransferNative), - ReserveTransferNative(ReserveTransferNative), - Execute(Execute), -} - -/// tries to parse and execute extrinsic again define chain -#[derive(Parser, Debug)] -pub struct Execute { - /// path to key - pub suri: String, // name for parity clis - - /// hex encoded call to execute - pub call: String, - - /// ask before - //#[clap(default = true)] - pub ask: Option, - - /// one of supported networks - pub network: String, - - pub rpc: String, -} - -#[derive(Parser, Debug)] -pub struct TransferNative { - pub from_account_id: String, - pub to_account_id: String, - pub amount: u128, - pub rpc: String, -} - -#[derive(Parser, Debug)] -pub struct AcceptChannelOpen { - pub para_id: u32, - pub root: String, - pub rpc: String, -} - -#[derive(Parser, Debug)] -pub struct Address { - pub para_id: u32, - #[clap(arg_enum, value_parser, default_value_t = AddressFormat::Base58)] - pub format: AddressFormat, -} - -#[derive(Parser, Debug)] -pub struct ReserveTransferNative { - pub from_account_id: String, - pub to_para_id: u32, - pub to_account_id: String, - pub amount: u128, - pub rpc: String, -} - -#[derive(Parser, Debug, Clone, ArgEnum)] -pub enum AddressFormat { - Hex, - Base58, -} diff --git a/code/utils/xcmp/src/main.rs b/code/utils/xcmp/src/main.rs deleted file mode 100644 index b83501ee053..00000000000 --- a/code/utils/xcmp/src/main.rs +++ /dev/null @@ -1,222 +0,0 @@ -use std::io::Read; - -use clap::Parser; -use composable_subxt::generated::{self, dali, picasso}; -use scale_codec::{Decode, Encode}; -use sp_core::{ - crypto::{AccountId32, Ss58Codec}, - sr25519, Pair, -}; - -use sp_runtime::MultiAddress; -use subxt::{tx::*, *}; - -pub type RelayPairSigner = subxt::tx::PairSigner; - -use crate::generated::rococo::{ - self, - api::runtime_types::xcm::{ - v0::junction::NetworkId, - v1::{ - junction::Junction, - multiasset::{AssetId, Fungibility, MultiAsset}, - }, - *, - }, -}; - -mod config; -use config::*; - -pub fn pair_signer(pair: sr25519::Pair) -> RelayPairSigner { - RelayPairSigner::new(pair) -} - -#[tokio::main] -pub async fn main() { - let args = Args::parse(); - println!("Executing {:?}", args); - match args.command { - Command::Parachain(address) => { - parachain_id_into_address(address); - }, - Command::ReserveTransferNative(command) => { - reserve_transfer_native_asset(command).await; - }, - Command::TransferNative(command) => { - transfer_native_asset(command).await; - }, - Command::Sudo(command) => match command.command { - SudoCommand::Execute(execute) => - execute_sudo(execute.ask, execute.call, execute.network, execute.suri, execute.rpc) - .await, - _ => todo!("implement"), - }, - } -} - -macro_rules! decode_call { - ($network:ident, $network_runtime: ident, $encoded:ident) => {{ - use $network::api::runtime_types::*; - // NOTE: tried various ways to compose types into mod name, failed - // or check this https://github.com/paritytech/subxt/issues/669 - // error[E0573]: expected type, found module `dali_runtime` - // --> utils/xcmp/src/main.rs:63:16 - // | - // 63 | let call = concat_idents!($network, _runtime)::Call::decode(&mut - // &$encoded[..]) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type - let call = $network_runtime::Call::decode(&mut &$encoded[..]).expect("invalid call"); - println!("{:?}", &call); - call - }}; -} - -macro_rules! encode_sudo { - ($network:ident, $call:ident) => { - $network::api::tx().sudo().sudo($call) - }; -} - -macro_rules! sudo_call { - ($network:ident, $network_runtime: ident, $call:ident) => {{ - let call = decode_call!($network, $network_runtime, $call); - let extrinsic = encode_sudo!($network, call); - extrinsic - }}; -} - -async fn execute_sudo(ask: Option, call: String, network: String, suri: String, rpc: String) { - let call = sc_cli::utils::decode_hex(call).expect("call is not hex encoded"); - let key: sr25519::Pair = - sc_cli::utils::pair_from_suri(&suri, None).expect("private key parsing failed"); - let signer = pair_signer(key); - - // https://github.com/paritytech/subxt/issues/668 - let api = OnlineClient::::from_url(&rpc).await.unwrap(); - match network.as_str() { - "dali" => { - let extrinsic = sudo_call!(dali, dali_runtime, call); - may_be_do_call(ask, api, extrinsic, signer).await; - }, - "picasso" => { - let extrinsic = sudo_call!(picasso, picasso_runtime, call); - may_be_do_call(ask, api, extrinsic, signer).await; - }, - _ => panic!("unknown network"), - } -} - -async fn may_be_do_call( - ask: Option, - api: OnlineClient< - subxt::config::WithExtrinsicParams< - SubstrateConfig, - BaseExtrinsicParams, - >, - >, - extrinsic: StaticTxPayload, - signer: PairSigner< - subxt::config::WithExtrinsicParams< - SubstrateConfig, - BaseExtrinsicParams, - >, - sr25519::Pair, - >, -) { - if ask.is_none() || matches!(Some(true), _ask) { - println!("type `y` or `yes` to sign and submit sudo transaction"); - let mut message = vec![]; - std::io::stdin().lock().read_to_end(&mut message).expect("console always work"); - let message = String::from_utf8(message).expect("utf8").to_lowercase(); - if !(message == "yes" || message == "y") { - panic!("rejected") - } - } - let _result = api.tx().sign_and_submit_then_watch_default(&extrinsic, &signer).await.unwrap(); -} - -async fn transfer_native_asset(command: TransferNative) { - let api = OnlineClient::::from_url(&command.rpc).await.unwrap(); - let signer = pair_signer( - sr25519::Pair::from_string(&command.from_account_id, None) - .expect("provided key is not valid"), - ); - let beneficiary = MultiAddress::Id(AccountId32::new( - sp_keyring::sr25519::sr25519::Public::from_string(command.to_account_id.as_str()) - .unwrap() - .into(), - )); - - let extrinsic = rococo::api::tx().balances().transfer(beneficiary, command.amount); - let mut result = - api.tx().sign_and_submit_then_watch_default(&extrinsic, &signer).await.unwrap(); - - while let Some(ev) = result.next_item().await { - println!("{:?}", ev); - } -} - -async fn reserve_transfer_native_asset(command: ReserveTransferNative) { - let asset = v1::multilocation::MultiLocation { - parents: 0, - interior: v1::multilocation::Junctions::Here, - }; - let asset = - MultiAsset { id: AssetId::Concrete(asset), fun: Fungibility::Fungible(command.amount) }; - let assets = VersionedMultiAssets::V1(v1::multiasset::MultiAssets { 0: vec![asset] }); - let destination = VersionedMultiLocation::V1(v1::multilocation::MultiLocation { - parents: 0, - interior: v1::multilocation::Junctions::X1(Junction::Parachain(command.to_para_id)), - }); - let signer = pair_signer( - sr25519::Pair::from_string(&command.from_account_id, None) - .expect("provided key is not valid"), - ); - - let api = OnlineClient::::from_url(&command.rpc).await.unwrap(); - - let beneficiary = - sp_keyring::sr25519::sr25519::Public::from_string(command.to_account_id.as_str()).unwrap(); - - let beneficiary = VersionedMultiLocation::V1(v1::multilocation::MultiLocation { - parents: 0, - interior: v1::multilocation::Junctions::X1(Junction::AccountId32 { - network: NetworkId::Any, - id: beneficiary.into(), - }), - }); - - let extrinsic = - rococo::api::tx() - .xcm_pallet() - .reserve_transfer_assets(destination, beneficiary, assets, 0); - let mut result = - api.tx().sign_and_submit_then_watch_default(&extrinsic, &signer).await.unwrap(); - - while let Some(ev) = result.next_item().await { - println!("{:?}", ev); - if let Ok(TxStatus::Finalized(block)) = ev { - println!("https://rococo.subscan.io/extrinsic/{:?}", block.extrinsic_hash()); - } - } -} - -// TODO: PR this to subkey -fn parachain_id_into_address(address: Address) { - // https://substrate.stackexchange.com/questions/1200/how-to-calculate-sovereignaccount-for-parachain/1210#1210 - let mut hex = Vec::new(); - let mut para = b"para".to_vec(); - let mut number = address.para_id.encode(); - let mut suffix = [0_u8; 24].to_vec(); - hex.append(&mut para); - hex.append(&mut number); - hex.append(&mut suffix); - let result = match address.format { - AddressFormat::Hex => hex::encode(hex), - _ => { - let account = sp_core::crypto::AccountId32::try_from(&hex[0..32]).unwrap(); - account.to_ss58check() - }, - }; - println!("{:?}", result); -} From 9790cc610caa333c1fa0f99a8449cc6988d29ff0 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 13:01:58 +0100 Subject: [PATCH 33/44] feat(tools): upgrade common package to v0.9.37 --- code/utils/common/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/utils/common/src/lib.rs b/code/utils/common/src/lib.rs index 78f05be0815..d4a476c71a4 100644 --- a/code/utils/common/src/lib.rs +++ b/code/utils/common/src/lib.rs @@ -3,11 +3,11 @@ #[derive(derive_more::From)] pub enum AllRuntimeEvents { /// Picasso runtime events - Picasso(picasso_runtime::Event), + Picasso(picasso_runtime::RuntimeEvent), /// Dali runtime events - Dali(dali_runtime::Event), + Dali(dali_runtime::RuntimeEvent), /// Composable runtime events - Composable(composable_runtime::Event), + Composable(composable_runtime::RuntimeEvent), } /// Convenience method to match on [`AllRuntimeEvents`] @@ -16,9 +16,9 @@ macro_rules! match_event { ($ev:expr, $event:ident, $sub_ev:pat) => {{ matches!( $ev, - AllRuntimeEvents::Picasso(picasso_runtime::Event::$event($sub_ev)) | - AllRuntimeEvents::Dali(dali_runtime::Event::$event($sub_ev)) | - AllRuntimeEvents::Composable(composable_runtime::Event::$event($sub_ev)) + AllRuntimeEvents::Picasso(picasso_runtime::RuntimeEvent::$event($sub_ev)) | + AllRuntimeEvents::Dali(dali_runtime::RuntimeEvent::$event($sub_ev)) | + AllRuntimeEvents::Composable(composable_runtime::RuntimeEvent::$event($sub_ev)) ) }}; } From f3c44074355f63687733e2aeb2204696f28c3c7d Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 13:02:19 +0100 Subject: [PATCH 34/44] chore: remove cargo patches (finally) --- code/Cargo.toml | 226 ------------------------------------------------ 1 file changed, 226 deletions(-) diff --git a/code/Cargo.toml b/code/Cargo.toml index c0d5ac4032a..8a02d186362 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -73,229 +73,3 @@ rpath = false [patch.crates-io] serde-json-wasm = { git = "https://github.com/hussein-aitlahcen/serde-json-wasm", rev = "1608a13d2a2ba90605d9626a51ff6667aca5a2d6" } -# wasmi-validation = { git = "https://github.com/ComposableFi/wasmi", rev = "cd8c0c775a1d197a35ff3d5c7d6cded3d476411b" } - -# sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } - -# [patch."https://github.com/paritytech/subxt"] -# subxt-codegen = { git = "https://github.com/paritytech//subxt", rev = "2fe9a1446d32b93a10804db3304ccaac65f764b8" } - -# [patch."https://github.com/paritytech/cumulus"] -# cumulus-client-cli = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-collator = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-consensus-aura = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-consensus-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-network = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-pov-recovery = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-client-service = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-aura-ext = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-dmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-parachain-system = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-session-benchmarking = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-xcm = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-pallet-xcmp-queue = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-primitives-core = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-primitives-parachain-inherent = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-primitives-timestamp = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-primitives-utility = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-relay-chain-inprocess-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-relay-chain-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-relay-chain-rpc-interface = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# cumulus-test-relay-sproof-builder = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# pallet-collator-selection = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# parachains-common = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } -# statemine-runtime = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } - -# parachain-info = { git = "https://github.com/ComposableFi/cumulus", rev = "f730e6747be173e2d4609381edc7929c8671f4d8" } - -# [patch.'https://github.com/paritytech/polkadot'] -# kusama-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# kusama-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# pallet-xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-core-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-parachain = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-primitives = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-runtime-common = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-runtime-constants = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# polkadot-runtime-parachains = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# westend-runtime = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# xcm = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# xcm-builder = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } -# xcm-executor = { git = "https://github.com/ComposableFi/polkadot", branch = "release-v0.9.30" } - -# [patch."https://github.com/paritytech/substrate"] -# beefy-gadget = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# beefy-gadget-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# beefy-merkle-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# beefy-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# fork-tree = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-benchmarking-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-election-provider-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-executive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-support = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-support-procedural = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-support-procedural-tools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-support-procedural-tools-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-system-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-system-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# frame-try-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-asset-tx-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-assets = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-bags-list = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-balances = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-beefy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-beefy-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-child-bounties = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-collective = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-democracy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-election-provider-multi-phase = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-election-provider-support-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-elections-phragmen = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-gilt = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-identity = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-im-online = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-indices = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-membership = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-mmr = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-mmr-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-multisig = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-nomination-pools = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-nomination-pools-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-nomination-pools-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-offences = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-offences-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-preimage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-proxy = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-randomness-collective-flip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-recovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-scheduler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-session-benchmarking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-society = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-staking-reward-curve = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-staking-reward-fn = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-sudo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-tips = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-transaction-payment = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-transaction-payment-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-treasury = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-uniques = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-utility = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# pallet-vesting = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# remote-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-allocator = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-basic-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-chain-spec = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-chain-spec-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-client-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-client-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-babe-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-epochs = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-manual-seal = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-consensus-uncles = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-executor = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-executor-common = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-executor-wasmi = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-executor-wasmtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-finality-grandpa-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-informant = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-network = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-network-gossip = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-peerset = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-proposer-metrics = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-rpc-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-rpc-server = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-service = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-state-db = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-sync-state-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-sysinfo = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-telemetry = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-tracing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-transaction-pool-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sc-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-api = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-api-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-application-crypto = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-arithmetic = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-authority-discovery = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-authorship = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-block-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-blockchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-consensus = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-consensus-aura = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-consensus-babe = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-consensus-slots = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-consensus-vrf = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-core = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-core-hashing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-core-hashing-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-database = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-debug-derive = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-externalities = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-finality-grandpa = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-inherents = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-io = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-keyring = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-keystore = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-maybe-compressed-blob = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-mmr-primitives = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-npos-elections = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-offchain = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-panic-handler = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-runtime = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-runtime-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-runtime-interface-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-sandbox = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-serializer = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-session = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-staking = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-state-machine = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-std = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-storage = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-tasks = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-timestamp = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-tracing = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-transaction-pool = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-transaction-storage-proof = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-trie = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-version = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-version-proc-macro = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# sp-wasm-interface = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# substrate-build-script-utils = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# substrate-frame-rpc-system = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# substrate-prometheus-endpoint = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# substrate-state-trie-migration-rpc = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# substrate-wasm-builder = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } -# try-runtime-cli = { git = "https://github.com/ComposableFi/substrate", rev = "9bdc51acad943bd07fae159f59564a1b464d33b5" } From 627b54af697eb2c992bcdc7cf61efdf892b8aed7 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 13:03:03 +0100 Subject: [PATCH 35/44] chore: comment why --- code/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/Cargo.toml b/code/Cargo.toml index 8a02d186362..7b30943af74 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -30,6 +30,7 @@ exclude = ["utils/extrinsics-docs-scraper", "integration-tests"] members = [ "services/cmc-api", "parachain/frame/*", + # TODO(hussein): let's upgrade them in v0.9.33 # "integration-tests/local-integration-tests", "parachain/node", "parachain/runtime/common", @@ -44,6 +45,7 @@ members = [ "utils/price-feed", "utils/collator-sidecar", "utils/composable-subxt", + # TODO(hussein): do we completely remove this? # "simnode/simnode-tests", # "simnode/common", "utils/wasm-optimizer", From c6231c15eb04b012bbfb557defba8ee935dd8ff5 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 13:04:38 +0100 Subject: [PATCH 36/44] chore: upgrade tests/mocks/benchmarkings to v0.9.30 --- code/parachain/frame/airdrop/src/mocks.rs | 2 +- code/parachain/frame/airdrop/src/tests.rs | 36 +-- .../frame/assets-registry/Cargo.toml | 5 +- .../frame/assets-registry/src/tests.rs | 14 +- code/parachain/frame/assets/Cargo.toml | 1 + code/parachain/frame/assets/src/mocks.rs | 3 + .../frame/assets/src/tests/extrinsics.rs | 42 +-- .../frame/bonded-finance/src/mock.rs | 15 +- .../frame/bonded-finance/src/tests.rs | 54 ++-- code/parachain/frame/call-filter/src/tests.rs | 28 +- code/parachain/frame/cosmwasm/src/mock.rs | 3 + .../frame/crowdloan-rewards/Cargo.toml | 1 + .../frame/crowdloan-rewards/src/mocks.rs | 4 +- .../frame/crowdloan-rewards/src/tests.rs | 90 +++--- .../frame/currency-factory/Cargo.toml | 3 +- .../frame/currency-factory/src/tests.rs | 2 +- code/parachain/frame/dex-router/Cargo.toml | 1 + code/parachain/frame/dex-router/src/mock.rs | 3 + code/parachain/frame/dex-router/src/tests.rs | 38 +-- code/parachain/frame/dutch-auction/Cargo.toml | 1 + .../frame/dutch-auction/src/mock/runtime.rs | 9 +- .../frame/dutch-auction/src/tests.rs | 24 +- code/parachain/frame/fnft/Cargo.toml | 1 + code/parachain/frame/fnft/src/test/mock.rs | 6 +- .../fnft/src/test/nonfungibles/extrinsic.rs | 32 +-- .../fnft/src/test/nonfungibles/mutate.rs | 18 +- .../fnft/src/test/nonfungibles/transfer.rs | 14 +- code/parachain/frame/fnft/src/test/prelude.rs | 8 +- .../frame/governance-registry/src/tests.rs | 14 +- code/parachain/frame/lending/Cargo.toml | 1 + .../frame/lending/src/mocks/general.rs | 19 +- .../frame/lending/src/mocks/offchain.rs | 23 +- .../frame/lending/src/tests/borrow.rs | 66 ++--- .../frame/lending/src/tests/liquidation.rs | 48 ++-- .../frame/lending/src/tests/market.rs | 48 ++-- code/parachain/frame/lending/src/tests/mod.rs | 6 +- .../frame/lending/src/tests/offchain.rs | 12 +- .../frame/lending/src/tests/repay.rs | 46 ++-- .../frame/lending/src/tests/vault.rs | 30 +- .../frame/liquidations/src/mock/runtime.rs | 9 +- .../parachain/frame/liquidations/src/tests.rs | 2 +- code/parachain/frame/mosaic/Cargo.toml | 1 + code/parachain/frame/mosaic/src/mock.rs | 3 + code/parachain/frame/mosaic/src/tests.rs | 260 +++++++++--------- code/parachain/frame/oracle/Cargo.toml | 7 +- code/parachain/frame/oracle/src/mock.rs | 12 +- code/parachain/frame/oracle/src/tests.rs | 246 ++++++++--------- code/parachain/frame/pablo/Cargo.toml | 1 + code/parachain/frame/pablo/src/mock.rs | 3 + .../pablo/src/test/common_test_functions.rs | 44 +-- .../test/dual_asset_constant_product_tests.rs | 50 ++-- .../dual_asset_constant_product_tests_new.rs | 32 +-- .../frame/pablo/src/test/pablo_tests.rs | 8 +- .../frame/staking-rewards/Cargo.toml | 3 +- .../frame/staking-rewards/src/runtime.rs | 9 +- .../frame/staking-rewards/src/test/mod.rs | 120 ++++---- .../src/test/test_reward_accumulation_hook.rs | 2 +- .../src/test/test_update_reward_pools.rs | 8 +- code/parachain/frame/vault/Cargo.toml | 1 + code/parachain/frame/vault/src/mocks/tests.rs | 3 + code/parachain/frame/vault/src/tests.rs | 108 ++++---- code/parachain/frame/vesting/Cargo.toml | 1 + code/parachain/frame/vesting/src/mock.rs | 17 +- code/parachain/frame/vesting/src/tests.rs | 180 ++++++------ code/parachain/runtime/common/src/rewards.rs | 3 + .../runtime/picasso/src/migrations.rs | 4 +- 66 files changed, 982 insertions(+), 926 deletions(-) diff --git a/code/parachain/frame/airdrop/src/mocks.rs b/code/parachain/frame/airdrop/src/mocks.rs index d048bd58d82..8bad2887814 100644 --- a/code/parachain/frame/airdrop/src/mocks.rs +++ b/code/parachain/frame/airdrop/src/mocks.rs @@ -175,7 +175,7 @@ impl Identity { ethereum_proof(ethereum_account, reward_account.clone()), }; - Airdrop::claim(Origin::none(), airdrop_id, reward_account, proof) + Airdrop::claim(RuntimeOrigin::none(), airdrop_id, reward_account, proof) } } diff --git a/code/parachain/frame/airdrop/src/tests.rs b/code/parachain/frame/airdrop/src/tests.rs index 5c704a3f24b..ff889bfaa08 100644 --- a/code/parachain/frame/airdrop/src/tests.rs +++ b/code/parachain/frame/airdrop/src/tests.rs @@ -1,7 +1,7 @@ use crate::{ mocks::{ ethereum_address, generate_accounts, AccountId, Airdrop, AirdropId, Balance, Balances, - EthereumKey, ExtBuilder, Identity, MockRuntime, Moment, Origin, System, Timestamp, + EthereumKey, ExtBuilder, Identity, MockRuntime, Moment, RuntimeOrigin, System, Timestamp, PROOF_PREFIX, STAKE, }, models::AirdropState, @@ -55,7 +55,7 @@ fn with_recipients( ExtBuilder::default().build().execute_with(|| { System::set_block_number(0xDEADC0DE); - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start_moment = 0xCAFEBABE; let set_moment = |x: Moment| Timestamp::set_timestamp(start_moment + x); @@ -88,7 +88,7 @@ mod create_airdrop { #[test] fn should_create_airdrop_without_start_successfully() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start: Option = None; let vesting_schedule = DEFAULT_VESTING_PERIOD; @@ -104,7 +104,7 @@ mod create_airdrop { #[test] #[allow(clippy::disallowed_methods)] // Allow unwrap fn should_create_airdrop_with_start_successfully() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start: Option = Some(DEFAULT_VESTING_PERIOD * 2); let vesting_schedule = DEFAULT_VESTING_PERIOD; @@ -120,7 +120,7 @@ mod create_airdrop { #[test] fn should_fail_to_create_an_airdrop_in_the_past() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start: Option = Some(DEFAULT_VESTING_PERIOD * 2); let vesting_schedule = DEFAULT_VESTING_PERIOD; @@ -144,8 +144,8 @@ mod add_recipient { #[test] fn should_fail_to_add_recipients_if_origin_is_not_creator() { - let creator = Origin::signed(CREATOR); - let other = Origin::signed(OTHER); + let creator = RuntimeOrigin::signed(CREATOR); + let other = RuntimeOrigin::signed(OTHER); let start: Option = Some(DEFAULT_VESTING_PERIOD * 2); let vesting_schedule = DEFAULT_VESTING_PERIOD; let accounts = generate_accounts(128); @@ -174,7 +174,7 @@ mod add_recipient { #[test] fn should_fail_to_add_recipients_if_origin_has_insufficient_funds() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start: Option = Some(DEFAULT_VESTING_PERIOD * 2); let vesting_schedule = DEFAULT_VESTING_PERIOD; let accounts = generate_accounts(128); @@ -203,7 +203,7 @@ mod add_recipient { #[test] fn should_fail_to_add_recipients_if_airdrop_does_not_exist() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let accounts = generate_accounts(128); let recipients = accounts .iter() @@ -251,7 +251,7 @@ mod remove_recipient { #[test] fn should_fail_to_remove_recipient_if_origin_is_not_creator() { - let other = Origin::signed(OTHER); + let other = RuntimeOrigin::signed(OTHER); with_default_recipients(|_, accounts| { assert_noop!( @@ -263,13 +263,13 @@ mod remove_recipient { #[test] fn should_fail_to_remove_recipient_if_recipient_started_claiming() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); with_default_recipients(|set_moment, accounts| { set_moment(DEFAULT_VESTING_PERIOD); assert_ok!(Airdrop::claim( - Origin::none(), + RuntimeOrigin::none(), 1, accounts[0].clone().0, accounts[0].clone().1.proof(accounts[0].clone().0) @@ -283,7 +283,7 @@ mod remove_recipient { #[test] fn should_prune_airdrop_if_last_recipient_is_removed() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); with_default_recipients(|_, accounts| { assert!(Airdrop::airdrops(1).is_some()); @@ -300,7 +300,7 @@ mod remove_recipient { #[test] fn should_remove_recipient_successfully() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); with_default_recipients(|_, accounts| { assert_ok!(Airdrop::remove_recipient( @@ -320,7 +320,7 @@ mod enable_airdrop { #[test] fn should_fail_to_enable_airdrop_if_origin_is_not_creator() { - let other = Origin::signed(OTHER); + let other = RuntimeOrigin::signed(OTHER); with_default_recipients(|_, _| { assert_noop!( @@ -332,7 +332,7 @@ mod enable_airdrop { #[test] fn should_fail_to_enable_airdrop_if_airdrop_has_already_been_scheduled() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); let start_at = Some(DEFAULT_VESTING_PERIOD * 2); ExtBuilder::default().build().execute_with(|| { @@ -363,7 +363,7 @@ mod disable_airdrop { #[test] fn should_fail_to_disable_airdrop_if_origin_is_not_creator() { - let other = Origin::signed(OTHER); + let other = RuntimeOrigin::signed(OTHER); with_default_recipients(|_, _| { assert_noop!( @@ -376,7 +376,7 @@ mod disable_airdrop { #[test] #[allow(clippy::disallowed_methods)] // Allow unwrap fn should_disable_airdrop_successfully() { - let creator = Origin::signed(CREATOR); + let creator = RuntimeOrigin::signed(CREATOR); with_default_recipients(|set_moment, _| { set_moment(DEFAULT_VESTING_PERIOD * 2); diff --git a/code/parachain/frame/assets-registry/Cargo.toml b/code/parachain/frame/assets-registry/Cargo.toml index 4134db9b944..945b411aac9 100644 --- a/code/parachain/frame/assets-registry/Cargo.toml +++ b/code/parachain/frame/assets-registry/Cargo.toml @@ -57,10 +57,11 @@ std = [ "xcm/std", "pallet-currency-factory/std", "cumulus-primitives-core/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ "frame-benchmarking", - 'frame-support/runtime-benchmarks', - 'frame-system/runtime-benchmarks', + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", ] diff --git a/code/parachain/frame/assets-registry/src/tests.rs b/code/parachain/frame/assets-registry/src/tests.rs index be4b0d7bdcf..5e3d15459bb 100644 --- a/code/parachain/frame/assets-registry/src/tests.rs +++ b/code/parachain/frame/assets-registry/src/tests.rs @@ -31,7 +31,7 @@ fn set_metadata() { let asset_id = System::events() .iter() .find_map(|x| match x.event { - Event::AssetsRegistry(crate::Event::::AssetRegistered { + RuntimeEvent::AssetsRegistry(crate::Event::::AssetRegistered { asset_id, location: _, decimals: _, @@ -71,7 +71,7 @@ fn register_asset() { assert_eq!(AssetsRegistry::from_foreign_asset(location.clone()), None); assert_ok!(AssetsRegistry::register_asset( - Origin::root(), + RuntimeOrigin::root(), location.clone(), ratio, Some(decimals) @@ -83,7 +83,7 @@ fn register_asset() { ); assert_noop!( - AssetsRegistry::register_asset(Origin::root(), location, ratio, Some(decimals)), + AssetsRegistry::register_asset(RuntimeOrigin::root(), location, ratio, Some(decimals)), Error::::ForeignAssetAlreadyRegistered ); }) @@ -100,7 +100,7 @@ fn update_asset() { let decimals = 3; assert_ok!(AssetsRegistry::register_asset( - Origin::root(), + RuntimeOrigin::root(), location.clone(), ratio, Some(decimals) @@ -116,7 +116,7 @@ fn update_asset() { let new_decimals = 12; let new_ratio = rational!(100500 / 666); assert_ok!(AssetsRegistry::update_asset( - Origin::root(), + RuntimeOrigin::root(), local_asset_id, location.clone(), new_ratio, @@ -143,7 +143,7 @@ fn set_min_fee() { ); assert_ok!(AssetsRegistry::set_min_fee( - Origin::root(), + RuntimeOrigin::root(), target_parachain_id, foreign_asset_id.clone(), Some(balance) @@ -171,7 +171,7 @@ fn get_foreign_assets_list_should_work() { assert_eq!(foreign_assets, vec![]); assert_ok!(AssetsRegistry::register_asset( - Origin::root(), + RuntimeOrigin::root(), location.clone(), ratio, Some(decimals) diff --git a/code/parachain/frame/assets/Cargo.toml b/code/parachain/frame/assets/Cargo.toml index 0692fd2f18a..3af5a19964e 100644 --- a/code/parachain/frame/assets/Cargo.toml +++ b/code/parachain/frame/assets/Cargo.toml @@ -62,4 +62,5 @@ std = [ "sp-api/std", "orml-traits/std", "num-traits/std", + "frame-benchmarking/std", ] diff --git a/code/parachain/frame/assets/src/mocks.rs b/code/parachain/frame/assets/src/mocks.rs index 7342e28b421..fd3bbc87c2d 100644 --- a/code/parachain/frame/assets/src/mocks.rs +++ b/code/parachain/frame/assets/src/mocks.rs @@ -121,6 +121,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl governance_registry::Config for Test { diff --git a/code/parachain/frame/assets/src/tests/extrinsics.rs b/code/parachain/frame/assets/src/tests/extrinsics.rs index 7981ac93465..a308df42745 100644 --- a/code/parachain/frame/assets/src/tests/extrinsics.rs +++ b/code/parachain/frame/assets/src/tests/extrinsics.rs @@ -1,5 +1,5 @@ use crate::*; -use mocks::{new_test_ext, GovernanceRegistry, Origin, Test}; +use mocks::{new_test_ext, GovernanceRegistry, RuntimeOrigin, Test}; use orml_traits::MultiCurrency; const FROM_ACCOUNT: u64 = 1; @@ -11,13 +11,13 @@ const TRANSFER_AMOUNT: u64 = 500; #[test] fn set_only_by_root() { new_test_ext().execute_with(|| { - GovernanceRegistry::set(Origin::root(), 1, 1).unwrap(); - ensure_admin_or_governance::(Origin::root(), &2).unwrap(); - ensure_admin_or_governance::(Origin::signed(1), &2).unwrap_err(); - ensure_admin_or_governance::(Origin::signed(2), &1).unwrap_err(); - ensure_admin_or_governance::(Origin::signed(1), &1).unwrap(); - ensure_admin_or_governance::(Origin::none(), &1).unwrap_err(); - ensure_admin_or_governance::(Origin::none(), &2).unwrap_err(); + GovernanceRegistry::set(RuntimeOrigin::root(), 1, 1).unwrap(); + ensure_admin_or_governance::(RuntimeOrigin::root(), &2).unwrap(); + ensure_admin_or_governance::(RuntimeOrigin::signed(1), &2).unwrap_err(); + ensure_admin_or_governance::(RuntimeOrigin::signed(2), &1).unwrap_err(); + ensure_admin_or_governance::(RuntimeOrigin::signed(1), &1).unwrap(); + ensure_admin_or_governance::(RuntimeOrigin::none(), &1).unwrap_err(); + ensure_admin_or_governance::(RuntimeOrigin::none(), &2).unwrap_err(); }); } @@ -25,7 +25,7 @@ fn set_only_by_root() { fn test_transfer() { new_test_ext().execute_with(|| { Pallet::::transfer( - Origin::signed(FROM_ACCOUNT), + RuntimeOrigin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, TRANSFER_AMOUNT, @@ -47,7 +47,7 @@ fn test_transfer() { fn test_transfer_native() { new_test_ext().execute_with(|| { Pallet::::transfer_native( - Origin::signed(FROM_ACCOUNT), + RuntimeOrigin::signed(FROM_ACCOUNT), TO_ACCOUNT, TRANSFER_AMOUNT, true, @@ -68,7 +68,7 @@ fn test_transfer_native() { fn test_force_transfer() { new_test_ext().execute_with(|| { Pallet::::force_transfer( - Origin::root(), + RuntimeOrigin::root(), ASSET_ID, FROM_ACCOUNT, TO_ACCOUNT, @@ -91,7 +91,7 @@ fn test_force_transfer() { fn test_force_transfer_native() { new_test_ext().execute_with(|| { Pallet::::force_transfer_native( - Origin::root(), + RuntimeOrigin::root(), FROM_ACCOUNT, TO_ACCOUNT, TRANSFER_AMOUNT, @@ -112,7 +112,7 @@ fn test_force_transfer_native() { #[test] fn test_transfer_all() { new_test_ext().execute_with(|| { - Pallet::::transfer_all(Origin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, true) + Pallet::::transfer_all(RuntimeOrigin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, true) .expect("transfer_all should work"); assert_eq!(Pallet::::total_balance(ASSET_ID, &FROM_ACCOUNT), 1); assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT * 2 - 1); @@ -122,7 +122,7 @@ fn test_transfer_all() { #[test] fn test_transfer_all_native() { new_test_ext().execute_with(|| { - Pallet::::transfer_all_native(Origin::signed(FROM_ACCOUNT), TO_ACCOUNT, true) + Pallet::::transfer_all_native(RuntimeOrigin::signed(FROM_ACCOUNT), TO_ACCOUNT, true) .expect("transfer_all_native should work"); assert_eq!(Pallet::::total_balance(ASSET_ID, &FROM_ACCOUNT), 1); assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT * 2 - 1); @@ -133,7 +133,7 @@ fn test_transfer_all_native() { fn test_mint_initialize() { new_test_ext().execute_with(|| { assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT); - Pallet::::mint_initialize(Origin::root(), TRANSFER_AMOUNT, TO_ACCOUNT) + Pallet::::mint_initialize(RuntimeOrigin::root(), TRANSFER_AMOUNT, TO_ACCOUNT) .expect("mint_initialize should work"); assert_eq!( Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), @@ -147,7 +147,7 @@ fn test_mint_initialize_with_governance() { new_test_ext().execute_with(|| { assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT); Pallet::::mint_initialize_with_governance( - Origin::root(), + RuntimeOrigin::root(), TRANSFER_AMOUNT, TO_ACCOUNT, TO_ACCOUNT, @@ -157,7 +157,7 @@ fn test_mint_initialize_with_governance() { Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT + TRANSFER_AMOUNT ); - ensure_admin_or_governance::(Origin::signed(TO_ACCOUNT), &ASSET_ID).expect( + ensure_admin_or_governance::(RuntimeOrigin::signed(TO_ACCOUNT), &ASSET_ID).expect( "mint_initialize_with_governance should add governance_origin to GovernanceRegistry", ); }); @@ -166,12 +166,12 @@ fn test_mint_initialize_with_governance() { #[test] fn test_mint_into() { new_test_ext().execute_with(|| { - GovernanceRegistry::set(Origin::root(), ASSET_ID, FROM_ACCOUNT).unwrap(); + GovernanceRegistry::set(RuntimeOrigin::root(), ASSET_ID, FROM_ACCOUNT).unwrap(); assert_eq!(Pallet::::total_balance(ASSET_ID, &FROM_ACCOUNT), INIT_AMOUNT); assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT); Pallet::::mint_into( - Origin::signed(FROM_ACCOUNT), + RuntimeOrigin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, TRANSFER_AMOUNT, @@ -188,12 +188,12 @@ fn test_mint_into() { #[test] fn test_burn_from() { new_test_ext().execute_with(|| { - GovernanceRegistry::set(Origin::root(), ASSET_ID, FROM_ACCOUNT).unwrap(); + GovernanceRegistry::set(RuntimeOrigin::root(), ASSET_ID, FROM_ACCOUNT).unwrap(); assert_eq!(Pallet::::total_balance(ASSET_ID, &FROM_ACCOUNT), INIT_AMOUNT); assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT); Pallet::::burn_from( - Origin::signed(FROM_ACCOUNT), + RuntimeOrigin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, TRANSFER_AMOUNT, diff --git a/code/parachain/frame/bonded-finance/src/mock.rs b/code/parachain/frame/bonded-finance/src/mock.rs index 42d5f38edb3..de74d7381ab 100644 --- a/code/parachain/frame/bonded-finance/src/mock.rs +++ b/code/parachain/frame/bonded-finance/src/mock.rs @@ -90,20 +90,20 @@ impl frame_system::Config for Runtime { } pub struct EnsureAliceOrBob; -impl EnsureOrigin for EnsureAliceOrBob { +impl EnsureOrigin for EnsureAliceOrBob { type Success = AccountId; - fn try_origin(o: Origin) -> Result { - Into::, Origin>>::into(o).and_then(|o| match o { + fn try_origin(o: RuntimeOrigin) -> Result { + Into::, RuntimeOrigin>>::into(o).and_then(|o| match o { RawOrigin::Signed(ALICE) => Ok(ALICE), RawOrigin::Signed(BOB) => Ok(BOB), - r => Err(Origin::from(r)), + r => Err(RuntimeOrigin::from(r)), }) } #[cfg(feature = "runtime-benchmarks")] - fn successful_origin() -> Origin { - Origin::from(RawOrigin::Signed(Default::default())) + fn successful_origin() -> RuntimeOrigin { + RuntimeOrigin::from(RawOrigin::Signed(Default::default())) } } @@ -132,6 +132,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/bonded-finance/src/tests.rs b/code/parachain/frame/bonded-finance/src/tests.rs index 159a48fe893..75847e9c02f 100644 --- a/code/parachain/frame/bonded-finance/src/tests.rs +++ b/code/parachain/frame/bonded-finance/src/tests.rs @@ -15,7 +15,7 @@ use frame_support::{ tokens::WithdrawConsequence, }, }; -use mock::{Event, *}; +use mock::{RuntimeEvent, *}; use proptest::prelude::*; prop_compose! { @@ -64,7 +64,7 @@ proptest! { prop_assert_ok!(offer_id); let offer_id = offer_id.expect("impossible; qed"); - System::assert_last_event(Event::BondedFinance(crate::Event::NewOffer{ offer_id, beneficiary: BOB })); + System::assert_last_event(RuntimeEvent::BondedFinance(crate::Event::NewOffer{ offer_id, beneficiary: BOB })); Ok(()) })?; } @@ -113,7 +113,7 @@ proptest! { prop_assert_ok!(BondedFinance::do_bond(offer_id, &BOB, half_nb_of_bonds, false)); // Alice cancel the offer - prop_assert_ok!(BondedFinance::cancel(Origin::signed(ALICE), offer_id)); + prop_assert_ok!(BondedFinance::cancel(RuntimeOrigin::signed(ALICE), offer_id)); // The remaining half is refunded to alice let precision = 100; @@ -136,7 +136,7 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); // Alice cancel the offer - prop_assert_ok!(BondedFinance::cancel(Origin::signed(ALICE), offer_id)); + prop_assert_ok!(BondedFinance::cancel(RuntimeOrigin::signed(ALICE), offer_id)); // The stake is refunded prop_assert_eq!(Tokens::balance(NATIVE_CURRENCY_ID, &ALICE), Stake::get()); @@ -155,9 +155,9 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); prop_assert_ok!(Tokens::mint_into(offer.asset, &BOB, offer.total_price().expect("impossible; qed;"))); - prop_assert_ok!(BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds, false)); + prop_assert_ok!(BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds, false)); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds, false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds, false), Err(Error::::OfferCompleted.into()) ); @@ -175,7 +175,7 @@ proptest! { 0 ); System::set_block_number(return_in); - prop_assert_ok!(Vesting::claim(Origin::signed(BOB), offer.asset, VestingScheduleIdSet::All)); + prop_assert_ok!(Vesting::claim(RuntimeOrigin::signed(BOB), offer.asset, VestingScheduleIdSet::All)); prop_assert_eq!( Tokens::balance(offer.asset, &BOB), offer.total_price().expect("impossible; qed;") @@ -230,23 +230,23 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); prop_assert_ok!(Tokens::mint_into(offer.asset, &BOB, offer.total_price().expect("impossible; qed;"))); - prop_assert_ok!(BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds - 1, false)); + prop_assert_ok!(BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds - 1, false)); - System::assert_last_event(Event::BondedFinance(crate::Event::NewBond { + System::assert_last_event(RuntimeEvent::BondedFinance(crate::Event::NewBond { offer_id, who: BOB, nb_of_bonds: offer.nb_of_bonds - 1 })); - prop_assert_ok!(BondedFinance::bond(Origin::signed(BOB), offer_id, 1, false)); + prop_assert_ok!(BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, 1, false)); - System::assert_has_event(Event::BondedFinance(crate::Event::NewBond { + System::assert_has_event(RuntimeEvent::BondedFinance(crate::Event::NewBond { offer_id, who: BOB, nb_of_bonds: 1 })); - System::assert_last_event(Event::BondedFinance(crate::Event::OfferCompleted { offer_id })); + System::assert_last_event(RuntimeEvent::BondedFinance(crate::Event::OfferCompleted { offer_id })); Ok(()) })?; @@ -285,8 +285,8 @@ proptest! { System::set_block_number(offer.reward.maturity); - prop_assert_ok!(Vesting::claim(Origin::signed(BOB), offer.reward.asset, VestingScheduleIdSet::All)); - prop_assert_ok!(Vesting::claim(Origin::signed(CHARLIE), offer.reward.asset, VestingScheduleIdSet::All)); + prop_assert_ok!(Vesting::claim(RuntimeOrigin::signed(BOB), offer.reward.asset, VestingScheduleIdSet::All)); + prop_assert_ok!(Vesting::claim(RuntimeOrigin::signed(CHARLIE), offer.reward.asset, VestingScheduleIdSet::All)); prop_assert!(Tokens::can_withdraw(offer.reward.asset, &BOB, bob_reward) == WithdrawConsequence::Success); prop_assert!(Tokens::can_withdraw(offer.reward.asset, &CHARLIE, charlie_reward) == WithdrawConsequence::Success); @@ -306,7 +306,7 @@ proptest! { prop_assert_ok!(Tokens::mint_into(offer.asset, &BOB, offer.total_price().expect("impossible; qed;"))); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id + 1, offer.nb_of_bonds,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id + 1, offer.nb_of_bonds,false), Err(Error::::BondOfferNotFound.into()) ); @@ -325,11 +325,11 @@ proptest! { prop_assert_ok!(Tokens::mint_into(offer.asset, &BOB, offer.total_price().expect("impossible; qed;"))); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds + 1,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds + 1,false), Err(Error::::InvalidNumberOfBonds.into()) ); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, 0,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, 0,false), Err(Error::::InvalidNumberOfBonds.into()) ); @@ -347,9 +347,9 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); prop_assert_ok!(Tokens::mint_into(offer.asset, &BOB, offer.total_price().expect("impossible; qed;"))); - prop_assert_ok!(BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds,false)); + prop_assert_ok!(BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds,false)); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds,false), Err(Error::::OfferCompleted.into()) ); @@ -371,20 +371,20 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); prop_assert_eq!( - BondedFinance::cancel(Origin::signed(BOB), offer_id), + BondedFinance::cancel(RuntimeOrigin::signed(BOB), offer_id), Err(BadOrigin.into()) ); - prop_assert_ok!(BondedFinance::cancel(Origin::signed(ALICE), offer_id)); + prop_assert_ok!(BondedFinance::cancel(RuntimeOrigin::signed(ALICE), offer_id)); prop_assert_eq!(Tokens::balance(NATIVE_CURRENCY_ID, &ALICE), Stake::get()); prop_assert_eq!(Tokens::balance(offer.reward.asset, &ALICE), offer.reward.amount); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds,false), Err(Error::::BondOfferNotFound.into()) ); - System::assert_last_event(Event::BondedFinance(crate::Event::OfferCancelled { offer_id })); + System::assert_last_event(RuntimeEvent::BondedFinance(crate::Event::OfferCancelled { offer_id })); Ok(()) })?; @@ -402,20 +402,20 @@ proptest! { let offer_id = offer_id.expect("impossible; qed"); prop_assert_eq!( - BondedFinance::cancel(Origin::signed(BOB), offer_id), + BondedFinance::cancel(RuntimeOrigin::signed(BOB), offer_id), Err(BadOrigin.into()) ); - prop_assert_ok!(BondedFinance::cancel(Origin::root(), offer_id)); + prop_assert_ok!(BondedFinance::cancel(RuntimeOrigin::root(), offer_id)); prop_assert_eq!(Tokens::balance(NATIVE_CURRENCY_ID, &ALICE), Stake::get()); prop_assert_eq!(Tokens::balance(offer.reward.asset, &ALICE), offer.reward.amount); prop_assert_eq!( - BondedFinance::bond(Origin::signed(BOB), offer_id, offer.nb_of_bonds,false), + BondedFinance::bond(RuntimeOrigin::signed(BOB), offer_id, offer.nb_of_bonds,false), Err(Error::::BondOfferNotFound.into()) ); - System::assert_last_event(Event::BondedFinance(crate::Event::OfferCancelled { offer_id })); + System::assert_last_event(RuntimeEvent::BondedFinance(crate::Event::OfferCancelled { offer_id })); Ok(()) })?; diff --git a/code/parachain/frame/call-filter/src/tests.rs b/code/parachain/frame/call-filter/src/tests.rs index f48cd75ab45..7fbb20c630c 100644 --- a/code/parachain/frame/call-filter/src/tests.rs +++ b/code/parachain/frame/call-filter/src/tests.rs @@ -1,12 +1,12 @@ #![cfg(test)] use super::*; -use mock::{Event, *}; +use mock::{RuntimeEvent, *}; use sp_runtime::traits::BadOrigin; use support::{assert_noop, assert_ok}; const BALANCE_TRANSFER: &::RuntimeCall = - &mock::Call::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 }); + &mock::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 }); #[test] fn pause_transaction_work() { ExtBuilder::default().build().execute_with(|| { @@ -16,11 +16,11 @@ fn pause_transaction_work() { pallet_name: b"Balances".to_vec().try_into().unwrap(), function_name: b"transfer".to_vec().try_into().unwrap(), }; - assert_noop!(Filter::disable(Origin::signed(5), balances_transfer.clone()), BadOrigin); + assert_noop!(Filter::disable(RuntimeOrigin::signed(5), balances_transfer.clone()), BadOrigin); assert_eq!(Filter::disabled_calls(&balances_transfer), None); - assert_ok!(Filter::disable(Origin::signed(1), balances_transfer.clone())); - System::assert_last_event(Event::Filter(crate::Event::Disabled { + assert_ok!(Filter::disable(RuntimeOrigin::signed(1), balances_transfer.clone())); + System::assert_last_event(RuntimeEvent::Filter(crate::Event::Disabled { entry: balances_transfer.clone(), })); assert_eq!(Filter::disabled_calls(&balances_transfer), Some(())); @@ -35,11 +35,11 @@ fn pause_transaction_work() { }; assert_noop!( - Filter::disable(Origin::signed(1), filter_pause), + Filter::disable(RuntimeOrigin::signed(1), filter_pause), Error::::CannotDisable ); assert_noop!( - Filter::disable(Origin::signed(1), filter_pause_2), + Filter::disable(RuntimeOrigin::signed(1), filter_pause_2), Error::::CannotDisable ); @@ -47,7 +47,7 @@ fn pause_transaction_work() { pallet_name: b"OtherPallet".to_vec().try_into().unwrap(), function_name: b"disable".to_vec().try_into().unwrap(), }; - assert_ok!(Filter::disable(Origin::signed(1), other)); + assert_ok!(Filter::disable(RuntimeOrigin::signed(1), other)); }); } @@ -61,13 +61,13 @@ fn enable_work() { function_name: b"transfer".to_vec().try_into().unwrap(), }; - assert_ok!(Filter::disable(Origin::signed(1), balances_transfer.clone())); + assert_ok!(Filter::disable(RuntimeOrigin::signed(1), balances_transfer.clone())); assert_eq!(Filter::disabled_calls(&balances_transfer), Some(())); - assert_noop!(Filter::enable(Origin::signed(5), balances_transfer.clone()), BadOrigin); + assert_noop!(Filter::enable(RuntimeOrigin::signed(5), balances_transfer.clone()), BadOrigin); - assert_ok!(Filter::enable(Origin::signed(1), balances_transfer.clone())); - System::assert_last_event(Event::Filter(crate::Event::Enabled { + assert_ok!(Filter::enable(RuntimeOrigin::signed(1), balances_transfer.clone())); + System::assert_last_event(RuntimeEvent::Filter(crate::Event::Enabled { entry: balances_transfer.clone(), })); assert_eq!(Filter::disabled_calls(&balances_transfer), None); @@ -83,10 +83,10 @@ fn paused_transaction_filter_work() { }; assert!(!Filter::contains(BALANCE_TRANSFER)); - assert_ok!(Filter::disable(Origin::signed(1), balances_transfer.clone())); + assert_ok!(Filter::disable(RuntimeOrigin::signed(1), balances_transfer.clone())); assert!(Filter::contains(BALANCE_TRANSFER)); - assert_ok!(Filter::enable(Origin::signed(1), balances_transfer)); + assert_ok!(Filter::enable(RuntimeOrigin::signed(1), balances_transfer)); assert!(!Filter::contains(BALANCE_TRANSFER)); }); diff --git a/code/parachain/frame/cosmwasm/src/mock.rs b/code/parachain/frame/cosmwasm/src/mock.rs index b67b541b672..f135ac965f8 100644 --- a/code/parachain/frame/cosmwasm/src/mock.rs +++ b/code/parachain/frame/cosmwasm/src/mock.rs @@ -109,6 +109,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl pallet_balances::Config for Test { diff --git a/code/parachain/frame/crowdloan-rewards/Cargo.toml b/code/parachain/frame/crowdloan-rewards/Cargo.toml index 6e257752739..ca770ef80f4 100644 --- a/code/parachain/frame/crowdloan-rewards/Cargo.toml +++ b/code/parachain/frame/crowdloan-rewards/Cargo.toml @@ -76,6 +76,7 @@ std = [ "sp-arithmetic/std", "scale-info/std", "serde/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/crowdloan-rewards/src/mocks.rs b/code/parachain/frame/crowdloan-rewards/src/mocks.rs index 3f47537fc46..68bdda91905 100644 --- a/code/parachain/frame/crowdloan-rewards/src/mocks.rs +++ b/code/parachain/frame/crowdloan-rewards/src/mocks.rs @@ -178,7 +178,7 @@ impl ClaimKey { } } pub fn claim(&self, reward_account: AccountId) -> DispatchResultWithPostInfo { - CrowdloanRewards::claim(Origin::signed(reward_account)) + CrowdloanRewards::claim(RuntimeOrigin::signed(reward_account)) } pub fn associate(&self, reward_account: AccountId) -> DispatchResultWithPostInfo { let proof = match self { @@ -186,7 +186,7 @@ impl ClaimKey { ClaimKey::Eth(ethereum_account) => ethereum_proof(ethereum_account, reward_account.clone()), }; - CrowdloanRewards::associate(Origin::none(), reward_account, proof) + CrowdloanRewards::associate(RuntimeOrigin::none(), reward_account, proof) } } diff --git a/code/parachain/frame/crowdloan-rewards/src/tests.rs b/code/parachain/frame/crowdloan-rewards/src/tests.rs index 4d053d0e7d7..905e01e0e87 100644 --- a/code/parachain/frame/crowdloan-rewards/src/tests.rs +++ b/code/parachain/frame/crowdloan-rewards/src/tests.rs @@ -2,7 +2,7 @@ use crate::{ ethereum_recover, mocks::{ ethereum_address, generate_accounts, AccountId, Balance, Balances, ClaimKey, - CrowdloanRewards, EthKey, ExtBuilder, Moment, Origin, System, Test, Timestamp, ALICE, + CrowdloanRewards, EthKey, ExtBuilder, Moment, RuntimeOrigin, System, Test, Timestamp, ALICE, INITIAL_PAYMENT, PROOF_PREFIX, VESTING_STEP, }, models::{Proof, RemoteAccount}, @@ -35,7 +35,7 @@ fn with_rewards( let set_moment = |x: Moment| Timestamp::set_timestamp(random_moment_start + x); set_moment(0); Balances::make_free_balance_be(&CrowdloanRewards::account_id(), reward * count); - assert_ok!(CrowdloanRewards::populate(Origin::root(), rewards)); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), rewards)); execute(&set_moment, accounts) }) } @@ -57,7 +57,7 @@ mod unlock_rewards_for { #[test] fn should_set_remove_rewards_lock() { with_rewards_default(|_set_moment, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.clone().into_iter() { assert_ok!(remote_account.associate(picasso_account)); @@ -66,7 +66,7 @@ mod unlock_rewards_for { assert!(CrowdloanRewards::remove_reward_locks().is_none()); let accounts = accounts.into_iter().map(|(account, _claim_key)| account).collect(); - assert_ok!(CrowdloanRewards::unlock_rewards_for(Origin::root(), accounts)); + assert_ok!(CrowdloanRewards::unlock_rewards_for(RuntimeOrigin::root(), accounts)); assert!(CrowdloanRewards::remove_reward_locks().is_some()); }) } @@ -74,7 +74,7 @@ mod unlock_rewards_for { #[test] fn should_unlock_reward_assets_for_accounts() { with_rewards_default(|_bugs_bugs_bugs, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.clone().into_iter() { assert_ok!(remote_account.associate(picasso_account)); @@ -92,7 +92,7 @@ mod unlock_rewards_for { let accounts: Vec = accounts.into_iter().map(|(account, _claim_key)| account).collect(); - assert_ok!(CrowdloanRewards::unlock_rewards_for(Origin::root(), accounts.clone())); + assert_ok!(CrowdloanRewards::unlock_rewards_for(RuntimeOrigin::root(), accounts.clone())); assert_ok!(>::transfer( &accounts[0], @@ -114,7 +114,7 @@ fn test_populate_rewards_not_funded() { }; ExtBuilder::default().build().execute_with(|| { Balances::make_free_balance_be(&CrowdloanRewards::account_id(), 0); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, DEFAULT_REWARD))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, DEFAULT_REWARD))); }); } @@ -133,7 +133,7 @@ fn test_incremental_populate() { let slice = accounts[start..start + 1000].to_vec(); let expected_total_rewards = (i + 1) as u128 * 1000 * DEFAULT_REWARD; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), slice)); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), slice)); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); } // Repopulating using the same accounts must overwrite existing entries. @@ -141,7 +141,7 @@ fn test_incremental_populate() { for i in 0..10 { let start = i * 1000; let slice = accounts[start..start + 1000].to_vec(); - assert_ok!(CrowdloanRewards::populate(Origin::root(), slice)); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), slice)); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); } }); @@ -158,13 +158,13 @@ fn test_populate_ok() { ExtBuilder::default().build().execute_with(|| { let expected_total_rewards = 0; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(0, DEFAULT_REWARD))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(0, DEFAULT_REWARD))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); let expected_total_rewards = 100 * DEFAULT_REWARD; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, DEFAULT_REWARD))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, DEFAULT_REWARD))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); @@ -174,7 +174,7 @@ fn test_populate_ok() { let s = frame_support::storage_root(StateVersion::V1); let expected_total_rewards = 100 * DEFAULT_REWARD; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, DEFAULT_REWARD))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, DEFAULT_REWARD))); assert_eq!(s, frame_support::storage_root(StateVersion::V1)); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); @@ -182,7 +182,7 @@ fn test_populate_ok() { // Overwrite rewards + 100 new contributors let expected_total_rewards = 200 * (DEFAULT_REWARD + 1); Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(200, DEFAULT_REWARD + 1))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(200, DEFAULT_REWARD + 1))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); }); @@ -199,10 +199,10 @@ fn test_add_ok() { ExtBuilder::default().build().execute_with(|| { let expected_total_rewards = 100 * DEFAULT_REWARD; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards * 2); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, DEFAULT_REWARD))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, DEFAULT_REWARD))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); - CrowdloanRewards::add(Origin::root(), gen(200, DEFAULT_REWARD)).unwrap(); + CrowdloanRewards::add(RuntimeOrigin::root(), gen(200, DEFAULT_REWARD)).unwrap(); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards * 2); }); } @@ -218,13 +218,13 @@ fn populate_should_overwrite_existing_rewards_with_new_values() { ExtBuilder::default().build().execute_with(|| { let expected_total_rewards = 100 * 200; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, 200))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, 200))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); let expected_total_rewards = 100 * 100; Balances::make_free_balance_be(&CrowdloanRewards::account_id(), expected_total_rewards); - assert_ok!(CrowdloanRewards::populate(Origin::root(), gen(100, 100))); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), gen(100, 100))); assert_eq!(CrowdloanRewards::total_rewards(), expected_total_rewards); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); }); @@ -233,9 +233,9 @@ fn populate_should_overwrite_existing_rewards_with_new_values() { #[test] fn test_populate_after_initialize_ko() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); assert_noop!( - CrowdloanRewards::populate(Origin::root(), vec![]), + CrowdloanRewards::populate(RuntimeOrigin::root(), vec![]), Error::::AlreadyInitialized ); }); @@ -244,7 +244,7 @@ fn test_populate_after_initialize_ko() { #[test] fn test_initialize_ok() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); assert_eq!(CrowdloanRewards::total_rewards(), 0); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); }); @@ -253,7 +253,7 @@ fn test_initialize_ok() { #[test] fn test_initialize_at_ok() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(CrowdloanRewards::initialize_at(Origin::root(), 10)); + assert_ok!(CrowdloanRewards::initialize_at(RuntimeOrigin::root(), 10)); assert_eq!(CrowdloanRewards::total_rewards(), 0); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); }); @@ -264,7 +264,7 @@ fn test_initialize_at_ko() { ExtBuilder::default().build().execute_with(|| { Timestamp::set_timestamp(100); assert_noop!( - CrowdloanRewards::initialize_at(Origin::root(), 99), + CrowdloanRewards::initialize_at(RuntimeOrigin::root(), 99), Error::::BackToTheFuture ); }); @@ -274,7 +274,7 @@ fn test_initialize_at_ko() { fn test_invalid_early_at_claim() { with_rewards_default(|set_moment, accounts| { let now = Timestamp::now(); - assert_ok!(CrowdloanRewards::initialize_at(Origin::root(), now + 10)); + assert_ok!(CrowdloanRewards::initialize_at(RuntimeOrigin::root(), now + 10)); for (picasso_account, remote_account) in accounts.clone().into_iter() { assert_noop!( @@ -294,9 +294,9 @@ fn test_invalid_early_at_claim() { #[test] fn test_initialize_once() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); assert_noop!( - CrowdloanRewards::initialize(Origin::root()), + CrowdloanRewards::initialize(RuntimeOrigin::root()), Error::::AlreadyInitialized ); }); @@ -314,7 +314,7 @@ fn test_not_initialized() { #[test] fn test_initialize_totals() { with_rewards_default(|_, _| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); assert_eq!(CrowdloanRewards::total_rewards(), DEFAULT_REWARD * DEFAULT_NB_OF_CONTRIBUTORS); assert_eq!(CrowdloanRewards::total_contributors() as u128, DEFAULT_NB_OF_CONTRIBUTORS); assert_eq!(CrowdloanRewards::claimed_rewards(), 0); @@ -325,7 +325,7 @@ fn test_initialize_totals() { fn initialize_should_fail_when_not_funded() { with_rewards_default(|_set_moment, _accounts| { Balances::make_free_balance_be(&CrowdloanRewards::account_id(), 0); - assert_noop!(CrowdloanRewards::initialize(Origin::root()), Error::::RewardsNotFunded); + assert_noop!(CrowdloanRewards::initialize(RuntimeOrigin::root()), Error::::RewardsNotFunded); }); } @@ -337,7 +337,7 @@ fn initialize_should_emit_warning_when_over_funded() { DEFAULT_REWARD * DEFAULT_NB_OF_CONTRIBUTORS * 2, ); - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); assert_eq!( Test::assert_event_with(|event| match event { Event::::OverFunded { excess_funds } => { @@ -355,7 +355,7 @@ fn initialize_should_emit_warning_when_over_funded() { #[test] fn test_initial_payment() { with_rewards_default(|_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.into_iter() { assert_ok!(remote_account.associate(picasso_account.clone())); assert_eq!(Balances::total_balance(&picasso_account), INITIAL_PAYMENT * DEFAULT_REWARD); @@ -370,7 +370,7 @@ fn test_initial_payment() { #[test] fn test_invalid_early_claim() { with_rewards_default(|_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.into_iter() { assert_ok!(remote_account.associate(picasso_account.clone())); assert_noop!(remote_account.claim(picasso_account), Error::::NothingToClaim); @@ -381,7 +381,7 @@ fn test_invalid_early_claim() { #[test] fn test_not_a_contributor() { with_rewards_default(|_, _| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for account in 0..100 { assert_noop!( ClaimKey::Relay(ed25519::Pair::from_seed(&[account as u8; 32])) @@ -395,7 +395,7 @@ fn test_not_a_contributor() { #[test] fn test_association_ok() { with_rewards_default(|_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.into_iter() { assert_ok!(remote_account.associate(picasso_account)); } @@ -405,7 +405,7 @@ fn test_association_ok() { #[test] fn test_association_ko() { with_rewards_default(|_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.into_iter() { assert_noop!(remote_account.claim(picasso_account), Error::::NotAssociated); } @@ -415,7 +415,7 @@ fn test_association_ko() { #[test] fn test_invalid_less_than_a_week() { with_rewards_default(|set_moment, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (picasso_account, remote_account) in accounts.clone().into_iter() { assert_ok!(remote_account.associate(picasso_account)); } @@ -436,7 +436,7 @@ fn test_valid_claim_full() { let total_vested_reward = DEFAULT_NB_OF_CONTRIBUTORS * DEFAULT_REWARD - total_initial_reward; let nb_of_vesting_step = DEFAULT_VESTING_PERIOD / VESTING_STEP; with_rewards_default(|set_moment, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); // Initial payment for (picasso_account, remote_account) in accounts.clone().into_iter() { assert_ok!(remote_account.associate(picasso_account)); @@ -462,7 +462,7 @@ fn test_valid_claim_full() { #[test] fn test_valid_claim_no_vesting() { with_rewards(DEFAULT_NB_OF_CONTRIBUTORS, DEFAULT_REWARD, 0, |_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); // Initial payment = full reward for (picasso_account, remote_account) in accounts.into_iter() { assert_ok!(remote_account.associate(picasso_account)); @@ -500,13 +500,13 @@ fn test_valid_eth_hardcoded() { let proof = Proof::Ethereum(eth_proof); ExtBuilder::default().build().execute_with(|| { Balances::make_free_balance_be(&CrowdloanRewards::account_id(), reward_amount); - assert_ok!(CrowdloanRewards::populate(Origin::root(), rewards)); - assert_ok!(CrowdloanRewards::initialize(Origin::root())); - assert_ok!(CrowdloanRewards::associate(Origin::none(), ALICE, proof)); + assert_ok!(CrowdloanRewards::populate(RuntimeOrigin::root(), rewards)); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); + assert_ok!(CrowdloanRewards::associate(RuntimeOrigin::none(), ALICE, proof)); Timestamp::set_timestamp(VESTING_STEP); - assert_ok!(CrowdloanRewards::claim(Origin::signed(ALICE))); + assert_ok!(CrowdloanRewards::claim(RuntimeOrigin::signed(ALICE))); Timestamp::set_timestamp(DEFAULT_VESTING_PERIOD); - assert_ok!(CrowdloanRewards::claim(Origin::signed(ALICE))); + assert_ok!(CrowdloanRewards::claim(RuntimeOrigin::signed(ALICE))); assert_eq!(CrowdloanRewards::claimed_rewards(), CrowdloanRewards::total_rewards()); }); } @@ -517,7 +517,7 @@ mod test_prevalidate_association { DEFAULT_VESTING_PERIOD, }; use crate::{ - mocks::{CrowdloanRewards, Origin}, + mocks::{CrowdloanRewards, RuntimeOrigin}, ValidityError, }; use frame_support::{ @@ -536,11 +536,11 @@ mod test_prevalidate_association { #[test] fn already_associated_associate_transactions_are_recognized() { with_rewards_default(|_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (reward_account, remote_account) in accounts.clone() { assert_ok!(CrowdloanRewards::associate( - Origin::none(), + RuntimeOrigin::none(), reward_account.clone(), remote_account.proof(reward_account.clone()), )); @@ -559,7 +559,7 @@ mod test_prevalidate_association { #[test] fn no_reward_associate_transactions_are_recognized() { with_rewards(DEFAULT_NB_OF_CONTRIBUTORS, 0, DEFAULT_VESTING_PERIOD, |_, accounts| { - assert_ok!(CrowdloanRewards::initialize(Origin::root())); + assert_ok!(CrowdloanRewards::initialize(RuntimeOrigin::root())); for (reward_account, remote_account) in accounts { let validate_result = setup_call(remote_account, &reward_account); diff --git a/code/parachain/frame/currency-factory/Cargo.toml b/code/parachain/frame/currency-factory/Cargo.toml index 68e54457e8a..85411714ee4 100644 --- a/code/parachain/frame/currency-factory/Cargo.toml +++ b/code/parachain/frame/currency-factory/Cargo.toml @@ -53,10 +53,11 @@ std = [ "sp-arithmetic/std", "composable-traits/std", "scale-info/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ - "frame-benchmarking/runtime-benchmarks", + "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", ] diff --git a/code/parachain/frame/currency-factory/src/tests.rs b/code/parachain/frame/currency-factory/src/tests.rs index cf257f72fe1..70eb2489d8d 100644 --- a/code/parachain/frame/currency-factory/src/tests.rs +++ b/code/parachain/frame/currency-factory/src/tests.rs @@ -33,7 +33,7 @@ proptest! { range in valid_ranges(), ) { new_test_ext().execute_with(|| { - prop_assert_ok!(CurrencyRanges::add_range(Origin::root(), range)); + prop_assert_ok!(CurrencyRanges::add_range(RuntimeOrigin::root(), range)); Ok(()) })?; } diff --git a/code/parachain/frame/dex-router/Cargo.toml b/code/parachain/frame/dex-router/Cargo.toml index f819a9799b6..c8e86c8e0a0 100644 --- a/code/parachain/frame/dex-router/Cargo.toml +++ b/code/parachain/frame/dex-router/Cargo.toml @@ -55,6 +55,7 @@ std = [ "frame-system/std", "sp-runtime/std", "composable-tests-helpers/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/dex-router/src/mock.rs b/code/parachain/frame/dex-router/src/mock.rs index 9e5e5edc376..c4d4db68ee7 100644 --- a/code/parachain/frame/dex-router/src/mock.rs +++ b/code/parachain/frame/dex-router/src/mock.rs @@ -141,6 +141,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/dex-router/src/tests.rs b/code/parachain/frame/dex-router/src/tests.rs index a356d300f04..712e0439bb3 100644 --- a/code/parachain/frame/dex-router/src/tests.rs +++ b/code/parachain/frame/dex-router/src/tests.rs @@ -53,7 +53,7 @@ fn create_constant_product_amm_pool(assets: AssetAmountPair, fee: Pe // Create Pablo pool let pool_id = Test::assert_extrinsic_event_with( - Pablo::create(Origin::signed(ALICE), init_config), + Pablo::create(RuntimeOrigin::signed(ALICE), init_config), |event| match event { pallet_pablo::Event::::PoolCreated { pool_id, .. } => Some(pool_id), _ => None, @@ -173,7 +173,7 @@ fn get_route_tests() { let dex_route = vec![create_usdc_eth_pool(), create_usdt_usdc_pool()]; assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.clone().try_into().unwrap()) )); @@ -194,7 +194,7 @@ fn update_route_origin_tests() { // only UpdateRouteOrigin can update the route which is set to EnsureRoot in mock. assert_noop!( DexRouter::update_route( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -215,7 +215,7 @@ fn halborn_hal11_route_with_cycle() { vec![create_usdt_usdc_pool(), create_usdc_usdt_pool(), create_usdt_usdc_pool()]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -229,7 +229,7 @@ fn halborn_hal11_route_with_cycle() { let dex_route = vec![usdt_usdc_pool, usdc_usdt_pool, usdt_usdc_pool]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -239,7 +239,7 @@ fn halborn_hal11_route_with_cycle() { let dex_route = vec![usdt_usdc_pool, usdc_usdt_pool]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), CurrencyPair::new(USDC, USDC), Some(dex_route.try_into().unwrap()) ), @@ -259,7 +259,7 @@ fn update_route_tests() { // insert let dex_route = vec![create_usdc_eth_pool(), create_usdt_usdc_pool()]; assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.clone().try_into().unwrap()) )); @@ -268,14 +268,14 @@ fn update_route_tests() { // update let dex_route = vec![create_dai_eth_pool(), create_usdt_dai_pool()]; assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.clone().try_into().unwrap()) )); assert_eq!(DexRouter::get_route(currency_pair), Some((dex_route, false))); // delete - assert_ok!(DexRouter::update_route(Origin::root(), currency_pair, None)); + assert_ok!(DexRouter::update_route(RuntimeOrigin::root(), currency_pair, None)); assert_eq!(DexRouter::get_route(currency_pair), None); // invalid route, case #1 @@ -286,7 +286,7 @@ fn update_route_tests() { ]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -297,7 +297,7 @@ fn update_route_tests() { let dex_route = vec![create_usdt_usdc_pool(), create_usdc_eth_pool()]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -308,7 +308,7 @@ fn update_route_tests() { let dex_route = vec![create_usdc_eth_pool()]; assert_noop!( DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) ), @@ -318,7 +318,7 @@ fn update_route_tests() { // route with a single pool. let dex_route = vec![create_usdt_usdc_pool()]; assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), CurrencyPair::new(USDT, USDC), Some(dex_route.try_into().unwrap()) )); @@ -334,7 +334,7 @@ fn exchange_tests() { let currency_pair = CurrencyPair { base: USDT, quote: ETH }; let dex_route = vec![create_usdc_eth_pool(), create_usdt_usdc_pool()]; assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) )); @@ -408,7 +408,7 @@ fn buy_test() { // USDT/USDC // USDT/ETH assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) )); @@ -469,7 +469,7 @@ fn unsupported_operation_test() { // USDT/USDC // USDT/ETH assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.try_into().unwrap()) )); @@ -511,7 +511,7 @@ fn single_pool_route_test() { let dex_route = vec![create_usdc_eth_pool()]; // USDC/ETH assert_ok!(DexRouter::update_route( - Origin::root(), + RuntimeOrigin::root(), currency_pair, Some(dex_route.clone().try_into().unwrap()) )); @@ -575,7 +575,7 @@ fn single_pool_route_test() { assert_ok!(Tokens::mint_into(USDC, &EVE, usdc_amount)); // base, quote amount should match currency_pair's base quote asset assert_ok!(DexRouter::add_liquidity( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), BTreeMap::from([(ETH, eth_amount), (USDC, usdc_amount)]), 0_u128, false @@ -583,7 +583,7 @@ fn single_pool_route_test() { let lp_amount = Tokens::balance(lp_token, &EVE); // min_base_amount, min_quote_amount should match currency_pair's base quote asset assert_ok!(DexRouter::remove_liquidity( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), lp_amount, BTreeMap::from([(ETH, 0), (USDC, 0)]), )); diff --git a/code/parachain/frame/dutch-auction/Cargo.toml b/code/parachain/frame/dutch-auction/Cargo.toml index 723e8d5bd3c..29321924260 100644 --- a/code/parachain/frame/dutch-auction/Cargo.toml +++ b/code/parachain/frame/dutch-auction/Cargo.toml @@ -76,6 +76,7 @@ std = [ "xcm/std", "polkadot-parachain/std", "log/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/dutch-auction/src/mock/runtime.rs b/code/parachain/frame/dutch-auction/src/mock/runtime.rs index 92955800b9f..44360374332 100644 --- a/code/parachain/frame/dutch-auction/src/mock/runtime.rs +++ b/code/parachain/frame/dutch-auction/src/mock/runtime.rs @@ -134,6 +134,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub static ALICE: Public = @@ -188,7 +191,7 @@ impl pallet_dutch_auction::Config for Runtime { type NativeCurrency = Balances; type AdminOrigin = EnsureOneOf, EnsureSignedBy>; type XcmSender = XcmFake; - type XcmOrigin = Origin; + type XcmOrigin = RuntimeOrigin; } impl cumulus_pallet_xcm::Config for Runtime { @@ -202,8 +205,8 @@ impl Into> for XcmFake { todo!("please test via local-integration-tests") } } -impl From for XcmFake { - fn from(_: Origin) -> Self { +impl From for XcmFake { + fn from(_: RuntimeOrigin) -> Self { todo!("please test via local-integration-tests") } } diff --git a/code/parachain/frame/dutch-auction/src/tests.rs b/code/parachain/frame/dutch-auction/src/tests.rs index 3fbf153781a..fd41e2fb166 100644 --- a/code/parachain/frame/dutch-auction/src/tests.rs +++ b/code/parachain/frame/dutch-auction/src/tests.rs @@ -48,7 +48,7 @@ fn xcm_sell_with_same_asset() { let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); let configuration_id = 1; DutchAuction::add_configuration( - Origin::signed(seller), + RuntimeOrigin::signed(seller), configuration_id, configuration.clone(), ) @@ -61,7 +61,7 @@ fn xcm_sell_with_same_asset() { configuration: configuration_id, }; assert_noop!( - DutchAuction::xcm_sell(Origin::signed(seller), request), + DutchAuction::xcm_sell(RuntimeOrigin::signed(seller), request), sp_runtime::DispatchError::Other("Auction creation with the same asset."), ); }); @@ -84,12 +84,12 @@ fn setup_sell() { let gas = Assets::balance(PICA, &ALICE); let treasury = Assets::balance(PICA, &DutchAuctionPalletId::get().into_account_truncating()); - DutchAuction::ask(Origin::signed(seller), sell, configuration).unwrap(); + DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let treasury_added = Assets::balance(PICA, &DutchAuctionPalletId::get().into_account_truncating()) - treasury; assert!(treasury_added > 0); - let ask_gas = ::WeightInfo::ask() as u128; + let ask_gas = ::WeightInfo::ask().ref_time() as u128; assert!(treasury_added >= ask_gas); let reserved = Assets::reserved_balance(BTC, &ALICE); assert!(not_reserved < reserved && reserved == 1); @@ -117,12 +117,12 @@ fn with_immediate_exact_buy() { let take_amount = 1000_u128; let sell = Sell::new(BTC, USDT, sell_amount, fixed(take_amount)); let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); - DutchAuction::ask(Origin::signed(seller), sell, configuration).unwrap(); + DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let order_id = crate::OrdersIndex::::get(); - let result = DutchAuction::take(Origin::signed(buyer), order_id, Take::new(1, fixed(999))); + let result = DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(999))); assert!(!result.is_ok()); let not_reserved = >::reserved_balance(USDT, &BOB); - let result = DutchAuction::take(Origin::signed(buyer), order_id, Take::new(1, fixed(1000))); + let result = DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1000))); assert_ok!(result); let reserved = Assets::reserved_balance(USDT, &BOB); assert!(not_reserved < reserved && reserved == take_amount); @@ -148,10 +148,10 @@ fn with_two_takes_higher_than_limit_and_not_enough_for_all() { let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); let sell = Sell::new(BTC, USDT, sell_amount, fixed(take_amount)); - DutchAuction::ask(Origin::signed(seller), sell, configuration).unwrap(); + DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let order_id = crate::OrdersIndex::::get(); - assert_ok!(DutchAuction::take(Origin::signed(buyer), order_id, Take::new(1, fixed(1001)))); - assert_ok!(DutchAuction::take(Origin::signed(buyer), order_id, Take::new(1, fixed(1002)))); + assert_ok!(DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1001)))); + assert_ok!(DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1002)))); DutchAuction::on_finalize(42); @@ -168,10 +168,10 @@ fn liquidation() { let seller = AccountId::from_raw(ALICE.0); let sell = Sell::new(BTC, USDT, 1, fixed(1000)); let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); - DutchAuction::ask(Origin::signed(seller), sell, configuration).unwrap(); + DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let order_id = crate::OrdersIndex::::get(); let balance_before = >::balance(&ALICE); - DutchAuction::liquidate(Origin::signed(seller), order_id).unwrap(); + DutchAuction::liquidate(RuntimeOrigin::signed(seller), order_id).unwrap(); let balance_after = >::balance(&ALICE); prop_assert!(balance_before < balance_after, "cleaning up is incentivized"); diff --git a/code/parachain/frame/fnft/Cargo.toml b/code/parachain/frame/fnft/Cargo.toml index e0e83ae2aa8..3e7a44cde76 100644 --- a/code/parachain/frame/fnft/Cargo.toml +++ b/code/parachain/frame/fnft/Cargo.toml @@ -56,6 +56,7 @@ std = [ "composable-support/std", "composable-tests-helpers/std", "pallet-proxy/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/fnft/src/test/mock.rs b/code/parachain/frame/fnft/src/test/mock.rs index 630f3f67f4d..0eeced9065f 100644 --- a/code/parachain/frame/fnft/src/test/mock.rs +++ b/code/parachain/frame/fnft/src/test/mock.rs @@ -123,14 +123,14 @@ impl system::Config for MockRuntime { type MaxConsumers = ConstU32<16>; } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::Governance => matches!( c, // TODO democracy - Call::System(..) + RuntimeCall::System(..) ), _ => false, } diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs b/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs index 58915b772aa..3d6d13d4e92 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs @@ -14,7 +14,7 @@ use frame_support::{ use crate::{ pallet, test::{ - mock::{new_test_ext, Event, MockRuntime, Nft, Origin, Proxy}, + mock::{new_test_ext, RuntimeEvent, MockRuntime, Nft, RuntimeOrigin, Proxy}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, CHARLIE, }, @@ -44,7 +44,7 @@ fn transfer_simple() { } MockRuntime::assert_extrinsic_event( - Nft::transfer(Origin::signed(ALICE), TEST_COLLECTION_ID, created_nft_id, BOB), + Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, created_nft_id, BOB), crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: created_nft_id, @@ -102,8 +102,8 @@ fn roundtrip() { process_and_progress_blocks::, MockRuntime>(10); // send one of ALICE's NFTs to BOB - assert_ok!(Nft::transfer(Origin::signed(ALICE), TEST_COLLECTION_ID, nft_to_trade, BOB)); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, nft_to_trade, BOB)); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, to: BOB, @@ -115,8 +115,8 @@ fn roundtrip() { process_and_progress_blocks::, MockRuntime>(10); // send said NFT back - assert_ok!(Nft::transfer(Origin::signed(BOB), TEST_COLLECTION_ID, nft_to_trade, ALICE)); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(BOB), TEST_COLLECTION_ID, nft_to_trade, ALICE)); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, to: ALICE, @@ -166,8 +166,8 @@ fn many() { } // transfer one of ALICE's NFTs to BOB - assert_ok!(Nft::transfer(Origin::signed(ALICE), TEST_COLLECTION_ID, a0, BOB)); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, a0, BOB)); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: a0, to: BOB, @@ -189,8 +189,8 @@ fn many() { // transfer all of CHARLIES's NFTs to BOB for nft_id in charlies_nfts.iter() { - assert_ok!(Nft::transfer(Origin::signed(CHARLIE), TEST_COLLECTION_ID, *nft_id, BOB)); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(CHARLIE), TEST_COLLECTION_ID, *nft_id, BOB)); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: *nft_id, to: BOB, @@ -213,8 +213,8 @@ fn many() { ]); // transfer one of (what was originally CHARLIES's) NFTs from BOB to ALICE - assert_ok!(Nft::transfer(Origin::signed(BOB), TEST_COLLECTION_ID, c9, ALICE)); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(BOB), TEST_COLLECTION_ID, c9, ALICE)); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: c9, to: ALICE, @@ -235,8 +235,8 @@ fn many() { ]); // transfer one of (what was originally CHARLIES's) NFTs from ALICE back to CHARLIE - assert_ok!(Nft::transfer(Origin::signed(ALICE), TEST_COLLECTION_ID, c9, CHARLIE),); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + assert_ok!(Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, c9, CHARLIE),); + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: c9, to: CHARLIE, @@ -265,7 +265,7 @@ fn ownership_check() { let created_nft_id = mint_nft_and_assert(); process_and_progress_blocks::, MockRuntime>(10); assert_noop!( - Nft::transfer(Origin::signed(BOB), TEST_COLLECTION_ID, created_nft_id, ALICE), + Nft::transfer(RuntimeOrigin::signed(BOB), TEST_COLLECTION_ID, created_nft_id, ALICE), crate::Error::::MustBeOwner ); }); @@ -276,7 +276,7 @@ fn ownership_check() { fn instance_not_found() { new_test_ext().execute_with(|| { assert_noop!( - Nft::transfer(Origin::signed(ALICE), TEST_COLLECTION_ID, 1, BOB), + Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, 1, BOB), crate::Error::::MustBeOwner ); }); diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs b/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs index e91107f0582..348b981f049 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs @@ -15,7 +15,7 @@ mod mint_into { use crate::{ pallet::*, test::{ - mock::{new_test_ext, Event, MockRuntime}, + mock::{new_test_ext, RuntimeEvent, MockRuntime}, prelude::*, ALICE, BOB, }, @@ -30,7 +30,7 @@ mod mint_into { Nft::mint_into(&TEST_COLLECTION_ID, &NEW_NFT_ID, &ALICE).unwrap(); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftCreated { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftCreated { collection_id: TEST_COLLECTION_ID, instance_id: NEW_NFT_ID, })); @@ -63,7 +63,7 @@ mod mint_into { Nft::mint_into(&TEST_COLLECTION_ID, &NEW_NFT_ID, &ALICE).unwrap(); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftCreated { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftCreated { collection_id: TEST_COLLECTION_ID, instance_id: NEW_NFT_ID, })); @@ -191,7 +191,7 @@ mod burn_from { use crate::{ pallet::*, test::{ - mock::{new_test_ext, Event, MockRuntime}, + mock::{new_test_ext, RuntimeEvent, MockRuntime}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, }, @@ -208,7 +208,7 @@ mod burn_from { process_and_progress_blocks::, MockRuntime>(10); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE))); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftBurned { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_burn, })); @@ -235,7 +235,7 @@ mod burn_from { process_and_progress_blocks::, MockRuntime>(10); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &new_id, Some(&ALICE))); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftBurned { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { collection_id: TEST_COLLECTION_ID, instance_id: new_id, })); @@ -267,7 +267,7 @@ mod burn_from { use sp_runtime::DispatchError; use crate::test::{ - mock::{new_test_ext, Event, MockRuntime}, + mock::{new_test_ext, RuntimeEvent, MockRuntime}, prelude::{mint_many_nfts_and_assert, mint_nft_and_assert, TEST_COLLECTION_ID}, ALICE, BOB, }; @@ -306,7 +306,7 @@ mod burn_from { mint_many_nfts_and_assert::<10>(ALICE, TEST_COLLECTION_ID); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE))); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftBurned { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_burn, })); @@ -325,7 +325,7 @@ mod burn_from { let nft_to_burn = mint_nft_and_assert(); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE))); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftBurned { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_burn, })); diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs b/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs index c65f14f9b81..cc255d6156d 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs @@ -11,7 +11,7 @@ use sp_runtime::DispatchError; use crate::{ test::{ - mock::{new_test_ext, Event, MockRuntime, Nft, Proxy}, + mock::{new_test_ext, RuntimeEvent, MockRuntime, Nft, Proxy}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, CHARLIE, }, @@ -86,7 +86,7 @@ fn roundtrip() { &nft_to_trade, &BOB )); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, to: BOB, @@ -103,7 +103,7 @@ fn roundtrip() { &nft_to_trade, &ALICE )); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, to: ALICE, @@ -158,7 +158,7 @@ fn many() { &a0, &BOB )); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: a0, to: BOB, @@ -185,7 +185,7 @@ fn many() { nft_id, &BOB )); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: *nft_id, to: BOB, @@ -213,7 +213,7 @@ fn many() { &c9, &ALICE )); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: c9, to: ALICE, @@ -239,7 +239,7 @@ fn many() { &c9, &CHARLIE ),); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftTransferred { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: c9, to: CHARLIE, diff --git a/code/parachain/frame/fnft/src/test/prelude.rs b/code/parachain/frame/fnft/src/test/prelude.rs index aa1fa701ad6..6286a1513da 100644 --- a/code/parachain/frame/fnft/src/test/prelude.rs +++ b/code/parachain/frame/fnft/src/test/prelude.rs @@ -13,7 +13,7 @@ use std::{ use crate::{ pallet::{Event as NftEvent, Instance, OwnerInstances}, test::{ - mock::{Event, MockRuntime, Nft}, + mock::{RuntimeEvent, MockRuntime, Nft}, ALICE, BOB, }, AccountIdOf, FinancialNftCollectionIdOf, FinancialNftInstanceIdOf, Pallet, @@ -30,7 +30,7 @@ pub(crate) fn mint_nft_and_assert() -> FinancialNftInstanceIdOf { let created_nft_id = 1_u64; assert_ok!(Pallet::::mint_into(&TEST_COLLECTION_ID, &created_nft_id, &ALICE)); - MockRuntime::assert_last_event(Event::Nft(NftEvent::FinancialNftCreated { + MockRuntime::assert_last_event(RuntimeEvent::Nft(NftEvent::FinancialNftCreated { collection_id: TEST_COLLECTION_ID, instance_id: created_nft_id, })); @@ -67,7 +67,7 @@ pub(crate) fn mint_into_and_assert() -> FinancialNftInstanceIdOf { Nft::create_collection(&TEST_COLLECTION_ID, &ALICE, &BOB).unwrap(); Pallet::::mint_into(&TEST_COLLECTION_ID, &NEW_NFT_ID, &ALICE).unwrap(); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftCreated { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftCreated { collection_id: TEST_COLLECTION_ID, instance_id: NEW_NFT_ID, })); @@ -97,7 +97,7 @@ pub(crate) fn mint_many_nfts_and_assert( let new_nft_id = Pallet::::get_next_nft_id(&collection).unwrap(); Pallet::::mint_into(&collection, &new_nft_id, &who).unwrap(); - MockRuntime::assert_last_event(Event::Nft(crate::Event::FinancialNftCreated { + MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftCreated { collection_id: collection, instance_id: new_nft_id, })); diff --git a/code/parachain/frame/governance-registry/src/tests.rs b/code/parachain/frame/governance-registry/src/tests.rs index 1ac248d1964..2f67fbf94e1 100644 --- a/code/parachain/frame/governance-registry/src/tests.rs +++ b/code/parachain/frame/governance-registry/src/tests.rs @@ -1,13 +1,13 @@ use composable_traits::governance::SignedRawOrigin; -use crate::mock::{new_test_ext, GovRegistry, Origin}; +use crate::mock::{new_test_ext, GovRegistry, RuntimeOrigin}; #[test] fn set_only_by_root() { new_test_ext().execute_with(|| { - GovRegistry::set(Origin::none(), 1, 1).unwrap_err(); - GovRegistry::set(Origin::signed(0), 1, 1).unwrap_err(); - GovRegistry::set(Origin::root(), 1, 1).unwrap(); + GovRegistry::set(RuntimeOrigin::none(), 1, 1).unwrap_err(); + GovRegistry::set(RuntimeOrigin::signed(0), 1, 1).unwrap_err(); + GovRegistry::set(RuntimeOrigin::root(), 1, 1).unwrap(); assert_eq!(GovRegistry::get(&1).unwrap(), SignedRawOrigin::Signed(1)) }); } @@ -15,9 +15,9 @@ fn set_only_by_root() { #[test] fn grant_root_only_by_root() { new_test_ext().execute_with(|| { - GovRegistry::grant_root(Origin::none(), 1).unwrap_err(); - GovRegistry::grant_root(Origin::signed(0), 1).unwrap_err(); - GovRegistry::grant_root(Origin::root(), 1).unwrap(); + GovRegistry::grant_root(RuntimeOrigin::none(), 1).unwrap_err(); + GovRegistry::grant_root(RuntimeOrigin::signed(0), 1).unwrap_err(); + GovRegistry::grant_root(RuntimeOrigin::root(), 1).unwrap(); assert_eq!(GovRegistry::get(&1).unwrap(), SignedRawOrigin::Root) }); } diff --git a/code/parachain/frame/lending/Cargo.toml b/code/parachain/frame/lending/Cargo.toml index c2a19e3aa61..ce0c35373c0 100644 --- a/code/parachain/frame/lending/Cargo.toml +++ b/code/parachain/frame/lending/Cargo.toml @@ -90,6 +90,7 @@ std = [ "xcm/std", "sp-keystore", "sp-application-crypto", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/lending/src/mocks/general.rs b/code/parachain/frame/lending/src/mocks/general.rs index 940648acfdb..7df0c0cec51 100644 --- a/code/parachain/frame/lending/src/mocks/general.rs +++ b/code/parachain/frame/lending/src/mocks/general.rs @@ -209,6 +209,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { @@ -323,8 +326,8 @@ impl Into> for XcmFake { unimplemented!("please test via local-integration-tests") } } -impl From for XcmFake { - fn from(_: Origin) -> Self { +impl From for XcmFake { + fn from(_: RuntimeOrigin) -> Self { unimplemented!("please test via local-integration-tests") } } @@ -364,7 +367,7 @@ impl pallet_liquidations::Config for Runtime { type MaxLiquidationStrategiesAmount = ConstU32<3>; } -pub type Extrinsic = TestXt; +pub type Extrinsic = TestXt; pub type AccountId = <::Signer as IdentifyAccount>::AccountId; impl frame_system::offchain::SigningTypes for Runtime { @@ -374,22 +377,22 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = Extrinsic; } impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, _public: ::Signer, _account: AccountId, nonce: u64, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { Some((call, (nonce, ()))) } } diff --git a/code/parachain/frame/lending/src/mocks/offchain.rs b/code/parachain/frame/lending/src/mocks/offchain.rs index 3b91f09e8d9..eda4f1b9896 100644 --- a/code/parachain/frame/lending/src/mocks/offchain.rs +++ b/code/parachain/frame/lending/src/mocks/offchain.rs @@ -42,7 +42,7 @@ use sp_runtime::testing::{Block, Digest, Header as HeaderType, TestSignature, Te pub struct CustomOnRuntimeUpgrade; impl OnRuntimeUpgrade for CustomOnRuntimeUpgrade { fn on_runtime_upgrade() -> frame_support::weights::Weight { - 100 + frame_support::weights::Weight::from_ref_time(100) } } @@ -55,7 +55,7 @@ pub type Executive = frame_executive::Executive< CustomOnRuntimeUpgrade, >; -pub type TestExtrinsic = TestXt>; +pub type TestExtrinsic = TestXt>; pub type TestBlock = Block; pub type Balance = u128; pub type Amount = i128; @@ -226,6 +226,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { @@ -335,8 +338,8 @@ impl Into> for XcmFake { unimplemented!("please test via local-integration-tests") } } -impl From for XcmFake { - fn from(_: Origin) -> Self { +impl From for XcmFake { + fn from(_: RuntimeOrigin) -> Self { unimplemented!("please test via local-integration-tests") } } @@ -385,22 +388,22 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = Extrinsic; } impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, _public: Public, _account: AccountId, nonce: u64, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { Some((call, (nonce, MockedExtension::new()))) } } @@ -513,7 +516,7 @@ impl MockedExtension { impl SignedExtension for MockedExtension { type AccountId = AccountId; - type RuntimeCall = RuntimeCall; + type Call = RuntimeCall; type AdditionalSigned = (); type Pre = (); const IDENTIFIER: &'static str = "MockedExtension"; diff --git a/code/parachain/frame/lending/src/tests/borrow.rs b/code/parachain/frame/lending/src/tests/borrow.rs index d6f83a9f4cf..79b90134cac 100644 --- a/code/parachain/frame/lending/src/tests/borrow.rs +++ b/code/parachain/frame/lending/src/tests/borrow.rs @@ -13,12 +13,12 @@ fn test_borrow_repay_in_same_block() { assert_extrinsic_event::( Lending::deposit_collateral( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_id, collateral_amount, false, ), - Event::Lending(crate::Event::CollateralDeposited { + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral_amount, market_id, @@ -27,7 +27,7 @@ fn test_borrow_repay_in_same_block() { let borrow_asset_deposit = USDT::units(1_000_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, borrow_asset_deposit)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault, borrow_asset_deposit)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault, borrow_asset_deposit)); let mut total_cash = DEFAULT_MARKET_VAULT_STRATEGY_SHARE.mul(borrow_asset_deposit) + initial_total_cash; @@ -38,8 +38,8 @@ fn test_borrow_repay_in_same_block() { process_and_progress_blocks::(1); // <- ??? assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market_id, limit_normalized / 4), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market_id, limit_normalized / 4), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: limit_normalized / 4, market_id, @@ -59,7 +59,7 @@ fn test_borrow_repay_in_same_block() { assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, alice_repay_amount - (limit_normalized / 4))); assert_noop!( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_id, *ALICE, RepayStrategy::PartialAmount(alice_repay_amount), @@ -68,7 +68,7 @@ fn test_borrow_repay_in_same_block() { Error::::BorrowAndRepayInSameBlockIsNotSupported, ); - assert_no_event::(Event::Lending(crate::Event::BorrowRepaid { + assert_no_event::(RuntimeEvent::Lending(crate::Event::BorrowRepaid { sender: *ALICE, market_id, beneficiary: *ALICE, @@ -124,7 +124,7 @@ fn old_price() { let borrow_amount = USDT::units(BORROW_AMOUNT); assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, borrow_amount)); - assert_ok!(Vault::deposit(Origin::signed(*ALICE), vault, borrow_amount * 2)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*ALICE), vault, borrow_amount * 2)); // Set BTC price set_price(BTC::ID, BTC::ONE.mul(FIRST_PRICE)); @@ -139,7 +139,7 @@ fn old_price() { // Deposit BTC on the market assert_ok!(Lending::deposit_collateral( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market, collateral_amount, false @@ -151,7 +151,7 @@ fn old_price() { // Try to borrow by SECOND_PRICE assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, borrow_amount), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow_amount), Error::::NotEnoughCollateralToBorrow ); @@ -164,7 +164,7 @@ fn old_price() { // Try to borrow by SECOND_PRICE assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, borrow_amount), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow_amount), Error::::PriceTooOld ); @@ -173,7 +173,7 @@ fn old_price() { set_price(USDT::ID, USDT::ONE); // Try to borrow by FIRST_PRICE - assert_ok!(Lending::borrow(Origin::signed(*ALICE), market, borrow_amount),); + assert_ok!(Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow_amount),); // skip blocks process_and_progress_blocks::(DEFAULT_MAX_PRICE_AGE as usize + 1); @@ -184,7 +184,7 @@ fn old_price() { // Try to borrow by SECOND_PRICE assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, borrow_amount), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow_amount), Error::::NotEnoughCollateralToBorrow ); @@ -193,7 +193,7 @@ fn old_price() { // Try to repay by SECOND_PRICE assert_ok!(Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market, *ALICE, RepayStrategy::PartialAmount(borrow_amount), @@ -215,12 +215,12 @@ fn borrow_flow() { assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, collateral_amount)); assert_ok!(Lending::deposit_collateral( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market, collateral_amount, false )); - let event = Event::Lending(crate::Event::CollateralDeposited { + let event = RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral_amount, market_id: market, @@ -235,7 +235,7 @@ fn borrow_flow() { ); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, borrow_amount)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault, borrow_amount)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault, borrow_amount)); process_and_progress_blocks::(1); @@ -246,8 +246,8 @@ fn borrow_flow() { let alice_borrow = borrow_amount / DEFAULT_COLLATERAL_FACTOR / 10; assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market, alice_borrow), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, alice_borrow), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: alice_borrow, market_id: market, @@ -285,19 +285,19 @@ fn borrow_flow() { assert!(borrow > alice_borrow); assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, original_limit), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, original_limit), Error::::NotEnoughCollateralToBorrow ); - assert_no_event::(Event::Lending(crate::Event::Borrowed { + assert_no_event::(RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: original_limit, market_id: market, })); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market, new_limit), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, new_limit), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: new_limit, market_id: market, @@ -305,11 +305,11 @@ fn borrow_flow() { ); assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, USDT::ONE), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, USDT::ONE), Error::::InvalidTimestampOnBorrowRequest ); - assert_no_event::(Event::Lending(crate::Event::Borrowed { + assert_no_event::(RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: USDT::ONE, market_id: market, @@ -320,8 +320,8 @@ fn borrow_flow() { assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, collateral_amount)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*ALICE), market, collateral_amount, false), - Event::Lending(crate::Event::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, collateral_amount, false), + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral_amount, market_id: market, @@ -332,19 +332,19 @@ fn borrow_flow() { assert!(get_price(BTC::ID, collateral_amount) > alice_limit); assert_noop!( - Lending::borrow(Origin::signed(*ALICE), market, alice_limit * 100), + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, alice_limit * 100), Error::::NotEnoughCollateralToBorrow ); - assert_no_event::(Event::Lending(crate::Event::Borrowed { + assert_no_event::(RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: alice_limit * 100, market_id: market, })); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market, 10), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, 10), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: 10, market_id: market, @@ -360,12 +360,12 @@ fn zero_amount_collateral_deposit_or_withdraw() { let collateral_amount = 0; let error_message = "Can not deposit or withdraw zero collateral"; assert_noop!( - Lending::deposit_collateral(Origin::signed(*ALICE), market, collateral_amount, false), + Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, collateral_amount, false), error_message ); assert_noop!( - Lending::withdraw_collateral(Origin::signed(*ALICE), market, collateral_amount,), + Lending::withdraw_collateral(RuntimeOrigin::signed(*ALICE), market, collateral_amount,), error_message ); }) diff --git a/code/parachain/frame/lending/src/tests/liquidation.rs b/code/parachain/frame/lending/src/tests/liquidation.rs index 7684d41f729..2efdc3ce2f0 100644 --- a/code/parachain/frame/lending/src/tests/liquidation.rs +++ b/code/parachain/frame/lending/src/tests/liquidation.rs @@ -16,7 +16,7 @@ fn test_liquidate_multiple() { // Deposit USDT in the vault. let vault_value = USDT::units(100_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &lender, vault_value)); - assert_ok!(Vault::deposit(Origin::signed(lender), vault_id, vault_value)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(lender), vault_id, vault_value)); process_and_progress_blocks::(1); // Deposit 1 BTC collateral from borrowers' accounts. mint_and_deposit_collateral::(first_borrower, BTC::units(1), market_id, BTC::ID); @@ -32,8 +32,8 @@ fn test_liquidate_multiple() { let borrowers_vec = vec![first_borrower, second_borrower, third_borrower]; let borrowers = TestBoundedVec::try_from(borrowers_vec.clone()).unwrap(); assert_extrinsic_event::( - Lending::liquidate(Origin::signed(manager), market_id.clone(), borrowers.clone()), - Event::Lending(crate::Event::LiquidationInitiated { + Lending::liquidate(RuntimeOrigin::signed(manager), market_id.clone(), borrowers.clone()), + RuntimeEvent::Lending(crate::Event::LiquidationInitiated { market_id, borrowers: borrowers_vec, }), @@ -83,7 +83,7 @@ fn test_liquidation_storage_transaction_rollback() { // Deposit USDT in the vault. let vault_value = USDT::units(100_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &lender, vault_value)); - assert_ok!(Vault::deposit(Origin::signed(lender), vault_id, vault_value)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(lender), vault_id, vault_value)); process_and_progress_blocks::(1); // Deposit 1 BTC collateral from normal borrower account. crate::tests::mint_and_deposit_collateral::( @@ -111,11 +111,11 @@ fn test_liquidation_storage_transaction_rollback() { set_price(BTC::ID, NORMALIZED::units(38_000)); assert_extrinsic_event::( Lending::liquidate( - Origin::signed(manager), + RuntimeOrigin::signed(manager), market_id.clone(), TestBoundedVec::try_from(vec![normal_borrower, borrower_with_a_twist]).unwrap(), ), - Event::Lending(crate::Event::LiquidationInitiated { + RuntimeEvent::Lending(crate::Event::LiquidationInitiated { market_id, borrowers: vec![normal_borrower], }), @@ -143,8 +143,8 @@ fn liquidation() { assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, collateral)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*ALICE), market_id, collateral, false), - Event::Lending(crate::Event::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market_id, collateral, false), + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral, market_id, @@ -154,7 +154,7 @@ fn liquidation() { let usdt_amt = 2 * DEFAULT_COLLATERAL_FACTOR * USDT::ONE * get_price(BTC::ID, collateral) / get_price(NORMALIZED::ID, NORMALIZED::ONE); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, usdt_amt)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault, usdt_amt)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault, usdt_amt)); // Allow the market to initialize it's account by withdrawing // from the vault @@ -164,8 +164,8 @@ fn liquidation() { assert!(borrow_limit > 0); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market_id, borrow_limit), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market_id, borrow_limit), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: borrow_limit, market_id, @@ -176,11 +176,11 @@ fn liquidation() { assert_extrinsic_event::( Lending::liquidate( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_id.clone(), TestBoundedVec::try_from(vec![*ALICE]).unwrap(), ), - Event::Lending(crate::Event::LiquidationInitiated { + RuntimeEvent::Lending(crate::Event::LiquidationInitiated { market_id, borrowers: vec![*ALICE], }), @@ -207,12 +207,12 @@ fn test_warn_soon_under_collateralized() { let two_btc_amount = BTC::units(2); assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, two_btc_amount)); assert_ok!(Lending::deposit_collateral( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market, two_btc_amount, false )); - let event = Event::Lending(crate::Event::CollateralDeposited { + let event = RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: two_btc_amount, market_id: market, @@ -221,7 +221,7 @@ fn test_warn_soon_under_collateralized() { let usdt_amt = USDT::units(100_000); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, usdt_amt)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault, usdt_amt)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault, usdt_amt)); process_and_progress_blocks::(1); @@ -230,8 +230,8 @@ fn test_warn_soon_under_collateralized() { let borrow_amount = USDT::units(80); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market, borrow_amount), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow_amount), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: borrow_amount, market_id: market, @@ -257,8 +257,8 @@ fn market_owner_cannot_retroactively_liquidate() { assert_ok!(Tokens::mint_into(BTC::ID, &BOB, collateral_amount)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*BOB), market_id, collateral_amount, false), - Event::Lending(crate::Event::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*BOB), market_id, collateral_amount, false), + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *BOB, amount: collateral_amount, market_id, @@ -267,7 +267,7 @@ fn market_owner_cannot_retroactively_liquidate() { let borrow_asset_deposit = USDT::units(1_000_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, borrow_asset_deposit)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault, borrow_asset_deposit)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault, borrow_asset_deposit)); process_and_progress_blocks::(1); @@ -275,8 +275,8 @@ fn market_owner_cannot_retroactively_liquidate() { process_and_progress_blocks::(2); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*BOB), market_id, limit_normalized), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*BOB), market_id, limit_normalized), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *BOB, amount: limit_normalized, market_id, @@ -295,7 +295,7 @@ fn market_owner_cannot_retroactively_liquidate() { }; // ALICE is the creator of the market. assert_noop!( - Lending::update_market(Origin::signed(*ALICE), market_id, updatable), + Lending::update_market(RuntimeOrigin::signed(*ALICE), market_id, updatable), Error::::CannotIncreaseCollateralFactorOfOpenMarket ); // if above update was succeeded BOB's loan would have to be liquidated. diff --git a/code/parachain/frame/lending/src/tests/market.rs b/code/parachain/frame/lending/src/tests/market.rs index e2918af4fd9..4189f8f4e14 100644 --- a/code/parachain/frame/lending/src/tests/market.rs +++ b/code/parachain/frame/lending/src/tests/market.rs @@ -12,7 +12,7 @@ fn can_update_market() { new_test_ext().execute_with(|| { System::set_block_number(1); let manager = *ALICE; - let origin = Origin::signed(manager); + let origin = RuntimeOrigin::signed(manager); // Create a market let ((market_id, _), _) = create_simple_vaulted_market(BTC::instance(), manager); // Get the market from the storage via market id @@ -30,7 +30,7 @@ fn can_update_market() { let market_updated_event: crate::Event = crate::Event::MarketUpdated { market_id, input: update_input }; // check if the event was emitted - System::assert_has_event(Event::Lending(market_updated_event)); + System::assert_has_event(RuntimeEvent::Lending(market_updated_event)); // validation on input fails as it has collateral_factor less than one let update_input = UpdateInput { @@ -71,7 +71,7 @@ fn can_create_valid_market() { assert_eq!(price, EXPECTED_AMOUNT_OF_BORROW_ASSET); let should_have_failed = Lending::create_market( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), config.clone(), false, ); @@ -96,7 +96,7 @@ fn can_create_valid_market() { Tokens::mint_into(BORROW_ASSET_ID, &*ALICE, INITIAL_BORROW_ASSET_AMOUNT).unwrap(); let manager = *ALICE; - let origin = Origin::signed(manager); + let origin = RuntimeOrigin::signed(manager); let input = config.clone(); let should_be_created = Lending::create_market(origin, config, false); @@ -114,7 +114,7 @@ fn can_create_valid_market() { let market_id = pallet_lending::pallet::MarketId::new(1); let vault_id = 1; let market_created_event = crate::Event::MarketCreated {market_id, vault_id, manager, currency_pair}; - System::assert_has_event(Event::Lending(market_created_event)); + System::assert_has_event(RuntimeEvent::Lending(market_created_event)); let initial_market_volume = Lending::calculate_initial_market_volume(BORROW_ASSET_ID).unwrap(); let alice_balance_after_market_creation = Tokens::balance(BORROW_ASSET_ID, &*ALICE); @@ -136,7 +136,7 @@ fn can_create_valid_market() { topics: event_topics, phase: Phase::Initialization, event: - Event::Lending(crate::Event::MarketCreated { + RuntimeEvent::Lending(crate::Event::MarketCreated { currency_pair: CurrencyPair { base: COLLATERAL_ASSET_ID, quote: BORROW_ASSET_ID }, market_id: created_market_id @ MarketId(1), @@ -198,7 +198,7 @@ fn can_create_valid_market_with_keep_alive() { assert_eq!(price, EXPECTED_AMOUNT_OF_BORROW_ASSET); let should_have_failed = Lending::create_market( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), config.clone(), true, ); @@ -223,7 +223,7 @@ fn can_create_valid_market_with_keep_alive() { Tokens::mint_into(BORROW_ASSET_ID, &*ALICE, INITIAL_BORROW_ASSET_AMOUNT).unwrap(); let manager = *ALICE; - let origin = Origin::signed(manager); + let origin = RuntimeOrigin::signed(manager); let input = config.clone(); let should_be_created = Lending::create_market(origin, config, true); @@ -241,7 +241,7 @@ fn can_create_valid_market_with_keep_alive() { let market_id = pallet_lending::pallet::MarketId::new(1); let vault_id = 1; let market_created_event = crate::Event::MarketCreated {market_id, vault_id, manager, currency_pair}; - System::assert_has_event(Event::Lending(market_created_event)); + System::assert_has_event(RuntimeEvent::Lending(market_created_event)); let initial_market_volume = Lending::calculate_initial_market_volume(BORROW_ASSET_ID).unwrap(); let alice_balance_after_market_creation = Tokens::balance(BORROW_ASSET_ID, &*ALICE); @@ -263,7 +263,7 @@ fn can_create_valid_market_with_keep_alive() { topics: event_topics, phase: Phase::Initialization, event: - Event::Lending(crate::Event::MarketCreated { + RuntimeEvent::Lending(crate::Event::MarketCreated { currency_pair: CurrencyPair { base: COLLATERAL_ASSET_ID, quote: BORROW_ASSET_ID }, market_id: created_market_id @ MarketId(1), @@ -370,18 +370,18 @@ proptest! { let (market, _) = create_simple_market(); let before = Tokens::balance( BTC::ID, &ALICE); prop_assert_ok!(Tokens::mint_into( BTC::ID, &ALICE, amount)); - prop_assert_ok!(Lending::deposit_collateral(Origin::signed(*ALICE), market, amount, false)); + prop_assert_ok!(Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, amount, false)); let event = - Event::Lending(crate::Event::CollateralDeposited { + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount, market_id: market, }); System::assert_last_event(event); - prop_assert_ok!(Lending::withdraw_collateral(Origin::signed(*ALICE), market, amount)); + prop_assert_ok!(Lending::withdraw_collateral(RuntimeOrigin::signed(*ALICE), market, amount)); let event = - Event::Lending(crate::Event::CollateralWithdrawn { + RuntimeEvent::Lending(crate::Event::CollateralWithdrawn { sender: *ALICE, amount, market_id: market, @@ -398,9 +398,9 @@ proptest! { new_test_ext().execute_with(|| { let (market, _vault) = create_simple_market(); prop_assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, amount)); - prop_assert_ok!(Lending::deposit_collateral(Origin::signed(*ALICE), market, amount, false)); + prop_assert_ok!(Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, amount, false)); let event = - Event::Lending(crate::Event::CollateralDeposited { + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount, market_id: market, @@ -408,11 +408,11 @@ proptest! { System::assert_last_event(event); prop_assert_eq!( - Lending::withdraw_collateral(Origin::signed(*ALICE), market, amount + 1), + Lending::withdraw_collateral(RuntimeOrigin::signed(*ALICE), market, amount + 1), Err(Error::::NotEnoughCollateralToWithdraw.into()) ); let event = - Event::Lending(crate::Event::CollateralWithdrawn { + RuntimeEvent::Lending(crate::Event::CollateralWithdrawn { sender: *ALICE, amount: amount + 1, market_id: market, @@ -429,17 +429,17 @@ proptest! { let ((market, _), collateral_asset) = create_simple_vaulted_market(BTC::instance(), *ALICE); let before = Tokens::balance(collateral_asset, &ALICE); prop_assert_ok!(Tokens::mint_into(collateral_asset, &ALICE, amount)); - prop_assert_ok!(Lending::deposit_collateral(Origin::signed(*ALICE), market, amount , false)); + prop_assert_ok!(Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, amount , false)); let event = - Event::Lending(crate::Event::CollateralDeposited { + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount, market_id: market, }); System::assert_last_event(event); - prop_assert_ok!(Lending::withdraw_collateral(Origin::signed(*ALICE), market, amount)); + prop_assert_ok!(Lending::withdraw_collateral(RuntimeOrigin::signed(*ALICE), market, amount)); let event = - Event::Lending(crate::Event::CollateralWithdrawn { + RuntimeEvent::Lending(crate::Event::CollateralWithdrawn { sender: *ALICE, amount, market_id: market, @@ -465,10 +465,10 @@ proptest! { prop_assert_ne!(Lending::account_id(&market_id1), Lending::account_id(&market_id2)); prop_assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, amount1)); - prop_assert_ok!(Vault::deposit(Origin::signed(*ALICE), vault_id1, amount1)); + prop_assert_ok!(Vault::deposit(RuntimeOrigin::signed(*ALICE), vault_id1, amount1)); prop_assert_ok!(Tokens::mint_into(USDT::ID, &BOB, 10*amount2)); - prop_assert_ok!(Vault::deposit(Origin::signed(*BOB), vault_id2, 10*amount2)); + prop_assert_ok!(Vault::deposit(RuntimeOrigin::signed(*BOB), vault_id2, 10*amount2)); process_and_progress_blocks::(1); diff --git a/code/parachain/frame/lending/src/tests/mod.rs b/code/parachain/frame/lending/src/tests/mod.rs index 3d5599f71f8..e321aa17fec 100644 --- a/code/parachain/frame/lending/src/tests/mod.rs +++ b/code/parachain/frame/lending/src/tests/mod.rs @@ -35,7 +35,7 @@ pub const DEFAULT_MAX_PRICE_AGE: u64 = 1020; pub const DEFAULT_MARKET_VAULT_STRATEGY_SHARE: Perquintill = Perquintill::from_percent(90); type SystemAccountIdOf = ::AccountId; -type SystemOriginOf = ::Origin; +type SystemOriginOf = ::RuntimeOrigin; type SystemEventOf = ::RuntimeEvent; pub type TestBoundedVec = BoundedVec; @@ -314,14 +314,14 @@ pub fn borrow( /// event. pub fn assert_extrinsic_event( result: DispatchResultWithPostInfo, - event: ::Event, + event: ::RuntimeEvent, ) { assert_ok!(result); frame_system::Pallet::::assert_last_event(event.into()); } /// Asserts the event wasn't dispatched. -pub fn assert_no_event(event: T::Event) +pub fn assert_no_event(event: T::RuntimeEvent) where T: frame_system::Config, { diff --git a/code/parachain/frame/lending/src/tests/offchain.rs b/code/parachain/frame/lending/src/tests/offchain.rs index e9e626a2310..f11a0380313 100644 --- a/code/parachain/frame/lending/src/tests/offchain.rs +++ b/code/parachain/frame/lending/src/tests/offchain.rs @@ -41,7 +41,7 @@ fn test_liquidation_offchain_worker() { // Deposit USDT in the vault. let vault_value = USDT::units(100_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &lender, vault_value)); - assert_ok!(Vault::deposit(Origin::signed(lender), vault_id, vault_value)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(lender), vault_id, vault_value)); //test::block::process_and_progress_blocks::(1); crate::Markets::::iter().for_each(|x| println!("{:?}", x)); @@ -77,7 +77,7 @@ fn test_liquidation_offchain_worker() { // Check that it is transaction which leads to the risky borrow liquidation. assert_eq!( tx.call, - Call::Lending(crate::Call::liquidate { + RuntimeCall::Lending(crate::Call::liquidate { market_id, borrowers: TestBoundedVec::try_from(vec![risky_borrower]).unwrap() }) @@ -87,20 +87,20 @@ fn test_liquidation_offchain_worker() { // Check event from Lending pallet let event = crate::Event::LiquidationInitiated { market_id, borrowers: vec![risky_borrower] }; - System::assert_has_event(Event::Lending(event)); + System::assert_has_event(RuntimeEvent::Lending(event)); // Check event from Liquidations pallet let event = pallet_liquidations::Event::PositionWasSentToLiquidation {}; - System::assert_has_event(Event::Liquidations(event)); + System::assert_has_event(RuntimeEvent::Liquidations(event)); // Check that events for the reliable borrow were not emitted // Check event from Lending pallet let event = crate::Event::::LiquidationInitiated { market_id, borrowers: vec![reliable_borrower], }; - assert_no_event::(Event::Lending(event)); + assert_no_event::(RuntimeEvent::Lending(event)); // Check that Liquidations pallet emitted only one event let event = - Event::Liquidations(pallet_liquidations::Event::PositionWasSentToLiquidation {}); + RuntimeEvent::Liquidations(pallet_liquidations::Event::PositionWasSentToLiquidation {}); assert!(System::events().iter().filter(|record| record.event == event).count() == 1); }); } diff --git a/code/parachain/frame/lending/src/tests/repay.rs b/code/parachain/frame/lending/src/tests/repay.rs index 840431e46ca..8daf3e40e6d 100644 --- a/code/parachain/frame/lending/src/tests/repay.rs +++ b/code/parachain/frame/lending/src/tests/repay.rs @@ -18,8 +18,8 @@ fn test_repay_partial_amount() { let borrow_asset_deposit = BORROW::units(1_000_000); assert_ok!(Tokens::mint_into(BORROW::ID, &CHARLIE, borrow_asset_deposit)); assert_extrinsic_event::( - Vault::deposit(Origin::signed(*CHARLIE), vault_id, borrow_asset_deposit), - Event::Vault(pallet_vault::Event::::Deposited { + Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault_id, borrow_asset_deposit), + RuntimeEvent::Vault(pallet_vault::Event::::Deposited { account: *CHARLIE, asset_amount: borrow_asset_deposit, lp_amount: borrow_asset_deposit, @@ -45,8 +45,8 @@ fn test_repay_partial_amount() { let alice_limit = get_collateral_borrow_limit_for_account(*ALICE); assert_extrinsic_event::( // partial borrow - Lending::borrow(Origin::signed(*ALICE), market_index, alice_limit / 2), - Event::Lending(crate::Event::::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market_index, alice_limit / 2), + RuntimeEvent::Lending(crate::Event::::Borrowed { sender: *ALICE, market_id: market_index, amount: alice_limit / 2, @@ -58,13 +58,13 @@ fn test_repay_partial_amount() { // pay off a small amount assert_extrinsic_event::( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_index, *ALICE, RepayStrategy::PartialAmount(BORROW::units(1) / 10_000), false, ), - Event::Lending(crate::Event::::BorrowRepaid { + RuntimeEvent::Lending(crate::Event::::BorrowRepaid { sender: *ALICE, market_id: market_index, beneficiary: *ALICE, @@ -78,13 +78,13 @@ fn test_repay_partial_amount() { // pay off a small amount assert_extrinsic_event::( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_index, *ALICE, RepayStrategy::PartialAmount(BORROW::units(1) / 10_000), false, ), - Event::Lending(crate::Event::::BorrowRepaid { + RuntimeEvent::Lending(crate::Event::::BorrowRepaid { sender: *ALICE, market_id: market_index, beneficiary: *ALICE, @@ -107,7 +107,7 @@ fn test_repay_partial_amount() { // can't repay more than is owed assert_err!( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_index, *ALICE, RepayStrategy::PartialAmount(alice_total_debt_with_interest + 1), @@ -123,7 +123,7 @@ fn test_repay_partial_amount() { }, ); - assert_no_event::(Event::Lending(crate::Event::BorrowRepaid { + assert_no_event::(RuntimeEvent::Lending(crate::Event::BorrowRepaid { sender: *ALICE, market_id: market_index, beneficiary: *ALICE, @@ -132,13 +132,13 @@ fn test_repay_partial_amount() { assert_extrinsic_event::( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_index, *ALICE, RepayStrategy::PartialAmount(alice_total_debt_with_interest), false, ), - Event::Lending(crate::Event::::BorrowRepaid { + RuntimeEvent::Lending(crate::Event::::BorrowRepaid { sender: *ALICE, market_id: market_index, beneficiary: *ALICE, @@ -162,8 +162,8 @@ fn test_repay_total_debt() { let deposit_collateral = |account, balance| { assert_ok!(Tokens::mint_into(BTC::ID, account, balance)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*account), market_index, balance, false), - Event::Lending(crate::Event::::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*account), market_index, balance, false), + RuntimeEvent::Lending(crate::Event::::CollateralDeposited { market_id: market_index, amount: BTC::ONE, sender: *account, @@ -177,7 +177,7 @@ fn test_repay_total_debt() { // CHARLIE is the lender let borrow_asset_deposit = USDT::units(1_000_000); assert_ok!(Tokens::mint_into(USDT::ID, &CHARLIE, borrow_asset_deposit)); - assert_ok!(Vault::deposit(Origin::signed(*CHARLIE), vault_id, borrow_asset_deposit)); + assert_ok!(Vault::deposit(RuntimeOrigin::signed(*CHARLIE), vault_id, borrow_asset_deposit)); // processes one block process_and_progress_blocks::(1); @@ -195,8 +195,8 @@ fn test_repay_total_debt() { let alice_borrow_limit = get_btc_borrow_limit_for_account(*ALICE); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market_index, alice_borrow_limit), - Event::Lending(crate::Event::::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market_index, alice_borrow_limit), + RuntimeEvent::Lending(crate::Event::::Borrowed { sender: *ALICE, market_id: market_index, amount: alice_borrow_limit, @@ -207,8 +207,8 @@ fn test_repay_total_debt() { let bob_limit_after_blocks = get_btc_borrow_limit_for_account(*BOB); assert_extrinsic_event::( - Lending::borrow(Origin::signed(*BOB), market_index, bob_limit_after_blocks), - Event::Lending(crate::Event::::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*BOB), market_index, bob_limit_after_blocks), + RuntimeEvent::Lending(crate::Event::::Borrowed { sender: *BOB, market_id: market_index, amount: bob_limit_after_blocks, @@ -231,13 +231,13 @@ fn test_repay_total_debt() { { assert_extrinsic_event::( Lending::repay_borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_index, *ALICE, RepayStrategy::TotalDebt, false, ), - Event::Lending(crate::Event::::BorrowRepaid { + RuntimeEvent::Lending(crate::Event::::BorrowRepaid { sender: *ALICE, market_id: market_index, beneficiary: *ALICE, @@ -255,13 +255,13 @@ fn test_repay_total_debt() { { assert_extrinsic_event::( Lending::repay_borrow( - Origin::signed(*BOB), + RuntimeOrigin::signed(*BOB), market_index, *BOB, RepayStrategy::TotalDebt, false, ), - Event::Lending(crate::Event::::BorrowRepaid { + RuntimeEvent::Lending(crate::Event::::BorrowRepaid { sender: *BOB, market_id: market_index, beneficiary: *BOB, diff --git a/code/parachain/frame/lending/src/tests/vault.rs b/code/parachain/frame/lending/src/tests/vault.rs index 55c37b9a582..260517d54bc 100644 --- a/code/parachain/frame/lending/src/tests/vault.rs +++ b/code/parachain/frame/lending/src/tests/vault.rs @@ -15,10 +15,10 @@ fn vault_takes_part_of_borrow_so_cannot_withdraw() { assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, deposit_usdt)); assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, deposit_btc)); - assert_ok!(Lending::vault_deposit(Origin::signed(*ALICE), market_id, deposit_btc)); + assert_ok!(Lending::vault_deposit(RuntimeOrigin::signed(*ALICE), market_id, deposit_btc)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*ALICE), market_id, deposit_usdt, false), - Event::Lending(pallet_lending::Event::::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market_id, deposit_usdt, false), + RuntimeEvent::Lending(pallet_lending::Event::::CollateralDeposited { sender: *ALICE, market_id, amount: deposit_usdt, @@ -26,13 +26,13 @@ fn vault_takes_part_of_borrow_so_cannot_withdraw() { ); assert_noop!( Lending::borrow( - Origin::signed(*ALICE), + RuntimeOrigin::signed(*ALICE), market_id.clone(), deposit_btc + initial_total_cash ), orml_tokens::Error::::BalanceTooLow ); - assert_no_event::(Event::Lending(pallet_lending::Event::::Borrowed { + assert_no_event::(RuntimeEvent::Lending(pallet_lending::Event::::Borrowed { sender: *ALICE, market_id, amount: deposit_btc + initial_total_cash, @@ -50,11 +50,11 @@ fn test_vault_market_can_withdraw() { assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, collateral)); assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, borrow)); - assert_ok!(Lending::vault_deposit(Origin::signed(*ALICE), market, borrow)); + assert_ok!(Lending::vault_deposit(RuntimeOrigin::signed(*ALICE), market, borrow)); assert_extrinsic_event::( - Lending::deposit_collateral(Origin::signed(*ALICE), market, collateral, false), - Event::Lending(crate::Event::CollateralDeposited { + Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, collateral, false), + RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral, market_id: market, @@ -63,8 +63,8 @@ fn test_vault_market_can_withdraw() { process_and_progress_blocks::(1); // We waited 1 block, the market should have withdraw the funds assert_extrinsic_event::( - Lending::borrow(Origin::signed(*ALICE), market, borrow - 1), - Event::Lending(crate::Event::Borrowed { + Lending::borrow(RuntimeOrigin::signed(*ALICE), market, borrow - 1), + RuntimeEvent::Lending(crate::Event::Borrowed { sender: *ALICE, amount: borrow - 1, // DEFAULT_MARKET_VAULT_RESERVE market_id: market, @@ -132,7 +132,7 @@ proptest! { let vault_account = Vault::account_id(&vault_id); // Deposit USDT in the vault. prop_assert_ok!(Tokens::mint_into(USDT::ID, &lender, USDT::units(total_amount))); - prop_assert_ok!(Lending::vault_deposit(Origin::signed(lender), market_id, USDT::units(total_amount))); + prop_assert_ok!(Lending::vault_deposit(RuntimeOrigin::signed(lender), market_id, USDT::units(total_amount))); // Process one block to transfer not-reserved assets to the corresponded market. process_and_progress_blocks::(1); // Generate a bunch of borrowers' accounts. @@ -150,7 +150,7 @@ proptest! { // For some reason lender needs some of his money back. // So, he withdraw all assets from vault's account. prop_assert_ok!(Lending::vault_withdraw( - Origin::signed(lender), + RuntimeOrigin::signed(lender), market_id, Assets::balance(USDT::ID, &vault_account) )); @@ -185,7 +185,7 @@ proptest! { prop_assert!(Lending::ensure_can_borrow_from_vault(&vault_id, &market_account).is_ok()); // Lender decided withdraw money from the vault again. prop_assert_ok!(Lending::vault_withdraw( - Origin::signed(lender), + RuntimeOrigin::signed(lender), market_id, Assets::balance(USDT::ID, &vault_account) )); @@ -196,13 +196,13 @@ proptest! { set_price(BTC::ID, NORMALIZED::units(50_000)); // Check that we can not borrow from market related to unbalanced vault - prop_assert_noop!(Lending::borrow(Origin::signed(*borrowers.get(0).unwrap()), market_id, Assets::balance(USDT::ID, &market_account)), + prop_assert_noop!(Lending::borrow(RuntimeOrigin::signed(*borrowers.get(0).unwrap()), market_id, Assets::balance(USDT::ID, &market_account)), Error::::CannotBorrowFromMarketWithUnbalancedVault); process_and_progress_blocks::(1); // Lender puts back assets to the vault. prop_assert_ok!(Tokens::mint_into(USDT::ID, &lender, USDT::units(total_amount))); - prop_assert_ok!(Lending::vault_deposit(Origin::signed(lender), market_id, USDT::units(total_amount))); + prop_assert_ok!(Lending::vault_deposit(RuntimeOrigin::signed(lender), market_id, USDT::units(total_amount))); process_and_progress_blocks::(1); // Vault is balanced. assert!(Lending::ensure_can_borrow_from_vault(&vault_id, &market_account).is_ok()); diff --git a/code/parachain/frame/liquidations/src/mock/runtime.rs b/code/parachain/frame/liquidations/src/mock/runtime.rs index 6ea7ca5aa57..034b2a4b149 100644 --- a/code/parachain/frame/liquidations/src/mock/runtime.rs +++ b/code/parachain/frame/liquidations/src/mock/runtime.rs @@ -36,7 +36,7 @@ pub type OrderId = u32; pub type Amount = i64; pub type AccountId = <::Signer as IdentifyAccount>::AccountId; -pub type SystemOriginOf = ::Origin; +pub type SystemOriginOf = ::RuntimeOrigin; frame_support::construct_runtime! { pub enum Runtime where @@ -137,6 +137,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub static ALICE: Public = @@ -205,8 +208,8 @@ impl Into> for XcmFake { todo!("please test via local-integration-tests") } } -impl From for XcmFake { - fn from(_: Origin) -> Self { +impl From for XcmFake { + fn from(_: RuntimeOrigin) -> Self { todo!("please test via local-integration-tests") } } diff --git a/code/parachain/frame/liquidations/src/tests.rs b/code/parachain/frame/liquidations/src/tests.rs index 96cc4d5c0cc..e6aed0c3dfc 100644 --- a/code/parachain/frame/liquidations/src/tests.rs +++ b/code/parachain/frame/liquidations/src/tests.rs @@ -67,7 +67,7 @@ pub enum ComposableCall { #[test] fn serde_call() { let order = Sell::new(PICA, KUSD, 100, FixedU128::saturating_from_integer(42_u64)); - let sell_typed = Call::Liquidations(pallet_liquidations::Call::::sell { + let sell_typed = RuntimeCall::Liquidations(pallet_liquidations::Call::::sell { order: order.clone(), configuration: Default::default(), }); diff --git a/code/parachain/frame/mosaic/Cargo.toml b/code/parachain/frame/mosaic/Cargo.toml index 829348edae9..88f3a2a9e6d 100644 --- a/code/parachain/frame/mosaic/Cargo.toml +++ b/code/parachain/frame/mosaic/Cargo.toml @@ -65,6 +65,7 @@ std = [ "sp-std/std", "xcm/std", "num-traits/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/mosaic/src/mock.rs b/code/parachain/frame/mosaic/src/mock.rs index 515bf892981..91322c50f2a 100644 --- a/code/parachain/frame/mosaic/src/mock.rs +++ b/code/parachain/frame/mosaic/src/mock.rs @@ -98,6 +98,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/mosaic/src/tests.rs b/code/parachain/frame/mosaic/src/tests.rs index 71eab2e4bad..847381000e5 100644 --- a/code/parachain/frame/mosaic/src/tests.rs +++ b/code/parachain/frame/mosaic/src/tests.rs @@ -40,16 +40,16 @@ use proptest::prelude::*; use sp_runtime::{DispatchError, TokenError}; pub trait OriginExt { - fn relayer() -> Origin { - Origin::signed(RELAYER) + fn relayer() -> RuntimeOrigin { + RuntimeOrigin::signed(RELAYER) } - fn alice() -> Origin { - Origin::signed(ALICE) + fn alice() -> RuntimeOrigin { + RuntimeOrigin::signed(ALICE) } - fn bob() -> Origin { - Origin::signed(BOB) + fn bob() -> RuntimeOrigin { + RuntimeOrigin::signed(BOB) } } @@ -58,7 +58,7 @@ const NETWORK_ID: NetworkId = 1; const ASSET_ID: AssetId = 1; const REMOTE_ASSET_ID: RemoteAssetId = [1u8; 20]; -impl OriginExt for Origin {} +impl OriginExt for RuntimeOrigin {} prop_compose! { fn account_id() @@ -105,7 +105,7 @@ mod ensure_relayer { fn ensure_relayer_is_set() { new_test_ext().execute_with(|| { assert_err!( - Mosaic::ensure_relayer(Origin::signed(ALICE)), + Mosaic::ensure_relayer(RuntimeOrigin::signed(ALICE)), Error::::RelayerNotSet ); }) @@ -114,8 +114,8 @@ mod ensure_relayer { #[test] fn ensure_relayer_origin_checked() { new_test_ext().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); - assert_err!(Mosaic::ensure_relayer(Origin::signed(ALICE)), DispatchError::BadOrigin); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); + assert_err!(Mosaic::ensure_relayer(RuntimeOrigin::signed(ALICE)), DispatchError::BadOrigin); }) } } @@ -126,7 +126,7 @@ mod set_relayer { #[test] fn set_relayer() { new_test_ext().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_eq!(Mosaic::relayer_account_id(), Ok(RELAYER)); }) } @@ -134,21 +134,21 @@ mod set_relayer { #[test] fn relayer_cannot_set_relayer() { new_test_ext().execute_with(|| { - assert_noop!(Mosaic::set_relayer(Origin::relayer(), ALICE), DispatchError::BadOrigin); + assert_noop!(Mosaic::set_relayer(RuntimeOrigin::relayer(), ALICE), DispatchError::BadOrigin); }) } #[test] fn none_cannot_set_relayer() { new_test_ext().execute_with(|| { - assert_noop!(Mosaic::set_relayer(Origin::none(), ALICE), DispatchError::BadOrigin); + assert_noop!(Mosaic::set_relayer(RuntimeOrigin::none(), ALICE), DispatchError::BadOrigin); }) } #[test] fn alice_cannot_set_relayer() { new_test_ext().execute_with(|| { assert_noop!( - Mosaic::set_relayer(Origin::signed(ALICE), ALICE), + Mosaic::set_relayer(RuntimeOrigin::signed(ALICE), ALICE), DispatchError::BadOrigin ); }) @@ -163,16 +163,16 @@ mod rotate_relayer { new_test_ext().execute_with(|| { let ttl = 500; let current_block = System::block_number(); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); //first rotation let validated_ttl = Validated::new(ttl).unwrap(); - assert_ok!(Mosaic::rotate_relayer(Origin::relayer(), BOB, validated_ttl)); + assert_ok!(Mosaic::rotate_relayer(RuntimeOrigin::relayer(), BOB, validated_ttl)); System::set_block_number(current_block + ttl); assert_eq!(Mosaic::relayer_account_id(), Ok(BOB)); // second rotation - assert_ok!(Mosaic::rotate_relayer(Origin::signed(BOB), CHARLIE, validated_ttl)); + assert_ok!(Mosaic::rotate_relayer(RuntimeOrigin::signed(BOB), CHARLIE, validated_ttl)); System::set_block_number(current_block + 2 * ttl); assert_eq!(Mosaic::relayer_account_id(), Ok(CHARLIE)); }) @@ -183,9 +183,9 @@ mod rotate_relayer { new_test_ext().execute_with(|| { let ttl = 500; let current_block = System::block_number(); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); let validated_ttl = Validated::new(ttl).unwrap(); - assert_ok!(Mosaic::rotate_relayer(Origin::relayer(), BOB, validated_ttl)); + assert_ok!(Mosaic::rotate_relayer(RuntimeOrigin::relayer(), BOB, validated_ttl)); System::set_block_number(current_block + ttl - 1); // just before the ttl assert_eq!(Mosaic::relayer_account_id(), Ok(RELAYER)); // not BOB }) @@ -195,9 +195,9 @@ mod rotate_relayer { fn arbitrary_account_cannot_rotate_relayer() { new_test_ext().execute_with(|| { let ttl = Validated::new(500).unwrap(); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_noop!( - Mosaic::rotate_relayer(Origin::signed(ALICE), BOB, ttl), + Mosaic::rotate_relayer(RuntimeOrigin::signed(ALICE), BOB, ttl), DispatchError::BadOrigin ); }) @@ -207,9 +207,9 @@ mod rotate_relayer { fn none_cannot_rotate_relayer() { new_test_ext().execute_with(|| { let ttl = Validated::new(500).unwrap(); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_noop!( - Mosaic::rotate_relayer(Origin::none(), BOB, ttl), + Mosaic::rotate_relayer(RuntimeOrigin::none(), BOB, ttl), DispatchError::BadOrigin ); }) @@ -225,9 +225,9 @@ mod set_network { let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 }; new_test_ext().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); - assert_ok!(Mosaic::set_network(Origin::relayer(), network_id, network_info.clone())); + assert_ok!(Mosaic::set_network(RuntimeOrigin::relayer(), network_id, network_info.clone())); assert_eq!(Mosaic::network_infos(network_id), Some(network_info)); }) } @@ -238,10 +238,10 @@ mod set_network { let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 }; new_test_ext().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_noop!( - Mosaic::set_network(Origin::root(), network_id, network_info.clone()), + Mosaic::set_network(RuntimeOrigin::root(), network_id, network_info.clone()), DispatchError::BadOrigin ); }) @@ -253,10 +253,10 @@ mod set_network { let network_info = NetworkInfo { enabled: false, min_transfer_size: 1, max_transfer_size: 100000 }; new_test_ext().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_noop!( - Mosaic::set_network(Origin::none(), network_id, network_info.clone()), + Mosaic::set_network(RuntimeOrigin::none(), network_id, network_info.clone()), DispatchError::BadOrigin ); }) @@ -273,7 +273,7 @@ mod budget { fn root_can_set_budget() { new_test_ext().execute_with(|| { assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), 1, 1, BudgetPenaltyDecayer::linear(5) @@ -286,7 +286,7 @@ mod budget { new_test_ext().execute_with(|| { assert_noop!( Mosaic::set_budget( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), 1, 1, BudgetPenaltyDecayer::linear(5) @@ -300,7 +300,7 @@ mod budget { fn none_cannot_set_budget() { new_test_ext().execute_with(|| { assert_noop!( - Mosaic::set_budget(Origin::none(), 1, 1, BudgetPenaltyDecayer::linear(5)), + Mosaic::set_budget(RuntimeOrigin::none(), 1, 1, BudgetPenaltyDecayer::linear(5)), DispatchError::BadOrigin ); }) @@ -311,13 +311,13 @@ mod budget { fn budget_are_isolated() { new_test_ext().execute_with(|| { assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), 1, 0xCAFEBABE, BudgetPenaltyDecayer::linear(10) )); assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), 2, 0xDEADC0DE, BudgetPenaltyDecayer::linear(5) @@ -332,7 +332,7 @@ mod budget { new_test_ext().execute_with(|| { let initial_block = System::block_number(); assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), 1, 0xCAFEBABE, BudgetPenaltyDecayer::linear(10) @@ -344,7 +344,7 @@ mod budget { System::set_block_number(initial_block + 1); assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), 1, 0xDEADC0DE, BudgetPenaltyDecayer::linear(10) @@ -374,7 +374,7 @@ fn incoming_outgoing_accounts_are_isolated() { assert_eq!(balance_of(SubAccount::new_outgoing(ALICE)), 0); assert_eq!(balance_of(SubAccount::new_incoming(ALICE)), 0); assert_ok!(Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), network_id, asset_id, ethereum_address, @@ -394,15 +394,15 @@ fn incoming_outgoing_accounts_are_isolated() { fn initialize() { System::set_block_number(1); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), 1, NetworkInfo { enabled: true, min_transfer_size: 1, max_transfer_size: 100000 }, )); - assert_ok!(Mosaic::set_budget(Origin::root(), 1, BUDGET, BudgetPenaltyDecayer::linear(10))); + assert_ok!(Mosaic::set_budget(RuntimeOrigin::root(), 1, BUDGET, BudgetPenaltyDecayer::linear(10))); assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), ASSET_ID, NETWORK_ID, Some(REMOTE_ASSET_ID) @@ -413,7 +413,7 @@ fn do_timelocked_mint(to: AccountId, amount: Balance, lock_time: u64) { let initial_block = System::block_number(); assert_ok!(Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, to, @@ -445,14 +445,14 @@ mod timelocked_mint { initialize(); let unsupported_remote_asset_id: RemoteAssetId = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), 0xCAFEBABE, NETWORK_ID, Some(unsupported_remote_asset_id) )); assert_noop!( Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, unsupported_remote_asset_id, ALICE, @@ -471,7 +471,7 @@ mod timelocked_mint { initialize(); assert_noop!( Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -490,7 +490,7 @@ mod timelocked_mint { initialize(); assert_noop!( Mosaic::timelocked_mint( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -509,7 +509,7 @@ mod timelocked_mint { initialize(); assert_noop!( Mosaic::timelocked_mint( - Origin::none(), + RuntimeOrigin::none(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -529,7 +529,7 @@ mod timelocked_mint { let amount = 50; let lock_time = 10; assert_ok!(Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -552,7 +552,7 @@ mod timelocked_mint { let lock_time = 10; assert_ok!(Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -569,7 +569,7 @@ mod timelocked_mint { let new_lock_time = 20; assert_ok!(Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -595,7 +595,7 @@ mod timelocked_mint { let initial_block = System::block_number(); assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -607,7 +607,7 @@ mod timelocked_mint { ); let transfer_amount = 9; assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -636,23 +636,23 @@ mod timelocked_mint { // initialize System::set_block_number(start_block); - prop_assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + prop_assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); prop_assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size, max_transfer_size }, ), "relayer may set network info"); - prop_assert_ok!(Mosaic::set_budget(Origin::root(), asset_id, budget, BudgetPenaltyDecayer::linear(decay)), "root may set budget"); - prop_assert_ok!(Mosaic::update_asset_mapping(Origin::root(), asset_id, network_id, Some(remote_asset_id))); + prop_assert_ok!(Mosaic::set_budget(RuntimeOrigin::root(), asset_id, budget, BudgetPenaltyDecayer::linear(decay)), "root may set budget"); + prop_assert_ok!(Mosaic::update_asset_mapping(RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id))); // We've split the budget in two parts. Both within the budget prop_assert_eq!(budget, first_part + second_part); // When mint the first part of the budget, it should be fine. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); // The new penalised_budget should be budget - first_part. // When we mint the second part of the budget, it should be fine because it matches the penalised_budget. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); Ok(()) })?; @@ -674,25 +674,25 @@ mod timelocked_mint { // initialize System::set_block_number(start_block); - prop_assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + prop_assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); prop_assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size, max_transfer_size }, ), "relayer may set network info"); - prop_assert_ok!(Mosaic::set_budget(Origin::root(), asset_id, budget, BudgetPenaltyDecayer::linear(decay)), "root may set budget"); - prop_assert_ok!(Mosaic::update_asset_mapping(Origin::root(), asset_id, network_id, Some(remote_asset_id))); + prop_assert_ok!(Mosaic::set_budget(RuntimeOrigin::root(), asset_id, budget, BudgetPenaltyDecayer::linear(decay)), "root may set budget"); + prop_assert_ok!(Mosaic::update_asset_mapping(RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id))); // We've split the budget in two parts. Both within the budget prop_assert_eq!(budget, first_part + second_part); // When mint the first part of the budget, it should be fine. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); // The new penalised_budget should be budget - first_part. // When we mint the second part of the budget, it should be fine because it matches the penalised_budget. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); // When we mint more than the penalised budget, it should fail. - prop_assert_noop!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, 1, 0, Default::default()), Error::::InsufficientBudget); + prop_assert_noop!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, 1, 0, Default::default()), Error::::InsufficientBudget); Ok(()) })?; } @@ -719,14 +719,14 @@ mod timelocked_mint { let budget_penalty_decayer = BudgetPenaltyDecayer::linear(decay_factor); - prop_assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + prop_assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); prop_assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size, max_transfer_size }, ), "relayer may set network info"); - prop_assert_ok!(Mosaic::set_budget(Origin::root(), asset_id, budget, budget_penalty_decayer.clone()), "root may set budget"); - prop_assert_ok!(Mosaic::update_asset_mapping(Origin::root(), asset_id, network_id, Some(remote_asset_id))); + prop_assert_ok!(Mosaic::set_budget(RuntimeOrigin::root(), asset_id, budget, budget_penalty_decayer.clone()), "root may set budget"); + prop_assert_ok!(Mosaic::update_asset_mapping(RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id))); // We've split the budget in two parts. Both within the budget @@ -740,14 +740,14 @@ mod timelocked_mint { for _ in 0..iteration_count { // When mint the first part of the budget, it should be fine. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, first_part, 0, Default::default())); // The new penalised_budget should be budget - first_part. // When we mint the second part of the budget, it should be fine because it matches the penalised_budget. - prop_assert_ok!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); + prop_assert_ok!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, second_part, 0, Default::default())); // When we mint more than the penalised budget, it should fail. - prop_assert_noop!(Mosaic::timelocked_mint(Origin::relayer(), network_id, remote_asset_id, account_a, 1, 0, Default::default()), Error::::InsufficientBudget); + prop_assert_noop!(Mosaic::timelocked_mint(RuntimeOrigin::relayer(), network_id, remote_asset_id, account_a, 1, 0, Default::default()), Error::::InsufficientBudget); // We wait until the budget has recovered @@ -769,7 +769,7 @@ mod rescind_timelocked_mint { initialize(); assert_noop!( Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -788,14 +788,14 @@ mod rescind_timelocked_mint { do_timelocked_mint(ALICE, 50, lock_time); let another_remote_asset_id = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), 0xCAFEBABE, NETWORK_ID, Some(another_remote_asset_id) )); assert_noop!( Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, another_remote_asset_id, ALICE, @@ -814,7 +814,7 @@ mod rescind_timelocked_mint { do_timelocked_mint(ALICE, 50, lock_time); assert_noop!( Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, BOB, @@ -834,7 +834,7 @@ mod rescind_timelocked_mint { do_timelocked_mint(ALICE, amount, lock_time); assert_noop!( Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -859,7 +859,7 @@ mod rescind_timelocked_mint { let rescind_amount = 9; assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -871,7 +871,7 @@ mod rescind_timelocked_mint { ); assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -890,7 +890,7 @@ mod set_timelock_duration { fn set_timelock_duration() { new_test_ext().execute_with(|| { assert_ok!(Mosaic::set_timelock_duration( - Origin::root(), + RuntimeOrigin::root(), Validated::new(MinimumTimeLockPeriod::get() + 1).unwrap() )); }) @@ -901,7 +901,7 @@ mod set_timelock_duration { new_test_ext().execute_with(|| { assert_noop!( Mosaic::set_timelock_duration( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Validated::new(MinimumTimeLockPeriod::get() + 1).unwrap() ), DispatchError::BadOrigin @@ -914,7 +914,7 @@ mod set_timelock_duration { new_test_ext().execute_with(|| { assert_noop!( Mosaic::set_timelock_duration( - Origin::none(), + RuntimeOrigin::none(), Validated::new(MinimumTimeLockPeriod::get() + 1).unwrap() ), DispatchError::BadOrigin @@ -940,7 +940,7 @@ mod transfer_to { initialize(); do_transfer_to(); assert_ok!(Mosaic::accept_transfer( - Origin::relayer(), + RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, @@ -955,7 +955,7 @@ mod transfer_to { initialize(); do_transfer_to(); assert_noop!( - Mosaic::accept_transfer(Origin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 101), + Mosaic::accept_transfer(RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 101), Error::::AmountMismatch ); }) @@ -968,7 +968,7 @@ mod transfer_to { do_transfer_to(); let current_block = System::block_number(); System::set_block_number(current_block + Mosaic::timelock_period() + 1); - assert_ok!(Mosaic::claim_stale_to(Origin::signed(ALICE), 1, ALICE)); + assert_ok!(Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE)); }) } @@ -980,7 +980,7 @@ mod transfer_to { let current_block = System::block_number(); System::set_block_number(current_block + Mosaic::timelock_period() - 1); assert_noop!( - Mosaic::claim_stale_to(Origin::signed(ALICE), 1, ALICE), + Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE), Error::::TxStillLocked ); }) @@ -992,7 +992,7 @@ mod transfer_to { initialize(); do_transfer_to(); assert_ok!(Mosaic::accept_transfer( - Origin::relayer(), + RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, @@ -1001,7 +1001,7 @@ mod transfer_to { let current_block = System::block_number(); System::set_block_number(current_block + Mosaic::timelock_period() + 1); assert_noop!( - Mosaic::claim_stale_to(Origin::signed(ALICE), 1, ALICE), + Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE), Error::::NoStaleTransactions ); }) @@ -1014,9 +1014,9 @@ mod transfer_to { do_transfer_to(); let current_block = System::block_number(); System::set_block_number(current_block + Mosaic::timelock_period() + 1); - assert_ok!(Mosaic::claim_stale_to(Origin::signed(ALICE), 1, ALICE)); + assert_ok!(Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE)); assert_noop!( - Mosaic::accept_transfer(Origin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 100), + Mosaic::accept_transfer(RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 100), Error::::NoOutgoingTx ); }) @@ -1030,14 +1030,14 @@ mod transfer_to { let current_block = System::block_number(); System::set_block_number(current_block + Mosaic::timelock_period() + 1); assert_ok!(Mosaic::accept_transfer( - Origin::relayer(), + RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 20 )); // System::set_block_number(current_block + Mosaic::timelock_period() + 1); - assert_ok!(Mosaic::claim_stale_to(Origin::signed(ALICE), 1, ALICE)); + assert_ok!(Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE)); }) } @@ -1047,18 +1047,18 @@ mod transfer_to { let min_transfer_size = 1000; let max_transfer_size = 100000; - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); let network_id = 1; assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size, max_transfer_size }, )); let asset_id: u128 = 1; assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), asset_id, 10000, BudgetPenaltyDecayer::linear(10) @@ -1066,7 +1066,7 @@ mod transfer_to { let remote_asset_id = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id) @@ -1077,7 +1077,7 @@ mod transfer_to { assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount)); assert_noop!( Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), network_id, asset_id, ethereum_address, @@ -1099,18 +1099,18 @@ mod transfer_to { let min_transfer_size = 1; let max_transfer_size = 100000; - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); let network_id = 1; assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size, max_transfer_size }, )); let asset_id: u128 = 1; assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), asset_id, 10000, BudgetPenaltyDecayer::linear(10) @@ -1118,7 +1118,7 @@ mod transfer_to { let remote_asset_id = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id) @@ -1130,7 +1130,7 @@ mod transfer_to { assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount)); assert_noop!( Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), network_id, asset_id, ethereum_address, @@ -1164,7 +1164,7 @@ mod transfer_to { assert_eq!(account_balance(), amount); assert_eq!(outgoing_balance(), 0); assert_ok!(Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), network_id, asset_id, ethereum_address, @@ -1183,9 +1183,9 @@ mod transfer_to { #[test] fn transfer_to_unsupported_asset() { ExtBuilder { balances: Default::default() }.build().execute_with(|| { - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), 1, NetworkInfo { enabled: true, min_transfer_size: 1, max_transfer_size: 100000 }, )); @@ -1200,7 +1200,7 @@ mod transfer_to { assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount)); assert_noop!( Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), network_id, asset_id, ethereum_address, @@ -1222,7 +1222,7 @@ mod transfer_to { let swap_to_native = false; assert_ok!(Mosaic::transfer_to( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), NETWORK_ID, ASSET_ID, ethereum_address, @@ -1263,7 +1263,7 @@ mod transfer_to { *nonce }); - System::assert_last_event(mock::Event::Mosaic(crate::Event::TransferOut { + System::assert_last_event(mock::RuntimeEvent::Mosaic(crate::Event::TransferOut { id, to: ethereum_address, asset_id: ASSET_ID, @@ -1287,7 +1287,7 @@ mod accept_transfer { initialize(); assert_noop!( Mosaic::timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -1310,7 +1310,7 @@ mod accept_transfer { let initial_block = System::block_number(); assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -1322,7 +1322,7 @@ mod accept_transfer { ); let transfer_amount = 9; assert_ok!(Mosaic::rescind_timelocked_mint( - Origin::relayer(), + RuntimeOrigin::relayer(), NETWORK_ID, REMOTE_ASSET_ID, ALICE, @@ -1343,9 +1343,9 @@ mod claim_to { let lock_time = 10; do_timelocked_mint(ALICE, 50, lock_time); let current_block = System::block_number(); - assert_noop!(Mosaic::claim_to(Origin::alice(), 1, ALICE), Error::::TxStillLocked); + assert_noop!(Mosaic::claim_to(RuntimeOrigin::alice(), 1, ALICE), Error::::TxStillLocked); System::set_block_number(current_block + lock_time + 1); - assert_ok!(Mosaic::claim_to(Origin::alice(), 1, ALICE)); + assert_ok!(Mosaic::claim_to(RuntimeOrigin::alice(), 1, ALICE)); }) } } @@ -1425,7 +1425,7 @@ mod add_remote_amm_id { System::set_block_number(start_block); prop_assert_ok!(Mosaic::add_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id )); @@ -1444,14 +1444,14 @@ mod add_remote_amm_id { System::set_block_number(start_block); prop_assert_ok!(Mosaic::add_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id )); prop_assert_noop!( Mosaic::add_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id ), @@ -1480,13 +1480,13 @@ mod remove_remote_amm_id { System::set_block_number(start_block); prop_assert_ok!(Mosaic::add_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id )); prop_assert_ok!(Mosaic::remove_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id )); @@ -1506,7 +1506,7 @@ mod remove_remote_amm_id { System::set_block_number(start_block); prop_assert_noop!( Mosaic::remove_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id ), @@ -1540,16 +1540,16 @@ mod do_transfer_with_remote_amm_swap { assert_ok!(Tokens::mint_into(asset_id, &account_a, amount)); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size: 1, max_transfer_size: amount }, )); assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), asset_id, amount, BudgetPenaltyDecayer::linear(10) @@ -1557,7 +1557,7 @@ mod do_transfer_with_remote_amm_swap { let remote_asset_id = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id) @@ -1567,7 +1567,7 @@ mod do_transfer_with_remote_amm_swap { System::set_block_number(start_block); prop_assert_ok!(Mosaic::add_remote_amm_id( - Origin::root(), + RuntimeOrigin::root(), network_id, amm_id )); @@ -1582,7 +1582,7 @@ mod do_transfer_with_remote_amm_swap { }; prop_assert_ok!(Mosaic::transfer_to( - Origin::signed(account_a), + RuntimeOrigin::signed(account_a), network_id, asset_id, ethereum_address, @@ -1613,16 +1613,16 @@ mod do_transfer_with_remote_amm_swap { assert_ok!(Tokens::mint_into(asset_id, &account_a, amount)); - assert_ok!(Mosaic::set_relayer(Origin::root(), RELAYER)); + assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); assert_ok!(Mosaic::set_network( - Origin::relayer(), + RuntimeOrigin::relayer(), network_id, NetworkInfo { enabled: true, min_transfer_size: 1, max_transfer_size: amount }, )); assert_ok!(Mosaic::set_budget( - Origin::root(), + RuntimeOrigin::root(), asset_id, amount, BudgetPenaltyDecayer::linear(10) @@ -1630,7 +1630,7 @@ mod do_transfer_with_remote_amm_swap { let remote_asset_id = [0xFFu8; 20]; assert_ok!(Mosaic::update_asset_mapping( - Origin::root(), + RuntimeOrigin::root(), asset_id, network_id, Some(remote_asset_id) @@ -1655,7 +1655,7 @@ mod do_transfer_with_remote_amm_swap { }; prop_assert_noop!(Mosaic::transfer_to( - Origin::signed(account_a), + RuntimeOrigin::signed(account_a), network_id, asset_id, ethereum_address, diff --git a/code/parachain/frame/oracle/Cargo.toml b/code/parachain/frame/oracle/Cargo.toml index 60d8eeb8040..217df637591 100644 --- a/code/parachain/frame/oracle/Cargo.toml +++ b/code/parachain/frame/oracle/Cargo.toml @@ -66,10 +66,11 @@ std = [ "sp-std/std", "scale-info/std", "composable-traits/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ - 'frame-benchmarking', - 'frame-support/runtime-benchmarks', - 'frame-system/runtime-benchmarks', + "frame-benchmarking", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", ] diff --git a/code/parachain/frame/oracle/src/mock.rs b/code/parachain/frame/oracle/src/mock.rs index 4795777cd06..587093868fe 100644 --- a/code/parachain/frame/oracle/src/mock.rs +++ b/code/parachain/frame/oracle/src/mock.rs @@ -116,7 +116,7 @@ ord_parameter_types! { pub const RootAccount: AccountId = get_root_account(); } -pub type Extrinsic = TestXt; +pub type Extrinsic = TestXt; pub type AccountId = <::Signer as IdentifyAccount>::AccountId; impl frame_system::offchain::SigningTypes for Test { @@ -126,22 +126,22 @@ impl frame_system::offchain::SigningTypes for Test { impl frame_system::offchain::SendTransactionTypes for Test where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = Extrinsic; } impl frame_system::offchain::CreateSignedTransaction for Test where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, _public: ::Signer, _account: AccountId, nonce: u64, - ) -> Option<(Call, ::SignaturePayload)> { + ) -> Option<(RuntimeCall, ::SignaturePayload)> { Some((call, (nonce, ()))) } } diff --git a/code/parachain/frame/oracle/src/tests.rs b/code/parachain/frame/oracle/src/tests.rs index 4be20fc6245..d9bd275f794 100644 --- a/code/parachain/frame/oracle/src/tests.rs +++ b/code/parachain/frame/oracle/src/tests.rs @@ -1,5 +1,5 @@ use crate::{ - mock::{AccountId, Call, Event, Extrinsic, *}, + mock::{AccountId, RuntimeCall, RuntimeEvent, Extrinsic, *}, AssetInfo, Error, PrePrice, Withdraw, *, }; use codec::Decode; @@ -99,7 +99,7 @@ mod add_asset_and_info { let root_account = get_root_account(); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id, Validated::new(asset_info.threshold).unwrap(), Validated::new(asset_info.min_answers).unwrap(), @@ -125,7 +125,7 @@ mod add_asset_and_info { let root_account = get_root_account(); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id, Validated::new(asset_info_1.threshold).unwrap(), Validated::new(asset_info_1.min_answers).unwrap(), @@ -138,7 +138,7 @@ mod add_asset_and_info { // does not increment asset_count because we have info for the same asset_id prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id, Validated::new(asset_info_2.threshold).unwrap(), Validated::new(asset_info_2.min_answers).unwrap(), @@ -166,7 +166,7 @@ mod add_asset_and_info { new_test_ext().execute_with(|| { prop_assert_noop!( Oracle::add_asset_and_info( - Origin::signed(account_id), + RuntimeOrigin::signed(account_id), asset_id, Validated::new(asset_info.threshold).unwrap(), Validated::new(asset_info.min_answers).unwrap(), @@ -195,7 +195,7 @@ mod add_asset_and_info { let root_account = get_root_account(); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id_1, Validated::new(asset_info_1.threshold).unwrap(), Validated::new(asset_info_1.min_answers).unwrap(), @@ -207,7 +207,7 @@ mod add_asset_and_info { )); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id_2, Validated::new(asset_info_2.threshold).unwrap(), Validated::new(asset_info_2.min_answers).unwrap(), @@ -238,7 +238,7 @@ mod add_asset_and_info { new_test_ext().execute_with(|| { prop_assert_noop!( Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id, Validated::new(asset_info.threshold).unwrap(), // notice that max and min are reversed: Validated::new(asset_info.max_answers).unwrap(), // MIN @@ -278,7 +278,7 @@ mod add_asset_and_info { prop_assert_eq!(MaxAssetsCount::get(), 2_u32); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id_1, Validated::new(asset_info_1.threshold).unwrap(), Validated::new(asset_info_1.min_answers).unwrap(), @@ -290,7 +290,7 @@ mod add_asset_and_info { )); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id_2, Validated::new(asset_info_2.threshold).unwrap(), Validated::new(asset_info_2.min_answers).unwrap(), @@ -307,7 +307,7 @@ mod add_asset_and_info { prop_assert_noop!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id_3, Validated::new(asset_info_3.threshold).unwrap(), Validated::new(asset_info_3.min_answers).unwrap(), @@ -337,7 +337,7 @@ mod set_signer { new_test_ext().execute_with(|| { let root_account = get_root_account(); - prop_assert_ok!(Oracle::set_signer(Origin::signed(root_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(root_account), signer_account)); prop_assert_eq!(Oracle::controller_to_signer(root_account), Some(signer_account)); prop_assert_eq!(Oracle::signer_to_controller(signer_account), Some(root_account)); @@ -358,13 +358,13 @@ mod set_signer { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&controller_account, controller_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account_1)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account_1)); prop_assert_eq!(Oracle::controller_to_signer(controller_account), Some(signer_account_1)); prop_assert_eq!(Oracle::signer_to_controller(signer_account_1), Some(controller_account)); Balances::make_free_balance_be(&signer_account_1, signer_1_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(signer_account_1), signer_account_2)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(signer_account_1), signer_account_2)); prop_assert_eq!(Oracle::controller_to_signer(signer_account_1), Some(signer_account_2)); prop_assert_eq!(Oracle::signer_to_controller(signer_account_2), Some(signer_account_1)); @@ -384,7 +384,7 @@ mod set_signer { Balances::make_free_balance_be(&controller_account, controller_balance); prop_assert_noop!( - Oracle::set_signer(Origin::signed(controller_account), signer_account), + Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account), BalancesError::::InsufficientBalance ); @@ -408,10 +408,10 @@ mod set_signer { Balances::make_free_balance_be(&controller_1_account, controller_1_balance); Balances::make_free_balance_be(&controller_2_account, controller_2_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_1_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_1_account), signer_account)); assert_noop!( - Oracle::set_signer(Origin::signed(controller_2_account), signer_account), + Oracle::set_signer(RuntimeOrigin::signed(controller_2_account), signer_account), Error::::SignerUsed ); @@ -433,10 +433,10 @@ mod set_signer { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&controller_account, controller_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_1_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_1_account)); assert_noop!( - Oracle::set_signer(Origin::signed(controller_account), signer_2_account), + Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_2_account), Error::::ControllerUsed ); @@ -459,7 +459,7 @@ mod add_stake { stake in 0..Balance::MAX, ) { new_test_ext().execute_with(|| { - prop_assert_noop!(Oracle::add_stake(Origin::signed(controller_account), stake), Error::::UnsetSigner); + prop_assert_noop!(Oracle::add_stake(RuntimeOrigin::signed(controller_account), stake), Error::::UnsetSigner); Ok(()) })?; } @@ -479,7 +479,7 @@ mod add_stake { Balances::make_free_balance_be(&controller_account, controller_balance); Balances::make_free_balance_be(&signer_account, signer_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account)); let new_controller_balance = controller_balance - MinStake::get(); @@ -489,7 +489,7 @@ mod add_stake { // Add the stake let stake_to_add = stake.min(new_controller_balance - 1); // -1 so that the controller lives after adding stake - prop_assert_ok!(Oracle::add_stake(Origin::signed(controller_account), stake_to_add)); + prop_assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(controller_account), stake_to_add)); // Check if the post-add-stake balances are correct prop_assert_eq!(Balances::free_balance(controller_account), new_controller_balance - stake_to_add); @@ -523,7 +523,7 @@ mod add_stake { Balances::make_free_balance_be(&controller_account, controller_balance); Balances::make_free_balance_be(&signer_account, signer_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account)); let new_controller_balance = controller_balance - MinStake::get(); @@ -533,7 +533,7 @@ mod add_stake { // Try to stake the entire controller balance prop_assert_noop!( - Oracle::add_stake(Origin::signed(controller_account), new_controller_balance), + Oracle::add_stake(RuntimeOrigin::signed(controller_account), new_controller_balance), BalancesError::::KeepAlive ); @@ -557,7 +557,7 @@ mod reclaim_stake { ) { new_test_ext().execute_with(|| { prop_assert_noop!( - Oracle::reclaim_stake(Origin::signed(controller_account)), + Oracle::reclaim_stake(RuntimeOrigin::signed(controller_account)), Error::::UnsetSigner ); @@ -575,10 +575,10 @@ mod reclaim_stake { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&controller_account, controller_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account)); prop_assert_noop!( - Oracle::reclaim_stake(Origin::signed(controller_account)), + Oracle::reclaim_stake(RuntimeOrigin::signed(controller_account)), Error::::Unknown ); @@ -597,15 +597,15 @@ mod reclaim_stake { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&controller_account, controller_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account)); System::set_block_number(start_block); // Remove the stake from setting the signer - prop_assert_ok!(Oracle::remove_stake(Origin::signed(controller_account))); + prop_assert_ok!(Oracle::remove_stake(RuntimeOrigin::signed(controller_account))); // Can't remove anymore because we did not stake anything else prop_assert_noop!( - Oracle::remove_stake(Origin::signed(controller_account)), + Oracle::remove_stake(RuntimeOrigin::signed(controller_account)), Error::::NoStake ); @@ -628,11 +628,11 @@ mod reclaim_stake { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&controller_account, controller_balance); Balances::make_free_balance_be(&signer_account, signer_balance); - prop_assert_ok!(Oracle::set_signer(Origin::signed(controller_account), signer_account)); + prop_assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(controller_account), signer_account)); let actual_stake_to_add = stake_to_add.min(controller_balance - MinStake::get() - 1); - prop_assert_ok!(Oracle::add_stake(Origin::signed(controller_account), actual_stake_to_add)); + prop_assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(controller_account), actual_stake_to_add)); // Assert that the stake is added prop_assert_eq!( @@ -642,7 +642,7 @@ mod reclaim_stake { // Remove the stake System::set_block_number(start_block); - prop_assert_ok!(Oracle::remove_stake(Origin::signed(controller_account))); + prop_assert_ok!(Oracle::remove_stake(RuntimeOrigin::signed(controller_account))); // Check if the withdrawal is correctly declared let withdrawal = Withdraw { stake: actual_stake_to_add + MinStake::get(), unlock_block: start_block + StakeLock::get() }; @@ -652,19 +652,19 @@ mod reclaim_stake { prop_assert_eq!(Oracle::oracle_stake(signer_account), None); prop_assert_noop!( - Oracle::remove_stake(Origin::signed(controller_account)), + Oracle::remove_stake(RuntimeOrigin::signed(controller_account)), Error::::NoStake ); // Check that stake cannot be claimed too early prop_assert_noop!( - Oracle::reclaim_stake(Origin::signed(controller_account)), + Oracle::reclaim_stake(RuntimeOrigin::signed(controller_account)), Error::::StakeLocked ); System::set_block_number(withdrawal.unlock_block + wait_after_unlock); - prop_assert_ok!(Oracle::reclaim_stake(Origin::signed(controller_account))); + prop_assert_ok!(Oracle::reclaim_stake(RuntimeOrigin::signed(controller_account))); // Check if the controller's balance is correct prop_assert_eq!(Balances::free_balance(&controller_account), controller_balance); @@ -674,8 +674,8 @@ mod reclaim_stake { prop_assert_eq!(Oracle::controller_to_signer(controller_account), None); prop_assert_eq!(Oracle::signer_to_controller(signer_account), None); - assert_noop!(Oracle::reclaim_stake(Origin::signed(controller_account)), Error::::UnsetSigner); - assert_noop!(Oracle::reclaim_stake(Origin::signed(signer_account)), Error::::UnsetSigner); + assert_noop!(Oracle::reclaim_stake(RuntimeOrigin::signed(controller_account)), Error::::UnsetSigner); + assert_noop!(Oracle::reclaim_stake(RuntimeOrigin::signed(signer_account)), Error::::UnsetSigner); Ok(()) @@ -697,7 +697,7 @@ mod submit_price { ) { new_test_ext().execute_with(|| { prop_assert_noop!( - Oracle::submit_price(Origin::signed(account_id), asset_id, price_value), + Oracle::submit_price(RuntimeOrigin::signed(account_id), asset_id, price_value), Error::::PriceNotRequested ); Ok(()) @@ -718,7 +718,7 @@ mod submit_price { System::set_block_number(start_block); prop_assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), asset_id, Validated::new(asset_info.threshold).unwrap(), Validated::new(asset_info.min_answers).unwrap(), @@ -734,7 +734,7 @@ mod submit_price { System::set_block_number(last_update + asset_info.block_interval + 1); prop_assert_noop!( - Oracle::submit_price(Origin::signed(submitter_account), price_value, asset_id), + Oracle::submit_price(RuntimeOrigin::signed(submitter_account), price_value, asset_id), Error::::NotEnoughStake ); @@ -750,7 +750,7 @@ mod submit_price { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -762,11 +762,11 @@ mod submit_price { )); System::set_block_number(6); - assert_ok!(Oracle::set_signer(Origin::signed(account_2), account_1)); - assert_ok!(Oracle::add_stake(Origin::signed(account_2), 50)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_2), account_1)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_2), 50)); // fails as asset's slash is high compare to current stake of account_1 assert_noop!( - Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128), Error::::NotEnoughStake ); }); @@ -782,7 +782,7 @@ fn add_price() { let account_5 = get_account_5(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -796,34 +796,34 @@ fn add_price() { System::set_block_number(6); // fails no stake assert_noop!( - Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128), Error::::NotEnoughStake ); - assert_ok!(Oracle::set_signer(Origin::signed(account_2), account_1)); - assert_ok!(Oracle::set_signer(Origin::signed(account_1), account_2)); - assert_ok!(Oracle::set_signer(Origin::signed(account_5), account_4)); - assert_ok!(Oracle::set_signer(Origin::signed(account_4), account_5)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_2), account_1)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_1), account_2)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_5), account_4)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_4), account_5)); - assert_ok!(Oracle::add_stake(Origin::signed(account_1), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_2), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_4), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_5), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_1), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_2), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_4), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_5), 50)); - assert_ok!(Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_2), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_2), 100_u128, 0_u128)); assert_noop!( - Oracle::submit_price(Origin::signed(account_2), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_2), 100_u128, 0_u128), Error::::AlreadySubmitted ); - assert_ok!(Oracle::submit_price(Origin::signed(account_4), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_4), 100_u128, 0_u128)); assert_eq!(Oracle::answer_in_transit(account_1), Some(5)); assert_eq!(Oracle::answer_in_transit(account_2), Some(5)); assert_eq!(Oracle::answer_in_transit(account_4), Some(5)); assert_noop!( - Oracle::submit_price(Origin::signed(account_5), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_5), 100_u128, 0_u128), Error::::MaxPrices ); @@ -839,13 +839,13 @@ fn add_price() { // fails price not requested assert_noop!( - Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128), Error::::PriceNotRequested ); // non existent asset_id assert_noop!( - Oracle::submit_price(Origin::signed(account_1), 100_u128, 10_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 10_u128), Error::::PriceNotRequested ); }); @@ -858,7 +858,7 @@ fn submit_price_fails_stake_less_than_asset_slash() { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -870,11 +870,11 @@ fn submit_price_fails_stake_less_than_asset_slash() { )); System::set_block_number(6); - assert_ok!(Oracle::set_signer(Origin::signed(account_2), account_1)); - assert_ok!(Oracle::add_stake(Origin::signed(account_2), 50)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_2), account_1)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_2), 50)); // fails as asset's slash is high compare to current stake of account_1 assert_noop!( - Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128), + Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128), Error::::NotEnoughStake ); }); @@ -898,7 +898,7 @@ fn halborn_test_price_manipulation() { let account_5 = get_account_5(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(root_account), + RuntimeOrigin::signed(root_account), ASSET_ID, Validated::new(THRESHOLD).unwrap(), Validated::new(MIN_ANSWERS).unwrap(), @@ -909,30 +909,30 @@ fn halborn_test_price_manipulation() { emit_price_changes, )); System::set_block_number(6); - assert_ok!(Oracle::set_signer(Origin::signed(account_3), account_1)); - assert_ok!(Oracle::set_signer(Origin::signed(account_1), account_3)); - assert_ok!(Oracle::set_signer(Origin::signed(account_4), account_5)); - assert_ok!(Oracle::set_signer(Origin::signed(account_5), account_4)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_3), account_1)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_1), account_3)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_4), account_5)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_5), account_4)); - assert_ok!(Oracle::add_stake(Origin::signed(account_1), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_3), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_4), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_5), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_1), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_3), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_4), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_5), 50)); // Scenario 1: >50% of Oracles are malicious - assert_ok!(Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_3), 690_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_4), 900_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_5), 900_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_3), 690_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_4), 900_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_5), 900_u128, 0_u128)); System::set_block_number(7); Oracle::on_initialize(7); System::set_block_number(13); // Scenario 2: 50% of Oracles are malicious // These prices prices will not be consider - assert_ok!(Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_3), 100_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_4), 900_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_5), 900_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_3), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_4), 900_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_5), 900_u128, 0_u128)); System::set_block_number(14); Oracle::on_initialize(14); }); @@ -959,7 +959,7 @@ fn check_request() { new_test_ext().execute_with(|| { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -986,7 +986,7 @@ fn is_requested() { new_test_ext().execute_with(|| { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1023,7 +1023,7 @@ fn test_payout_slash() { reward_tracker.current_block_reward = 100; reward_tracker.total_reward_weight = 82; RewardTrackerStore::::set(Option::from(reward_tracker)); - assert_ok!(Oracle::set_signer(Origin::signed(account_5), account_2)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_5), account_2)); let one = PrePrice { price: 79, block: 0, who: account_1 }; let two = PrePrice { price: 100, block: 0, who: account_2 }; @@ -1046,7 +1046,7 @@ fn test_payout_slash() { assert_eq!(Balances::free_balance(account_1), 100); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1061,9 +1061,9 @@ fn test_payout_slash() { add_price_storage(79, 0, account_1, 0); add_price_storage(100, 0, account_2, 0); - assert_ok!(Oracle::set_signer(Origin::signed(account_2), account_1)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_2), account_1)); assert_eq!(Oracle::oracle_stake(account_1), Some(1)); - assert_ok!(Oracle::set_signer(Origin::signed(account_1), account_4)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_1), account_4)); assert_eq!(Oracle::oracle_stake(account_4), Some(1)); assert_eq!(Oracle::answer_in_transit(account_1), Some(5)); @@ -1094,7 +1094,7 @@ fn test_payout_slash() { assert_eq!(Balances::free_balance(treasury_account), 102); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(90)).unwrap(), Validated::new(3).unwrap(), @@ -1158,7 +1158,7 @@ fn test_adjust_rewards() { // first time assert_ok!(Oracle::adjust_rewards( - Origin::root(), + RuntimeOrigin::root(), annual_cost_per_oracle, num_ideal_oracles )); @@ -1173,7 +1173,7 @@ fn test_adjust_rewards() { Timestamp::set_timestamp(MS_PER_YEAR_NAIVE / 4); num_ideal_oracles = 12; assert_ok!(Oracle::adjust_rewards( - Origin::root(), + RuntimeOrigin::root(), annual_cost_per_oracle, num_ideal_oracles )); @@ -1189,7 +1189,7 @@ fn test_adjust_rewards() { annual_cost_per_oracle * (num_ideal_oracles as Balance) / 2; RewardTrackerStore::::set(Option::from(reward_tracker)); assert_ok!(Oracle::adjust_rewards( - Origin::root(), + RuntimeOrigin::root(), annual_cost_per_oracle, num_ideal_oracles )); @@ -1211,7 +1211,7 @@ fn test_adjust_rewards() { annual_cost_per_oracle * (num_ideal_oracles as Balance) / 2; RewardTrackerStore::::set(Option::from(reward_tracker)); assert_ok!(Oracle::adjust_rewards( - Origin::root(), + RuntimeOrigin::root(), annual_cost_per_oracle, num_ideal_oracles )); @@ -1256,7 +1256,7 @@ fn halborn_test_bypass_slashing() { reward_tracker.total_reward_weight = 100; RewardTrackerStore::::set(Option::from(reward_tracker)); - //assert_ok!(Oracle::set_reward_rate(Origin::root(), REWARD_RATE)); + //assert_ok!(Oracle::set_reward_rate(RuntimeOrigin::root(), REWARD_RATE)); let account_1 = get_account_1(); let account_2 = get_root_account(); let account_4 = get_account_4(); @@ -1264,7 +1264,7 @@ fn halborn_test_bypass_slashing() { let treasury_account = get_treasury_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), ASSET_ID, Validated::new(THRESHOLD).unwrap(), Validated::new(MIN_ANSWERS).unwrap(), @@ -1287,14 +1287,14 @@ fn halborn_test_bypass_slashing() { println!("5: {}", balance5); System::set_block_number(6); - assert_ok!(Oracle::set_signer(Origin::signed(account_2), account_1)); - assert_ok!(Oracle::set_signer(Origin::signed(account_1), account_2)); - assert_ok!(Oracle::set_signer(Origin::signed(account_5), account_4)); - assert_ok!(Oracle::set_signer(Origin::signed(account_4), account_5)); - assert_ok!(Oracle::add_stake(Origin::signed(account_1), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_2), 50)); - assert_ok!(Oracle::add_stake(Origin::signed(account_4), 99)); - assert_ok!(Oracle::add_stake(Origin::signed(account_5), 50)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_2), account_1)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_1), account_2)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_5), account_4)); + assert_ok!(Oracle::set_signer(RuntimeOrigin::signed(account_4), account_5)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_1), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_2), 50)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_4), 99)); + assert_ok!(Oracle::add_stake(RuntimeOrigin::signed(account_5), 50)); let balance1 = Balances::free_balance(account_1); let balance2 = Balances::free_balance(account_2); @@ -1306,10 +1306,10 @@ fn halborn_test_bypass_slashing() { println!("4: {}", balance4); println!("5: {}", balance5); - assert_ok!(Oracle::submit_price(Origin::signed(account_1), 100_u128, 0_u128)); - assert_ok!(Oracle::submit_price(Origin::signed(account_2), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_1), 100_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_2), 100_u128, 0_u128)); // Proposing price of 4000 would result in getting stake slashed of controller account_5 - assert_ok!(Oracle::submit_price(Origin::signed(account_4), 4000_u128, 0_u128)); + assert_ok!(Oracle::submit_price(RuntimeOrigin::signed(account_4), 4000_u128, 0_u128)); System::set_block_number(7); Oracle::on_initialize(7); @@ -1325,9 +1325,9 @@ fn halborn_test_bypass_slashing() { println!("4: {}", balance4); println!("5: {}", balance5); - assert_ok!(Oracle::remove_stake(Origin::signed(account_5))); + assert_ok!(Oracle::remove_stake(RuntimeOrigin::signed(account_5))); System::set_block_number(44); - assert_ok!(Oracle::reclaim_stake(Origin::signed(account_5))); + assert_ok!(Oracle::reclaim_stake(RuntimeOrigin::signed(account_5))); let balance1 = Balances::free_balance(account_1); let balance2 = Balances::free_balance(account_2); let balance4 = Balances::free_balance(account_4); @@ -1360,7 +1360,7 @@ fn on_init() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1405,7 +1405,7 @@ fn update_price() { // Add KSM info. assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 4, // KSM Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1420,11 +1420,11 @@ fn update_price() { do_price_update(4, 2); // `PriceChanged` Event should NOT be emitted. - Test::assert_no_event(Event::Oracle(crate::Event::PriceChanged(0, 101))); + Test::assert_no_event(RuntimeEvent::Oracle(crate::Event::PriceChanged(0, 101))); // Add PICA info. assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 1, // PICA Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1439,7 +1439,7 @@ fn update_price() { do_price_update(1, 3); // `PriceChanged` Event should be emitted. - System::assert_has_event(Event::Oracle(crate::Event::PriceChanged(1, 101))); + System::assert_has_event(RuntimeEvent::Oracle(crate::Event::PriceChanged(1, 101))); // Set series of EQUAL prices for PICA into storage. // ----- @@ -1453,7 +1453,7 @@ fn update_price() { // `PriceChanged` event for last price (100) should NOT be emitted, as prices didn't // change - Test::assert_no_event(Event::Oracle(crate::Event::PriceChanged(1, 100))); + Test::assert_no_event(RuntimeEvent::Oracle(crate::Event::PriceChanged(1, 100))); }); } @@ -1463,7 +1463,7 @@ fn historic_pricing() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1591,7 +1591,7 @@ fn get_twap() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1628,7 +1628,7 @@ fn get_twap_for_amount() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), BTC::ID, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1667,7 +1667,7 @@ fn on_init_prune_scenarios() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1728,7 +1728,7 @@ fn on_init_over_max_answers() { // add and request oracle id let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(1).unwrap(), @@ -1832,7 +1832,7 @@ fn should_submit_signed_transaction_on_chain() { t.execute_with(|| { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), @@ -1850,7 +1850,7 @@ fn should_submit_signed_transaction_on_chain() { assert!(pool_state.read().transactions.is_empty()); let tx = Extrinsic::decode(&mut &*tx).unwrap(); assert_eq!(tx.signature.unwrap().0, 0); - assert_eq!(tx.call, Call::Oracle(crate::Call::submit_price { price: 15523, asset_id: 0 })); + assert_eq!(tx.call, RuntimeCall::Oracle(crate::Call::submit_price { price: 15523, asset_id: 0 })); }); } @@ -1864,7 +1864,7 @@ fn should_check_oracles_submitted_price() { let account_2 = get_root_account(); assert_ok!(Oracle::add_asset_and_info( - Origin::signed(account_2), + RuntimeOrigin::signed(account_2), 0, Validated::new(Percent::from_percent(80)).unwrap(), Validated::new(3).unwrap(), diff --git a/code/parachain/frame/pablo/Cargo.toml b/code/parachain/frame/pablo/Cargo.toml index ab01b1af7c8..b2cf49b3629 100644 --- a/code/parachain/frame/pablo/Cargo.toml +++ b/code/parachain/frame/pablo/Cargo.toml @@ -64,4 +64,5 @@ std = [ "composable-support/std", "composable-maths/std", "rust_decimal/std", + "frame-benchmarking/std", ] diff --git a/code/parachain/frame/pablo/src/mock.rs b/code/parachain/frame/pablo/src/mock.rs index f040ce2955f..1be7e7125ef 100644 --- a/code/parachain/frame/pablo/src/mock.rs +++ b/code/parachain/frame/pablo/src/mock.rs @@ -129,6 +129,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/pablo/src/test/common_test_functions.rs b/code/parachain/frame/pablo/src/test/common_test_functions.rs index 74b108ccbf6..d08a5868721 100644 --- a/code/parachain/frame/pablo/src/test/common_test_functions.rs +++ b/code/parachain/frame/pablo/src/test/common_test_functions.rs @@ -45,7 +45,7 @@ pub fn common_add_remove_lp( let actual_pool_id = Pablo::do_create_pool(init_config.clone(), Some(lp_token_id)) .expect("pool creation failed"); assert_has_event::( - |e| matches!(e.event, mock::Event::Pablo(crate::Event::PoolCreated { pool_id, .. }) if pool_id == actual_pool_id), + |e| matches!(e.event, mock::RuntimeEvent::Pablo(crate::Event::PoolCreated { pool_id, .. }) if pool_id == actual_pool_id), ); let pair = get_pair(init_config); // Mint the tokens @@ -55,7 +55,7 @@ pub fn common_add_remove_lp( System::set_block_number(System::block_number() + 1); // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), actual_pool_id, BTreeMap::from([(pair[0], first_asset_amount), (pair[1], second_asset_amount)]), 0, @@ -63,7 +63,7 @@ pub fn common_add_remove_lp( )); assert_last_event::(|e| { matches!(e.event, - mock::Event::Pablo(crate::Event::LiquidityAdded { who, pool_id, /* base_amount, quote_amount, */ .. }) + mock::RuntimeEvent::Pablo(crate::Event::LiquidityAdded { who, pool_id, /* base_amount, quote_amount, */ .. }) if who == ALICE && pool_id == actual_pool_id // && base_amount == first_asset_amount @@ -85,7 +85,7 @@ pub fn common_add_remove_lp( System::set_block_number(System::block_number() + 1); // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), actual_pool_id, BTreeMap::from([(pair[0], next_first_asset_amount), (pair[1], next_second_asset_amount)]), 0, @@ -93,7 +93,7 @@ pub fn common_add_remove_lp( )); assert_last_event::(|e| { matches!(e.event, - mock::Event::Pablo(crate::Event::LiquidityAdded { who, pool_id, /* base_amount, quote_amount, */ .. }) + mock::RuntimeEvent::Pablo(crate::Event::LiquidityAdded { who, pool_id, /* base_amount, quote_amount, */ .. }) if who == BOB && pool_id == actual_pool_id // && base_amount == next_first_asset_amount @@ -103,7 +103,7 @@ pub fn common_add_remove_lp( let lp = Tokens::balance(lp_token, &BOB); assert!(expected_lp_check(next_first_asset_amount, next_second_asset_amount, lp)); assert_ok!(Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), actual_pool_id, lp, BTreeMap::from([(pair[0], 0_u128), (pair[1], 0_u128)]), @@ -135,12 +135,12 @@ pub fn common_add_lp_with_min_mint_amount( second_asset_amount: Balance, expected_lp: impl Fn(Balance, Balance, Balance, Balance, Balance) -> Balance, ) { - Pablo::create(Origin::root(), init_config.clone()).expect("pool creation failed"); + Pablo::create(RuntimeOrigin::root(), init_config.clone()).expect("pool creation failed"); let pool_id = System::events() .into_iter() .find_map(|event| match event.event { - Event::Pablo(crate::Event::PoolCreated { pool_id, .. }) => Some(pool_id), + RuntimeEvent::Pablo(crate::Event::PoolCreated { pool_id, .. }) => Some(pool_id), _ => None, }) .expect("pool creation should emit an event if successful; qed;"); @@ -164,7 +164,7 @@ pub fn common_add_lp_with_min_mint_amount( // Add the liquidity, min amount = 0 assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, assets_with_amounts.clone(), 0, @@ -191,7 +191,7 @@ pub fn common_add_lp_with_min_mint_amount( // Add the liquidity, but expect more lp tokens, hence errors assert_noop!( Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts.clone(), min_mint_amount + 1, @@ -202,7 +202,7 @@ pub fn common_add_lp_with_min_mint_amount( // Add liquidity with min_mint_amount assert_ok!(Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts, min_mint_amount, @@ -227,7 +227,7 @@ pub fn common_remove_lp_failure( // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([(pair[0], init_base_amount), (pair[1], init_quote_amount)]), 0, @@ -246,7 +246,7 @@ pub fn common_remove_lp_failure( assert_eq!(lp, 0_u128); // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, BTreeMap::from([(pair[0], base_amount), (pair[1], quote_amount)]), 0, @@ -256,7 +256,7 @@ pub fn common_remove_lp_failure( // error as trying to redeem more tokens than lp assert_noop!( Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, lp + 1, BTreeMap::from([(pair[0], 0), (pair[1], 0)]) @@ -268,7 +268,7 @@ pub fn common_remove_lp_failure( // error as expected values are more than actual redeemed values. assert_noop!( Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, lp, BTreeMap::from([ @@ -298,7 +298,7 @@ pub fn common_exchange_failure( // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([ (init_first_amount.asset_id, init_first_amount.amount), @@ -313,7 +313,7 @@ pub fn common_exchange_failure( // error as trying to swap more value than balance assert_noop!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(exchange_first_amount.asset_id, exchange_first_amount.amount + 1), AssetAmount::new(init_second_amount.asset_id, 0), @@ -325,7 +325,7 @@ pub fn common_exchange_failure( // error as the expected value is more that input assert_noop!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(exchange_first_amount.asset_id, exchange_first_amount.amount), AssetAmount::new(init_second_amount.asset_id, dbg!(init_second_amount.amount + 1)), @@ -338,7 +338,7 @@ pub fn common_exchange_failure( pub fn assert_has_event(matcher: F) where T: Config, - F: Fn(&EventRecord) -> bool, + F: Fn(&EventRecord) -> bool, { assert!(System::events().iter().any(matcher)); } @@ -346,7 +346,7 @@ where pub fn assert_last_event(matcher: F) where T: Config, - F: FnOnce(&EventRecord) -> bool, + F: FnOnce(&EventRecord) -> bool, { assert!(matcher(System::events().last().expect("events expected"))); } @@ -361,7 +361,7 @@ mod create { System::set_block_number(1); let pool_weights = dual_asset_pool_weights(BTC, Permill::from_percent(50), USDT); assert_ok!(Pablo::create( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), PoolInitConfiguration::DualAssetConstantProduct { owner: ALICE, assets_weights: pool_weights.clone(), @@ -370,7 +370,7 @@ mod create { )); let inner_weights = pool_weights.into_inner(); assert_has_event::(|e| { - matches!(&e.event, mock::Event::Pablo(crate::Event::PoolCreated { pool_id: 0, asset_weights, .. }) if asset_weights.clone() == inner_weights) + matches!(&e.event, mock::RuntimeEvent::Pablo(crate::Event::PoolCreated { pool_id: 0, asset_weights, .. }) if asset_weights.clone() == inner_weights) }); }); } diff --git a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs index 53f3217276c..6e9063124da 100644 --- a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs +++ b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs @@ -74,7 +74,7 @@ fn create_pool( )); assert_last_event::(|e| { matches!(e.event, - mock::Event::Pablo(crate::Event::LiquidityAdded { who, pool_id, .. }) + mock::RuntimeEvent::Pablo(crate::Event::LiquidityAdded { who, pool_id, .. }) if who == ALICE && pool_id == actual_pool_id) }); actual_pool_id @@ -258,7 +258,7 @@ fn test_redeemable_assets() { } pub fn create_pool_from_config(init_config: PoolInitConfiguration) -> u128 { - Test::assert_extrinsic_event_with(Pablo::create(Origin::root(), init_config), |event| { + Test::assert_extrinsic_event_with(Pablo::create(RuntimeOrigin::root(), init_config), |event| { match event { crate::Event::PoolCreated { pool_id, .. } => Some(pool_id), _ => None, @@ -357,7 +357,7 @@ fn add_lp_with_min_mint_amount() { // Add the liquidity, min amount = 0 Test::assert_extrinsic_event( Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, assets_with_init_amounts.clone(), 0, @@ -388,7 +388,7 @@ fn add_lp_with_min_mint_amount() { // Add the liquidity, but expect more lp tokens, hence errors assert_noop!( Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts.clone(), // Arbitrarily large number, 200 * 10^12 @@ -400,7 +400,7 @@ fn add_lp_with_min_mint_amount() { // Add liquidity with min_mint_amount assert_ok!(Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts, 1, @@ -450,7 +450,7 @@ fn remove_lp_failure() { // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, [(first_asset, init_first_asset_amount), (second_asset, init_second_asset_amount)] .into_iter() @@ -468,7 +468,7 @@ fn remove_lp_failure() { // Add the liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, [(first_asset, first_asset_amount), (second_asset, second_asset_amount)] .into_iter() @@ -482,7 +482,7 @@ fn remove_lp_failure() { // error as trying to redeem more tokens than lp assert_noop!( Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, bob_lp_after_adding_liquidity + 1, [(first_asset, 1), (second_asset, 1)].into_iter().collect() @@ -493,7 +493,7 @@ fn remove_lp_failure() { // error as expected values are more than actual redeemed values. assert_noop!( Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, bob_lp_after_adding_liquidity, [ @@ -642,7 +642,7 @@ fn staking_pool_test() { // make sure a Staking pool is created. assert_has_event::(|e| { matches!(e.event, - mock::Event::StakingRewards(pallet_staking_rewards::Event::RewardPoolCreated { owner, .. }) + mock::RuntimeEvent::StakingRewards(pallet_staking_rewards::Event::RewardPoolCreated { owner, .. }) if owner == Pablo::account_id(&pool_id) ) }); @@ -664,7 +664,7 @@ fn staking_pool_test() { assert_has_event::(|e| { println!("{:?}", e.event); matches!(e.event, - mock::Event::StakingRewards(pallet_staking_rewards::Event::RewardTransferred { from, reward_currency, reward_increment, ..}) + mock::RuntimeEvent::StakingRewards(pallet_staking_rewards::Event::RewardTransferred { from, reward_currency, reward_increment, ..}) if from == BOB && reward_currency == USDT && reward_increment == protocol_fee) }); @@ -731,7 +731,7 @@ fn cannot_swap_between_wrong_pairs() { assert_noop!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(USDC, usdc_amount), AssetAmount::new(BTC, 0_u128), @@ -741,7 +741,7 @@ fn cannot_swap_between_wrong_pairs() { ); assert_noop!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(BTC, usdc_amount), AssetAmount::new(USDC, 0_u128), @@ -840,7 +840,7 @@ proptest! { prop_assert_ok!(Tokens::mint_into(USDT, &BOB, usdt_value)); prop_assert_ok!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(USDT, usdt_value), AssetAmount::new(BTC, 0_u128), @@ -855,7 +855,7 @@ proptest! { ); prop_assert_ok!( Pablo::buy( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, BTC, AssetAmount::new(USDT, usdt_value), @@ -895,14 +895,14 @@ proptest! { let pool = get_pool(pool_id); prop_assert_ok!(Tokens::mint_into(USDT, &BOB, usdt_value)); prop_assert_ok!(Tokens::mint_into(BTC, &BOB, btc_value)); - prop_assert_ok!(Pablo::add_liquidity(Origin::signed(BOB), pool_id, + prop_assert_ok!(Pablo::add_liquidity(RuntimeOrigin::signed(BOB), pool_id, BTreeMap::from([(BTC, btc_value), (USDT, usdt_value)]), 0, false)); let term1 = initial_usdt.integer_sqrt_checked().expect("integer_sqrt failed"); let term2 = initial_btc.integer_sqrt_checked().expect("integer_sqrt failed"); let expected_lp_tokens = safe_multiply_by_rational(term1, btc_value, term2).expect("multiply_by_rational failed"); let lp_token = Tokens::balance(pool.lp_token, &BOB); prop_assert_ok!(default_acceptable_computation_error(expected_lp_tokens, lp_token)); - prop_assert_ok!(Pablo::remove_liquidity(Origin::signed(BOB), pool_id, lp_token, + prop_assert_ok!(Pablo::remove_liquidity(RuntimeOrigin::signed(BOB), pool_id, lp_token, BTreeMap::from([(USDT, 0), (BTC, 0)]) )); let btc_value_redeemed = Tokens::balance(BTC, &BOB); @@ -935,7 +935,7 @@ proptest! { ); let pool = get_pool(pool_id); prop_assert_ok!(Tokens::mint_into(USDT, &BOB, usdt_value)); - prop_assert_ok!(Pablo::swap(Origin::signed(BOB), pool_id, AssetAmount::new(USDT, usdt_value), AssetAmount::new(BTC, 0), false)); + prop_assert_ok!(Pablo::swap(RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(USDT, usdt_value), AssetAmount::new(BTC, 0), false)); let usdt_value_after_fee = usdt_value - pool.fee_config.fee_rate.mul_floor(usdt_value); let ratio = initial_btc as f64 / initial_usdt as f64; let expected_btc_value = ratio * usdt_value_after_fee as f64; @@ -983,7 +983,7 @@ mod twap { System::set_block_number(0); assert_eq!(Pablo::twap(pool_id), None); - assert_ok!(Pablo::enable_twap(Origin::root(), pool_id)); + assert_ok!(Pablo::enable_twap(RuntimeOrigin::root(), pool_id)); process_and_progress_blocks::(1); assert_eq!( @@ -1004,7 +1004,7 @@ mod twap { let usdt_value = unit; assert_ok!(Tokens::mint_into(USDT, &BOB, usdt_value)); assert_ok!(Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(USDT, usdt_value), AssetAmount::new(BTC, 0), @@ -1083,7 +1083,7 @@ mod twap { }; System::set_block_number(0); assert_eq!(Pablo::twap(pool_identifier), None); - assert_ok!(Pablo::enable_twap(Origin::root(), pool_identifier)); + assert_ok!(Pablo::enable_twap(RuntimeOrigin::root(), pool_identifier)); process_and_progress_blocks::(1); assert_eq!( @@ -1102,7 +1102,7 @@ mod twap { let usdt_value = unit; assert_ok!(Tokens::mint_into(USDT, &BOB, usdt_value)); assert_ok!(Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_identifier, AssetAmount::new(USDT, usdt_value), AssetAmount::new(BTC, 0), @@ -1128,7 +1128,7 @@ mod twap { run_to_block_and_swap(TWAP_INTERVAL_BLOCKS + 1); assert_has_event::(|e| { matches!(e.event, - mock::Event::Pablo(crate::Event::TwapUpdated { pool_id, ..}) + mock::RuntimeEvent::Pablo(crate::Event::TwapUpdated { pool_id, ..}) if pool_id == pool_identifier ) }); @@ -1205,7 +1205,7 @@ fn add_lp_amounts_get_normalized() { // Add the liquidity, min amount = 0 Test::assert_extrinsic_event( Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, assets_with_init_amounts.clone(), 0, @@ -1241,7 +1241,7 @@ fn add_lp_amounts_get_normalized() { .value; Test::assert_extrinsic_event( - Pablo::add_liquidity(Origin::signed(BOB), pool_id, assets_with_amounts, 0, false), + Pablo::add_liquidity(RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts, 0, false), crate::Event::::LiquidityAdded { who: BOB, pool_id: 0, diff --git a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs index e2db93c2635..3b6a947d799 100644 --- a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs +++ b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs @@ -66,7 +66,7 @@ fn add_remove_lp() { Test::assert_extrinsic_event( Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, assets_with_amounts.clone(), 0, @@ -91,7 +91,7 @@ fn add_remove_lp() { // Add the liquidity Test::assert_extrinsic_event( Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, assets_with_next_amounts.clone(), 0, @@ -108,7 +108,7 @@ fn add_remove_lp() { assert!(Tokens::balance(lp_token, &BOB) > 0); assert_ok!(Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, Tokens::balance(lp_token, &BOB), BTreeMap::from([(first_asset, 0_u128), (second_asset, 0_u128)]), @@ -149,7 +149,7 @@ mod do_buy { // Add liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -199,7 +199,7 @@ mod do_buy { }); assert_noop!( - Pablo::buy(Origin::signed(BOB), pool_id, BTC, AssetAmount::new(BTC, 0), false), + Pablo::buy(RuntimeOrigin::signed(BOB), pool_id, BTC, AssetAmount::new(BTC, 0), false), crate::Error::::CannotBuyAssetWithItself, ); }); @@ -237,7 +237,7 @@ mod do_swap { // Add liquidity assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -291,7 +291,7 @@ mod do_swap { assert_noop!( Pablo::swap( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, AssetAmount::new(BTC, 128_000), AssetAmount::new(BTC, 0), @@ -356,7 +356,7 @@ mod remove_liquidity { // Add liquidity // Alice assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -364,7 +364,7 @@ mod remove_liquidity { )); // Charlie assert_ok!(Pablo::add_liquidity( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -373,7 +373,7 @@ mod remove_liquidity { // Other LPs other_lps.iter().for_each(|account_id| { assert_ok!(Pablo::add_liquidity( - Origin::signed(*account_id), + RuntimeOrigin::signed(*account_id), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -413,7 +413,7 @@ mod remove_liquidity { let pool_usdt_pre_charlie_withdraw = Tokens::balance(USDT, &Pablo::account_id(&pool_id)); let total_lp_pre_charlie_withdraw = Tokens::total_issuance(lp_token); assert_ok!(Pablo::remove_liquidity( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), pool_id, charlie_lpt_balance, min_receive() @@ -423,7 +423,7 @@ mod remove_liquidity { let pool_usdt_pre_alice_withdraw = Tokens::balance(USDT, &Pablo::account_id(&pool_id)); let total_lp_pre_alice_withdraw = Tokens::total_issuance(lp_token); assert_ok!(Pablo::remove_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, alice_lpt_balance, min_receive() @@ -524,7 +524,7 @@ mod integration { // Add liquidity // Alice assert_ok!(Pablo::add_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, BTreeMap::from([(BTC, initial_btc), (USDT, initial_usdt)]), 0, @@ -532,7 +532,7 @@ mod integration { )); let alice_lpt_balance = Tokens::balance(lp_token, &ALICE); - Tokens::transfer(Origin::signed(ALICE), CHARLIE, lp_token, alice_lpt_balance / 2) + Tokens::transfer(RuntimeOrigin::signed(ALICE), CHARLIE, lp_token, alice_lpt_balance / 2) .expect("Alice has tokens"); let alice_lpt_balance = Tokens::balance(lp_token, &ALICE); let charlie_lpt_balance = Tokens::balance(lp_token, &CHARLIE); @@ -563,7 +563,7 @@ mod integration { .expect("input will does not overflow"); Test::assert_extrinsic_event( Pablo::remove_liquidity( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), pool_id, charlie_lpt_balance, min_receive(), @@ -599,7 +599,7 @@ mod integration { .expect("input will does not overflow"); Test::assert_extrinsic_event( Pablo::remove_liquidity( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, alice_lpt_balance, min_receive(), diff --git a/code/parachain/frame/pablo/src/test/pablo_tests.rs b/code/parachain/frame/pablo/src/test/pablo_tests.rs index cb58a85e687..288bf9c864d 100644 --- a/code/parachain/frame/pablo/src/test/pablo_tests.rs +++ b/code/parachain/frame/pablo/src/test/pablo_tests.rs @@ -40,7 +40,7 @@ mod simulate { use sp_runtime::Permill; use crate::{ - mock::{new_test_ext, Origin, Pablo, System, Test, ALICE}, + mock::{new_test_ext, RuntimeOrigin, Pablo, System, Test, ALICE}, Event, PoolInitConfiguration, }; @@ -50,7 +50,7 @@ mod simulate { System::set_block_number(1); let pool_id = Test::assert_extrinsic_event_with( Pablo::create( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), PoolInitConfiguration::DualAssetConstantProduct { owner: ALICE, assets_weights: bounded_btree_map! { @@ -78,7 +78,7 @@ mod simulate { let add_result = Test::assert_extrinsic_event_with( Pablo::add_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, [(USDT, 100_000_000), (USDC, 100_000_000)].into_iter().collect(), 0, @@ -102,7 +102,7 @@ mod simulate { let remove_result = Test::assert_extrinsic_event_with( Pablo::remove_liquidity( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, add_result, [(USDT, 0), (USDC, 0)].into_iter().collect(), diff --git a/code/parachain/frame/staking-rewards/Cargo.toml b/code/parachain/frame/staking-rewards/Cargo.toml index 68eb9769bc5..7738af9348a 100644 --- a/code/parachain/frame/staking-rewards/Cargo.toml +++ b/code/parachain/frame/staking-rewards/Cargo.toml @@ -62,6 +62,7 @@ std = [ "composable-support/std", "pallet-proxy/std", "composable-tests-helpers/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ @@ -69,6 +70,6 @@ runtime-benchmarks = [ "pallet-balances/runtime-benchmarks", "frame-system/runtime-benchmarks", "frame-support/runtime-benchmarks", - "frame-benchmarking/runtime-benchmarks", + "frame-benchmarking", "composable-tests-helpers", ] diff --git a/code/parachain/frame/staking-rewards/src/runtime.rs b/code/parachain/frame/staking-rewards/src/runtime.rs index fad4a2dbfaa..7ff06c39195 100644 --- a/code/parachain/frame/staking-rewards/src/runtime.rs +++ b/code/parachain/frame/staking-rewards/src/runtime.rs @@ -159,6 +159,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub struct NoopRegistry; @@ -280,14 +283,14 @@ impl crate::Config for Test { type TreasuryAccount = TreasuryAccountId; } -impl InstanceFilter for ProxyType { - fn filter(&self, c: &Call) -> bool { +impl InstanceFilter for ProxyType { + fn filter(&self, c: &RuntimeCall) -> bool { match self { ProxyType::Any => true, ProxyType::Governance => matches!( c, // TODO democracy - Call::System(..) + RuntimeCall::System(..) ), // ProxyType::Staking => { // matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)) diff --git a/code/parachain/frame/staking-rewards/src/test/mod.rs b/code/parachain/frame/staking-rewards/src/test/mod.rs index 8ada3093e36..6181f209100 100644 --- a/code/parachain/frame/staking-rewards/src/test/mod.rs +++ b/code/parachain/frame/staking-rewards/src/test/mod.rs @@ -76,7 +76,7 @@ fn duration_presets_minimum_is_1() { System::set_block_number(1); assert_ok!(StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -109,7 +109,7 @@ fn zero_length_duration_preset_works() { System::set_block_number(1); assert_ok!(StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -138,7 +138,7 @@ fn test_create_reward_pool_invalid_end_block() { assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -164,7 +164,7 @@ fn create_staking_reward_pool_should_fail_when_pool_asset_id_is_zero() { assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: 0, @@ -190,7 +190,7 @@ fn create_staking_reward_pool_should_fail_when_slashed_amount_is_less_than_exist assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -235,7 +235,7 @@ fn create_staking_reward_pool_should_fail_when_slashed_minimum_amount_is_less_th assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -279,7 +279,7 @@ fn create_staking_reward_pool_should_fail_when_share_asset_id_is_zero() { assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -305,7 +305,7 @@ fn create_staking_reward_pool_should_fail_when_fnft_collection_asset_id_is_zero( assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -333,10 +333,10 @@ fn stake_should_fail_before_start_of_rewards_pool() { let pool_id = PICA::ID; process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); assert_noop!( - StakingRewards::stake(Origin::signed(staker), pool_id, amount, duration), + StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration), crate::Error::::RewardsPoolHasNotStarted ); }); @@ -355,7 +355,7 @@ fn stake_in_case_of_low_balance_should_not_work() { process_and_progress_blocks::(1); assert_noop!( - StakingRewards::stake(Origin::signed(ALICE), PICA::ID, AMOUNT, ONE_HOUR), + StakingRewards::stake(RuntimeOrigin::signed(ALICE), PICA::ID, AMOUNT, ONE_HOUR), crate::Error::::NotEnoughAssets ); @@ -372,10 +372,10 @@ fn stake_should_fail_if_amount_is_less_than_minimum() { let pool_id = PICA::ID; process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); assert_noop!( - StakingRewards::stake(Origin::signed(staker), pool_id, amount, duration), + StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration), crate::Error::::StakedAmountTooLow ); }); @@ -416,7 +416,7 @@ fn split_should_fail_if_any_amount_is_less_than_minimum() { assert_noop!( StakingRewards::split( - Origin::signed(staker), + RuntimeOrigin::signed(staker), STAKING_FNFT_COLLECTION_ID, original_fnft_instance_id, ratio.try_into_validated().unwrap(), @@ -432,7 +432,7 @@ fn split_should_fail_if_any_amount_is_less_than_minimum() { assert_noop!( StakingRewards::split( - Origin::signed(staker), + RuntimeOrigin::signed(staker), STAKING_FNFT_COLLECTION_ID, original_fnft_instance_id, ratio.try_into_validated().unwrap(), @@ -448,7 +448,7 @@ fn split_should_fail_if_any_amount_is_less_than_minimum() { assert_noop!( StakingRewards::split( - Origin::signed(staker), + RuntimeOrigin::signed(staker), STAKING_FNFT_COLLECTION_ID, original_fnft_instance_id, ratio.try_into_validated().unwrap(), @@ -506,7 +506,7 @@ fn stake_in_case_of_zero_inflation_should_work() { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); let staker: Public = ALICE; let amount: u128 = 100_500_u128; @@ -517,7 +517,7 @@ fn stake_in_case_of_zero_inflation_should_work() { mint_assets([staker], [staked_asset_id], amount * 2); let fnft_instance_id = Test::assert_extrinsic_event_with( - StakingRewards::stake(Origin::signed(staker), PICA::ID, amount, duration_preset), + StakingRewards::stake(RuntimeOrigin::signed(staker), PICA::ID, amount, duration_preset), |event| match event { crate::Event::::Staked { pool_id: PICA::ID, @@ -671,7 +671,7 @@ mod extend { use sp_runtime::Perbill; use crate::{ - runtime::{Origin, StakingRewards, ALICE, BOB}, + runtime::{RuntimeOrigin, StakingRewards, ALICE, BOB}, test::{ btree_map, mint_assets, prelude::{MINIMUM_STAKING_AMOUNT, STAKING_FNFT_COLLECTION_ID}, @@ -763,7 +763,7 @@ mod extend { Test::assert_extrinsic_event( StakingRewards::extend( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), STAKING_FNFT_COLLECTION_ID, fnft_instance_id, extended_amount, @@ -878,7 +878,7 @@ mod extend { Test::assert_extrinsic_event( StakingRewards::extend( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), STAKING_FNFT_COLLECTION_ID, fnft_instance_id, extended_amount, @@ -928,7 +928,7 @@ fn unstake_non_existent_stake_should_not_work() { System::set_block_number(1); let staker = ALICE; assert_noop!( - StakingRewards::unstake(Origin::signed(staker), 1, 0), + StakingRewards::unstake(RuntimeOrigin::signed(staker), 1, 0), crate::Error::::FnftNotFound ); }); @@ -938,7 +938,7 @@ fn unstake_non_existent_stake_should_not_work() { fn not_owner_of_stake_can_not_unstake() { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); let owner = ALICE; let not_owner = BOB; let pool_id = PICA::ID; @@ -950,10 +950,10 @@ fn not_owner_of_stake_can_not_unstake() { mint_assets([owner, not_owner], [staked_asset_id], amount * 2); process_and_progress_blocks::(1); - assert_ok!(StakingRewards::stake(Origin::signed(owner), pool_id, amount, duration_preset)); + assert_ok!(StakingRewards::stake(RuntimeOrigin::signed(owner), pool_id, amount, duration_preset)); assert_noop!( - StakingRewards::unstake(Origin::signed(not_owner), 1, 0), + StakingRewards::unstake(RuntimeOrigin::signed(not_owner), 1, 0), crate::Error::::OnlyStakeOwnerCanInteractWithStake, ); }); @@ -987,7 +987,7 @@ fn unstake_in_case_of_zero_claims_and_early_unlock_should_work() { // TODO(benluelo): Proper test helper for claim assert_ok!(StakingRewards::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), STAKING_FNFT_COLLECTION_ID, fnft_instance_id )); @@ -1080,7 +1080,7 @@ fn test_transfer_reward() { new_test_ext().execute_with(|| { System::set_block_number(1); let pool_init_config = get_default_reward_pool(); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), pool_init_config)); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), pool_init_config)); assert_ok!(::AccountId>>::mint_into( USDT::ID, &ALICE, @@ -1138,7 +1138,7 @@ fn test_split_position() { }; Test::assert_extrinsic_event( - StakingRewards::create_reward_pool(Origin::root(), pool_init_config), + StakingRewards::create_reward_pool(RuntimeOrigin::root(), pool_init_config), crate::Event::::RewardPoolCreated { pool_id: PICA::ID, owner: ALICE, @@ -1169,7 +1169,7 @@ fn test_split_position() { Stakes::::get(1, existing_fnft_instance_id).expect("stake should exist"); let new_stake = Stakes::::get(1, new_fnft_instance_id).expect("stake should exist"); - Test::assert_last_event(Event::StakingRewards(crate::Event::SplitPosition { + Test::assert_last_event(RuntimeEvent::StakingRewards(crate::Event::SplitPosition { positions: vec![(PICA::ID, 0, existing_stake.stake), (PICA::ID, 1, new_stake.stake)], })); @@ -1254,7 +1254,7 @@ fn split_positions_accrue_same_as_original_position() { process_blocks(); crate::Pallet::::claim( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), STAKING_FNFT_COLLECTION_ID, existing_fnft_instance_id, ) @@ -1280,13 +1280,13 @@ fn split_positions_accrue_same_as_original_position() { process_blocks(); crate::Pallet::::claim( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), STAKING_FNFT_COLLECTION_ID, existing_fnft_instance_id, ) .unwrap(); crate::Pallet::::claim( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), STAKING_FNFT_COLLECTION_ID, new_fnft_instance_id, ) @@ -1316,7 +1316,7 @@ fn extend_should_not_allow_non_owner() { false, |_pool_id, _unlock_penalty, _stake_duration, _staked_asset_id| { assert_noop!( - StakingRewards::extend(Origin::signed(non_owner), 1, 0, 1_000), + StakingRewards::extend(RuntimeOrigin::signed(non_owner), 1, 0, 1_000), crate::Error::::OnlyStakeOwnerCanInteractWithStake ); }, @@ -1361,7 +1361,7 @@ fn unstake_should_not_allow_non_owner() { assert_noop!( StakingRewards::unstake( - Origin::signed(DAVE), + RuntimeOrigin::signed(DAVE), STAKING_FNFT_COLLECTION_ID, fnft_instance_id ), @@ -1386,7 +1386,7 @@ fn split_should_not_allow_non_owner() { false, |_pool_id, _unlock_penalty, _stake_duration, _staked_asset_id| { assert_noop!( - StakingRewards::unstake(Origin::signed(non_owner), 1, 0), + StakingRewards::unstake(RuntimeOrigin::signed(non_owner), 1, 0), crate::Error::::OnlyStakeOwnerCanInteractWithStake ); }, @@ -1458,7 +1458,7 @@ mod claim { false, |_pool_id, _unlock_penalty, _stake_duration, _staked_asset_id| { assert_noop!( - StakingRewards::claim(Origin::signed(non_owner), 1, 0), + StakingRewards::claim(RuntimeOrigin::signed(non_owner), 1, 0), crate::Error::::OnlyStakeOwnerCanInteractWithStake ); }, @@ -1485,7 +1485,7 @@ mod claim { // Ensure that the value of the staked asset has **not** changed assert_eq!(balance(staked_asset_id, &staker), amount); process_and_progress_blocks::(1); - assert_ok!(StakingRewards::claim(Origin::signed(staker), 1, 0)); + assert_ok!(StakingRewards::claim(RuntimeOrigin::signed(staker), 1, 0)); assert_eq!(balance(staked_asset_id, &staker), amount); // Ensure that the value of the reward asset has changed @@ -1518,7 +1518,7 @@ mod claim { let rewards_pool = StakingRewards::pools(pool_id).expect("rewards_pool expected"); // First claim - assert_ok!(StakingRewards::claim(Origin::signed(staker), 1, 0)); + assert_ok!(StakingRewards::claim(RuntimeOrigin::signed(staker), 1, 0)); // Ensure no change in staked asset assert_eq!(balance(staked_asset_id, &staker), amount); // Ensure change in reward asset @@ -1531,7 +1531,7 @@ mod claim { } // Second claim, should not change balance - assert_ok!(StakingRewards::claim(Origin::signed(staker), 1, 0)); + assert_ok!(StakingRewards::claim(RuntimeOrigin::signed(staker), 1, 0)); // Ensure no change in staked asset assert_eq!(balance(staked_asset_id, &staker), amount); // Ensure no change in reward asset @@ -1556,7 +1556,7 @@ mod claim { process_and_progress_blocks::(1); assert_ok!(StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), get_default_reward_pool() )); @@ -1594,7 +1594,7 @@ mod claim { ); Test::assert_extrinsic_event( - StakingRewards::claim(Origin::signed(ALICE), 1, 0), + StakingRewards::claim(RuntimeOrigin::signed(ALICE), 1, 0), crate::Event::Claimed { owner: ALICE, fnft_collection_id: 1, fnft_instance_id: 0 }, ); @@ -1625,9 +1625,9 @@ mod claim { total_rewards, true, |pool_id, _unlock_penalty, _stake_duration, _staked_asset_id| { - assert_ok!(StakingRewards::claim(Origin::signed(staker), 1, 0)); + assert_ok!(StakingRewards::claim(RuntimeOrigin::signed(staker), 1, 0)); - Test::assert_last_event(Event::StakingRewards(crate::Event::Claimed { + Test::assert_last_event(RuntimeEvent::StakingRewards(crate::Event::Claimed { owner: staker, fnft_collection_id: 1, fnft_instance_id: 0, @@ -1653,7 +1653,7 @@ fn duration_presets_are_required() { new_test_ext().execute_with(|| { assert_err!( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -1689,13 +1689,13 @@ mod stake_proptests { new_test_ext().execute_with(|| { let staker = ALICE; let existential_deposit = 1_000_u128; - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); @@ -1720,14 +1720,14 @@ mod stake_proptests { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); let staker = ALICE; let existential_deposit = 1_000_u128; process_and_progress_blocks::(1); - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; @@ -1767,12 +1767,12 @@ mod split_proptests { System::set_block_number(1); let staker = ALICE; - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; let staking_amount = 100 * MINIMUM_STAKING_AMOUNT; - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); @@ -1801,12 +1801,12 @@ mod split_proptests { System::set_block_number(1); let staker = ALICE; - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; let staking_amount = 100 * MINIMUM_STAKING_AMOUNT; - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); @@ -1838,12 +1838,12 @@ mod split_proptests { System::set_block_number(1); let staker = ALICE; - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; let staking_amount = 100 * MINIMUM_STAKING_AMOUNT; - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); @@ -1884,12 +1884,12 @@ mod extend_proptests { System::set_block_number(1); let staker = ALICE; - let owner = Origin::signed(staker); + let owner = RuntimeOrigin::signed(staker); let pool_id = PICA::ID; let duration_preset = ONE_HOUR; let staking_amount = MINIMUM_STAKING_AMOUNT; - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); process_and_progress_blocks::(1); @@ -1929,7 +1929,7 @@ fn with_stake( ) -> R { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(Origin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); let staked_asset_id = PICA::ID; let rewards_pool = @@ -1946,7 +1946,7 @@ fn with_stake( process_and_progress_blocks::(1); let fnft_instance_id = stake_and_assert::(staker, PICA::ID, amount, duration); - // assert_ok!(StakingRewards::stake(Origin::signed(staker), pool_id, amount, duration)); + // assert_ok!(StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration)); assert_eq!(balance(staked_asset_id, &staker), amount); let stake = StakingRewards::stakes(1, 0).expect("stake expected. QED"); @@ -1956,7 +1956,7 @@ fn with_stake( if should_claim { // update_reductions(&mut stake.reductions, claim); assert_ok!(StakingRewards::claim( - Origin::signed(staker), + RuntimeOrigin::signed(staker), STAKING_FNFT_COLLECTION_ID, fnft_instance_id )); @@ -1969,7 +1969,7 @@ fn with_stake( fn create_default_reward_pool() { Test::assert_extrinsic_event( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, diff --git a/code/parachain/frame/staking-rewards/src/test/test_reward_accumulation_hook.rs b/code/parachain/frame/staking-rewards/src/test/test_reward_accumulation_hook.rs index d8a80b6ba48..0502cf64e3e 100644 --- a/code/parachain/frame/staking-rewards/src/test/test_reward_accumulation_hook.rs +++ b/code/parachain/frame/staking-rewards/src/test/test_reward_accumulation_hook.rs @@ -91,7 +91,7 @@ fn test_reward_update_calculation() { RewardAccumulationHookError::BackToTheFuture, RewardAccumulationHookError::Overflow, ] { - Test::assert_no_event(Event::StakingRewards( + Test::assert_no_event(RuntimeEvent::StakingRewards( crate::Event::::RewardAccumulationHookError { pool_id: PICA::ID, asset_id: PICA::ID, diff --git a/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs b/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs index 0c94066eee2..81bbdf45191 100644 --- a/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs +++ b/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs @@ -23,7 +23,7 @@ use sp_runtime::{FixedPointNumber, Perbill}; use crate::{ runtime::{ - MaxRewardConfigsPerPool, Origin, StakingRewards, System, Test, Tokens, ALICE, BOB, CHARLIE, + MaxRewardConfigsPerPool, RuntimeOrigin, StakingRewards, System, Test, Tokens, ALICE, BOB, CHARLIE, }, test::{ default_lock_config, mint_assets, new_test_ext, @@ -94,7 +94,7 @@ fn test_update_reward_pool() { .unwrap(); Test::assert_extrinsic_event( - StakingRewards::update_rewards_pool(Origin::root(), PICA::ID, reward_updates), + StakingRewards::update_rewards_pool(RuntimeOrigin::root(), PICA::ID, reward_updates), crate::Event::RewardPoolUpdated { pool_id: PICA::ID }, ); @@ -155,7 +155,7 @@ fn update_accumulates_properly() { Test::assert_extrinsic_event( StakingRewards::create_reward_pool( - Origin::root(), + RuntimeOrigin::root(), RewardPoolConfiguration::RewardRateBasedIncentive { owner: ALICE, asset_id: PICA::ID, @@ -206,7 +206,7 @@ fn update_accumulates_properly() { process_and_progress_blocks::(1); Test::assert_extrinsic_event( - StakingRewards::claim(Origin::signed(CHARLIE), STAKING_FNFT_COLLECTION_ID, stake_id), + StakingRewards::claim(RuntimeOrigin::signed(CHARLIE), STAKING_FNFT_COLLECTION_ID, stake_id), crate::Event::Claimed { owner: CHARLIE, fnft_collection_id: STAKING_FNFT_COLLECTION_ID, diff --git a/code/parachain/frame/vault/Cargo.toml b/code/parachain/frame/vault/Cargo.toml index 720109a51b4..b1fb1604ae1 100644 --- a/code/parachain/frame/vault/Cargo.toml +++ b/code/parachain/frame/vault/Cargo.toml @@ -60,6 +60,7 @@ std = [ "sp-arithmetic/std", "composable-traits/std", "scale-info/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/vault/src/mocks/tests.rs b/code/parachain/frame/vault/src/mocks/tests.rs index c42018f0d5b..4561bea2ff2 100644 --- a/code/parachain/frame/vault/src/mocks/tests.rs +++ b/code/parachain/frame/vault/src/mocks/tests.rs @@ -131,6 +131,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl crate::mocks::currency_factory::Config for Test { diff --git a/code/parachain/frame/vault/src/tests.rs b/code/parachain/frame/vault/src/tests.rs index b599f814f0b..ce04a63eabb 100644 --- a/code/parachain/frame/vault/src/tests.rs +++ b/code/parachain/frame/vault/src/tests.rs @@ -2,8 +2,8 @@ use crate::{ mocks::{ currency_factory::MockCurrencyId, tests::{ - AccountId, Balance, Balances, BlockNumber, CreationDeposit, Event, ExistentialDeposit, - ExtBuilder, Origin, System, Test, Tokens, TombstoneDuration, Vaults, + AccountId, Balance, Balances, BlockNumber, CreationDeposit, RuntimeEvent, ExistentialDeposit, + ExtBuilder, RuntimeOrigin, System, Test, Tokens, TombstoneDuration, Vaults, ACCOUNT_FREE_START, ALICE, BOB, CHARLIE, MINIMUM_BALANCE, }, }, @@ -53,7 +53,7 @@ fn create_vault_with_share( fn create_vault_with_deposit(asset_id: MockCurrencyId, deposit: Balance) -> u64 { let v = Vaults::create( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), VaultConfig { asset_id, manager: ALICE, @@ -176,7 +176,7 @@ proptest! { prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, total_funds)); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), total_funds); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, total_funds)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, total_funds)); let expected_strategy_funds = strategy_share.mul_floor(total_funds); @@ -258,7 +258,7 @@ proptest! { prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, total_funds)); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), total_funds); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, total_funds)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, total_funds)); let expected_strategy_funds = strategy_share.mul_floor(total_funds); @@ -283,7 +283,7 @@ proptest! { let reserve = total_funds - expected_strategy_funds; prop_assert_ok!( Vaults::withdraw( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), vault_id, reserve ) @@ -338,8 +338,8 @@ proptest! { prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount)); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), amount); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount)); - prop_assert_ok!(Vaults::withdraw(Origin::signed(ALICE), vault_id, amount)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(ALICE), vault_id, amount)); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), amount); Ok(()) @@ -367,13 +367,13 @@ proptest! { prop_assert_eq!(Tokens::balance(asset_id, &ALICE), amount1); prop_assert_eq!(Tokens::balance(asset_id, &CHARLIE), amount3); - prop_assert_ok!(Vaults::deposit(Origin::signed(CHARLIE), vault_id, amount3)); - prop_assert_ok!(Vaults::deposit(Origin::signed(BOB), vault_id, amount2)); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount1)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(CHARLIE), vault_id, amount3)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(BOB), vault_id, amount2)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount1)); - prop_assert_ok!(Vaults::withdraw(Origin::signed(ALICE), vault_id, amount1)); - prop_assert_ok!(Vaults::withdraw(Origin::signed(CHARLIE), vault_id, amount3)); - prop_assert_ok!(Vaults::withdraw(Origin::signed(BOB), vault_id, amount2)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(ALICE), vault_id, amount1)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(CHARLIE), vault_id, amount3)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(BOB), vault_id, amount2)); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), amount1); prop_assert_eq!(Tokens::balance(asset_id, &BOB), amount2); @@ -411,7 +411,7 @@ proptest! { prop_assert_eq!(Tokens::balance(vault_info.lp_token_id, &ALICE), 0); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount)); prop_assert_eq!(Tokens::balance(vault_info.lp_token_id, &ALICE), amount); Ok(()) @@ -430,7 +430,7 @@ proptest! { ExtBuilder::default().build().execute_with(|| { let (vault_id, vault) = create_vault(strategy_account_id, asset_id); prop_assert_eq!(Tokens::balance(vault.lp_token_id, &ALICE), 0); - assert_noop!(Vaults::withdraw(Origin::signed(ALICE), vault_id, amount), ArithmeticError::Overflow); + assert_noop!(Vaults::withdraw(RuntimeOrigin::signed(ALICE), vault_id, amount), ArithmeticError::Overflow); Ok(()) })?; } @@ -446,10 +446,10 @@ proptest! { let (vault_id, vault) = create_vault(strategy_account_id, asset_id); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), 0); prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount)); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount)); prop_assert_eq!(Tokens::balance(vault.lp_token_id, &BOB), 0); - assert_noop!(Vaults::withdraw(Origin::signed(BOB), vault_id, amount), Error::::InsufficientLpTokens); + assert_noop!(Vaults::withdraw(RuntimeOrigin::signed(BOB), vault_id, amount), Error::::InsufficientLpTokens); Ok(()) })?; } @@ -492,15 +492,15 @@ proptest! { prop_assert_ok!(Tokens::mint_into(asset_id, &BOB, amount2)); prop_assert_ok!(Tokens::mint_into(asset_id, &strategy_account_id, strategy_profits)); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount1)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount1)); prop_assert_ok!(::deposit(&vault_id, &strategy_account_id, strategy_profits)); - prop_assert_ok!(Vaults::deposit(Origin::signed(BOB), vault_id, amount2)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(BOB), vault_id, amount2)); let alice_lp = Tokens::balance(vault.lp_token_id, &ALICE); let bob_lp = Tokens::balance(vault.lp_token_id, &BOB); - prop_assert_ok!(Vaults::withdraw(Origin::signed(ALICE), vault_id, alice_lp)); - prop_assert_ok!(Vaults::withdraw(Origin::signed(BOB), vault_id, bob_lp)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(ALICE), vault_id, alice_lp)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(BOB), vault_id, bob_lp)); let alice_total_balance = Tokens::balance(asset_id, &ALICE); let bob_total_balance = Tokens::balance(asset_id, &BOB); @@ -538,13 +538,13 @@ proptest! { prop_assert_eq!(Tokens::balance(asset_id, &Vaults::account_id(&vault_id1)), 0); prop_assert_eq!(Tokens::balance(asset_id, &ALICE), 0); prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount1)); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id1, amount1)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id1, amount1)); // Bob deposit an amount in vault 2 prop_assert_eq!(Tokens::balance(asset_id, &Vaults::account_id(&vault_id2)), 0); prop_assert_eq!(Tokens::balance(asset_id, &BOB), 0); prop_assert_ok!(Tokens::mint_into(asset_id, &BOB, amount2)); - prop_assert_ok!(Vaults::deposit(Origin::signed(BOB), vault_id2, amount2)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(BOB), vault_id2, amount2)); // The funds should not be shared. prop_assert_eq!(Tokens::balance(asset_id, &Vaults::account_id(&vault_id1)), amount1); @@ -566,14 +566,14 @@ proptest! { prop_assert_eq!(Tokens::balance(asset_id, &ALICE), 0); prop_assert_ok!(Tokens::mint_into(asset_id, &ALICE, amount1)); - prop_assert_ok!(Vaults::deposit(Origin::signed(ALICE), vault_id, amount1)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(ALICE), vault_id, amount1)); // Rate unchanged prop_assert_eq!(Vaults::stock_dilution_rate(&vault_id), Ok(Rate::from(1))); prop_assert_eq!(Tokens::balance(asset_id, &BOB), 0); prop_assert_ok!(Tokens::mint_into(asset_id, &BOB, amount2)); - prop_assert_ok!(Vaults::deposit(Origin::signed(BOB), vault_id, amount2)); + prop_assert_ok!(Vaults::deposit(RuntimeOrigin::signed(BOB), vault_id, amount2)); // Rate unchanged prop_assert_eq!(Vaults::stock_dilution_rate(&vault_id), Ok(Rate::from(1))); @@ -665,7 +665,7 @@ proptest! { // Liquidity providers deposit all their native tokens to receive LP tokens // BEFORE losses and profits for (account, initial_native_tokens) in before_moment_lps() { - let origin = Origin::signed(account); + let origin = RuntimeOrigin::signed(account); prop_assert_ok!(Vaults::deposit(origin, vault_id, initial_native_tokens)); } @@ -690,7 +690,7 @@ proptest! { // Liquidity providers deposit all their native tokens to receive LP tokens // AFTER losses and profits for (account, initial_native_tokens) in after_moment_lps() { - let origin = Origin::signed(account); + let origin = RuntimeOrigin::signed(account); prop_assert_ok!(Vaults::deposit(origin, vault_id, initial_native_tokens)); } @@ -704,7 +704,7 @@ proptest! { let withdrawn_lp_tokens = lp_tokens / 2; // Withdraws all LP tokens - prop_assert_ok!(Vaults::withdraw(Origin::signed(account), vault_id, withdrawn_lp_tokens)); + prop_assert_ok!(Vaults::withdraw(RuntimeOrigin::signed(account), vault_id, withdrawn_lp_tokens)); // New balance that includes losses and profits let new_native_tokens = Tokens::balance(asset_id, &account); @@ -762,7 +762,7 @@ fn test_vault_claim_surcharge_existential() { Balances::mint_into(&ALICE, ExistentialDeposit::get() * 3).unwrap(); let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get()); System::set_block_number(10000000000); - Vaults::claim_surcharge(Origin::none(), id, Some(ALICE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(ALICE)) .expect("claiming surcharge for existential should always ok"); }) } @@ -775,7 +775,7 @@ fn test_vault_claim_surcharge_rent_exempt() { System::set_block_number(1); let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() / 2); System::set_block_number(1); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); assert!(Balances::balance(&CHARLIE) == 0); let vault = Vaults::vault_data(id).unwrap(); @@ -792,7 +792,7 @@ fn test_vault_claim_surcharge_rent_charge() { let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() / 2); let duration = 20; System::set_block_number(duration); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); assert!(Balances::balance(&CHARLIE) > 0); let vault = Vaults::vault_data(id).unwrap(); @@ -809,7 +809,7 @@ fn test_vault_claim_surcharge_rent_evict() { let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() / 2); let duration = 100000; System::set_block_number(duration); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); assert!(Balances::balance(&CHARLIE) > 0); let vault = Vaults::vault_data(id).unwrap(); @@ -826,13 +826,13 @@ fn test_vault_add_surcharge() { let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() / 2); let duration = 100000; System::set_block_number(duration); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); assert!(Balances::balance(&CHARLIE) > 0); let vault = Vaults::vault_data(id).unwrap(); assert!(vault.capabilities.is_tombstoned()); Vaults::add_surcharge( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), id, Validated::new(CreationDeposit::get()).unwrap(), ) @@ -850,18 +850,18 @@ fn test_vault_delete_tombstoned() { System::set_block_number(0); let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() - 1); System::set_block_number(1000000); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); let after_surcharge_balance = Balances::balance(&CHARLIE); assert!(after_surcharge_balance > 0); let vault = Vaults::vault_data(id).unwrap(); assert!(vault.capabilities.is_tombstoned()); System::set_block_number(1000000 + TombstoneDuration::get()); - Vaults::delete_tombstoned(Origin::signed(CHARLIE), id, None).unwrap(); + Vaults::delete_tombstoned(RuntimeOrigin::signed(CHARLIE), id, None).unwrap(); let after_delete_balance = Balances::balance(&CHARLIE); assert!(after_delete_balance > after_surcharge_balance); // second time should error, as the vault is not deleted. - Vaults::delete_tombstoned(Origin::signed(CHARLIE), id, None).unwrap_err(); + Vaults::delete_tombstoned(RuntimeOrigin::signed(CHARLIE), id, None).unwrap_err(); }) } @@ -873,13 +873,13 @@ fn test_vault_delete_tombstoned_insufficient_time_fails() { System::set_block_number(0); let id = create_vault_with_deposit(MockCurrencyId::A, ExistentialDeposit::get() - 1); System::set_block_number(1000000); - Vaults::claim_surcharge(Origin::none(), id, Some(CHARLIE)) + Vaults::claim_surcharge(RuntimeOrigin::none(), id, Some(CHARLIE)) .expect("claiming surcharge for rent should work"); assert!(Balances::balance(&CHARLIE) > 0); let vault = Vaults::vault_data(id).unwrap(); assert!(vault.capabilities.is_tombstoned()); System::set_block_number(1000000 + TombstoneDuration::get() - 1); - Vaults::delete_tombstoned(Origin::signed(ALICE), id, None).unwrap_err(); + Vaults::delete_tombstoned(RuntimeOrigin::signed(ALICE), id, None).unwrap_err(); }) } @@ -889,7 +889,7 @@ fn test_vault_delete_tombstoned_non_tombstoned_fails() { Balances::mint_into(&ALICE, ExistentialDeposit::get() - 1).unwrap(); assert_eq!(Balances::balance(&CHARLIE), 0); let id = create_vault_with_deposit(MockCurrencyId::A, CreationDeposit::get()); - Vaults::delete_tombstoned(Origin::signed(ALICE), id, None).unwrap_err(); + Vaults::delete_tombstoned(RuntimeOrigin::signed(ALICE), id, None).unwrap_err(); }) } @@ -897,9 +897,9 @@ fn test_vault_delete_tombstoned_non_tombstoned_fails() { fn test_vault_emergency_shutdown_origin() { ExtBuilder::default().build().execute_with(|| { let (id, _) = create_vault(ALICE, MockCurrencyId::A); - Vaults::emergency_shutdown(Origin::signed(ALICE), id) + Vaults::emergency_shutdown(RuntimeOrigin::signed(ALICE), id) .expect_err("only root may emergency_shutdown"); - Vaults::emergency_shutdown(Origin::none(), id) + Vaults::emergency_shutdown(RuntimeOrigin::none(), id) .expect_err("only root may emergency_shutdown"); }) } @@ -912,22 +912,22 @@ fn test_vault_emergency_shutdown() { // ensure that the specific deposit cannot be withdrawn if the vault is stopped. Tokens::mint_into(MockCurrencyId::A, &ALICE, 1000) .expect("minting for ALICE should succeed"); - Vaults::deposit(Origin::signed(ALICE), id, 100) + Vaults::deposit(RuntimeOrigin::signed(ALICE), id, 100) .expect("depositing in active vault should succeed"); // Shutdown the vault, and ensure that the deposited funds cannot be withdrawn. - Vaults::emergency_shutdown(Origin::root(), id) + Vaults::emergency_shutdown(RuntimeOrigin::root(), id) .expect("root should be able to emergency shutdown"); - Vaults::deposit(Origin::signed(ALICE), id, 100) + Vaults::deposit(RuntimeOrigin::signed(ALICE), id, 100) .expect_err("depositing in stopped vault should fail"); - Vaults::withdraw(Origin::signed(ALICE), id, 100) + Vaults::withdraw(RuntimeOrigin::signed(ALICE), id, 100) .expect_err("withdrawing from stopped vault should fail"); // Restart the vault, and ensure that funds can be withdrawn and deposited - Vaults::start(Origin::root(), id).expect("root can restart the vault"); - Vaults::deposit(Origin::signed(ALICE), id, 100) + Vaults::start(RuntimeOrigin::root(), id).expect("root can restart the vault"); + Vaults::deposit(RuntimeOrigin::signed(ALICE), id, 100) .expect("depositing in restarted vault should succeed"); - Vaults::withdraw(Origin::signed(ALICE), id, 100) + Vaults::withdraw(RuntimeOrigin::signed(ALICE), id, 100) .expect("withdrawing from restarted vault should succeed"); }); } @@ -937,7 +937,7 @@ fn liquidate_strategy_can_not_be_executed_by_non_manager_accounts() { ExtBuilder::default().build().execute_with(|| { let (id, _) = create_vault(ALICE, MockCurrencyId::A); assert_noop!( - Vaults::liquidate_strategy(Origin::signed(BOB), id, 100), + Vaults::liquidate_strategy(RuntimeOrigin::signed(BOB), id, 100), Error::::AccountIsNotManager ); }); @@ -959,20 +959,20 @@ fn do_liquidate_strategy_successfully_liquidates_a_strategy_account( let (id, _) = create_vault(strategy_account_id, currency_id); - Vaults::deposit(Origin::signed(ALICE), id, total_funds).unwrap(); + Vaults::deposit(RuntimeOrigin::signed(ALICE), id, total_funds).unwrap(); assert_eq!(Tokens::balance(currency_id, &strategy_account_id), 0); ::withdraw(&id, &strategy_account_id, strategy_vault).unwrap(); assert!(CapitalStructure::::try_get(id, strategy_account_id).is_ok()); assert_eq!(Tokens::balance(currency_id, &strategy_account_id), strategy_vault); - Vaults::liquidate_strategy(Origin::signed(ALICE), id, strategy_account_id).unwrap(); + Vaults::liquidate_strategy(RuntimeOrigin::signed(ALICE), id, strategy_account_id).unwrap(); assert!(CapitalStructure::::try_get(id, strategy_account_id).is_err()); assert_eq!( ::available_funds(&id, &strategy_account_id), Ok(FundsAvailability::MustLiquidate) ); - System::assert_has_event(Event::Vaults(crate::Event::LiquidateStrategy { + System::assert_has_event(RuntimeEvent::Vaults(crate::Event::LiquidateStrategy { account: strategy_account_id, amount: strategy_vault, })); diff --git a/code/parachain/frame/vesting/Cargo.toml b/code/parachain/frame/vesting/Cargo.toml index 01da2ebc543..455a2949a26 100644 --- a/code/parachain/frame/vesting/Cargo.toml +++ b/code/parachain/frame/vesting/Cargo.toml @@ -45,6 +45,7 @@ std = [ "frame-system/std", "composable-traits/std", "orml-traits/std", + "frame-benchmarking/std", ] runtime-benchmarks = [ diff --git a/code/parachain/frame/vesting/src/mock.rs b/code/parachain/frame/vesting/src/mock.rs index 6d1c8ec6773..ebae9bcd03d 100644 --- a/code/parachain/frame/vesting/src/mock.rs +++ b/code/parachain/frame/vesting/src/mock.rs @@ -98,27 +98,27 @@ fn benchmark_vested_transfer_account() -> AccountId { } pub struct EnsureAliceOrBob; -impl EnsureOrigin for EnsureAliceOrBob { +impl EnsureOrigin for EnsureAliceOrBob { type Success = AccountId; - fn try_origin(o: Origin) -> Result { + fn try_origin(o: RuntimeOrigin) -> Result { let benchmark_acc = benchmark_vested_transfer_account(); - Into::, Origin>>::into(o).and_then(|o| match o { + Into::, RuntimeOrigin>>::into(o).and_then(|o| match o { RawOrigin::Signed(ALICE) => Ok(ALICE), RawOrigin::Signed(BOB) => Ok(BOB), RawOrigin::Signed(acc) => if acc == benchmark_acc { Ok(benchmark_acc) } else { - Err(Origin::from(RawOrigin::Signed(acc))) + Err(RuntimeOrigin::from(RawOrigin::Signed(acc))) }, - r => Err(Origin::from(r)), + r => Err(RuntimeOrigin::from(r)), }) } #[cfg(feature = "runtime-benchmarks")] - fn successful_origin() -> Origin { - Origin::from(RawOrigin::Signed(benchmark_vested_transfer_account())) + fn successful_origin() -> RuntimeOrigin { + RuntimeOrigin::from(RawOrigin::Signed(benchmark_vested_transfer_account())) } } @@ -147,6 +147,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/vesting/src/tests.rs b/code/parachain/frame/vesting/src/tests.rs index 2a1b4977e2c..8969fa3ff88 100644 --- a/code/parachain/frame/vesting/src/tests.rs +++ b/code/parachain/frame/vesting/src/tests.rs @@ -12,7 +12,7 @@ use frame_support::{ error::BadOrigin, traits::{fungibles::Mutate, TryCollect}, }; -use mock::{Event, *}; +use mock::{RuntimeEvent, *}; use orml_tokens::BalanceLock; #[test] @@ -97,7 +97,7 @@ fn vesting_from_chain_spec_works() { System::set_block_number(1); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -107,7 +107,7 @@ fn vesting_from_chain_spec_works() { System::set_block_number(11); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -117,7 +117,7 @@ fn vesting_from_chain_spec_works() { System::set_block_number(14); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -128,7 +128,7 @@ fn vesting_from_chain_spec_works() { System::set_block_number(25); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -139,7 +139,7 @@ fn vesting_from_chain_spec_works() { Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); // everything unlocked assert_ok!(Vesting::claim( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -159,7 +159,7 @@ fn vested_transfer_self_vest_ko() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, ALICE, MockCurrencyId::BTC, @@ -181,7 +181,7 @@ fn vested_transfer_works() { per_period: 100_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -191,7 +191,7 @@ fn vested_transfer_works() { let schedules: BoundedBTreeMap<_, _, MaxVestingSchedule> = [(4_u128, schedule.clone())].into_iter().try_collect().unwrap(); assert_eq!(Vesting::vesting_schedules(&BOB, MockCurrencyId::BTC), schedules); - System::assert_last_event(Event::Vesting(crate::Event::VestingScheduleAdded { + System::assert_last_event(RuntimeEvent::Vesting(crate::Event::VestingScheduleAdded { from: ALICE, to: BOB, asset: MockCurrencyId::BTC, @@ -224,7 +224,7 @@ fn vested_transfer_trait_emits_vesting_schedule_added_event() { schedule_input, )); - System::assert_last_event(Event::Vesting(crate::Event::VestingScheduleAdded { + System::assert_last_event(RuntimeEvent::Vesting(crate::Event::VestingScheduleAdded { from: ALICE, to: BOB, asset: MockCurrencyId::ETH, @@ -248,7 +248,7 @@ fn vested_transfer_for_moment_based_schedule_works() { }; let schedule = VestingSchedule::from_input(4_u128, schedule_input.clone()); assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -258,7 +258,7 @@ fn vested_transfer_for_moment_based_schedule_works() { [(4_u128, schedule.clone())].into_iter().try_collect().unwrap(); assert_eq!(Vesting::vesting_schedules(&BOB, MockCurrencyId::BTC), schedules); - System::assert_last_event(Event::Vesting(crate::Event::VestingScheduleAdded { + System::assert_last_event(RuntimeEvent::Vesting(crate::Event::VestingScheduleAdded { from: ALICE, to: BOB, asset: MockCurrencyId::BTC, @@ -278,7 +278,7 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -294,7 +294,7 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() { per_period: 7_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -307,7 +307,7 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() { per_period: 7_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -330,7 +330,7 @@ fn cannot_use_fund_if_not_claimed() { per_period: 50_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -342,7 +342,7 @@ fn cannot_use_fund_if_not_claimed() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -352,7 +352,7 @@ fn cannot_use_fund_if_not_claimed() { Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert!(Tokens::ensure_can_withdraw(MockCurrencyId::BTC, &BOB, 59).is_err()); assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -370,7 +370,7 @@ fn vested_transfer_fails_if_zero_period_count() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -391,7 +391,7 @@ fn vested_transfer_fails_if_zero_period() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -402,7 +402,7 @@ fn vested_transfer_fails_if_zero_period() { assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -423,7 +423,7 @@ fn vested_transfer_fails_if_transfer_err() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), BOB, ALICE, MockCurrencyId::BTC, @@ -444,7 +444,7 @@ fn vested_transfer_fails_if_overflow() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -460,7 +460,7 @@ fn vested_transfer_fails_if_overflow() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -476,7 +476,7 @@ fn vested_transfer_fails_if_overflow() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -497,7 +497,7 @@ fn vested_transfer_fails_if_bad_origin() { }; assert_noop!( Vesting::vested_transfer( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), CHARLIE, BOB, MockCurrencyId::BTC, @@ -517,7 +517,7 @@ fn claim_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -526,16 +526,16 @@ fn claim_works() { System::set_block_number(11); // remain locked if not claimed - assert!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 10).is_err()); + assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10).is_err()); // unlocked after claiming assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) )); let claimed_amount_per_schedule: BoundedBTreeMap<_, _, MaxVestingSchedule> = [(4_u128, 10)].into_iter().try_collect().unwrap(); - System::assert_last_event(Event::Vesting(crate::Event::Claimed { + System::assert_last_event(RuntimeEvent::Vesting(crate::Event::Claimed { who: BOB, asset: MockCurrencyId::BTC, locked_amount: 10, @@ -544,14 +544,14 @@ fn claim_works() { })); assert!(VestingSchedules::::contains_key(BOB, MockCurrencyId::BTC)); - assert_ok!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 10)); + assert_ok!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10)); // more are still locked - assert!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); + assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); System::set_block_number(21); // claim more assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -559,7 +559,7 @@ fn claim_works() { let claimed_amount_per_schedule: BoundedBTreeMap<_, _, MaxVestingSchedule> = [(4_u128, 10)].into_iter().try_collect().unwrap(); - System::assert_last_event(Event::Vesting(crate::Event::Claimed { + System::assert_last_event(RuntimeEvent::Vesting(crate::Event::Claimed { who: BOB, asset: MockCurrencyId::BTC, locked_amount: 0, @@ -568,7 +568,7 @@ fn claim_works() { })); assert!(!VestingSchedules::::contains_key(BOB, MockCurrencyId::BTC)); - assert_ok!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 10)); + assert_ok!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10)); // all used up assert_eq!(Tokens::free_balance(MockCurrencyId::BTC, &BOB), 0); @@ -583,7 +583,7 @@ fn claim_nonexistent_schedules() { // Claim schedule 10, which does not exist assert_noop!( Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::One(10_u128) ), @@ -592,7 +592,7 @@ fn claim_nonexistent_schedules() { // Claim all schedules assert_noop!( - Vesting::claim(Origin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All,), + Vesting::claim(RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All,), Error::::VestingScheduleNotFound ); @@ -603,7 +603,7 @@ fn claim_nonexistent_schedules() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -625,7 +625,7 @@ fn claim_nonexistent_schedules() { assert_noop!( Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::Many(claim_schedules), ), @@ -641,7 +641,7 @@ fn claim_nonexistent_schedules() { // Claim schedule 4 assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128), )); @@ -665,7 +665,7 @@ fn claim_with_id_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -679,7 +679,7 @@ fn claim_with_id_works() { per_period: 15_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -693,7 +693,7 @@ fn claim_with_id_works() { per_period: 3_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -709,7 +709,7 @@ fn claim_with_id_works() { // Claim for schedule 4 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -728,7 +728,7 @@ fn claim_with_id_works() { // Claim for schedule 5 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(5_u128) @@ -744,7 +744,7 @@ fn claim_with_id_works() { // Claim for schedule 6 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(6_u128) @@ -763,7 +763,7 @@ fn claim_with_id_works() { // Claim for schedule 4 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -789,7 +789,7 @@ fn claim_with_id_works() { // Claim for schedule 6 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(6_u128) @@ -805,7 +805,7 @@ fn claim_with_id_works() { // Claim remaining for schedule 5 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(5_u128) @@ -827,7 +827,7 @@ fn claim_with_multiple_ids_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -841,7 +841,7 @@ fn claim_with_multiple_ids_works() { per_period: 15_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -855,7 +855,7 @@ fn claim_with_multiple_ids_works() { per_period: 3_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -873,7 +873,7 @@ fn claim_with_multiple_ids_works() { let claim_schedules = BoundedVec::::try_from(vec![4_u128, 5_u128]).unwrap(); assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::Many(claim_schedules.clone()) @@ -892,7 +892,7 @@ fn claim_with_multiple_ids_works() { // Claim for schedule 4 and 5 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::Many(claim_schedules) @@ -913,7 +913,7 @@ fn claim_with_multiple_ids_works() { let claim_schedules = BoundedVec::::try_from(vec![4_u128, 6_u128]).unwrap(); assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::Many(claim_schedules) @@ -939,7 +939,7 @@ fn claim_for_with_id_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -953,7 +953,7 @@ fn claim_for_with_id_works() { per_period: 15_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -968,7 +968,7 @@ fn claim_for_with_id_works() { // Claim for schedule 4 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -985,7 +985,7 @@ fn claim_for_with_id_works() { // Claim for schedule 5 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(5_u128) @@ -1001,7 +1001,7 @@ fn claim_for_with_id_works() { // Claim for schedule 4 assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -1023,7 +1023,7 @@ fn claim_for_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1038,7 +1038,7 @@ fn claim_for_works() { // Claim all schedules assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::All @@ -1055,7 +1055,7 @@ fn claim_for_works() { // Claim for all schedules assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::All @@ -1076,7 +1076,7 @@ fn claim_for_works_moment_based() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1084,7 +1084,7 @@ fn claim_for_works_moment_based() { )); assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -1101,7 +1101,7 @@ fn claim_for_works_moment_based() { Some(&BalanceLock { id: VESTING_LOCK_ID, amount: 20_u64 }) ); assert_ok!(Vesting::claim_for( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) @@ -1121,7 +1121,7 @@ fn update_vesting_schedules_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1134,7 +1134,7 @@ fn update_vesting_schedules_works() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1152,7 +1152,7 @@ fn update_vesting_schedules_works() { per_period: 10_u64, }; assert_ok!(Vesting::update_vesting_schedules( - Origin::root(), + RuntimeOrigin::root(), BOB, MockCurrencyId::BTC, vec![updated_schedule, updated_moment_based_schedule], @@ -1161,20 +1161,20 @@ fn update_vesting_schedules_works() { System::set_block_number(11); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); - assert!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); + assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); System::set_block_number(21); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); - assert_ok!(Tokens::transfer(Origin::signed(BOB), ALICE, MockCurrencyId::BTC, 20)); + assert_ok!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 20)); // empty vesting schedules cleanup the storage and unlock the fund assert!(VestingSchedules::::contains_key(BOB, MockCurrencyId::BTC)); @@ -1183,7 +1183,7 @@ fn update_vesting_schedules_works() { Some(&BalanceLock { id: VESTING_LOCK_ID, amount: 20_u64 }) ); assert_ok!(Vesting::update_vesting_schedules( - Origin::root(), + RuntimeOrigin::root(), BOB, MockCurrencyId::BTC, vec![], @@ -1209,7 +1209,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1224,7 +1224,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1238,7 +1238,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { // Claim all. Should have locked 1_400 - (25 * 10) - (25 * 8) = 950 assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -1261,7 +1261,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { // Unlocks all and locks 300 + 400 = 700 assert_ok!(Vesting::update_vesting_schedules( - Origin::root(), + RuntimeOrigin::root(), BOB, MockCurrencyId::BTC, vec![schedule_input_3.clone(), schedule_input_4.clone()] @@ -1273,7 +1273,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { // Claim all. Should have locked 700 - (20 * 5) - (10 * 2) = 580 assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All )); @@ -1285,7 +1285,7 @@ fn update_vesting_schedules_does_not_break_locking_amount() { #[test] fn update_vesting_schedules_fails_if_unexpected_existing_locks() { ExtBuilder::build().execute_with(|| { - assert_ok!(Tokens::transfer(Origin::signed(ALICE), BOB, MockCurrencyId::BTC, 1)); + assert_ok!(Tokens::transfer(RuntimeOrigin::signed(ALICE), BOB, MockCurrencyId::BTC, 1)); assert_ok!(Tokens::set_lock(*b"prelocks", MockCurrencyId::BTC, &BOB, 0_u64)); }); } @@ -1300,7 +1300,7 @@ fn vested_transfer_check_for_min() { }; assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), BOB, ALICE, MockCurrencyId::BTC, @@ -1321,7 +1321,7 @@ fn multiple_vesting_schedule_claim_works() { }; let schedule = VestingSchedule::from_input(4_u128, schedule_input.clone()); assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1336,7 +1336,7 @@ fn multiple_vesting_schedule_claim_works() { let schedule2 = VestingSchedule::from_input(5_u128, schedule2_input.clone()); assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1352,7 +1352,7 @@ fn multiple_vesting_schedule_claim_works() { System::set_block_number(21); assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::One(4_u128) )); @@ -1366,7 +1366,7 @@ fn multiple_vesting_schedule_claim_works() { System::set_block_number(31); assert_ok!(Vesting::claim( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::One(5_u128) )); @@ -1390,21 +1390,21 @@ fn exceeding_maximum_schedules_should_fail() { per_period: 10_u64, }; assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, schedule_input.clone(), )); assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, schedule_input.clone(), )); assert_ok!(Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1412,7 +1412,7 @@ fn exceeding_maximum_schedules_should_fail() { )); assert_noop!( Vesting::vested_transfer( - Origin::root(), + RuntimeOrigin::root(), ALICE, BOB, MockCurrencyId::BTC, @@ -1430,7 +1430,7 @@ fn exceeding_maximum_schedules_should_fail() { assert_noop!( Vesting::update_vesting_schedules( - Origin::root(), + RuntimeOrigin::root(), BOB, MockCurrencyId::BTC, schedule_inputs, diff --git a/code/parachain/runtime/common/src/rewards.rs b/code/parachain/runtime/common/src/rewards.rs index bfab665c406..64a2e04f159 100644 --- a/code/parachain/runtime/common/src/rewards.rs +++ b/code/parachain/runtime/common/src/rewards.rs @@ -184,6 +184,9 @@ mod tests { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { diff --git a/code/parachain/runtime/picasso/src/migrations.rs b/code/parachain/runtime/picasso/src/migrations.rs index 4803fd4e985..aa39d97c88a 100644 --- a/code/parachain/runtime/picasso/src/migrations.rs +++ b/code/parachain/runtime/picasso/src/migrations.rs @@ -187,9 +187,9 @@ mod tests { unhashed::put_raw(&old_prefix, &[42]); let hash_root = storage_root(StateVersion::V1); - assert_ne!(TechCollectiveRenameMigration::on_runtime_upgrade(), 0); + assert_ne!(TechCollectiveRenameMigration::on_runtime_upgrade(), Weight::from_ref_time(0)); assert_ne!(hash_root, storage_root(StateVersion::V1)); - let updated = || assert_eq!(TechCollectiveRenameMigration::on_runtime_upgrade(), 0); + let updated = || assert_eq!(TechCollectiveRenameMigration::on_runtime_upgrade(), Weight::from_ref_time(0)); assert_storage_noop!(updated()); assert!(unhashed::get_raw(&old_prefix).is_none()); From 835fc06a418973494ef31e6c59c9d5e4f66d8b2f Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 13:05:49 +0100 Subject: [PATCH 37/44] chore: cargo fmt --- code/parachain/frame/assets/src/mocks.rs | 6 +- .../frame/assets/src/tests/extrinsics.rs | 9 ++- .../frame/bonded-finance/src/mock.rs | 6 +- code/parachain/frame/call-filter/src/tests.rs | 10 +++- code/parachain/frame/cosmwasm/src/mock.rs | 6 +- .../frame/crowdloan-rewards/src/tests.rs | 14 +++-- code/parachain/frame/dex-router/src/mock.rs | 6 +- .../frame/dutch-auction/src/mock/runtime.rs | 6 +- .../frame/dutch-auction/src/tests.rs | 21 +++++-- .../fnft/src/test/nonfungibles/extrinsic.rs | 35 +++++++++--- .../fnft/src/test/nonfungibles/mutate.rs | 26 +++++---- .../fnft/src/test/nonfungibles/transfer.rs | 14 +++-- code/parachain/frame/fnft/src/test/prelude.rs | 2 +- .../frame/lending/src/mocks/general.rs | 6 +- .../frame/lending/src/mocks/offchain.rs | 6 +- .../frame/lending/src/tests/borrow.rs | 14 ++++- .../frame/lending/src/tests/liquidation.rs | 20 ++++++- .../frame/lending/src/tests/repay.rs | 7 ++- .../frame/lending/src/tests/vault.rs | 19 +++++-- .../frame/liquidations/src/mock/runtime.rs | 6 +- code/parachain/frame/mosaic/src/mock.rs | 6 +- code/parachain/frame/mosaic/src/tests.rs | 56 ++++++++++++++++--- code/parachain/frame/oracle/src/tests.rs | 7 ++- code/parachain/frame/pablo/src/mock.rs | 6 +- .../test/dual_asset_constant_product_tests.rs | 8 ++- .../dual_asset_constant_product_tests_new.rs | 17 +++++- .../frame/pablo/src/test/pablo_tests.rs | 2 +- .../frame/staking-rewards/src/runtime.rs | 6 +- .../frame/staking-rewards/src/test/mod.rs | 35 +++++++++--- .../src/test/test_update_reward_pools.rs | 9 ++- code/parachain/frame/vault/src/mocks/tests.rs | 6 +- code/parachain/frame/vault/src/tests.rs | 6 +- code/parachain/frame/vesting/src/mock.rs | 6 +- code/parachain/frame/vesting/src/tests.rs | 18 ++++-- code/parachain/runtime/common/src/rewards.rs | 6 +- code/parachain/runtime/composable/src/lib.rs | 2 +- code/parachain/runtime/dali/src/lib.rs | 2 +- code/parachain/runtime/picasso/src/lib.rs | 2 +- .../runtime/picasso/src/migrations.rs | 12 +++- 39 files changed, 320 insertions(+), 131 deletions(-) diff --git a/code/parachain/frame/assets/src/mocks.rs b/code/parachain/frame/assets/src/mocks.rs index fd3bbc87c2d..5627b290026 100644 --- a/code/parachain/frame/assets/src/mocks.rs +++ b/code/parachain/frame/assets/src/mocks.rs @@ -121,9 +121,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl governance_registry::Config for Test { diff --git a/code/parachain/frame/assets/src/tests/extrinsics.rs b/code/parachain/frame/assets/src/tests/extrinsics.rs index a308df42745..ad822be8ae3 100644 --- a/code/parachain/frame/assets/src/tests/extrinsics.rs +++ b/code/parachain/frame/assets/src/tests/extrinsics.rs @@ -112,8 +112,13 @@ fn test_force_transfer_native() { #[test] fn test_transfer_all() { new_test_ext().execute_with(|| { - Pallet::::transfer_all(RuntimeOrigin::signed(FROM_ACCOUNT), ASSET_ID, TO_ACCOUNT, true) - .expect("transfer_all should work"); + Pallet::::transfer_all( + RuntimeOrigin::signed(FROM_ACCOUNT), + ASSET_ID, + TO_ACCOUNT, + true, + ) + .expect("transfer_all should work"); assert_eq!(Pallet::::total_balance(ASSET_ID, &FROM_ACCOUNT), 1); assert_eq!(Pallet::::total_balance(ASSET_ID, &TO_ACCOUNT), INIT_AMOUNT * 2 - 1); }); diff --git a/code/parachain/frame/bonded-finance/src/mock.rs b/code/parachain/frame/bonded-finance/src/mock.rs index de74d7381ab..37a761f5089 100644 --- a/code/parachain/frame/bonded-finance/src/mock.rs +++ b/code/parachain/frame/bonded-finance/src/mock.rs @@ -132,9 +132,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/call-filter/src/tests.rs b/code/parachain/frame/call-filter/src/tests.rs index 7fbb20c630c..48a8df6fac8 100644 --- a/code/parachain/frame/call-filter/src/tests.rs +++ b/code/parachain/frame/call-filter/src/tests.rs @@ -16,7 +16,10 @@ fn pause_transaction_work() { pallet_name: b"Balances".to_vec().try_into().unwrap(), function_name: b"transfer".to_vec().try_into().unwrap(), }; - assert_noop!(Filter::disable(RuntimeOrigin::signed(5), balances_transfer.clone()), BadOrigin); + assert_noop!( + Filter::disable(RuntimeOrigin::signed(5), balances_transfer.clone()), + BadOrigin + ); assert_eq!(Filter::disabled_calls(&balances_transfer), None); assert_ok!(Filter::disable(RuntimeOrigin::signed(1), balances_transfer.clone())); @@ -64,7 +67,10 @@ fn enable_work() { assert_ok!(Filter::disable(RuntimeOrigin::signed(1), balances_transfer.clone())); assert_eq!(Filter::disabled_calls(&balances_transfer), Some(())); - assert_noop!(Filter::enable(RuntimeOrigin::signed(5), balances_transfer.clone()), BadOrigin); + assert_noop!( + Filter::enable(RuntimeOrigin::signed(5), balances_transfer.clone()), + BadOrigin + ); assert_ok!(Filter::enable(RuntimeOrigin::signed(1), balances_transfer.clone())); System::assert_last_event(RuntimeEvent::Filter(crate::Event::Enabled { diff --git a/code/parachain/frame/cosmwasm/src/mock.rs b/code/parachain/frame/cosmwasm/src/mock.rs index f135ac965f8..10eb5ea5634 100644 --- a/code/parachain/frame/cosmwasm/src/mock.rs +++ b/code/parachain/frame/cosmwasm/src/mock.rs @@ -109,9 +109,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl pallet_balances::Config for Test { diff --git a/code/parachain/frame/crowdloan-rewards/src/tests.rs b/code/parachain/frame/crowdloan-rewards/src/tests.rs index 905e01e0e87..2dc754edb6a 100644 --- a/code/parachain/frame/crowdloan-rewards/src/tests.rs +++ b/code/parachain/frame/crowdloan-rewards/src/tests.rs @@ -2,8 +2,8 @@ use crate::{ ethereum_recover, mocks::{ ethereum_address, generate_accounts, AccountId, Balance, Balances, ClaimKey, - CrowdloanRewards, EthKey, ExtBuilder, Moment, RuntimeOrigin, System, Test, Timestamp, ALICE, - INITIAL_PAYMENT, PROOF_PREFIX, VESTING_STEP, + CrowdloanRewards, EthKey, ExtBuilder, Moment, RuntimeOrigin, System, Test, Timestamp, + ALICE, INITIAL_PAYMENT, PROOF_PREFIX, VESTING_STEP, }, models::{Proof, RemoteAccount}, Error, Event, RemoteAccountOf, RewardAmountOf, VestingPeriodOf, @@ -92,7 +92,10 @@ mod unlock_rewards_for { let accounts: Vec = accounts.into_iter().map(|(account, _claim_key)| account).collect(); - assert_ok!(CrowdloanRewards::unlock_rewards_for(RuntimeOrigin::root(), accounts.clone())); + assert_ok!(CrowdloanRewards::unlock_rewards_for( + RuntimeOrigin::root(), + accounts.clone() + )); assert_ok!(>::transfer( &accounts[0], @@ -325,7 +328,10 @@ fn test_initialize_totals() { fn initialize_should_fail_when_not_funded() { with_rewards_default(|_set_moment, _accounts| { Balances::make_free_balance_be(&CrowdloanRewards::account_id(), 0); - assert_noop!(CrowdloanRewards::initialize(RuntimeOrigin::root()), Error::::RewardsNotFunded); + assert_noop!( + CrowdloanRewards::initialize(RuntimeOrigin::root()), + Error::::RewardsNotFunded + ); }); } diff --git a/code/parachain/frame/dex-router/src/mock.rs b/code/parachain/frame/dex-router/src/mock.rs index c4d4db68ee7..c3da049cbc9 100644 --- a/code/parachain/frame/dex-router/src/mock.rs +++ b/code/parachain/frame/dex-router/src/mock.rs @@ -141,9 +141,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/dutch-auction/src/mock/runtime.rs b/code/parachain/frame/dutch-auction/src/mock/runtime.rs index 44360374332..fa9a7077847 100644 --- a/code/parachain/frame/dutch-auction/src/mock/runtime.rs +++ b/code/parachain/frame/dutch-auction/src/mock/runtime.rs @@ -134,9 +134,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub static ALICE: Public = diff --git a/code/parachain/frame/dutch-auction/src/tests.rs b/code/parachain/frame/dutch-auction/src/tests.rs index fd41e2fb166..ca27692730b 100644 --- a/code/parachain/frame/dutch-auction/src/tests.rs +++ b/code/parachain/frame/dutch-auction/src/tests.rs @@ -89,7 +89,8 @@ fn setup_sell() { Assets::balance(PICA, &DutchAuctionPalletId::get().into_account_truncating()) - treasury; assert!(treasury_added > 0); - let ask_gas = ::WeightInfo::ask().ref_time() as u128; + let ask_gas = + ::WeightInfo::ask().ref_time() as u128; assert!(treasury_added >= ask_gas); let reserved = Assets::reserved_balance(BTC, &ALICE); assert!(not_reserved < reserved && reserved == 1); @@ -119,10 +120,12 @@ fn with_immediate_exact_buy() { let configuration = TimeReleaseFunction::LinearDecrease(LinearDecrease { total: 42 }); DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let order_id = crate::OrdersIndex::::get(); - let result = DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(999))); + let result = + DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(999))); assert!(!result.is_ok()); let not_reserved = >::reserved_balance(USDT, &BOB); - let result = DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1000))); + let result = + DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1000))); assert_ok!(result); let reserved = Assets::reserved_balance(USDT, &BOB); assert!(not_reserved < reserved && reserved == take_amount); @@ -150,8 +153,16 @@ fn with_two_takes_higher_than_limit_and_not_enough_for_all() { let sell = Sell::new(BTC, USDT, sell_amount, fixed(take_amount)); DutchAuction::ask(RuntimeOrigin::signed(seller), sell, configuration).unwrap(); let order_id = crate::OrdersIndex::::get(); - assert_ok!(DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1001)))); - assert_ok!(DutchAuction::take(RuntimeOrigin::signed(buyer), order_id, Take::new(1, fixed(1002)))); + assert_ok!(DutchAuction::take( + RuntimeOrigin::signed(buyer), + order_id, + Take::new(1, fixed(1001)) + )); + assert_ok!(DutchAuction::take( + RuntimeOrigin::signed(buyer), + order_id, + Take::new(1, fixed(1002)) + )); DutchAuction::on_finalize(42); diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs b/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs index 3d6d13d4e92..02ef1c150ce 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/extrinsic.rs @@ -14,7 +14,7 @@ use frame_support::{ use crate::{ pallet, test::{ - mock::{new_test_ext, RuntimeEvent, MockRuntime, Nft, RuntimeOrigin, Proxy}, + mock::{new_test_ext, MockRuntime, Nft, Proxy, RuntimeEvent, RuntimeOrigin}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, CHARLIE, }, @@ -102,7 +102,12 @@ fn roundtrip() { process_and_progress_blocks::, MockRuntime>(10); // send one of ALICE's NFTs to BOB - assert_ok!(Nft::transfer(RuntimeOrigin::signed(ALICE), TEST_COLLECTION_ID, nft_to_trade, BOB)); + assert_ok!(Nft::transfer( + RuntimeOrigin::signed(ALICE), + TEST_COLLECTION_ID, + nft_to_trade, + BOB + )); MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, @@ -115,7 +120,12 @@ fn roundtrip() { process_and_progress_blocks::, MockRuntime>(10); // send said NFT back - assert_ok!(Nft::transfer(RuntimeOrigin::signed(BOB), TEST_COLLECTION_ID, nft_to_trade, ALICE)); + assert_ok!(Nft::transfer( + RuntimeOrigin::signed(BOB), + TEST_COLLECTION_ID, + nft_to_trade, + ALICE + )); MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { collection_id: TEST_COLLECTION_ID, instance_id: nft_to_trade, @@ -189,12 +199,19 @@ fn many() { // transfer all of CHARLIES's NFTs to BOB for nft_id in charlies_nfts.iter() { - assert_ok!(Nft::transfer(RuntimeOrigin::signed(CHARLIE), TEST_COLLECTION_ID, *nft_id, BOB)); - MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { - collection_id: TEST_COLLECTION_ID, - instance_id: *nft_id, - to: BOB, - })); + assert_ok!(Nft::transfer( + RuntimeOrigin::signed(CHARLIE), + TEST_COLLECTION_ID, + *nft_id, + BOB + )); + MockRuntime::assert_last_event(RuntimeEvent::Nft( + crate::Event::FinancialNftTransferred { + collection_id: TEST_COLLECTION_ID, + instance_id: *nft_id, + to: BOB, + }, + )); process_and_progress_blocks::, MockRuntime>(2); } diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs b/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs index 348b981f049..bf0967df5da 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/mutate.rs @@ -15,7 +15,7 @@ mod mint_into { use crate::{ pallet::*, test::{ - mock::{new_test_ext, RuntimeEvent, MockRuntime}, + mock::{new_test_ext, MockRuntime, RuntimeEvent}, prelude::*, ALICE, BOB, }, @@ -191,7 +191,7 @@ mod burn_from { use crate::{ pallet::*, test::{ - mock::{new_test_ext, RuntimeEvent, MockRuntime}, + mock::{new_test_ext, MockRuntime, RuntimeEvent}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, }, @@ -267,7 +267,7 @@ mod burn_from { use sp_runtime::DispatchError; use crate::test::{ - mock::{new_test_ext, RuntimeEvent, MockRuntime}, + mock::{new_test_ext, MockRuntime, RuntimeEvent}, prelude::{mint_many_nfts_and_assert, mint_nft_and_assert, TEST_COLLECTION_ID}, ALICE, BOB, }; @@ -306,10 +306,12 @@ mod burn_from { mint_many_nfts_and_assert::<10>(ALICE, TEST_COLLECTION_ID); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE))); - MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { - collection_id: TEST_COLLECTION_ID, - instance_id: nft_to_burn, - })); + MockRuntime::assert_last_event(RuntimeEvent::Nft( + crate::Event::FinancialNftBurned { + collection_id: TEST_COLLECTION_ID, + instance_id: nft_to_burn, + }, + )); assert_noop!( Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE)), @@ -325,10 +327,12 @@ mod burn_from { let nft_to_burn = mint_nft_and_assert(); assert_ok!(Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE))); - MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftBurned { - collection_id: TEST_COLLECTION_ID, - instance_id: nft_to_burn, - })); + MockRuntime::assert_last_event(RuntimeEvent::Nft( + crate::Event::FinancialNftBurned { + collection_id: TEST_COLLECTION_ID, + instance_id: nft_to_burn, + }, + )); assert_noop!( Nft::burn(&TEST_COLLECTION_ID, &nft_to_burn, Some(&ALICE)), diff --git a/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs b/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs index cc255d6156d..5ce33b5e7eb 100644 --- a/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs +++ b/code/parachain/frame/fnft/src/test/nonfungibles/transfer.rs @@ -11,7 +11,7 @@ use sp_runtime::DispatchError; use crate::{ test::{ - mock::{new_test_ext, RuntimeEvent, MockRuntime, Nft, Proxy}, + mock::{new_test_ext, MockRuntime, Nft, Proxy, RuntimeEvent}, prelude::{TEST_COLLECTION_ID, *}, ALICE, BOB, CHARLIE, }, @@ -185,11 +185,13 @@ fn many() { nft_id, &BOB )); - MockRuntime::assert_last_event(RuntimeEvent::Nft(crate::Event::FinancialNftTransferred { - collection_id: TEST_COLLECTION_ID, - instance_id: *nft_id, - to: BOB, - })); + MockRuntime::assert_last_event(RuntimeEvent::Nft( + crate::Event::FinancialNftTransferred { + collection_id: TEST_COLLECTION_ID, + instance_id: *nft_id, + to: BOB, + }, + )); process_and_progress_blocks::, MockRuntime>(2); } diff --git a/code/parachain/frame/fnft/src/test/prelude.rs b/code/parachain/frame/fnft/src/test/prelude.rs index 6286a1513da..5c566f61be5 100644 --- a/code/parachain/frame/fnft/src/test/prelude.rs +++ b/code/parachain/frame/fnft/src/test/prelude.rs @@ -13,7 +13,7 @@ use std::{ use crate::{ pallet::{Event as NftEvent, Instance, OwnerInstances}, test::{ - mock::{RuntimeEvent, MockRuntime, Nft}, + mock::{MockRuntime, Nft, RuntimeEvent}, ALICE, BOB, }, AccountIdOf, FinancialNftCollectionIdOf, FinancialNftInstanceIdOf, Pallet, diff --git a/code/parachain/frame/lending/src/mocks/general.rs b/code/parachain/frame/lending/src/mocks/general.rs index 7df0c0cec51..6988042e029 100644 --- a/code/parachain/frame/lending/src/mocks/general.rs +++ b/code/parachain/frame/lending/src/mocks/general.rs @@ -209,9 +209,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { diff --git a/code/parachain/frame/lending/src/mocks/offchain.rs b/code/parachain/frame/lending/src/mocks/offchain.rs index eda4f1b9896..5a3e35dd7a3 100644 --- a/code/parachain/frame/lending/src/mocks/offchain.rs +++ b/code/parachain/frame/lending/src/mocks/offchain.rs @@ -226,9 +226,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { diff --git a/code/parachain/frame/lending/src/tests/borrow.rs b/code/parachain/frame/lending/src/tests/borrow.rs index 79b90134cac..2347ac1b2ec 100644 --- a/code/parachain/frame/lending/src/tests/borrow.rs +++ b/code/parachain/frame/lending/src/tests/borrow.rs @@ -320,7 +320,12 @@ fn borrow_flow() { assert_ok!(Tokens::mint_into(USDT::ID, &ALICE, collateral_amount)); assert_extrinsic_event::( - Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, collateral_amount, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*ALICE), + market, + collateral_amount, + false, + ), RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral_amount, @@ -360,7 +365,12 @@ fn zero_amount_collateral_deposit_or_withdraw() { let collateral_amount = 0; let error_message = "Can not deposit or withdraw zero collateral"; assert_noop!( - Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market, collateral_amount, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*ALICE), + market, + collateral_amount, + false + ), error_message ); diff --git a/code/parachain/frame/lending/src/tests/liquidation.rs b/code/parachain/frame/lending/src/tests/liquidation.rs index 2efdc3ce2f0..2495a95178e 100644 --- a/code/parachain/frame/lending/src/tests/liquidation.rs +++ b/code/parachain/frame/lending/src/tests/liquidation.rs @@ -32,7 +32,11 @@ fn test_liquidate_multiple() { let borrowers_vec = vec![first_borrower, second_borrower, third_borrower]; let borrowers = TestBoundedVec::try_from(borrowers_vec.clone()).unwrap(); assert_extrinsic_event::( - Lending::liquidate(RuntimeOrigin::signed(manager), market_id.clone(), borrowers.clone()), + Lending::liquidate( + RuntimeOrigin::signed(manager), + market_id.clone(), + borrowers.clone(), + ), RuntimeEvent::Lending(crate::Event::LiquidationInitiated { market_id, borrowers: borrowers_vec, @@ -143,7 +147,12 @@ fn liquidation() { assert_ok!(Tokens::mint_into(BTC::ID, &ALICE, collateral)); assert_extrinsic_event::( - Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market_id, collateral, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*ALICE), + market_id, + collateral, + false, + ), RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *ALICE, amount: collateral, @@ -257,7 +266,12 @@ fn market_owner_cannot_retroactively_liquidate() { assert_ok!(Tokens::mint_into(BTC::ID, &BOB, collateral_amount)); assert_extrinsic_event::( - Lending::deposit_collateral(RuntimeOrigin::signed(*BOB), market_id, collateral_amount, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*BOB), + market_id, + collateral_amount, + false, + ), RuntimeEvent::Lending(crate::Event::CollateralDeposited { sender: *BOB, amount: collateral_amount, diff --git a/code/parachain/frame/lending/src/tests/repay.rs b/code/parachain/frame/lending/src/tests/repay.rs index 8daf3e40e6d..a43a874fbf8 100644 --- a/code/parachain/frame/lending/src/tests/repay.rs +++ b/code/parachain/frame/lending/src/tests/repay.rs @@ -162,7 +162,12 @@ fn test_repay_total_debt() { let deposit_collateral = |account, balance| { assert_ok!(Tokens::mint_into(BTC::ID, account, balance)); assert_extrinsic_event::( - Lending::deposit_collateral(RuntimeOrigin::signed(*account), market_index, balance, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*account), + market_index, + balance, + false, + ), RuntimeEvent::Lending(crate::Event::::CollateralDeposited { market_id: market_index, amount: BTC::ONE, diff --git a/code/parachain/frame/lending/src/tests/vault.rs b/code/parachain/frame/lending/src/tests/vault.rs index 260517d54bc..e201995d417 100644 --- a/code/parachain/frame/lending/src/tests/vault.rs +++ b/code/parachain/frame/lending/src/tests/vault.rs @@ -17,7 +17,12 @@ fn vault_takes_part_of_borrow_so_cannot_withdraw() { assert_ok!(Lending::vault_deposit(RuntimeOrigin::signed(*ALICE), market_id, deposit_btc)); assert_extrinsic_event::( - Lending::deposit_collateral(RuntimeOrigin::signed(*ALICE), market_id, deposit_usdt, false), + Lending::deposit_collateral( + RuntimeOrigin::signed(*ALICE), + market_id, + deposit_usdt, + false, + ), RuntimeEvent::Lending(pallet_lending::Event::::CollateralDeposited { sender: *ALICE, market_id, @@ -32,11 +37,13 @@ fn vault_takes_part_of_borrow_so_cannot_withdraw() { ), orml_tokens::Error::::BalanceTooLow ); - assert_no_event::(RuntimeEvent::Lending(pallet_lending::Event::::Borrowed { - sender: *ALICE, - market_id, - amount: deposit_btc + initial_total_cash, - })); + assert_no_event::(RuntimeEvent::Lending( + pallet_lending::Event::::Borrowed { + sender: *ALICE, + market_id, + amount: deposit_btc + initial_total_cash, + }, + )); }); } diff --git a/code/parachain/frame/liquidations/src/mock/runtime.rs b/code/parachain/frame/liquidations/src/mock/runtime.rs index 034b2a4b149..d51e8f6c0dc 100644 --- a/code/parachain/frame/liquidations/src/mock/runtime.rs +++ b/code/parachain/frame/liquidations/src/mock/runtime.rs @@ -137,9 +137,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub static ALICE: Public = diff --git a/code/parachain/frame/mosaic/src/mock.rs b/code/parachain/frame/mosaic/src/mock.rs index 91322c50f2a..4fd054e5f0b 100644 --- a/code/parachain/frame/mosaic/src/mock.rs +++ b/code/parachain/frame/mosaic/src/mock.rs @@ -98,9 +98,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/mosaic/src/tests.rs b/code/parachain/frame/mosaic/src/tests.rs index 847381000e5..11f9bc2b5c1 100644 --- a/code/parachain/frame/mosaic/src/tests.rs +++ b/code/parachain/frame/mosaic/src/tests.rs @@ -115,7 +115,10 @@ mod ensure_relayer { fn ensure_relayer_origin_checked() { new_test_ext().execute_with(|| { assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); - assert_err!(Mosaic::ensure_relayer(RuntimeOrigin::signed(ALICE)), DispatchError::BadOrigin); + assert_err!( + Mosaic::ensure_relayer(RuntimeOrigin::signed(ALICE)), + DispatchError::BadOrigin + ); }) } } @@ -134,14 +137,20 @@ mod set_relayer { #[test] fn relayer_cannot_set_relayer() { new_test_ext().execute_with(|| { - assert_noop!(Mosaic::set_relayer(RuntimeOrigin::relayer(), ALICE), DispatchError::BadOrigin); + assert_noop!( + Mosaic::set_relayer(RuntimeOrigin::relayer(), ALICE), + DispatchError::BadOrigin + ); }) } #[test] fn none_cannot_set_relayer() { new_test_ext().execute_with(|| { - assert_noop!(Mosaic::set_relayer(RuntimeOrigin::none(), ALICE), DispatchError::BadOrigin); + assert_noop!( + Mosaic::set_relayer(RuntimeOrigin::none(), ALICE), + DispatchError::BadOrigin + ); }) } #[test] @@ -227,7 +236,11 @@ mod set_network { new_test_ext().execute_with(|| { assert_ok!(Mosaic::set_relayer(RuntimeOrigin::root(), RELAYER)); - assert_ok!(Mosaic::set_network(RuntimeOrigin::relayer(), network_id, network_info.clone())); + assert_ok!(Mosaic::set_network( + RuntimeOrigin::relayer(), + network_id, + network_info.clone() + )); assert_eq!(Mosaic::network_infos(network_id), Some(network_info)); }) } @@ -300,7 +313,12 @@ mod budget { fn none_cannot_set_budget() { new_test_ext().execute_with(|| { assert_noop!( - Mosaic::set_budget(RuntimeOrigin::none(), 1, 1, BudgetPenaltyDecayer::linear(5)), + Mosaic::set_budget( + RuntimeOrigin::none(), + 1, + 1, + BudgetPenaltyDecayer::linear(5) + ), DispatchError::BadOrigin ); }) @@ -400,7 +418,12 @@ fn initialize() { 1, NetworkInfo { enabled: true, min_transfer_size: 1, max_transfer_size: 100000 }, )); - assert_ok!(Mosaic::set_budget(RuntimeOrigin::root(), 1, BUDGET, BudgetPenaltyDecayer::linear(10))); + assert_ok!(Mosaic::set_budget( + RuntimeOrigin::root(), + 1, + BUDGET, + BudgetPenaltyDecayer::linear(10) + )); assert_ok!(Mosaic::update_asset_mapping( RuntimeOrigin::root(), ASSET_ID, @@ -955,7 +978,13 @@ mod transfer_to { initialize(); do_transfer_to(); assert_noop!( - Mosaic::accept_transfer(RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 101), + Mosaic::accept_transfer( + RuntimeOrigin::relayer(), + ALICE, + NETWORK_ID, + REMOTE_ASSET_ID, + 101 + ), Error::::AmountMismatch ); }) @@ -1016,7 +1045,13 @@ mod transfer_to { System::set_block_number(current_block + Mosaic::timelock_period() + 1); assert_ok!(Mosaic::claim_stale_to(RuntimeOrigin::signed(ALICE), 1, ALICE)); assert_noop!( - Mosaic::accept_transfer(RuntimeOrigin::relayer(), ALICE, NETWORK_ID, REMOTE_ASSET_ID, 100), + Mosaic::accept_transfer( + RuntimeOrigin::relayer(), + ALICE, + NETWORK_ID, + REMOTE_ASSET_ID, + 100 + ), Error::::NoOutgoingTx ); }) @@ -1343,7 +1378,10 @@ mod claim_to { let lock_time = 10; do_timelocked_mint(ALICE, 50, lock_time); let current_block = System::block_number(); - assert_noop!(Mosaic::claim_to(RuntimeOrigin::alice(), 1, ALICE), Error::::TxStillLocked); + assert_noop!( + Mosaic::claim_to(RuntimeOrigin::alice(), 1, ALICE), + Error::::TxStillLocked + ); System::set_block_number(current_block + lock_time + 1); assert_ok!(Mosaic::claim_to(RuntimeOrigin::alice(), 1, ALICE)); }) diff --git a/code/parachain/frame/oracle/src/tests.rs b/code/parachain/frame/oracle/src/tests.rs index d9bd275f794..deee773c2f6 100644 --- a/code/parachain/frame/oracle/src/tests.rs +++ b/code/parachain/frame/oracle/src/tests.rs @@ -1,5 +1,5 @@ use crate::{ - mock::{AccountId, RuntimeCall, RuntimeEvent, Extrinsic, *}, + mock::{AccountId, Extrinsic, RuntimeCall, RuntimeEvent, *}, AssetInfo, Error, PrePrice, Withdraw, *, }; use codec::Decode; @@ -1850,7 +1850,10 @@ fn should_submit_signed_transaction_on_chain() { assert!(pool_state.read().transactions.is_empty()); let tx = Extrinsic::decode(&mut &*tx).unwrap(); assert_eq!(tx.signature.unwrap().0, 0); - assert_eq!(tx.call, RuntimeCall::Oracle(crate::Call::submit_price { price: 15523, asset_id: 0 })); + assert_eq!( + tx.call, + RuntimeCall::Oracle(crate::Call::submit_price { price: 15523, asset_id: 0 }) + ); }); } diff --git a/code/parachain/frame/pablo/src/mock.rs b/code/parachain/frame/pablo/src/mock.rs index 1be7e7125ef..d85f25e6db5 100644 --- a/code/parachain/frame/pablo/src/mock.rs +++ b/code/parachain/frame/pablo/src/mock.rs @@ -129,9 +129,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs index 6e9063124da..817d7df4822 100644 --- a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs +++ b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests.rs @@ -1241,7 +1241,13 @@ fn add_lp_amounts_get_normalized() { .value; Test::assert_extrinsic_event( - Pablo::add_liquidity(RuntimeOrigin::signed(BOB), pool_id, assets_with_amounts, 0, false), + Pablo::add_liquidity( + RuntimeOrigin::signed(BOB), + pool_id, + assets_with_amounts, + 0, + false, + ), crate::Event::::LiquidityAdded { who: BOB, pool_id: 0, diff --git a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs index 3b6a947d799..51eccfff348 100644 --- a/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs +++ b/code/parachain/frame/pablo/src/test/dual_asset_constant_product_tests_new.rs @@ -199,7 +199,13 @@ mod do_buy { }); assert_noop!( - Pablo::buy(RuntimeOrigin::signed(BOB), pool_id, BTC, AssetAmount::new(BTC, 0), false), + Pablo::buy( + RuntimeOrigin::signed(BOB), + pool_id, + BTC, + AssetAmount::new(BTC, 0), + false + ), crate::Error::::CannotBuyAssetWithItself, ); }); @@ -532,8 +538,13 @@ mod integration { )); let alice_lpt_balance = Tokens::balance(lp_token, &ALICE); - Tokens::transfer(RuntimeOrigin::signed(ALICE), CHARLIE, lp_token, alice_lpt_balance / 2) - .expect("Alice has tokens"); + Tokens::transfer( + RuntimeOrigin::signed(ALICE), + CHARLIE, + lp_token, + alice_lpt_balance / 2, + ) + .expect("Alice has tokens"); let alice_lpt_balance = Tokens::balance(lp_token, &ALICE); let charlie_lpt_balance = Tokens::balance(lp_token, &CHARLIE); diff --git a/code/parachain/frame/pablo/src/test/pablo_tests.rs b/code/parachain/frame/pablo/src/test/pablo_tests.rs index 288bf9c864d..a7cc69a1594 100644 --- a/code/parachain/frame/pablo/src/test/pablo_tests.rs +++ b/code/parachain/frame/pablo/src/test/pablo_tests.rs @@ -40,7 +40,7 @@ mod simulate { use sp_runtime::Permill; use crate::{ - mock::{new_test_ext, RuntimeOrigin, Pablo, System, Test, ALICE}, + mock::{new_test_ext, Pablo, RuntimeOrigin, System, Test, ALICE}, Event, PoolInitConfiguration, }; diff --git a/code/parachain/frame/staking-rewards/src/runtime.rs b/code/parachain/frame/staking-rewards/src/runtime.rs index 7ff06c39195..c6af43276f2 100644 --- a/code/parachain/frame/staking-rewards/src/runtime.rs +++ b/code/parachain/frame/staking-rewards/src/runtime.rs @@ -159,9 +159,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } pub struct NoopRegistry; diff --git a/code/parachain/frame/staking-rewards/src/test/mod.rs b/code/parachain/frame/staking-rewards/src/test/mod.rs index 6181f209100..cb679cb3fa1 100644 --- a/code/parachain/frame/staking-rewards/src/test/mod.rs +++ b/code/parachain/frame/staking-rewards/src/test/mod.rs @@ -333,7 +333,10 @@ fn stake_should_fail_before_start_of_rewards_pool() { let pool_id = PICA::ID; process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool( + RuntimeOrigin::root(), + get_default_reward_pool() + )); assert_noop!( StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration), @@ -372,7 +375,10 @@ fn stake_should_fail_if_amount_is_less_than_minimum() { let pool_id = PICA::ID; process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool( + RuntimeOrigin::root(), + get_default_reward_pool() + )); assert_noop!( StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration), @@ -506,7 +512,10 @@ fn stake_in_case_of_zero_inflation_should_work() { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool( + RuntimeOrigin::root(), + get_default_reward_pool() + )); process_and_progress_blocks::(1); let staker: Public = ALICE; let amount: u128 = 100_500_u128; @@ -938,7 +947,10 @@ fn unstake_non_existent_stake_should_not_work() { fn not_owner_of_stake_can_not_unstake() { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool( + RuntimeOrigin::root(), + get_default_reward_pool() + )); let owner = ALICE; let not_owner = BOB; let pool_id = PICA::ID; @@ -950,7 +962,12 @@ fn not_owner_of_stake_can_not_unstake() { mint_assets([owner, not_owner], [staked_asset_id], amount * 2); process_and_progress_blocks::(1); - assert_ok!(StakingRewards::stake(RuntimeOrigin::signed(owner), pool_id, amount, duration_preset)); + assert_ok!(StakingRewards::stake( + RuntimeOrigin::signed(owner), + pool_id, + amount, + duration_preset + )); assert_noop!( StakingRewards::unstake(RuntimeOrigin::signed(not_owner), 1, 0), @@ -1929,7 +1946,10 @@ fn with_stake( ) -> R { new_test_ext().execute_with(|| { process_and_progress_blocks::(1); - assert_ok!(StakingRewards::create_reward_pool(RuntimeOrigin::root(), get_default_reward_pool())); + assert_ok!(StakingRewards::create_reward_pool( + RuntimeOrigin::root(), + get_default_reward_pool() + )); let staked_asset_id = PICA::ID; let rewards_pool = @@ -1946,7 +1966,8 @@ fn with_stake( process_and_progress_blocks::(1); let fnft_instance_id = stake_and_assert::(staker, PICA::ID, amount, duration); - // assert_ok!(StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, duration)); + // assert_ok!(StakingRewards::stake(RuntimeOrigin::signed(staker), pool_id, amount, + // duration)); assert_eq!(balance(staked_asset_id, &staker), amount); let stake = StakingRewards::stakes(1, 0).expect("stake expected. QED"); diff --git a/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs b/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs index 81bbdf45191..ec28a499198 100644 --- a/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs +++ b/code/parachain/frame/staking-rewards/src/test/test_update_reward_pools.rs @@ -23,7 +23,8 @@ use sp_runtime::{FixedPointNumber, Perbill}; use crate::{ runtime::{ - MaxRewardConfigsPerPool, RuntimeOrigin, StakingRewards, System, Test, Tokens, ALICE, BOB, CHARLIE, + MaxRewardConfigsPerPool, RuntimeOrigin, StakingRewards, System, Test, Tokens, ALICE, BOB, + CHARLIE, }, test::{ default_lock_config, mint_assets, new_test_ext, @@ -206,7 +207,11 @@ fn update_accumulates_properly() { process_and_progress_blocks::(1); Test::assert_extrinsic_event( - StakingRewards::claim(RuntimeOrigin::signed(CHARLIE), STAKING_FNFT_COLLECTION_ID, stake_id), + StakingRewards::claim( + RuntimeOrigin::signed(CHARLIE), + STAKING_FNFT_COLLECTION_ID, + stake_id, + ), crate::Event::Claimed { owner: CHARLIE, fnft_collection_id: STAKING_FNFT_COLLECTION_ID, diff --git a/code/parachain/frame/vault/src/mocks/tests.rs b/code/parachain/frame/vault/src/mocks/tests.rs index 4561bea2ff2..c7117bcb423 100644 --- a/code/parachain/frame/vault/src/mocks/tests.rs +++ b/code/parachain/frame/vault/src/mocks/tests.rs @@ -131,9 +131,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } impl crate::mocks::currency_factory::Config for Test { diff --git a/code/parachain/frame/vault/src/tests.rs b/code/parachain/frame/vault/src/tests.rs index ce04a63eabb..43ba0688f9f 100644 --- a/code/parachain/frame/vault/src/tests.rs +++ b/code/parachain/frame/vault/src/tests.rs @@ -2,9 +2,9 @@ use crate::{ mocks::{ currency_factory::MockCurrencyId, tests::{ - AccountId, Balance, Balances, BlockNumber, CreationDeposit, RuntimeEvent, ExistentialDeposit, - ExtBuilder, RuntimeOrigin, System, Test, Tokens, TombstoneDuration, Vaults, - ACCOUNT_FREE_START, ALICE, BOB, CHARLIE, MINIMUM_BALANCE, + AccountId, Balance, Balances, BlockNumber, CreationDeposit, ExistentialDeposit, + ExtBuilder, RuntimeEvent, RuntimeOrigin, System, Test, Tokens, TombstoneDuration, + Vaults, ACCOUNT_FREE_START, ALICE, BOB, CHARLIE, MINIMUM_BALANCE, }, }, models::VaultInfo, diff --git a/code/parachain/frame/vesting/src/mock.rs b/code/parachain/frame/vesting/src/mock.rs index ebae9bcd03d..eacbe180a43 100644 --- a/code/parachain/frame/vesting/src/mock.rs +++ b/code/parachain/frame/vesting/src/mock.rs @@ -147,9 +147,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Everything; type OnNewTokenAccount = (); type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } parameter_types! { diff --git a/code/parachain/frame/vesting/src/tests.rs b/code/parachain/frame/vesting/src/tests.rs index 8969fa3ff88..6f74ed9548c 100644 --- a/code/parachain/frame/vesting/src/tests.rs +++ b/code/parachain/frame/vesting/src/tests.rs @@ -526,7 +526,9 @@ fn claim_works() { System::set_block_number(11); // remain locked if not claimed - assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10).is_err()); + assert!( + Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10).is_err() + ); // unlocked after claiming assert_ok!(Vesting::claim( RuntimeOrigin::signed(BOB), @@ -546,7 +548,9 @@ fn claim_works() { assert!(VestingSchedules::::contains_key(BOB, MockCurrencyId::BTC)); assert_ok!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 10)); // more are still locked - assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); + assert!( + Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err() + ); System::set_block_number(21); // claim more @@ -592,7 +596,11 @@ fn claim_nonexistent_schedules() { // Claim all schedules assert_noop!( - Vesting::claim(RuntimeOrigin::signed(BOB), MockCurrencyId::BTC, VestingScheduleIdSet::All,), + Vesting::claim( + RuntimeOrigin::signed(BOB), + MockCurrencyId::BTC, + VestingScheduleIdSet::All, + ), Error::::VestingScheduleNotFound ); @@ -1165,7 +1173,9 @@ fn update_vesting_schedules_works() { MockCurrencyId::BTC, VestingScheduleIdSet::All )); - assert!(Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err()); + assert!( + Tokens::transfer(RuntimeOrigin::signed(BOB), ALICE, MockCurrencyId::BTC, 1).is_err() + ); System::set_block_number(21); Timestamp::set_timestamp(System::block_number() * MILLISECS_PER_BLOCK); diff --git a/code/parachain/runtime/common/src/rewards.rs b/code/parachain/runtime/common/src/rewards.rs index 64a2e04f159..30edde3b5ca 100644 --- a/code/parachain/runtime/common/src/rewards.rs +++ b/code/parachain/runtime/common/src/rewards.rs @@ -184,9 +184,9 @@ mod tests { type DustRemovalWhitelist = Everything; type OnKilledTokenAccount = (); type OnNewTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); } ord_parameter_types! { diff --git a/code/parachain/runtime/composable/src/lib.rs b/code/parachain/runtime/composable/src/lib.rs index f5051ce6332..6989f4d04a9 100644 --- a/code/parachain/runtime/composable/src/lib.rs +++ b/code/parachain/runtime/composable/src/lib.rs @@ -870,7 +870,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO(hussein) Still broken on v0.9.30 + // TODO(hussein) Still broken on v0.9.30 // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 058e48c8fc8..7b877d75e75 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1427,7 +1427,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO(hussein) Still broken on v0.9.30 + // TODO(hussein) Still broken on v0.9.30 // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index 7134c9791ea..39787c5362f 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -901,7 +901,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO(hussein) Still broken on v0.9.30 + // TODO(hussein) Still broken on v0.9.30 // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] diff --git a/code/parachain/runtime/picasso/src/migrations.rs b/code/parachain/runtime/picasso/src/migrations.rs index aa39d97c88a..e6570072bcf 100644 --- a/code/parachain/runtime/picasso/src/migrations.rs +++ b/code/parachain/runtime/picasso/src/migrations.rs @@ -187,9 +187,17 @@ mod tests { unhashed::put_raw(&old_prefix, &[42]); let hash_root = storage_root(StateVersion::V1); - assert_ne!(TechCollectiveRenameMigration::on_runtime_upgrade(), Weight::from_ref_time(0)); + assert_ne!( + TechCollectiveRenameMigration::on_runtime_upgrade(), + Weight::from_ref_time(0) + ); assert_ne!(hash_root, storage_root(StateVersion::V1)); - let updated = || assert_eq!(TechCollectiveRenameMigration::on_runtime_upgrade(), Weight::from_ref_time(0)); + let updated = || { + assert_eq!( + TechCollectiveRenameMigration::on_runtime_upgrade(), + Weight::from_ref_time(0) + ) + }; assert_storage_noop!(updated()); assert!(unhashed::get_raw(&old_prefix).is_none()); From 08e843ba58d329dcec13158e16da617016fd5ec0 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 14:30:15 +0100 Subject: [PATCH 38/44] feat(dali): disable lending benchmarking --- code/parachain/runtime/dali/src/lib.rs | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 7b877d75e75..8ecd5dd128d 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1427,7 +1427,7 @@ mod benches { [balances, Balances] [session, SessionBench::] [timestamp, Timestamp] - // TODO(hussein) Still broken on v0.9.30 + // TODO(hussein) Still broken on v0.9.30 // [collator_selection, CollatorSelection] [indices, Indices] [membership, CouncilMembership] @@ -1445,7 +1445,24 @@ mod benches { [mosaic, Mosaic] [liquidations, Liquidations] [bonded_finance, BondedFinance] - [lending, Lending] + // TODO(hussein): broken as of v0.9.30 + // [lending, Lending] + /* + 2023-01-17 13:01:50 panicked at 'Timestamp slot must match `CurrentSlot`', /sources/b44e579ebfa6a9c3cb36e320617fc592078911c53e5f75fcffd348678aec1f49/pallet-aura-4.0.0-dev/src/lib.rs:299:9 +Error: + 0: Invalid input: Error executing and verifying runtime benchmark: Execution aborted due to trap: wasm trap: wasm `unreachable` instruction executed + WASM backtrace: + + 0: 0x7c44 - !rust_begin_unwind + 1: 0x15456 - !core::panicking::panic_fmt::hbd719b21b7458dd3 + 2: 0x518a89 - !pallet_aura::::Moment> for pallet_aura::pallet::Pallet>::on_timestamp_set::h18f88ba233c0b591 + 3: 0x54665d - !pallet_timestamp::>::set_timestamp::ha4c72baaa2c36987 + 4: 0x801c62 - !pallet_lending::benchmarking::setup::produce_block::hf5f1f77bfd4bce7c + 5: 0x8e59c3 - !>::instance::h48a1d91aceee3bf1 + 6: 0x90679c - !pallet_lending::benchmarking::>::run_benchmark::hb135064c01208619 + 7: 0x8d23f7 - !,sp_runtime::generic::unchecked_extrinsic::UncheckedExtrinsic::Signer as sp_runtime::traits::IdentifyAccount>::AccountId,u32>,dali_runtime::RuntimeCall,sp_runtime::MultiSignature,(frame_system::extensions::check_non_zero_sender::CheckNonZeroSender,frame_system::extensions::check_spec_version::CheckSpecVersion,frame_system::extensions::check_tx_version::CheckTxVersion,frame_system::extensions::check_genesis::CheckGenesis,frame_system::extensions::check_mortality::CheckMortality,frame_system::extensions::check_nonce::CheckNonce,frame_system::extensions::check_weight::CheckWeight,pallet_asset_tx_payment::ChargeAssetTxPayment)>>>>::dispatch_benchmark::h2e63e652b0d76345 + 8: 0x965f70 - !Benchmark_dispatch_benchmark + */ [assets_registry, AssetsRegistry] [pablo, Pablo] [pallet_staking_rewards, StakingRewards] From 03df5b82f6ea18189848be7aa2a62f0f9ef7ee3f Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 14:35:32 +0100 Subject: [PATCH 39/44] chore: fix clippy unncessary cast --- .../frame/assets-registry/src/weights.rs | 6 +- code/parachain/frame/assets/src/weights.rs | 120 +-- .../frame/call-filter/src/weights.rs | 12 +- code/parachain/frame/cosmwasm/src/weights.rs | 816 +++++++++--------- .../frame/crowdloan-rewards/src/weights.rs | 38 +- .../frame/currency-factory/src/weights.rs | 6 +- .../frame/dutch-auction/src/weights.rs | 32 +- .../frame/governance-registry/src/weights.rs | 36 +- code/parachain/frame/lending/src/weights.rs | 71 +- .../frame/liquidations/src/weights.rs | 16 +- code/parachain/frame/oracle/src/weights.rs | 120 +-- code/parachain/frame/vault/src/weights.rs | 96 +-- code/parachain/frame/vesting/src/weights.rs | 26 +- .../composable/src/weights/balances.rs | 42 +- .../src/weights/collator_selection.rs | 50 +- .../composable/src/weights/collective.rs | 104 +-- .../src/weights/currency_factory.rs | 12 +- .../composable/src/weights/democracy.rs | 198 ++--- .../composable/src/weights/frame_system.rs | 32 +- .../runtime/composable/src/weights/indices.rs | 30 +- .../composable/src/weights/membership.rs | 54 +- .../composable/src/weights/scheduler.rs | 144 ++-- .../runtime/composable/src/weights/session.rs | 12 +- .../composable/src/weights/timestamp.rs | 8 +- .../runtime/composable/src/weights/tokens.rs | 30 +- .../composable/src/weights/treasury.rs | 40 +- .../runtime/composable/src/weights/utility.rs | 16 +- code/parachain/runtime/dali/src/lib.rs | 94 +- .../dali/src/weights/assets_registry.rs | 18 +- .../runtime/dali/src/weights/balances.rs | 42 +- .../dali/src/weights/bonded_finance.rs | 18 +- .../dali/src/weights/collator_selection.rs | 50 +- .../runtime/dali/src/weights/collective.rs | 104 +-- .../runtime/dali/src/weights/cosmwasm.rs | 398 ++++----- .../dali/src/weights/crowdloan_rewards.rs | 36 +- .../dali/src/weights/currency_factory.rs | 10 +- .../runtime/dali/src/weights/democracy.rs | 198 ++--- .../runtime/dali/src/weights/dex_router.rs | 30 +- .../runtime/dali/src/weights/dutch_auction.rs | 34 +- .../runtime/dali/src/weights/frame_system.rs | 32 +- .../runtime/dali/src/weights/identity.rs | 152 ++-- .../runtime/dali/src/weights/indices.rs | 30 +- .../runtime/dali/src/weights/lending.rs | 84 +- .../runtime/dali/src/weights/liquidations.rs | 16 +- .../runtime/dali/src/weights/membership.rs | 54 +- .../runtime/dali/src/weights/mosaic.rs | 80 +- .../runtime/dali/src/weights/multisig.rs | 88 +- .../runtime/dali/src/weights/oracle.rs | 60 +- .../runtime/dali/src/weights/pablo.rs | 36 +- .../src/weights/pallet_staking_rewards.rs | 72 +- .../runtime/dali/src/weights/proxy.rs | 66 +- .../runtime/dali/src/weights/scheduler.rs | 144 ++-- .../runtime/dali/src/weights/session.rs | 12 +- .../runtime/dali/src/weights/timestamp.rs | 8 +- .../runtime/dali/src/weights/tokens.rs | 30 +- .../runtime/dali/src/weights/treasury.rs | 40 +- .../runtime/dali/src/weights/utility.rs | 24 +- .../runtime/dali/src/weights/vault.rs | 48 +- .../runtime/dali/src/weights/vesting.rs | 30 +- .../picasso/src/weights/assets_registry.rs | 18 +- .../runtime/picasso/src/weights/balances.rs | 42 +- .../picasso/src/weights/bonded_finance.rs | 18 +- .../picasso/src/weights/collator_selection.rs | 50 +- .../runtime/picasso/src/weights/collective.rs | 104 +-- .../picasso/src/weights/crowdloan_rewards.rs | 38 +- .../picasso/src/weights/currency_factory.rs | 10 +- .../runtime/picasso/src/weights/democracy.rs | 198 ++--- .../picasso/src/weights/frame_system.rs | 32 +- .../runtime/picasso/src/weights/identity.rs | 150 ++-- .../runtime/picasso/src/weights/indices.rs | 30 +- .../runtime/picasso/src/weights/membership.rs | 54 +- .../runtime/picasso/src/weights/multisig.rs | 88 +- .../runtime/picasso/src/weights/pablo.rs | 36 +- .../runtime/picasso/src/weights/proxy.rs | 72 +- .../runtime/picasso/src/weights/scheduler.rs | 144 ++-- .../runtime/picasso/src/weights/session.rs | 12 +- .../runtime/picasso/src/weights/timestamp.rs | 8 +- .../runtime/picasso/src/weights/tokens.rs | 30 +- .../runtime/picasso/src/weights/treasury.rs | 40 +- .../runtime/picasso/src/weights/utility.rs | 24 +- .../runtime/picasso/src/weights/vesting.rs | 30 +- 81 files changed, 2766 insertions(+), 2767 deletions(-) diff --git a/code/parachain/frame/assets-registry/src/weights.rs b/code/parachain/frame/assets-registry/src/weights.rs index 62425ea6419..e7bbffb312d 100644 --- a/code/parachain/frame/assets-registry/src/weights.rs +++ b/code/parachain/frame/assets-registry/src/weights.rs @@ -30,12 +30,12 @@ impl WeightInfo for () { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn register_asset() -> Weight { - Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000_u64).saturating_add(T::DbWeight::get().writes(1_u64)) } fn update_asset() -> Weight { - Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000_u64).saturating_add(T::DbWeight::get().writes(1_u64)) } fn set_min_fee() -> Weight { - Weight::from_ref_time(9_958_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(9_958_000_u64).saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/frame/assets/src/weights.rs b/code/parachain/frame/assets/src/weights.rs index d6644e9e888..62c82d87536 100644 --- a/code/parachain/frame/assets/src/weights.rs +++ b/code/parachain/frame/assets/src/weights.rs @@ -23,121 +23,121 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn transfer_all() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn transfer_all_native() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn transfer() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn transfer_native() -> Weight { - Weight::from_ref_time(70_665_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(70_665_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn force_transfer_native() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn mint_initialize() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn set_administrator() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn mint_into() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn burn_from() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } } // For backwards compatibility and tests impl WeightInfo for () { fn transfer_native() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn force_transfer_native() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_all() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_all_native() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn mint_initialize() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn set_administrator() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn mint_into() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn burn_from() -> Weight { - Weight::from_ref_time(81_458_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(81_458_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/frame/call-filter/src/weights.rs b/code/parachain/frame/call-filter/src/weights.rs index 8b095ad78c2..57614b588e8 100644 --- a/code/parachain/frame/call-filter/src/weights.rs +++ b/code/parachain/frame/call-filter/src/weights.rs @@ -15,13 +15,13 @@ pub trait WeightInfo { // For backwards compatibility and tests impl WeightInfo for () { fn disable() -> Weight { - Weight::from_ref_time(25_798_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_798_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn enable() -> Weight { - Weight::from_ref_time(25_355_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_355_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/frame/cosmwasm/src/weights.rs b/code/parachain/frame/cosmwasm/src/weights.rs index 98b7415f513..4668836dc0a 100644 --- a/code/parachain/frame/cosmwasm/src/weights.rs +++ b/code/parachain/frame/cosmwasm/src/weights.rs @@ -142,11 +142,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - Weight::from_ref_time(288_447_000 as u64) + Weight::from_ref_time(288_447_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(45_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + .saturating_add(Weight::from_ref_time(45_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -158,13 +158,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(671_760_000 as u64) + Weight::from_ref_time(671_760_000_u64) // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(23_111_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(23_111_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -175,13 +175,13 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn execute(n: u32, ) -> Weight { - Weight::from_ref_time(662_248_000 as u64) + Weight::from_ref_time(662_248_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(22_792_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(22_792_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -192,9 +192,9 @@ impl WeightInfo for SubstrateWeight { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - Weight::from_ref_time(793_332_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(793_332_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -202,88 +202,88 @@ impl WeightInfo for SubstrateWeight { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - Weight::from_ref_time(224_958_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(224_958_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - Weight::from_ref_time(7_708_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(7_708_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - Weight::from_ref_time(7_625_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(7_625_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - Weight::from_ref_time(8_167_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(8_167_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn db_scan() -> Weight { - Weight::from_ref_time(3_708_000 as u64) + Weight::from_ref_time(3_708_000_u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - Weight::from_ref_time(16_541_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(16_541_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - Weight::from_ref_time(4_958_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(4_958_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - Weight::from_ref_time(2_792_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(2_792_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn transfer(n: u32, ) -> Weight { - Weight::from_ref_time(9_198_000 as u64) + Weight::from_ref_time(9_198_000_u64) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(21_063_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(21_063_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - Weight::from_ref_time(5_625_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(5_625_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn running_contract_meta() -> Weight { - Weight::from_ref_time(3_584_000 as u64) + Weight::from_ref_time(3_584_000_u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - Weight::from_ref_time(3_958_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(3_958_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } fn addr_validate() -> Weight { - Weight::from_ref_time(750_000 as u64) + Weight::from_ref_time(750_000_u64) } fn addr_canonicalize() -> Weight { - Weight::from_ref_time(750_000 as u64) + Weight::from_ref_time(750_000_u64) } fn addr_humanize() -> Weight { - Weight::from_ref_time(167_000 as u64) + Weight::from_ref_time(167_000_u64) } fn secp256k1_recover_pubkey() -> Weight { - Weight::from_ref_time(34_166_000 as u64) + Weight::from_ref_time(34_166_000_u64) } fn secp256k1_verify() -> Weight { - Weight::from_ref_time(34_166_000 as u64) + Weight::from_ref_time(34_166_000_u64) } fn ed25519_verify() -> Weight { - Weight::from_ref_time(37_333_000 as u64) + Weight::from_ref_time(37_333_000_u64) } fn ed25519_batch_verify() -> Weight { - Weight::from_ref_time(152_458_000 as u64) + Weight::from_ref_time(152_458_000_u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -294,454 +294,454 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn continue_instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(650_499_000 as u64) + Weight::from_ref_time(650_499_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(21_625_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(21_625_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 23]`. fn continue_execute(n: u32, ) -> Weight { - Weight::from_ref_time(622_227_000 as u64) + Weight::from_ref_time(622_227_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(Weight::from_ref_time(528_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - Weight::from_ref_time(545_749_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + Weight::from_ref_time(545_749_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_query() -> Weight { - Weight::from_ref_time(533_416_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + Weight::from_ref_time(533_416_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_reply() -> Weight { - Weight::from_ref_time(537_248_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + Weight::from_ref_time(537_248_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - Weight::from_ref_time(10_834_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(10_834_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - Weight::from_ref_time(11_917_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(11_917_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - Weight::from_ref_time(86_021_000 as u64) + Weight::from_ref_time(86_021_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(493_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(493_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(491_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - Weight::from_ref_time(85_840_000 as u64) + Weight::from_ref_time(85_840_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_860_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_860_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - Weight::from_ref_time(85_954_000 as u64) + Weight::from_ref_time(85_954_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(1_853_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_853_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - Weight::from_ref_time(86_250_000 as u64) + Weight::from_ref_time(86_250_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_786_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_786_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - Weight::from_ref_time(85_839_000 as u64) + Weight::from_ref_time(85_839_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_804_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_804_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(86_133_000 as u64) + Weight::from_ref_time(86_133_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_065_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - Weight::from_ref_time(85_860_000 as u64) + Weight::from_ref_time(85_860_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(870_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(870_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(86_085_000 as u64) + Weight::from_ref_time(86_085_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_058_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - Weight::from_ref_time(86_209_000 as u64) + Weight::from_ref_time(86_209_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_064_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - Weight::from_ref_time(86_150_000 as u64) + Weight::from_ref_time(86_150_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_055_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - Weight::from_ref_time(86_678_000 as u64) + Weight::from_ref_time(86_678_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_042_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_042_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - Weight::from_ref_time(86_166_000 as u64) + Weight::from_ref_time(86_166_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_054_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - Weight::from_ref_time(86_364_000 as u64) + Weight::from_ref_time(86_364_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(857_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(857_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - Weight::from_ref_time(85_914_000 as u64) + Weight::from_ref_time(85_914_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(866_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(866_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - Weight::from_ref_time(85_996_000 as u64) + Weight::from_ref_time(85_996_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(862_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - Weight::from_ref_time(86_224_000 as u64) + Weight::from_ref_time(86_224_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_052_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_052_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Sub(r: u32, ) -> Weight { - Weight::from_ref_time(86_126_000 as u64) + Weight::from_ref_time(86_126_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_068_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(86_389_000 as u64) + Weight::from_ref_time(86_389_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_056_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_056_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - Weight::from_ref_time(85_985_000 as u64) + Weight::from_ref_time(85_985_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_126_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_126_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - Weight::from_ref_time(86_128_000 as u64) + Weight::from_ref_time(86_128_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_069_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - Weight::from_ref_time(86_232_000 as u64) + Weight::from_ref_time(86_232_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_104_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_104_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - Weight::from_ref_time(86_414_000 as u64) + Weight::from_ref_time(86_414_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - Weight::from_ref_time(86_296_000 as u64) + Weight::from_ref_time(86_296_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_051_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_051_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - Weight::from_ref_time(86_279_000 as u64) + Weight::from_ref_time(86_279_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_053_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - Weight::from_ref_time(86_156_000 as u64) + Weight::from_ref_time(86_156_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_058_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - Weight::from_ref_time(86_356_000 as u64) + Weight::from_ref_time(86_356_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - Weight::from_ref_time(86_241_000 as u64) + Weight::from_ref_time(86_241_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_054_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - Weight::from_ref_time(86_047_000 as u64) + Weight::from_ref_time(86_047_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(862_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - Weight::from_ref_time(86_022_000 as u64) + Weight::from_ref_time(86_022_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(86_081_000 as u64) + Weight::from_ref_time(86_081_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_065_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(86_285_000 as u64) + Weight::from_ref_time(86_285_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_053_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_066_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - Weight::from_ref_time(86_207_000 as u64) + Weight::from_ref_time(86_207_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_061_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - Weight::from_ref_time(86_349_000 as u64) + Weight::from_ref_time(86_349_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_068_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - Weight::from_ref_time(86_191_000 as u64) + Weight::from_ref_time(86_191_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_061_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - Weight::from_ref_time(85_991_000 as u64) + Weight::from_ref_time(85_991_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(895_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(895_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - Weight::from_ref_time(86_036_000 as u64) + Weight::from_ref_time(86_036_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - Weight::from_ref_time(86_010_000 as u64) + Weight::from_ref_time(86_010_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(941_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(941_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - Weight::from_ref_time(86_101_000 as u64) + Weight::from_ref_time(86_101_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(929_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(929_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - Weight::from_ref_time(85_978_000 as u64) + Weight::from_ref_time(85_978_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(926_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - Weight::from_ref_time(86_017_000 as u64) + Weight::from_ref_time(86_017_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_123_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_123_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - Weight::from_ref_time(85_956_000 as u64) + Weight::from_ref_time(85_956_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(926_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - Weight::from_ref_time(86_242_000 as u64) + Weight::from_ref_time(86_242_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_066_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - Weight::from_ref_time(85_989_000 as u64) + Weight::from_ref_time(85_989_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_077_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_077_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(86_007_000 as u64) + Weight::from_ref_time(86_007_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_069_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_071_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_071_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - Weight::from_ref_time(86_028_000 as u64) + Weight::from_ref_time(86_028_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(1_179_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_179_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - Weight::from_ref_time(86_050_000 as u64) + Weight::from_ref_time(86_050_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_177_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_177_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_064_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - Weight::from_ref_time(86_056_000 as u64) + Weight::from_ref_time(86_056_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_260_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_260_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - Weight::from_ref_time(85_880_000 as u64) + Weight::from_ref_time(85_880_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(528_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - Weight::from_ref_time(85_871_000 as u64) + Weight::from_ref_time(85_871_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(842_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(842_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(86_297_000 as u64) + Weight::from_ref_time(86_297_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(547_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(547_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(85_933_000 as u64) + Weight::from_ref_time(85_933_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(529_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(529_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - Weight::from_ref_time(86_007_000 as u64) + Weight::from_ref_time(86_007_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(_r: u32, ) -> Weight { - Weight::from_ref_time(85_923_000 as u64) + Weight::from_ref_time(85_923_000_u64) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(_r: u32, ) -> Weight { - Weight::from_ref_time(85_975_000 as u64) + Weight::from_ref_time(85_975_000_u64) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - Weight::from_ref_time(85_875_000 as u64) + Weight::from_ref_time(85_875_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(587_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(587_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 28_951_000 - .saturating_add(Weight::from_ref_time(1_478_646_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_478_646_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - Weight::from_ref_time(85_873_000 as u64) + Weight::from_ref_time(85_873_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(262_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(262_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - Weight::from_ref_time(85_877_000 as u64) + Weight::from_ref_time(85_877_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(514_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_114_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_114_000_u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(s: u32, ) -> Weight { - Weight::from_ref_time(87_175_000 as u64) + Weight::from_ref_time(87_175_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(4_000_u64).saturating_mul(s as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - Weight::from_ref_time(86_587_000 as u64) + Weight::from_ref_time(86_587_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(6_861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(6_861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CallIndirect(r: u32, ) -> Weight { - Weight::from_ref_time(86_709_000 as u64) + Weight::from_ref_time(86_709_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(8_256_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(8_256_000_u64).saturating_mul(r as u64)) } } @@ -755,11 +755,11 @@ impl WeightInfo for () { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - Weight::from_ref_time(288_447_000 as u64) + Weight::from_ref_time(288_447_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(45_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(6 as u64)) + .saturating_add(Weight::from_ref_time(45_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(6_u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -771,13 +771,13 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(671_760_000 as u64) + Weight::from_ref_time(671_760_000_u64) // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(23_111_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads(6 as u64)) - .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) - .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(23_111_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(6_u64)) + .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(3_u64)) + .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -788,13 +788,13 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn execute(n: u32, ) -> Weight { - Weight::from_ref_time(662_248_000 as u64) + Weight::from_ref_time(662_248_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(22_792_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) - .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(22_792_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(1_u64)) + .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -805,9 +805,9 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - Weight::from_ref_time(793_332_000 as u64) - .saturating_add(RocksDbWeight::get().reads(8 as u64)) - .saturating_add(RocksDbWeight::get().writes(7 as u64)) + Weight::from_ref_time(793_332_000_u64) + .saturating_add(RocksDbWeight::get().reads(8_u64)) + .saturating_add(RocksDbWeight::get().writes(7_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -815,88 +815,88 @@ impl WeightInfo for () { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - Weight::from_ref_time(224_958_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(224_958_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - Weight::from_ref_time(7_708_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(7_708_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - Weight::from_ref_time(7_625_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(7_625_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - Weight::from_ref_time(8_167_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(8_167_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn db_scan() -> Weight { - Weight::from_ref_time(3_708_000 as u64) + Weight::from_ref_time(3_708_000_u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - Weight::from_ref_time(16_541_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(16_541_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - Weight::from_ref_time(4_958_000 as u64) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(4_958_000_u64) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - Weight::from_ref_time(2_792_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(2_792_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn transfer(n: u32, ) -> Weight { - Weight::from_ref_time(9_198_000 as u64) + Weight::from_ref_time(9_198_000_u64) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(21_063_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(21_063_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - Weight::from_ref_time(5_625_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(5_625_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn running_contract_meta() -> Weight { - Weight::from_ref_time(3_584_000 as u64) + Weight::from_ref_time(3_584_000_u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - Weight::from_ref_time(3_958_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(3_958_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) } fn addr_validate() -> Weight { - Weight::from_ref_time(750_000 as u64) + Weight::from_ref_time(750_000_u64) } fn addr_canonicalize() -> Weight { - Weight::from_ref_time(750_000 as u64) + Weight::from_ref_time(750_000_u64) } fn addr_humanize() -> Weight { - Weight::from_ref_time(167_000 as u64) + Weight::from_ref_time(167_000_u64) } fn secp256k1_recover_pubkey() -> Weight { - Weight::from_ref_time(34_166_000 as u64) + Weight::from_ref_time(34_166_000_u64) } fn secp256k1_verify() -> Weight { - Weight::from_ref_time(34_166_000 as u64) + Weight::from_ref_time(34_166_000_u64) } fn ed25519_verify() -> Weight { - Weight::from_ref_time(37_333_000 as u64) + Weight::from_ref_time(37_333_000_u64) } fn ed25519_batch_verify() -> Weight { - Weight::from_ref_time(152_458_000 as u64) + Weight::from_ref_time(152_458_000_u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -907,453 +907,453 @@ impl WeightInfo for () { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 23]`. fn continue_instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(650_499_000 as u64) + Weight::from_ref_time(650_499_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(21_625_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) - .saturating_add(RocksDbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(21_625_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(RocksDbWeight::get().writes(3_u64)) + .saturating_add(RocksDbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 23]`. fn continue_execute(n: u32, ) -> Weight { - Weight::from_ref_time(622_227_000 as u64) + Weight::from_ref_time(622_227_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(n as u64)) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) + .saturating_add(Weight::from_ref_time(528_000_u64).saturating_mul(n as u64)) + .saturating_add(RocksDbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - Weight::from_ref_time(545_749_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) + Weight::from_ref_time(545_749_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_query() -> Weight { - Weight::from_ref_time(533_416_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) + Weight::from_ref_time(533_416_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_reply() -> Weight { - Weight::from_ref_time(537_248_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) + Weight::from_ref_time(537_248_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - Weight::from_ref_time(10_834_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) + Weight::from_ref_time(10_834_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - Weight::from_ref_time(11_917_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) + Weight::from_ref_time(11_917_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - Weight::from_ref_time(86_021_000 as u64) + Weight::from_ref_time(86_021_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(493_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(493_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(491_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - Weight::from_ref_time(85_840_000 as u64) + Weight::from_ref_time(85_840_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_860_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_860_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - Weight::from_ref_time(85_954_000 as u64) + Weight::from_ref_time(85_954_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(1_853_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_853_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - Weight::from_ref_time(86_250_000 as u64) + Weight::from_ref_time(86_250_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_786_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_786_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - Weight::from_ref_time(85_839_000 as u64) + Weight::from_ref_time(85_839_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_804_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_804_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(86_133_000 as u64) + Weight::from_ref_time(86_133_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_065_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - Weight::from_ref_time(85_860_000 as u64) + Weight::from_ref_time(85_860_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(870_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(870_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(86_085_000 as u64) + Weight::from_ref_time(86_085_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_058_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - Weight::from_ref_time(86_209_000 as u64) + Weight::from_ref_time(86_209_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_064_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - Weight::from_ref_time(86_150_000 as u64) + Weight::from_ref_time(86_150_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_055_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - Weight::from_ref_time(86_678_000 as u64) + Weight::from_ref_time(86_678_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_042_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_042_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - Weight::from_ref_time(86_166_000 as u64) + Weight::from_ref_time(86_166_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_054_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - Weight::from_ref_time(86_364_000 as u64) + Weight::from_ref_time(86_364_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(857_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(857_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - Weight::from_ref_time(85_914_000 as u64) + Weight::from_ref_time(85_914_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(866_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(866_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - Weight::from_ref_time(85_996_000 as u64) + Weight::from_ref_time(85_996_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(862_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - Weight::from_ref_time(86_224_000 as u64) + Weight::from_ref_time(86_224_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_052_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_052_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Sub(r: u32, ) -> Weight { - Weight::from_ref_time(86_126_000 as u64) + Weight::from_ref_time(86_126_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_068_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(86_389_000 as u64) + Weight::from_ref_time(86_389_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_056_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_056_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - Weight::from_ref_time(85_985_000 as u64) + Weight::from_ref_time(85_985_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_126_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_126_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - Weight::from_ref_time(86_128_000 as u64) + Weight::from_ref_time(86_128_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_069_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - Weight::from_ref_time(86_232_000 as u64) + Weight::from_ref_time(86_232_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_104_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_104_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - Weight::from_ref_time(86_414_000 as u64) + Weight::from_ref_time(86_414_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - Weight::from_ref_time(86_296_000 as u64) + Weight::from_ref_time(86_296_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_051_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_051_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - Weight::from_ref_time(86_279_000 as u64) + Weight::from_ref_time(86_279_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_053_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - Weight::from_ref_time(86_156_000 as u64) + Weight::from_ref_time(86_156_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_058_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_058_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - Weight::from_ref_time(86_356_000 as u64) + Weight::from_ref_time(86_356_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - Weight::from_ref_time(86_241_000 as u64) + Weight::from_ref_time(86_241_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_054_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_057_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_057_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - Weight::from_ref_time(86_047_000 as u64) + Weight::from_ref_time(86_047_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(862_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(862_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - Weight::from_ref_time(86_022_000 as u64) + Weight::from_ref_time(86_022_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(86_081_000 as u64) + Weight::from_ref_time(86_081_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_065_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_065_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(86_285_000 as u64) + Weight::from_ref_time(86_285_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_053_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_053_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_066_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - Weight::from_ref_time(86_207_000 as u64) + Weight::from_ref_time(86_207_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_061_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - Weight::from_ref_time(86_349_000 as u64) + Weight::from_ref_time(86_349_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_068_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_068_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - Weight::from_ref_time(86_191_000 as u64) + Weight::from_ref_time(86_191_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_061_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_061_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - Weight::from_ref_time(85_991_000 as u64) + Weight::from_ref_time(85_991_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(895_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(895_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - Weight::from_ref_time(86_036_000 as u64) + Weight::from_ref_time(86_036_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - Weight::from_ref_time(86_010_000 as u64) + Weight::from_ref_time(86_010_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(941_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(941_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - Weight::from_ref_time(86_101_000 as u64) + Weight::from_ref_time(86_101_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(929_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(929_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - Weight::from_ref_time(85_978_000 as u64) + Weight::from_ref_time(85_978_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(926_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - Weight::from_ref_time(86_017_000 as u64) + Weight::from_ref_time(86_017_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_123_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_123_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - Weight::from_ref_time(85_956_000 as u64) + Weight::from_ref_time(85_956_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(926_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(926_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - Weight::from_ref_time(86_242_000 as u64) + Weight::from_ref_time(86_242_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_066_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_066_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - Weight::from_ref_time(85_989_000 as u64) + Weight::from_ref_time(85_989_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_077_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_077_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(86_007_000 as u64) + Weight::from_ref_time(86_007_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_069_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_069_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_071_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_071_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - Weight::from_ref_time(86_028_000 as u64) + Weight::from_ref_time(86_028_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(1_179_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_179_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - Weight::from_ref_time(86_050_000 as u64) + Weight::from_ref_time(86_050_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_177_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_177_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - Weight::from_ref_time(86_113_000 as u64) + Weight::from_ref_time(86_113_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_064_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_064_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - Weight::from_ref_time(86_056_000 as u64) + Weight::from_ref_time(86_056_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_260_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_260_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - Weight::from_ref_time(85_880_000 as u64) + Weight::from_ref_time(85_880_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(528_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - Weight::from_ref_time(85_871_000 as u64) + Weight::from_ref_time(85_871_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(842_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(842_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(86_297_000 as u64) + Weight::from_ref_time(86_297_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(547_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(547_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(85_933_000 as u64) + Weight::from_ref_time(85_933_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(529_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(529_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - Weight::from_ref_time(86_007_000 as u64) + Weight::from_ref_time(86_007_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(_r: u32, ) -> Weight { - Weight::from_ref_time(85_923_000 as u64) + Weight::from_ref_time(85_923_000_u64) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(_r: u32, ) -> Weight { - Weight::from_ref_time(85_975_000 as u64) + Weight::from_ref_time(85_975_000_u64) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - Weight::from_ref_time(85_875_000 as u64) + Weight::from_ref_time(85_875_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(587_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(587_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 28_951_000 - .saturating_add(Weight::from_ref_time(1_478_646_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_478_646_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - Weight::from_ref_time(85_873_000 as u64) + Weight::from_ref_time(85_873_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(262_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(262_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - Weight::from_ref_time(85_877_000 as u64) + Weight::from_ref_time(85_877_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(514_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - Weight::from_ref_time(86_084_000 as u64) + Weight::from_ref_time(86_084_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_114_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_114_000_u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(s: u32, ) -> Weight { - Weight::from_ref_time(87_175_000 as u64) + Weight::from_ref_time(87_175_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(4_000_u64).saturating_mul(s as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - Weight::from_ref_time(86_587_000 as u64) + Weight::from_ref_time(86_587_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(6_861_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(6_861_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CallIndirect(r: u32, ) -> Weight { - Weight::from_ref_time(86_709_000 as u64) + Weight::from_ref_time(86_709_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(8_256_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(8_256_000_u64).saturating_mul(r as u64)) } } diff --git a/code/parachain/frame/crowdloan-rewards/src/weights.rs b/code/parachain/frame/crowdloan-rewards/src/weights.rs index f77c7c0756d..ee824281d4a 100644 --- a/code/parachain/frame/crowdloan-rewards/src/weights.rs +++ b/code/parachain/frame/crowdloan-rewards/src/weights.rs @@ -23,21 +23,21 @@ impl WeightInfo for () { // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 109_000 - .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().reads((1 as u64).saturating_mul(x as u64))) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) - .saturating_add(RocksDbWeight::get().writes((1 as u64).saturating_mul(x as u64))) + .saturating_add(Weight::from_ref_time(6_792_000_u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(x as u64))) + .saturating_add(RocksDbWeight::get().writes(2_u64)) + .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32) -> Weight { - Weight::from_ref_time(33_355_000 as u64) + Weight::from_ref_time(33_355_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -45,11 +45,11 @@ impl WeightInfo for () { // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32) -> Weight { - Weight::from_ref_time(169_323_000 as u64) + Weight::from_ref_time(169_323_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(8_000_u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -57,15 +57,15 @@ impl WeightInfo for () { // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32) -> Weight { - Weight::from_ref_time(94_034_000 as u64) + Weight::from_ref_time(94_034_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(31_000_u64).saturating_mul(x as u64)) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn unlock_rewards_for(_x: u32) -> Weight { // TODO(hussein-aitlahcen): extrinsic added without benchmark - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } } diff --git a/code/parachain/frame/currency-factory/src/weights.rs b/code/parachain/frame/currency-factory/src/weights.rs index 531c5e28c04..af3259c22f5 100644 --- a/code/parachain/frame/currency-factory/src/weights.rs +++ b/code/parachain/frame/currency-factory/src/weights.rs @@ -14,9 +14,9 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn add_range() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn set_metadata() -> Weight { diff --git a/code/parachain/frame/dutch-auction/src/weights.rs b/code/parachain/frame/dutch-auction/src/weights.rs index b3d0b72dadf..6c60e27c0a1 100644 --- a/code/parachain/frame/dutch-auction/src/weights.rs +++ b/code/parachain/frame/dutch-auction/src/weights.rs @@ -17,7 +17,7 @@ pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { // Storage: DutchAuction Configurations (r:0 w:1) fn add_configuration() -> Weight { - Weight::from_ref_time(8_434_000 as u64).saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(8_434_000_u64).saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: DutchAuction OrdersIndex (r:1 w:1) // Storage: System Account (r:1 w:1) @@ -25,26 +25,26 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn ask() -> Weight { - Weight::from_ref_time(36_854_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(36_854_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: DutchAuction SellOrders (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction Takes (r:1 w:1) fn take() -> Weight { - Weight::from_ref_time(21_406_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(21_406_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn liquidate() -> Weight { - Weight::from_ref_time(33_038_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(33_038_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1) // Storage: DutchAuction Configurations (r:1 w:0) @@ -55,9 +55,9 @@ impl WeightInfo for SubstrateWeight { // Storage: DutchAuction LocalOrderIdToRemote (r:0 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn xcm_sell() -> Weight { - Weight::from_ref_time(44_295_000 as u64) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(44_295_000_u64) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: DutchAuction Takes (r:2 w:1) // Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1) @@ -65,8 +65,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:2 w:2) // Storage: DutchAuction LocalOrderIdToRemote (r:1 w:1) fn known_overhead_for_on_finalize() -> Weight { - Weight::from_ref_time(37_057_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(37_057_000_u64) + .saturating_add(T::DbWeight::get().reads(7_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } } diff --git a/code/parachain/frame/governance-registry/src/weights.rs b/code/parachain/frame/governance-registry/src/weights.rs index 943a023e5b1..845ae3c528f 100644 --- a/code/parachain/frame/governance-registry/src/weights.rs +++ b/code/parachain/frame/governance-registry/src/weights.rs @@ -16,41 +16,41 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn set() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn grant_root() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } fn remove() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } // TODO: remove, really it is not needed impl WeightInfo for () { fn set() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn grant_root() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn remove() -> Weight { - Weight::from_ref_time(83_205_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(83_205_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/frame/lending/src/weights.rs b/code/parachain/frame/lending/src/weights.rs index cfc821903af..9d7479f5230 100644 --- a/code/parachain/frame/lending/src/weights.rs +++ b/code/parachain/frame/lending/src/weights.rs @@ -29,75 +29,74 @@ pub trait WeightInfo { impl WeightInfo for () { fn create_market() -> Weight { - Weight::from_ref_time(96_881_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(11 as u64)) + Weight::from_ref_time(96_881_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(11_u64)) } // same as vaults deposit plus 1 more read fn vault_deposit() -> Weight { - Weight::from_ref_time(140_947_000 as u64) - .saturating_add(RocksDbWeight::get().reads(10 as u64)) - .saturating_add(RocksDbWeight::get().writes(5 as u64)) + Weight::from_ref_time(140_947_000_u64) + .saturating_add(RocksDbWeight::get().reads(10_u64)) + .saturating_add(RocksDbWeight::get().writes(5_u64)) } // same as vaults withdraw plus 1 more read fn vault_withdraw() -> Weight { - Weight::from_ref_time(112_296_000 as u64) - .saturating_add(RocksDbWeight::get().reads(9 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(112_296_000_u64) + .saturating_add(RocksDbWeight::get().reads(9_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn deposit_collateral() -> Weight { - Weight::from_ref_time(123_789_000 as u64) + Weight::from_ref_time(123_789_000_u64) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn withdraw_collateral() -> Weight { - Weight::from_ref_time(138_802_000 as u64) + Weight::from_ref_time(138_802_000_u64) .saturating_add(RocksDbWeight::get().reads(10_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn borrow() -> Weight { - Weight::from_ref_time(332_730_000 as u64) - .saturating_add(RocksDbWeight::get().reads(19 as u64)) - .saturating_add(RocksDbWeight::get().writes(9 as u64)) + Weight::from_ref_time(332_730_000_u64) + .saturating_add(RocksDbWeight::get().reads(19_u64)) + .saturating_add(RocksDbWeight::get().writes(9_u64)) } fn repay_borrow() -> Weight { - Weight::from_ref_time(209_694_000 as u64) - .saturating_add(RocksDbWeight::get().reads(13 as u64)) - .saturating_add(RocksDbWeight::get().writes(6 as u64)) + Weight::from_ref_time(209_694_000_u64) + .saturating_add(RocksDbWeight::get().reads(13_u64)) + .saturating_add(RocksDbWeight::get().writes(6_u64)) } fn liquidate(b: u32) -> Weight { - Weight::from_ref_time(25_879_000 as u64) - .saturating_add(Weight::from_ref_time(7_877_000 as u64).saturating_mul(b as u64)) - .saturating_add(RocksDbWeight::get().reads(7 as u64)) + Weight::from_ref_time(25_879_000_u64) + .saturating_add(Weight::from_ref_time(7_877_000_u64).saturating_mul(b as u64)) + .saturating_add(RocksDbWeight::get().reads(7_u64)) } fn now() -> Weight { - Weight::from_ref_time(4_744_000 as u64).saturating_add(RocksDbWeight::get().reads(1 as u64)) + Weight::from_ref_time(4_744_000_u64).saturating_add(RocksDbWeight::get().reads(1_u64)) } fn accrue_interest(_x: u32) -> Weight { - Weight::from_ref_time(76_626_000 as u64) - .saturating_add(RocksDbWeight::get().reads(8 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(76_626_000_u64) + .saturating_add(RocksDbWeight::get().reads(8_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn account_id() -> Weight { - Weight::from_ref_time(3_126_000 as u64) + Weight::from_ref_time(3_126_000_u64) } fn available_funds() -> Weight { - Weight::from_ref_time(16_450_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) + Weight::from_ref_time(16_450_000_u64).saturating_add(RocksDbWeight::get().reads(2_u64)) } fn handle_withdrawable() -> Weight { - Weight::from_ref_time(20_716_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_716_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn handle_depositable() -> Weight { - Weight::from_ref_time(40_066_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(40_066_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn handle_must_liquidate() -> Weight { - Weight::from_ref_time(38_744_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(38_744_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/frame/liquidations/src/weights.rs b/code/parachain/frame/liquidations/src/weights.rs index 4a7254504c3..24cdc9dd06a 100644 --- a/code/parachain/frame/liquidations/src/weights.rs +++ b/code/parachain/frame/liquidations/src/weights.rs @@ -17,9 +17,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Liquidations StrategyIndex (r:1 w:1) // Storage: Liquidations Strategies (r:0 w:1) fn add_liquidation_strategy() -> Weight { - Weight::from_ref_time(3_127_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(3_127_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Liquidations Strategies (r:2 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -28,11 +28,11 @@ impl WeightInfo for SubstrateWeight { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn sell(x: u32) -> Weight { - Weight::from_ref_time(43_980_000 as u64) + Weight::from_ref_time(43_980_000_u64) // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(1_758_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(1_758_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/frame/oracle/src/weights.rs b/code/parachain/frame/oracle/src/weights.rs index 9bb07ca575b..6355906f97b 100644 --- a/code/parachain/frame/oracle/src/weights.rs +++ b/code/parachain/frame/oracle/src/weights.rs @@ -22,111 +22,111 @@ pub trait WeightInfo { pub struct SubstrateWeight(PhantomData); impl WeightInfo for SubstrateWeight { fn add_asset_and_info() -> Weight { - Weight::from_ref_time(33_000_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(33_000_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } fn set_signer() -> Weight { - Weight::from_ref_time(134_000_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(134_000_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } fn adjust_rewards() -> Weight { - Weight::from_ref_time(134_000_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(134_000_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } fn add_stake() -> Weight { - Weight::from_ref_time(219_457_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(219_457_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } fn remove_stake() -> Weight { - Weight::from_ref_time(42_512_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(42_512_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } fn reclaim_stake() -> Weight { - Weight::from_ref_time(51_245_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(51_245_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } fn submit_price(p: u32) -> Weight { - Weight::from_ref_time(85_274_000 as u64) + Weight::from_ref_time(85_274_000_u64) // Standard Error: 148_000 - .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(254_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn update_pre_prices(p: u32) -> Weight { - Weight::from_ref_time(11_336_000 as u64) + Weight::from_ref_time(11_336_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(238_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(238_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn update_price(p: u32) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 2_426_000 - .saturating_add(Weight::from_ref_time(22_017_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(22_017_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } // For backwards compatibility and tests impl WeightInfo for () { fn add_asset_and_info() -> Weight { - Weight::from_ref_time(33_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(33_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } fn set_signer() -> Weight { - Weight::from_ref_time(134_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(134_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn adjust_rewards() -> Weight { - Weight::from_ref_time(134_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(134_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn add_stake() -> Weight { - Weight::from_ref_time(219_457_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(219_457_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } fn remove_stake() -> Weight { - Weight::from_ref_time(42_512_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(42_512_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } fn reclaim_stake() -> Weight { - Weight::from_ref_time(51_245_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(51_245_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn submit_price(p: u32) -> Weight { - Weight::from_ref_time(85_274_000 as u64) + Weight::from_ref_time(85_274_000_u64) // Standard Error: 148_000 - .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(p as u64)) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(254_000_u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn update_pre_prices(p: u32) -> Weight { - Weight::from_ref_time(11_336_000 as u64) + Weight::from_ref_time(11_336_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(238_000 as u64).saturating_mul(p as u64)) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(238_000_u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } fn update_price(p: u32) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 2_426_000 - .saturating_add(Weight::from_ref_time(22_017_000 as u64).saturating_mul(p as u64)) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(22_017_000_u64).saturating_mul(p as u64)) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/frame/vault/src/weights.rs b/code/parachain/frame/vault/src/weights.rs index c71048dcb3a..5587d372e23 100644 --- a/code/parachain/frame/vault/src/weights.rs +++ b/code/parachain/frame/vault/src/weights.rs @@ -29,9 +29,9 @@ impl WeightInfo for SubstrateWeight { // Storage: Vault Allocations (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - Weight::from_ref_time(144_989_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(144_989_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -39,52 +39,52 @@ impl WeightInfo for SubstrateWeight { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - Weight::from_ref_time(140_947_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + Weight::from_ref_time(140_947_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - Weight::from_ref_time(112_296_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(112_296_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - Weight::from_ref_time(25_497_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_497_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - Weight::from_ref_time(25_388_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_388_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - Weight::from_ref_time(77_802_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(77_802_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - Weight::from_ref_time(70_839_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(70_839_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - Weight::from_ref_time(25_030_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(25_030_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } @@ -96,9 +96,9 @@ impl WeightInfo for () { // Storage: Vault Allocations (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - Weight::from_ref_time(144_989_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(7 as u64)) + Weight::from_ref_time(144_989_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(7_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -106,51 +106,51 @@ impl WeightInfo for () { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - Weight::from_ref_time(140_947_000 as u64) - .saturating_add(RocksDbWeight::get().reads(9 as u64)) - .saturating_add(RocksDbWeight::get().writes(5 as u64)) + Weight::from_ref_time(140_947_000_u64) + .saturating_add(RocksDbWeight::get().reads(9_u64)) + .saturating_add(RocksDbWeight::get().writes(5_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - Weight::from_ref_time(112_296_000 as u64) - .saturating_add(RocksDbWeight::get().reads(8 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(112_296_000_u64) + .saturating_add(RocksDbWeight::get().reads(8_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - Weight::from_ref_time(25_497_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_497_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - Weight::from_ref_time(25_388_000 as u64) - .saturating_add(RocksDbWeight::get().reads(1 as u64)) - .saturating_add(RocksDbWeight::get().writes(1 as u64)) + Weight::from_ref_time(25_388_000_u64) + .saturating_add(RocksDbWeight::get().reads(1_u64)) + .saturating_add(RocksDbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - Weight::from_ref_time(77_802_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(77_802_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - Weight::from_ref_time(70_839_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(70_839_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - Weight::from_ref_time(25_030_000 as u64) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + Weight::from_ref_time(25_030_000_u64) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/frame/vesting/src/weights.rs b/code/parachain/frame/vesting/src/weights.rs index 8e5efc5bbcf..2181f5b4715 100644 --- a/code/parachain/frame/vesting/src/weights.rs +++ b/code/parachain/frame/vesting/src/weights.rs @@ -39,28 +39,28 @@ pub trait WeightInfo { /// Default weights. impl WeightInfo for () { fn vested_transfer() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn claim(i: u32, ) -> Weight { - Weight::from_ref_time(31_747_000 as u64) + Weight::from_ref_time(31_747_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(63_000 as u64).saturating_mul(i as u64)) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(63_000_u64).saturating_mul(i as u64)) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } fn update_vesting_schedules(i: u32, ) -> Weight { - Weight::from_ref_time(29_457_000 as u64) + Weight::from_ref_time(29_457_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(117_000 as u64).saturating_mul(i as u64)) - .saturating_add(RocksDbWeight::get().reads(2 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(117_000_u64).saturating_mul(i as u64)) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn claim_for(i: u32, ) -> Weight { - Weight::from_ref_time(31_747_000 as u64) + Weight::from_ref_time(31_747_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(63_000 as u64).saturating_mul(i as u64)) + .saturating_add(Weight::from_ref_time(63_000_u64).saturating_mul(i as u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/balances.rs b/code/parachain/runtime/composable/src/weights/balances.rs index 433061ce5d2..1bd07fe88e3 100644 --- a/code/parachain/runtime/composable/src/weights/balances.rs +++ b/code/parachain/runtime/composable/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - Weight::from_ref_time(125_213_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(125_213_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(80_379_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(80_379_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - Weight::from_ref_time(54_186_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(54_186_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - Weight::from_ref_time(61_035_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(61_035_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - Weight::from_ref_time(128_888_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(128_888_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - Weight::from_ref_time(99_649_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(99_649_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - Weight::from_ref_time(49_408_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(49_408_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/collator_selection.rs b/code/parachain/runtime/composable/src/weights/collator_selection.rs index d7bddeada89..e03fd78f074 100644 --- a/code/parachain/runtime/composable/src/weights/collator_selection.rs +++ b/code/parachain/runtime/composable/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - Weight::from_ref_time(19_184_000 as u64) + Weight::from_ref_time(19_184_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(7_232_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(7_232_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - Weight::from_ref_time(17_944_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(17_944_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - Weight::from_ref_time(18_325_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(18_325_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - Weight::from_ref_time(117_065_000 as u64) + Weight::from_ref_time(117_065_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(219_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(219_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - Weight::from_ref_time(125_020_000 as u64) + Weight::from_ref_time(125_020_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(202_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(202_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - Weight::from_ref_time(75_977_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(75_977_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 3_255_000 - .saturating_add(Weight::from_ref_time(19_013_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(19_013_000_u64).saturating_mul(r as u64)) // Standard Error: 3_255_000 - .saturating_add(Weight::from_ref_time(89_734_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) + .saturating_add(Weight::from_ref_time(89_734_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/collective.rs b/code/parachain/runtime/composable/src/weights/collective.rs index e0d8043a456..0c1060a3cc7 100644 --- a/code/parachain/runtime/composable/src/weights/collective.rs +++ b/code/parachain/runtime/composable/src/weights/collective.rs @@ -38,40 +38,40 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(20_718_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(20_718_000_u64).saturating_mul(m as u64)) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(365_000 as u64).saturating_mul(n as u64)) + .saturating_add(Weight::from_ref_time(365_000_u64).saturating_mul(n as u64)) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(27_666_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(27_666_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(42_954_000 as u64) + Weight::from_ref_time(42_954_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(b as u64)) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(88_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(88_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(47_049_000 as u64) + Weight::from_ref_time(47_049_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(4_000_u64).saturating_mul(b as u64)) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(170_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(170_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -82,25 +82,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(64_124_000 as u64) + Weight::from_ref_time(64_124_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(10_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(10_000_u64).saturating_mul(b as u64)) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(104_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(104_000_u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(533_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(533_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - Weight::from_ref_time(76_824_000 as u64) + Weight::from_ref_time(76_824_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(257_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(257_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -109,13 +109,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(74_717_000 as u64) + Weight::from_ref_time(74_717_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(159_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(159_000_u64).saturating_mul(m as u64)) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(460_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(460_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -125,15 +125,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(88_068_000 as u64) + Weight::from_ref_time(88_068_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(7_000_u64).saturating_mul(b as u64)) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(199_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(199_000_u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(531_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(531_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -143,13 +143,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(78_225_000 as u64) + Weight::from_ref_time(78_225_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(186_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(186_000_u64).saturating_mul(m as u64)) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(451_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(451_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -160,25 +160,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(91_125_000 as u64) + Weight::from_ref_time(91_125_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(9_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(9_000_u64).saturating_mul(b as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(203_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(203_000_u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(548_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(548_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(47_091_000 as u64) + Weight::from_ref_time(47_091_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(588_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(588_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/currency_factory.rs b/code/parachain/runtime/composable/src/weights/currency_factory.rs index 5798ee4d4d9..df1bf611528 100644 --- a/code/parachain/runtime/composable/src/weights/currency_factory.rs +++ b/code/parachain/runtime/composable/src/weights/currency_factory.rs @@ -9,14 +9,14 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn add_range() -> Weight { - Weight::from_ref_time(99_095_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(99_095_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:1 w:1) fn set_metadata() -> Weight { - Weight::from_ref_time(59_284_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(59_284_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/democracy.rs b/code/parachain/runtime/composable/src/weights/democracy.rs index f99aea9eee4..cffd290822d 100644 --- a/code/parachain/runtime/composable/src/weights/democracy.rs +++ b/code/parachain/runtime/composable/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - Weight::from_ref_time(98_845_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(98_845_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - Weight::from_ref_time(59_255_000 as u64) + Weight::from_ref_time(59_255_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(254_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(254_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - Weight::from_ref_time(71_268_000 as u64) + Weight::from_ref_time(71_268_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(383_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(383_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - Weight::from_ref_time(72_294_000 as u64) + Weight::from_ref_time(72_294_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(357_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(357_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - Weight::from_ref_time(32_689_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(32_689_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - Weight::from_ref_time(112_279_000 as u64) + Weight::from_ref_time(112_279_000_u64) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(666_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + .saturating_add(Weight::from_ref_time(666_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - Weight::from_ref_time(16_742_000 as u64) + Weight::from_ref_time(16_742_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(56_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(56_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - Weight::from_ref_time(3_388_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_388_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - Weight::from_ref_time(3_365_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_365_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - Weight::from_ref_time(33_963_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(33_963_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - Weight::from_ref_time(36_141_000 as u64) + Weight::from_ref_time(36_141_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(83_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(83_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(82_770_000 as u64) + Weight::from_ref_time(82_770_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(566_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(566_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - Weight::from_ref_time(20_600_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_600_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - Weight::from_ref_time(35_919_000 as u64) + Weight::from_ref_time(35_919_000_u64) // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(2_128_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_128_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - Weight::from_ref_time(28_277_000 as u64) + Weight::from_ref_time(28_277_000_u64) // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(6_694_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(6_694_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - Weight::from_ref_time(14_827_000 as u64) + Weight::from_ref_time(14_827_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(6_985_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(6_985_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - Weight::from_ref_time(69_506_000 as u64) + Weight::from_ref_time(69_506_000_u64) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(9_264_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_264_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - Weight::from_ref_time(33_886_000 as u64) + Weight::from_ref_time(33_886_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(9_246_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_246_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - Weight::from_ref_time(4_051_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(4_051_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(53_641_000 as u64) + Weight::from_ref_time(53_641_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(34_779_000 as u64) + Weight::from_ref_time(34_779_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(50_048_000 as u64) + Weight::from_ref_time(50_048_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - Weight::from_ref_time(47_429_000 as u64) + Weight::from_ref_time(47_429_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(150_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(150_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - Weight::from_ref_time(45_173_000 as u64) + Weight::from_ref_time(45_173_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(289_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(289_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - Weight::from_ref_time(26_608_000 as u64) + Weight::from_ref_time(26_608_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(289_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(289_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - Weight::from_ref_time(26_339_000 as u64) + Weight::from_ref_time(26_339_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(298_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(298_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/frame_system.rs b/code/parachain/runtime/composable/src/weights/frame_system.rs index 17a0acdc25b..fdeee0f225e 100644 --- a/code/parachain/runtime/composable/src/weights/frame_system.rs +++ b/code/parachain/runtime/composable/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - Weight::from_ref_time(4_067_000 as u64) + Weight::from_ref_time(4_067_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - Weight::from_ref_time(15_638_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(15_638_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(1_527_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_527_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_211_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_211_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(2_178_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(2_178_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/indices.rs b/code/parachain/runtime/composable/src/weights/indices.rs index 2dbf82feb47..7a9fd28a85e 100644 --- a/code/parachain/runtime/composable/src/weights/indices.rs +++ b/code/parachain/runtime/composable/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - Weight::from_ref_time(69_943_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(69_943_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - Weight::from_ref_time(77_530_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(77_530_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - Weight::from_ref_time(65_682_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(65_682_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - Weight::from_ref_time(68_237_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(68_237_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - Weight::from_ref_time(80_167_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(80_167_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/membership.rs b/code/parachain/runtime/composable/src/weights/membership.rs index 2c58c83f6d8..a7fc226fe74 100644 --- a/code/parachain/runtime/composable/src/weights/membership.rs +++ b/code/parachain/runtime/composable/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - Weight::from_ref_time(36_659_000 as u64) + Weight::from_ref_time(36_659_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(179_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(179_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - Weight::from_ref_time(41_444_000 as u64) + Weight::from_ref_time(41_444_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(195_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - Weight::from_ref_time(42_253_000 as u64) + Weight::from_ref_time(42_253_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(210_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(210_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - Weight::from_ref_time(43_169_000 as u64) + Weight::from_ref_time(43_169_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(401_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(401_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - Weight::from_ref_time(44_426_000 as u64) + Weight::from_ref_time(44_426_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(190_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(190_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - Weight::from_ref_time(12_589_000 as u64) + Weight::from_ref_time(12_589_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(82_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(82_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - Weight::from_ref_time(4_782_000 as u64) + Weight::from_ref_time(4_782_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/scheduler.rs b/code/parachain/runtime/composable/src/weights/scheduler.rs index a4e5f439645..8c66866a0e4 100644 --- a/code/parachain/runtime/composable/src/weights/scheduler.rs +++ b/code/parachain/runtime/composable/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(25_833_000 as u64) + Weight::from_ref_time(25_833_000_u64) // Standard Error: 78_000 - .saturating_add(Weight::from_ref_time(55_570_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(55_570_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(30_243_000 as u64) + Weight::from_ref_time(30_243_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(43_140_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(43_140_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(29_618_000 as u64) + Weight::from_ref_time(29_618_000_u64) // Standard Error: 64_000 - .saturating_add(Weight::from_ref_time(47_304_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(47_304_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(29_946_000 as u64) + Weight::from_ref_time(29_946_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(39_758_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(39_758_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(22_282_000 as u64) + Weight::from_ref_time(22_282_000_u64) // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(15_931_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(15_931_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(20_548_000 as u64) + Weight::from_ref_time(20_548_000_u64) // Standard Error: 23_000 - .saturating_add(Weight::from_ref_time(8_918_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(8_918_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - Weight::from_ref_time(36_435_000 as u64) + Weight::from_ref_time(36_435_000_u64) // Standard Error: 52_000 - .saturating_add(Weight::from_ref_time(28_752_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(28_752_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - Weight::from_ref_time(36_127_000 as u64) + Weight::from_ref_time(36_127_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(21_339_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(21_339_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - Weight::from_ref_time(36_519_000 as u64) + Weight::from_ref_time(36_519_000_u64) // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(16_970_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(16_970_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - Weight::from_ref_time(35_236_000 as u64) + Weight::from_ref_time(35_236_000_u64) // Standard Error: 26_000 - .saturating_add(Weight::from_ref_time(14_029_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(14_029_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - Weight::from_ref_time(47_067_000 as u64) + Weight::from_ref_time(47_067_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(191_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(191_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - Weight::from_ref_time(46_357_000 as u64) + Weight::from_ref_time(46_357_000_u64) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(1_890_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(1_890_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - Weight::from_ref_time(56_723_000 as u64) + Weight::from_ref_time(56_723_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(214_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(214_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - Weight::from_ref_time(49_893_000 as u64) + Weight::from_ref_time(49_893_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(1_948_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(1_948_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/session.rs b/code/parachain/runtime/composable/src/weights/session.rs index 4400d05be26..2e2f1a0f059 100644 --- a/code/parachain/runtime/composable/src/weights/session.rs +++ b/code/parachain/runtime/composable/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - Weight::from_ref_time(44_501_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(44_501_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - Weight::from_ref_time(36_298_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(36_298_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/timestamp.rs b/code/parachain/runtime/composable/src/weights/timestamp.rs index 638642adfd9..040897806bc 100644 --- a/code/parachain/runtime/composable/src/weights/timestamp.rs +++ b/code/parachain/runtime/composable/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - Weight::from_ref_time(23_303_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(23_303_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn on_finalize() -> Weight { - Weight::from_ref_time(7_705_000 as u64) + Weight::from_ref_time(7_705_000_u64) } } diff --git a/code/parachain/runtime/composable/src/weights/tokens.rs b/code/parachain/runtime/composable/src/weights/tokens.rs index 1e66692a5b5..5d57932c60b 100644 --- a/code/parachain/runtime/composable/src/weights/tokens.rs +++ b/code/parachain/runtime/composable/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_all() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(38_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(38_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(45_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(45_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn set_balance() -> Weight { - Weight::from_ref_time(34_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(34_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/composable/src/weights/treasury.rs b/code/parachain/runtime/composable/src/weights/treasury.rs index 4d38b30c317..d2a0f48b70e 100644 --- a/code/parachain/runtime/composable/src/weights/treasury.rs +++ b/code/parachain/runtime/composable/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - Weight::from_ref_time(589_000 as u64) + Weight::from_ref_time(589_000_u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - Weight::from_ref_time(67_476_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(67_476_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - Weight::from_ref_time(97_021_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(97_021_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(29_230_000 as u64) + Weight::from_ref_time(29_230_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(341_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(341_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - Weight::from_ref_time(20_076_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_076_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - Weight::from_ref_time(77_938_000 as u64) + Weight::from_ref_time(77_938_000_u64) // Standard Error: 165_000 - .saturating_add(Weight::from_ref_time(76_281_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(76_281_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/composable/src/weights/utility.rs b/code/parachain/runtime/composable/src/weights/utility.rs index 37f36556d78..19ea24c92f8 100644 --- a/code/parachain/runtime/composable/src/weights/utility.rs +++ b/code/parachain/runtime/composable/src/weights/utility.rs @@ -32,26 +32,26 @@ pub struct WeightInfo(PhantomData); impl utility::WeightInfo for WeightInfo { /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - Weight::from_ref_time(34_796_000 as u64) + Weight::from_ref_time(34_796_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(8_531_000 as u64).saturating_mul(c as u64)) + .saturating_add(Weight::from_ref_time(8_531_000_u64).saturating_mul(c as u64)) } fn as_derivative() -> Weight { - Weight::from_ref_time(15_550_000 as u64) + Weight::from_ref_time(15_550_000_u64) } /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - Weight::from_ref_time(45_171_000 as u64) + Weight::from_ref_time(45_171_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(8_913_000 as u64).saturating_mul(c as u64)) + .saturating_add(Weight::from_ref_time(8_913_000_u64).saturating_mul(c as u64)) } fn dispatch_as() -> Weight { - Weight::from_ref_time(32_513_000 as u64) + Weight::from_ref_time(32_513_000_u64) } /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - Weight::from_ref_time(42_000_000 as u64) + Weight::from_ref_time(42_000_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(8_526_000 as u64).saturating_mul(c as u64)) + .saturating_add(Weight::from_ref_time(8_526_000_u64).saturating_mul(c as u64)) } } diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 8ecd5dd128d..22a4dd76d82 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -1423,53 +1423,53 @@ extern crate frame_benchmarking; mod benches { use frame_benchmarking::define_benchmarks; define_benchmarks!( - [frame_system, SystemBench::] - [balances, Balances] - [session, SessionBench::] - [timestamp, Timestamp] - // TODO(hussein) Still broken on v0.9.30 - // [collator_selection, CollatorSelection] - [indices, Indices] - [membership, CouncilMembership] - [treasury, Treasury] - [scheduler, Scheduler] - [collective, Council] - [utility, Utility] - [identity, Identity] - [multisig, Multisig] - [vault, Vault] - [vesting, Vesting] - [oracle, Oracle] - [dutch_auction, DutchAuction] - [currency_factory, CurrencyFactory] - [mosaic, Mosaic] - [liquidations, Liquidations] - [bonded_finance, BondedFinance] - // TODO(hussein): broken as of v0.9.30 - // [lending, Lending] - /* - 2023-01-17 13:01:50 panicked at 'Timestamp slot must match `CurrentSlot`', /sources/b44e579ebfa6a9c3cb36e320617fc592078911c53e5f75fcffd348678aec1f49/pallet-aura-4.0.0-dev/src/lib.rs:299:9 -Error: - 0: Invalid input: Error executing and verifying runtime benchmark: Execution aborted due to trap: wasm trap: wasm `unreachable` instruction executed - WASM backtrace: - - 0: 0x7c44 - !rust_begin_unwind - 1: 0x15456 - !core::panicking::panic_fmt::hbd719b21b7458dd3 - 2: 0x518a89 - !pallet_aura::::Moment> for pallet_aura::pallet::Pallet>::on_timestamp_set::h18f88ba233c0b591 - 3: 0x54665d - !pallet_timestamp::>::set_timestamp::ha4c72baaa2c36987 - 4: 0x801c62 - !pallet_lending::benchmarking::setup::produce_block::hf5f1f77bfd4bce7c - 5: 0x8e59c3 - !>::instance::h48a1d91aceee3bf1 - 6: 0x90679c - !pallet_lending::benchmarking::>::run_benchmark::hb135064c01208619 - 7: 0x8d23f7 - !,sp_runtime::generic::unchecked_extrinsic::UncheckedExtrinsic::Signer as sp_runtime::traits::IdentifyAccount>::AccountId,u32>,dali_runtime::RuntimeCall,sp_runtime::MultiSignature,(frame_system::extensions::check_non_zero_sender::CheckNonZeroSender,frame_system::extensions::check_spec_version::CheckSpecVersion,frame_system::extensions::check_tx_version::CheckTxVersion,frame_system::extensions::check_genesis::CheckGenesis,frame_system::extensions::check_mortality::CheckMortality,frame_system::extensions::check_nonce::CheckNonce,frame_system::extensions::check_weight::CheckWeight,pallet_asset_tx_payment::ChargeAssetTxPayment)>>>>::dispatch_benchmark::h2e63e652b0d76345 - 8: 0x965f70 - !Benchmark_dispatch_benchmark - */ - [assets_registry, AssetsRegistry] - [pablo, Pablo] - [pallet_staking_rewards, StakingRewards] - [proxy, Proxy] - [dex_router, DexRouter] - [cosmwasm, Cosmwasm] - ); + [frame_system, SystemBench::] + [balances, Balances] + [session, SessionBench::] + [timestamp, Timestamp] + // TODO(hussein) Still broken on v0.9.30 + // [collator_selection, CollatorSelection] + [indices, Indices] + [membership, CouncilMembership] + [treasury, Treasury] + [scheduler, Scheduler] + [collective, Council] + [utility, Utility] + [identity, Identity] + [multisig, Multisig] + [vault, Vault] + [vesting, Vesting] + [oracle, Oracle] + [dutch_auction, DutchAuction] + [currency_factory, CurrencyFactory] + [mosaic, Mosaic] + [liquidations, Liquidations] + [bonded_finance, BondedFinance] + // TODO(hussein): broken as of v0.9.30 + // [lending, Lending] + /* + 2023-01-17 13:01:50 panicked at 'Timestamp slot must match `CurrentSlot`', /sources/b44e579ebfa6a9c3cb36e320617fc592078911c53e5f75fcffd348678aec1f49/pallet-aura-4.0.0-dev/src/lib.rs:299:9 + Error: + 0: Invalid input: Error executing and verifying runtime benchmark: Execution aborted due to trap: wasm trap: wasm `unreachable` instruction executed + WASM backtrace: + + 0: 0x7c44 - !rust_begin_unwind + 1: 0x15456 - !core::panicking::panic_fmt::hbd719b21b7458dd3 + 2: 0x518a89 - !pallet_aura::::Moment> for pallet_aura::pallet::Pallet>::on_timestamp_set::h18f88ba233c0b591 + 3: 0x54665d - !pallet_timestamp::>::set_timestamp::ha4c72baaa2c36987 + 4: 0x801c62 - !pallet_lending::benchmarking::setup::produce_block::hf5f1f77bfd4bce7c + 5: 0x8e59c3 - !>::instance::h48a1d91aceee3bf1 + 6: 0x90679c - !pallet_lending::benchmarking::>::run_benchmark::hb135064c01208619 + 7: 0x8d23f7 - !,sp_runtime::generic::unchecked_extrinsic::UncheckedExtrinsic::Signer as sp_runtime::traits::IdentifyAccount>::AccountId,u32>,dali_runtime::RuntimeCall,sp_runtime::MultiSignature,(frame_system::extensions::check_non_zero_sender::CheckNonZeroSender,frame_system::extensions::check_spec_version::CheckSpecVersion,frame_system::extensions::check_tx_version::CheckTxVersion,frame_system::extensions::check_genesis::CheckGenesis,frame_system::extensions::check_mortality::CheckMortality,frame_system::extensions::check_nonce::CheckNonce,frame_system::extensions::check_weight::CheckWeight,pallet_asset_tx_payment::ChargeAssetTxPayment)>>>>::dispatch_benchmark::h2e63e652b0d76345 + 8: 0x965f70 - !Benchmark_dispatch_benchmark + */ + [assets_registry, AssetsRegistry] + [pablo, Pablo] + [pallet_staking_rewards, StakingRewards] + [proxy, Proxy] + [dex_router, DexRouter] + [cosmwasm, Cosmwasm] + ); } impl_runtime_apis! { diff --git a/code/parachain/runtime/dali/src/weights/assets_registry.rs b/code/parachain/runtime/dali/src/weights/assets_registry.rs index 0e0eaaa5e6a..3d848dddde8 100644 --- a/code/parachain/runtime/dali/src/weights/assets_registry.rs +++ b/code/parachain/runtime/dali/src/weights/assets_registry.rs @@ -35,22 +35,22 @@ impl assets_registry::WeightInfo for WeightInfo { // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) fn register_asset() -> Weight { - Weight::from_ref_time(63_771_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(63_771_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) // Storage: AssetsRegistry ForeignToLocal (r:0 w:1) fn update_asset() -> Weight { - Weight::from_ref_time(49_298_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(49_298_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: AssetsRegistry MinFeeAmounts (r:1 w:1) fn set_min_fee() -> Weight { - Weight::from_ref_time(43_550_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(43_550_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/balances.rs b/code/parachain/runtime/dali/src/weights/balances.rs index e63423ef937..b05ff3fbad8 100644 --- a/code/parachain/runtime/dali/src/weights/balances.rs +++ b/code/parachain/runtime/dali/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - Weight::from_ref_time(135_510_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(135_510_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(88_015_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(88_015_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - Weight::from_ref_time(62_658_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(62_658_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - Weight::from_ref_time(67_586_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(67_586_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - Weight::from_ref_time(138_204_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(138_204_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - Weight::from_ref_time(104_739_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(104_739_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - Weight::from_ref_time(52_747_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(52_747_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/bonded_finance.rs b/code/parachain/runtime/dali/src/weights/bonded_finance.rs index fc150c200b1..3a1855fe449 100644 --- a/code/parachain/runtime/dali/src/weights/bonded_finance.rs +++ b/code/parachain/runtime/dali/src/weights/bonded_finance.rs @@ -35,9 +35,9 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: BondedFinance BondOffers (r:0 w:1) fn offer() -> Weight { - Weight::from_ref_time(165_046_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(165_046_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: Tokens Accounts (r:4 w:4) @@ -46,15 +46,15 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Vesting VestingSchedules (r:2 w:2) // Storage: Tokens Locks (r:2 w:2) fn bond() -> Weight { - Weight::from_ref_time(392_203_000 as u64) - .saturating_add(T::DbWeight::get().reads(12 as u64)) - .saturating_add(T::DbWeight::get().writes(12 as u64)) + Weight::from_ref_time(392_203_000_u64) + .saturating_add(T::DbWeight::get().reads(12_u64)) + .saturating_add(T::DbWeight::get().writes(12_u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel() -> Weight { - Weight::from_ref_time(114_123_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(114_123_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/collator_selection.rs b/code/parachain/runtime/dali/src/weights/collator_selection.rs index a715b31eb65..ab75f05c8de 100644 --- a/code/parachain/runtime/dali/src/weights/collator_selection.rs +++ b/code/parachain/runtime/dali/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - Weight::from_ref_time(20_415_000 as u64) + Weight::from_ref_time(20_415_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(7_309_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(7_309_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - Weight::from_ref_time(20_211_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_211_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - Weight::from_ref_time(20_212_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_212_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - Weight::from_ref_time(115_663_000 as u64) + Weight::from_ref_time(115_663_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(239_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(239_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - Weight::from_ref_time(111_893_000 as u64) + Weight::from_ref_time(111_893_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(244_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(244_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - Weight::from_ref_time(76_971_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(76_971_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 3_529_000 - .saturating_add(Weight::from_ref_time(21_666_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(21_666_000_u64).saturating_mul(r as u64)) // Standard Error: 3_529_000 - .saturating_add(Weight::from_ref_time(96_527_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) + .saturating_add(Weight::from_ref_time(96_527_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/collective.rs b/code/parachain/runtime/dali/src/weights/collective.rs index fc5d5438832..25a3249142a 100644 --- a/code/parachain/runtime/dali/src/weights/collective.rs +++ b/code/parachain/runtime/dali/src/weights/collective.rs @@ -38,29 +38,29 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(20_177_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(20_177_000_u64).saturating_mul(m as u64)) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(131_000 as u64).saturating_mul(n as u64)) + .saturating_add(Weight::from_ref_time(131_000_u64).saturating_mul(n as u64)) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(27_668_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(27_668_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(49_648_000 as u64) + Weight::from_ref_time(49_648_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(7_000_u64).saturating_mul(b as u64)) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(111_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(111_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) @@ -68,12 +68,12 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(58_035_000 as u64) + Weight::from_ref_time(58_035_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(189_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(Weight::from_ref_time(189_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -84,25 +84,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(71_236_000 as u64) + Weight::from_ref_time(71_236_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(11_000_u64).saturating_mul(b as u64)) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(78_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(78_000_u64).saturating_mul(m as u64)) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(492_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(492_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - Weight::from_ref_time(75_685_000 as u64) + Weight::from_ref_time(75_685_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(216_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(216_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -111,13 +111,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(88_658_000 as u64) + Weight::from_ref_time(88_658_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(84_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(84_000_u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(397_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(397_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -128,15 +128,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(99_765_000 as u64) + Weight::from_ref_time(99_765_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(11_000_u64).saturating_mul(b as u64)) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(196_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(196_000_u64).saturating_mul(m as u64)) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(488_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(488_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -146,13 +146,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(87_559_000 as u64) + Weight::from_ref_time(87_559_000_u64) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(154_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(154_000_u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(433_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(433_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -164,25 +164,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(96_304_000 as u64) + Weight::from_ref_time(96_304_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(13_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(13_000_u64).saturating_mul(b as u64)) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(264_000_u64).saturating_mul(m as u64)) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(539_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(539_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(54_053_000 as u64) + Weight::from_ref_time(54_053_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(514_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(514_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/cosmwasm.rs b/code/parachain/runtime/dali/src/weights/cosmwasm.rs index 046dc6b526e..d721218c9dd 100644 --- a/code/parachain/runtime/dali/src/weights/cosmwasm.rs +++ b/code/parachain/runtime/dali/src/weights/cosmwasm.rs @@ -38,11 +38,11 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Cosmwasm CodeIdToInfo (r:0 w:1) /// The range of component `n` is `[1, 514288]`. fn upload(n: u32, ) -> Weight { - Weight::from_ref_time(683_853_000 as u64) + Weight::from_ref_time(683_853_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(146_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + .saturating_add(Weight::from_ref_time(146_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -54,13 +54,13 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(1_201_802_000 as u64) + Weight::from_ref_time(1_201_802_000_u64) // Standard Error: 685_000 - .saturating_add(Weight::from_ref_time(54_049_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(54_049_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -71,13 +71,13 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn execute(n: u32, ) -> Weight { - Weight::from_ref_time(1_194_812_000 as u64) + Weight::from_ref_time(1_194_812_000_u64) // Standard Error: 699_000 - .saturating_add(Weight::from_ref_time(50_621_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(50_621_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:2 w:2) @@ -88,9 +88,9 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Cosmwasm CodeHashToId (r:0 w:1) fn migrate() -> Weight { - Weight::from_ref_time(1_567_144_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(1_567_144_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) @@ -98,88 +98,88 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn update_admin() -> Weight { - Weight::from_ref_time(534_505_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(534_505_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read() -> Weight { - Weight::from_ref_time(25_963_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(25_963_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0xe9a804b2e527fd3601d2ffc0bb023cd668656c6c6f20776f726c64] (r:1 w:0) fn db_read_other_contract() -> Weight { - Weight::from_ref_time(25_743_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(25_743_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:1) fn db_write() -> Weight { - Weight::from_ref_time(28_603_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(28_603_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn db_scan() -> Weight { - Weight::from_ref_time(11_417_000 as u64) + Weight::from_ref_time(11_417_000_u64) } // Storage: unknown [0x] (r:1 w:0) fn db_next() -> Weight { - Weight::from_ref_time(119_411_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(119_411_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:0 w:1) fn db_remove() -> Weight { - Weight::from_ref_time(17_259_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(17_259_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Tokens Accounts (r:1 w:0) fn balance() -> Weight { - Weight::from_ref_time(7_817_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(7_817_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: System Account (r:2 w:2) // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn transfer(n: u32, ) -> Weight { - Weight::from_ref_time(41_147_000 as u64) + Weight::from_ref_time(41_147_000_u64) // Standard Error: 327_000 - .saturating_add(Weight::from_ref_time(46_316_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(46_316_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:1) fn set_contract_meta() -> Weight { - Weight::from_ref_time(18_119_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(18_119_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn running_contract_meta() -> Weight { - Weight::from_ref_time(10_973_000 as u64) + Weight::from_ref_time(10_973_000_u64) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) fn contract_meta() -> Weight { - Weight::from_ref_time(12_953_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(12_953_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } fn addr_validate() -> Weight { - Weight::from_ref_time(2_307_000 as u64) + Weight::from_ref_time(2_307_000_u64) } fn addr_canonicalize() -> Weight { - Weight::from_ref_time(2_317_000 as u64) + Weight::from_ref_time(2_317_000_u64) } fn addr_humanize() -> Weight { - Weight::from_ref_time(431_000 as u64) + Weight::from_ref_time(431_000_u64) } fn secp256k1_recover_pubkey() -> Weight { - Weight::from_ref_time(61_485_000 as u64) + Weight::from_ref_time(61_485_000_u64) } fn secp256k1_verify() -> Weight { - Weight::from_ref_time(74_985_000 as u64) + Weight::from_ref_time(74_985_000_u64) } fn ed25519_verify() -> Weight { - Weight::from_ref_time(94_174_000 as u64) + Weight::from_ref_time(94_174_000_u64) } fn ed25519_batch_verify() -> Weight { - Weight::from_ref_time(265_682_000 as u64) + Weight::from_ref_time(265_682_000_u64) } // Storage: Cosmwasm CodeIdToInfo (r:1 w:1) // Storage: Cosmwasm ContractToInfo (r:1 w:1) @@ -190,436 +190,436 @@ impl cosmwasm::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) /// The range of component `n` is `[0, 22]`. fn continue_instantiate(n: u32, ) -> Weight { - Weight::from_ref_time(1_167_956_000 as u64) + Weight::from_ref_time(1_167_956_000_u64) // Standard Error: 785_000 - .saturating_add(Weight::from_ref_time(48_486_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(n as u64))) + .saturating_add(Weight::from_ref_time(48_486_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n as u64))) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(n as u64))) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `n` is `[0, 22]`. fn continue_execute(n: u32, ) -> Weight { - Weight::from_ref_time(1_078_364_000 as u64) + Weight::from_ref_time(1_078_364_000_u64) // Standard Error: 520_000 - .saturating_add(Weight::from_ref_time(1_089_000 as u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(Weight::from_ref_time(1_089_000_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn continue_migrate() -> Weight { - Weight::from_ref_time(1_022_172_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + Weight::from_ref_time(1_022_172_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Cosmwasm CodeIdToInfo (r:1 w:0) fn query_info() -> Weight { - Weight::from_ref_time(32_179_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(32_179_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn query_continuation() -> Weight { - Weight::from_ref_time(992_771_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + Weight::from_ref_time(992_771_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Cosmwasm ContractToInfo (r:1 w:0) // Storage: unknown [0x46fb7408d4f285228f4af516ea25851b68656c6c6f] (r:1 w:0) fn query_raw() -> Weight { - Weight::from_ref_time(36_625_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(36_625_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Const(r: u32, ) -> Weight { - Weight::from_ref_time(121_199_000 as u64) + Weight::from_ref_time(121_199_000_u64) // Standard Error: 60_000 - .saturating_add(Weight::from_ref_time(1_885_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_885_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Const(r: u32, ) -> Weight { - Weight::from_ref_time(122_825_000 as u64) + Weight::from_ref_time(122_825_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(1_758_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_758_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Load(r: u32, ) -> Weight { - Weight::from_ref_time(125_799_000 as u64) + Weight::from_ref_time(125_799_000_u64) // Standard Error: 66_000 - .saturating_add(Weight::from_ref_time(5_682_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(5_682_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Load(r: u32, ) -> Weight { - Weight::from_ref_time(125_748_000 as u64) + Weight::from_ref_time(125_748_000_u64) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(5_547_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(5_547_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Store(r: u32, ) -> Weight { - Weight::from_ref_time(120_716_000 as u64) + Weight::from_ref_time(120_716_000_u64) // Standard Error: 56_000 - .saturating_add(Weight::from_ref_time(5_757_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(5_757_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Store(r: u32, ) -> Weight { - Weight::from_ref_time(122_091_000 as u64) + Weight::from_ref_time(122_091_000_u64) // Standard Error: 64_000 - .saturating_add(Weight::from_ref_time(5_769_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(5_769_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(119_919_000 as u64) + Weight::from_ref_time(119_919_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(3_913_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_913_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Eqz(r: u32, ) -> Weight { - Weight::from_ref_time(125_674_000 as u64) + Weight::from_ref_time(125_674_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(2_578_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_578_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(118_228_000 as u64) + Weight::from_ref_time(118_228_000_u64) // Standard Error: 66_000 - .saturating_add(Weight::from_ref_time(3_693_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_693_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LtS(r: u32, ) -> Weight { - Weight::from_ref_time(122_012_000 as u64) + Weight::from_ref_time(122_012_000_u64) // Standard Error: 57_000 - .saturating_add(Weight::from_ref_time(3_690_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_690_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GtS(r: u32, ) -> Weight { - Weight::from_ref_time(120_007_000 as u64) + Weight::from_ref_time(120_007_000_u64) // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(3_617_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_617_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64LeS(r: u32, ) -> Weight { - Weight::from_ref_time(118_954_000 as u64) + Weight::from_ref_time(118_954_000_u64) // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(3_876_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_876_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64GeS(r: u32, ) -> Weight { - Weight::from_ref_time(121_310_000 as u64) + Weight::from_ref_time(121_310_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(3_672_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_672_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Clz(r: u32, ) -> Weight { - Weight::from_ref_time(120_485_000 as u64) + Weight::from_ref_time(120_485_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(2_653_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_653_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Ctz(r: u32, ) -> Weight { - Weight::from_ref_time(122_052_000 as u64) + Weight::from_ref_time(122_052_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(2_677_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_677_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Popcnt(r: u32, ) -> Weight { - Weight::from_ref_time(121_016_000 as u64) + Weight::from_ref_time(121_016_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(2_628_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_628_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Add(r: u32, ) -> Weight { - Weight::from_ref_time(123_235_000 as u64) + Weight::from_ref_time(123_235_000_u64) // Standard Error: 44_000 - .saturating_add(Weight::from_ref_time(3_420_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_420_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(117_593_000 as u64) + Weight::from_ref_time(117_593_000_u64) // Standard Error: 60_000 - .saturating_add(Weight::from_ref_time(3_807_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_807_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivS(r: u32, ) -> Weight { - Weight::from_ref_time(122_927_000 as u64) + Weight::from_ref_time(122_927_000_u64) // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(4_869_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_869_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64DivU(r: u32, ) -> Weight { - Weight::from_ref_time(118_071_000 as u64) + Weight::from_ref_time(118_071_000_u64) // Standard Error: 66_000 - .saturating_add(Weight::from_ref_time(4_634_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_634_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64RemS(r: u32, ) -> Weight { - Weight::from_ref_time(124_946_000 as u64) + Weight::from_ref_time(124_946_000_u64) // Standard Error: 67_000 - .saturating_add(Weight::from_ref_time(4_839_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_839_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64And(r: u32, ) -> Weight { - Weight::from_ref_time(123_587_000 as u64) + Weight::from_ref_time(123_587_000_u64) // Standard Error: 56_000 - .saturating_add(Weight::from_ref_time(3_518_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_518_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Or(r: u32, ) -> Weight { - Weight::from_ref_time(124_215_000 as u64) + Weight::from_ref_time(124_215_000_u64) // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(3_607_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_607_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Xor(r: u32, ) -> Weight { - Weight::from_ref_time(119_872_000 as u64) + Weight::from_ref_time(119_872_000_u64) // Standard Error: 83_000 - .saturating_add(Weight::from_ref_time(3_891_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_891_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Shl(r: u32, ) -> Weight { - Weight::from_ref_time(122_452_000 as u64) + Weight::from_ref_time(122_452_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(3_633_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_633_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ShrS(r: u32, ) -> Weight { - Weight::from_ref_time(121_092_000 as u64) + Weight::from_ref_time(121_092_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(3_667_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_667_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotl(r: u32, ) -> Weight { - Weight::from_ref_time(120_266_000 as u64) + Weight::from_ref_time(120_266_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(3_695_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_695_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64Rotr(r: u32, ) -> Weight { - Weight::from_ref_time(122_018_000 as u64) + Weight::from_ref_time(122_018_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(3_512_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_512_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I64ExtendSI32(r: u32, ) -> Weight { - Weight::from_ref_time(119_367_000 as u64) + Weight::from_ref_time(119_367_000_u64) // Standard Error: 42_000 - .saturating_add(Weight::from_ref_time(2_669_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_669_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_I32WrapI64(r: u32, ) -> Weight { - Weight::from_ref_time(120_878_000 as u64) + Weight::from_ref_time(120_878_000_u64) // Standard Error: 44_000 - .saturating_add(Weight::from_ref_time(2_650_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_650_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Eq(r: u32, ) -> Weight { - Weight::from_ref_time(126_360_000 as u64) + Weight::from_ref_time(126_360_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(3_475_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_475_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ne(r: u32, ) -> Weight { - Weight::from_ref_time(119_615_000 as u64) + Weight::from_ref_time(119_615_000_u64) // Standard Error: 62_000 - .saturating_add(Weight::from_ref_time(3_803_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_803_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Lt(r: u32, ) -> Weight { - Weight::from_ref_time(120_877_000 as u64) + Weight::from_ref_time(120_877_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(3_696_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_696_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Gt(r: u32, ) -> Weight { - Weight::from_ref_time(119_923_000 as u64) + Weight::from_ref_time(119_923_000_u64) // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(3_808_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_808_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Le(r: u32, ) -> Weight { - Weight::from_ref_time(121_427_000 as u64) + Weight::from_ref_time(121_427_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(3_801_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_801_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ge(r: u32, ) -> Weight { - Weight::from_ref_time(115_328_000 as u64) + Weight::from_ref_time(115_328_000_u64) // Standard Error: 50_000 - .saturating_add(Weight::from_ref_time(4_002_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_002_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Abs(r: u32, ) -> Weight { - Weight::from_ref_time(125_795_000 as u64) + Weight::from_ref_time(125_795_000_u64) // Standard Error: 49_000 - .saturating_add(Weight::from_ref_time(2_726_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_726_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Neg(r: u32, ) -> Weight { - Weight::from_ref_time(121_105_000 as u64) + Weight::from_ref_time(121_105_000_u64) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(2_730_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_730_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Ceil(r: u32, ) -> Weight { - Weight::from_ref_time(122_684_000 as u64) + Weight::from_ref_time(122_684_000_u64) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(2_840_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_840_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Floor(r: u32, ) -> Weight { - Weight::from_ref_time(119_894_000 as u64) + Weight::from_ref_time(119_894_000_u64) // Standard Error: 47_000 - .saturating_add(Weight::from_ref_time(2_857_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_857_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Trunc(r: u32, ) -> Weight { - Weight::from_ref_time(126_095_000 as u64) + Weight::from_ref_time(126_095_000_u64) // Standard Error: 47_000 - .saturating_add(Weight::from_ref_time(2_658_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_658_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Nearest(r: u32, ) -> Weight { - Weight::from_ref_time(123_045_000 as u64) + Weight::from_ref_time(123_045_000_u64) // Standard Error: 49_000 - .saturating_add(Weight::from_ref_time(3_334_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_334_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sqrt(r: u32, ) -> Weight { - Weight::from_ref_time(117_412_000 as u64) + Weight::from_ref_time(117_412_000_u64) // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(3_032_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_032_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Add(r: u32, ) -> Weight { - Weight::from_ref_time(125_923_000 as u64) + Weight::from_ref_time(125_923_000_u64) // Standard Error: 56_000 - .saturating_add(Weight::from_ref_time(3_440_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_440_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Sub(r: u32, ) -> Weight { - Weight::from_ref_time(124_278_000 as u64) + Weight::from_ref_time(124_278_000_u64) // Standard Error: 57_000 - .saturating_add(Weight::from_ref_time(3_507_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_507_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Mul(r: u32, ) -> Weight { - Weight::from_ref_time(118_591_000 as u64) + Weight::from_ref_time(118_591_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(3_751_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_751_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Div(r: u32, ) -> Weight { - Weight::from_ref_time(121_785_000 as u64) + Weight::from_ref_time(121_785_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(3_640_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_640_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Min(r: u32, ) -> Weight { - Weight::from_ref_time(115_012_000 as u64) + Weight::from_ref_time(115_012_000_u64) // Standard Error: 97_000 - .saturating_add(Weight::from_ref_time(4_392_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_392_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Max(r: u32, ) -> Weight { - Weight::from_ref_time(123_869_000 as u64) + Weight::from_ref_time(123_869_000_u64) // Standard Error: 57_000 - .saturating_add(Weight::from_ref_time(3_709_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_709_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_F64Copysign(r: u32, ) -> Weight { - Weight::from_ref_time(120_220_000 as u64) + Weight::from_ref_time(120_220_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(3_520_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_520_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Select(r: u32, ) -> Weight { - Weight::from_ref_time(120_112_000 as u64) + Weight::from_ref_time(120_112_000_u64) // Standard Error: 67_000 - .saturating_add(Weight::from_ref_time(4_654_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(4_654_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_If(r: u32, ) -> Weight { - Weight::from_ref_time(122_517_000 as u64) + Weight::from_ref_time(122_517_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(1_802_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_802_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Else(r: u32, ) -> Weight { - Weight::from_ref_time(119_003_000 as u64) + Weight::from_ref_time(119_003_000_u64) // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(3_068_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_068_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(121_435_000 as u64) + Weight::from_ref_time(121_435_000_u64) // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(1_993_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_993_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetLocal(r: u32, ) -> Weight { - Weight::from_ref_time(122_967_000 as u64) + Weight::from_ref_time(122_967_000_u64) // Standard Error: 44_000 - .saturating_add(Weight::from_ref_time(1_926_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_926_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_TeeLocal(r: u32, ) -> Weight { - Weight::from_ref_time(118_984_000 as u64) + Weight::from_ref_time(118_984_000_u64) // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(87_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(87_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_GetGlobal(r: u32, ) -> Weight { - Weight::from_ref_time(123_678_000 as u64) + Weight::from_ref_time(123_678_000_u64) // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(25_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(25_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_SetGlobal(r: u32, ) -> Weight { - Weight::from_ref_time(122_151_000 as u64) + Weight::from_ref_time(122_151_000_u64) // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(43_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(43_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_CurrentMemory(r: u32, ) -> Weight { - Weight::from_ref_time(123_606_000 as u64) + Weight::from_ref_time(123_606_000_u64) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(1_973_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_973_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 3]`. fn instruction_GrowMemory(r: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 141_750_000 - .saturating_add(Weight::from_ref_time(3_313_834_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(3_313_834_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_Br(r: u32, ) -> Weight { - Weight::from_ref_time(120_424_000 as u64) + Weight::from_ref_time(120_424_000_u64) // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(1_198_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_198_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrIf(r: u32, ) -> Weight { - Weight::from_ref_time(118_321_000 as u64) + Weight::from_ref_time(118_321_000_u64) // Standard Error: 56_000 - .saturating_add(Weight::from_ref_time(2_175_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_175_000_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instruction_BrTable(r: u32, ) -> Weight { - Weight::from_ref_time(121_236_000 as u64) + Weight::from_ref_time(121_236_000_u64) // Standard Error: 77_000 - .saturating_add(Weight::from_ref_time(2_838_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_838_000_u64).saturating_mul(r as u64)) } /// The range of component `s` is `[1, 50]`. fn instruction_BrTable_per_elem(_s: u32, ) -> Weight { - Weight::from_ref_time(125_276_000 as u64) + Weight::from_ref_time(125_276_000_u64) } /// The range of component `r` is `[0, 50]`. fn instruction_Call(r: u32, ) -> Weight { - Weight::from_ref_time(130_253_000 as u64) + Weight::from_ref_time(130_253_000_u64) // Standard Error: 102_000 - .saturating_add(Weight::from_ref_time(20_810_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(20_810_000_u64).saturating_mul(r as u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs index 90dfa06df1b..bc833a561cb 100644 --- a/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/dali/src/weights/crowdloan_rewards.rs @@ -32,21 +32,21 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 109_000 - .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(x as u64))) + .saturating_add(Weight::from_ref_time(6_792_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32, ) -> Weight { - Weight::from_ref_time(33_355_000 as u64) + Weight::from_ref_time(33_355_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -54,11 +54,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32, ) -> Weight { - Weight::from_ref_time(169_323_000 as u64) + Weight::from_ref_time(169_323_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(8_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -66,11 +66,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32, ) -> Weight { - Weight::from_ref_time(94_034_000 as u64) + Weight::from_ref_time(94_034_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(31_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } fn unlock_rewards_for(_: u32) -> Weight { Weight::from_ref_time(10_000) diff --git a/code/parachain/runtime/dali/src/weights/currency_factory.rs b/code/parachain/runtime/dali/src/weights/currency_factory.rs index 29b1f5c125b..a8683aac326 100644 --- a/code/parachain/runtime/dali/src/weights/currency_factory.rs +++ b/code/parachain/runtime/dali/src/weights/currency_factory.rs @@ -32,13 +32,13 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) fn add_range() -> Weight { - Weight::from_ref_time(40_775_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(40_775_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CurrencyFactory AssetMetadata (r:0 w:1) fn set_metadata() -> Weight { - Weight::from_ref_time(5_343_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(5_343_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/democracy.rs b/code/parachain/runtime/dali/src/weights/democracy.rs index 989cd4bcc1a..284c7c0cf90 100644 --- a/code/parachain/runtime/dali/src/weights/democracy.rs +++ b/code/parachain/runtime/dali/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - Weight::from_ref_time(97_523_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(97_523_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - Weight::from_ref_time(61_117_000 as u64) + Weight::from_ref_time(61_117_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(274_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(274_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - Weight::from_ref_time(74_651_000 as u64) + Weight::from_ref_time(74_651_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(370_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(370_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - Weight::from_ref_time(75_377_000 as u64) + Weight::from_ref_time(75_377_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(358_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(358_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - Weight::from_ref_time(38_084_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(38_084_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - Weight::from_ref_time(117_345_000 as u64) + Weight::from_ref_time(117_345_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(623_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + .saturating_add(Weight::from_ref_time(623_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - Weight::from_ref_time(17_920_000 as u64) + Weight::from_ref_time(17_920_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(51_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(51_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - Weight::from_ref_time(3_534_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_534_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - Weight::from_ref_time(3_607_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_607_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - Weight::from_ref_time(36_442_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(36_442_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - Weight::from_ref_time(38_034_000 as u64) + Weight::from_ref_time(38_034_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(82_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(82_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(86_834_000 as u64) + Weight::from_ref_time(86_834_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(581_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(581_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - Weight::from_ref_time(23_341_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(23_341_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - Weight::from_ref_time(44_035_000 as u64) + Weight::from_ref_time(44_035_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(3_103_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_103_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - Weight::from_ref_time(4_747_000 as u64) + Weight::from_ref_time(4_747_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(7_094_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(7_094_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - Weight::from_ref_time(14_702_000 as u64) + Weight::from_ref_time(14_702_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(7_135_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(7_135_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - Weight::from_ref_time(73_009_000 as u64) + Weight::from_ref_time(73_009_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(9_195_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_195_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - Weight::from_ref_time(33_943_000 as u64) + Weight::from_ref_time(33_943_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(9_193_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_193_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - Weight::from_ref_time(4_017_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(4_017_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(56_488_000 as u64) + Weight::from_ref_time(56_488_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(35_732_000 as u64) + Weight::from_ref_time(35_732_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(53_132_000 as u64) + Weight::from_ref_time(53_132_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - Weight::from_ref_time(49_361_000 as u64) + Weight::from_ref_time(49_361_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(150_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(150_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - Weight::from_ref_time(45_088_000 as u64) + Weight::from_ref_time(45_088_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(333_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(333_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - Weight::from_ref_time(28_268_000 as u64) + Weight::from_ref_time(28_268_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(315_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(315_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - Weight::from_ref_time(26_741_000 as u64) + Weight::from_ref_time(26_741_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(281_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(281_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/dex_router.rs b/code/parachain/runtime/dali/src/weights/dex_router.rs index afaec13cf99..a25f499c33d 100644 --- a/code/parachain/runtime/dali/src/weights/dex_router.rs +++ b/code/parachain/runtime/dali/src/weights/dex_router.rs @@ -33,9 +33,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: Pablo Pools (r:4 w:0) // Storage: DexRouter DexRoutes (r:2 w:1) fn update_route() -> Weight { - Weight::from_ref_time(96_642_000 as u64) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(96_642_000_u64) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: DexRouter DexRoutes (r:2 w:0) // Storage: Pablo Pools (r:4 w:0) @@ -43,9 +43,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:4 w:0) // Storage: Pablo PriceCumulativeState (r:4 w:4) fn swap() -> Weight { - Weight::from_ref_time(656_289_000 as u64) - .saturating_add(T::DbWeight::get().reads(27 as u64)) - .saturating_add(T::DbWeight::get().writes(17 as u64)) + Weight::from_ref_time(656_289_000_u64) + .saturating_add(T::DbWeight::get().reads(27_u64)) + .saturating_add(T::DbWeight::get().writes(17_u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:4 w:0) @@ -53,9 +53,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:4 w:0) // Storage: Pablo PriceCumulativeState (r:4 w:4) fn buy() -> Weight { - Weight::from_ref_time(651_013_000 as u64) - .saturating_add(T::DbWeight::get().reads(26 as u64)) - .saturating_add(T::DbWeight::get().writes(17 as u64)) + Weight::from_ref_time(651_013_000_u64) + .saturating_add(T::DbWeight::get().reads(26_u64)) + .saturating_add(T::DbWeight::get().writes(17_u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:1 w:0) @@ -64,9 +64,9 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - Weight::from_ref_time(322_811_000 as u64) - .saturating_add(T::DbWeight::get().reads(10 as u64)) - .saturating_add(T::DbWeight::get().writes(8 as u64)) + Weight::from_ref_time(322_811_000_u64) + .saturating_add(T::DbWeight::get().reads(10_u64)) + .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: DexRouter DexRoutes (r:1 w:0) // Storage: Pablo Pools (r:1 w:0) @@ -74,8 +74,8 @@ impl dex_router::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:3 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - Weight::from_ref_time(164_497_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(164_497_000_u64) + .saturating_add(T::DbWeight::get().reads(7_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/dutch_auction.rs b/code/parachain/runtime/dali/src/weights/dutch_auction.rs index ae5e2fffd42..36991920c57 100644 --- a/code/parachain/runtime/dali/src/weights/dutch_auction.rs +++ b/code/parachain/runtime/dali/src/weights/dutch_auction.rs @@ -32,8 +32,8 @@ pub struct WeightInfo(PhantomData); impl dutch_auction::WeightInfo for WeightInfo { // Storage: DutchAuction Configurations (r:0 w:1) fn add_configuration() -> Weight { - Weight::from_ref_time(40_626_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(40_626_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: DutchAuction OrdersIndex (r:1 w:1) // Storage: System Account (r:1 w:1) @@ -41,26 +41,26 @@ impl dutch_auction::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn ask() -> Weight { - Weight::from_ref_time(122_685_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(122_685_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: DutchAuction SellOrders (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) // Storage: Tokens Accounts (r:1 w:1) // Storage: DutchAuction Takes (r:1 w:1) fn take() -> Weight { - Weight::from_ref_time(82_652_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(82_652_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn liquidate() -> Weight { - Weight::from_ref_time(121_448_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(121_448_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: DutchAuction Configurations (r:1 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -70,17 +70,17 @@ impl dutch_auction::WeightInfo for WeightInfo { // Storage: DutchAuction LocalOrderIdToRemote (r:0 w:1) // Storage: DutchAuction SellOrders (r:0 w:1) fn xcm_sell() -> Weight { - Weight::from_ref_time(148_705_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + Weight::from_ref_time(148_705_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: DutchAuction Takes (r:2 w:1) // Storage: DutchAuction SellOrders (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) // Storage: DutchAuction LocalOrderIdToRemote (r:1 w:1) fn known_overhead_for_on_finalize() -> Weight { - Weight::from_ref_time(123_237_000 as u64) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + Weight::from_ref_time(123_237_000_u64) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/frame_system.rs b/code/parachain/runtime/dali/src/weights/frame_system.rs index b1d9fdd1994..f7425335cdf 100644 --- a/code/parachain/runtime/dali/src/weights/frame_system.rs +++ b/code/parachain/runtime/dali/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - Weight::from_ref_time(19_355_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(19_355_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(1_554_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_554_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(1_228_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_228_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - Weight::from_ref_time(11_074_000 as u64) + Weight::from_ref_time(11_074_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(2_118_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(2_118_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/identity.rs b/code/parachain/runtime/dali/src/weights/identity.rs index 13092334ce0..1636fb02f77 100644 --- a/code/parachain/runtime/dali/src/weights/identity.rs +++ b/code/parachain/runtime/dali/src/weights/identity.rs @@ -33,48 +33,48 @@ impl identity::WeightInfo for WeightInfo { // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn add_registrar(r: u32, ) -> Weight { - Weight::from_ref_time(43_709_000 as u64) + Weight::from_ref_time(43_709_000_u64) // Standard Error: 289_000 - .saturating_add(Weight::from_ref_time(755_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(755_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn set_identity(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(86_108_000 as u64) + Weight::from_ref_time(86_108_000_u64) // Standard Error: 396_000 - .saturating_add(Weight::from_ref_time(491_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(491_000_u64).saturating_mul(r as u64)) // Standard Error: 67_000 - .saturating_add(Weight::from_ref_time(1_147_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_147_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn set_subs_new(s: u32, ) -> Weight { - Weight::from_ref_time(71_034_000 as u64) + Weight::from_ref_time(71_034_000_u64) // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(8_197_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(8_197_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:1) /// The range of component `p` is `[1, 32]`. fn set_subs_old(p: u32, ) -> Weight { - Weight::from_ref_time(75_813_000 as u64) + Weight::from_ref_time(75_813_000_u64) // Standard Error: 63_000 - .saturating_add(Weight::from_ref_time(2_857_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(2_857_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -83,79 +83,79 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight { - Weight::from_ref_time(91_020_000 as u64) + Weight::from_ref_time(91_020_000_u64) // Standard Error: 405_000 - .saturating_add(Weight::from_ref_time(638_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(638_000_u64).saturating_mul(r as u64)) // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(2_894_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(2_894_000_u64).saturating_mul(s as u64)) // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(496_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(496_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn request_judgement(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(79_938_000 as u64) + Weight::from_ref_time(79_938_000_u64) // Standard Error: 422_000 - .saturating_add(Weight::from_ref_time(2_075_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(2_075_000_u64).saturating_mul(r as u64)) // Standard Error: 71_000 - .saturating_add(Weight::from_ref_time(1_187_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_187_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn cancel_request(_r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(95_051_000 as u64) + Weight::from_ref_time(95_051_000_u64) // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(1_006_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_006_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fee(r: u32, ) -> Weight { - Weight::from_ref_time(22_284_000 as u64) + Weight::from_ref_time(22_284_000_u64) // Standard Error: 306_000 - .saturating_add(Weight::from_ref_time(876_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(876_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_account_id(r: u32, ) -> Weight { - Weight::from_ref_time(22_998_000 as u64) + Weight::from_ref_time(22_998_000_u64) // Standard Error: 163_000 - .saturating_add(Weight::from_ref_time(767_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(767_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fields(r: u32, ) -> Weight { - Weight::from_ref_time(23_994_000 as u64) + Weight::from_ref_time(23_994_000_u64) // Standard Error: 236_000 - .saturating_add(Weight::from_ref_time(528_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(528_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 7]`. /// The range of component `x` is `[1, 32]`. fn provide_judgement(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(60_069_000 as u64) + Weight::from_ref_time(60_069_000_u64) // Standard Error: 370_000 - .saturating_add(Weight::from_ref_time(651_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(651_000_u64).saturating_mul(r as u64)) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(1_244_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_244_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -165,57 +165,57 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight { - Weight::from_ref_time(113_694_000 as u64) + Weight::from_ref_time(113_694_000_u64) // Standard Error: 400_000 - .saturating_add(Weight::from_ref_time(702_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(702_000_u64).saturating_mul(r as u64)) // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(3_005_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(3_005_000_u64).saturating_mul(s as u64)) // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(134_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(134_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn add_sub(s: u32, ) -> Weight { - Weight::from_ref_time(99_260_000 as u64) + Weight::from_ref_time(99_260_000_u64) // Standard Error: 64_000 - .saturating_add(Weight::from_ref_time(206_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(206_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn rename_sub(s: u32, ) -> Weight { - Weight::from_ref_time(36_583_000 as u64) + Weight::from_ref_time(36_583_000_u64) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(181_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(181_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn remove_sub(s: u32, ) -> Weight { - Weight::from_ref_time(96_454_000 as u64) + Weight::from_ref_time(96_454_000_u64) // Standard Error: 51_000 - .saturating_add(Weight::from_ref_time(347_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(347_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn quit_sub(s: u32, ) -> Weight { - Weight::from_ref_time(66_854_000 as u64) + Weight::from_ref_time(66_854_000_u64) // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(390_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(390_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/indices.rs b/code/parachain/runtime/dali/src/weights/indices.rs index b8c23795079..a883ea0bd65 100644 --- a/code/parachain/runtime/dali/src/weights/indices.rs +++ b/code/parachain/runtime/dali/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - Weight::from_ref_time(69_087_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(69_087_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - Weight::from_ref_time(84_460_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(84_460_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - Weight::from_ref_time(68_933_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(68_933_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - Weight::from_ref_time(72_087_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(72_087_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - Weight::from_ref_time(77_437_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(77_437_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/lending.rs b/code/parachain/runtime/dali/src/weights/lending.rs index 8b71e9c4a63..bc9a7c3e3a3 100644 --- a/code/parachain/runtime/dali/src/weights/lending.rs +++ b/code/parachain/runtime/dali/src/weights/lending.rs @@ -33,15 +33,15 @@ impl lending::WeightInfo for WeightInfo { // same as vaults deposit plus 1 more read // TODO: Please impl benchmarks fn vault_deposit() -> Weight { - Weight::from_ref_time(140_947_000 as u64) - .saturating_add(T::DbWeight::get().reads(10 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + Weight::from_ref_time(140_947_000_u64) + .saturating_add(T::DbWeight::get().reads(10_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // same as vaults withdraw plus 1 more read fn vault_withdraw() -> Weight { - Weight::from_ref_time(112_296_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(112_296_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Oracle Prices (r:2 w:0) // Storage: Lending LendingCount (r:1 w:1) @@ -56,18 +56,18 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowIndex (r:0 w:1) // Storage: Lending Markets (r:0 w:1) fn create_market() -> Weight { - Weight::from_ref_time(193_469_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(12 as u64)) + Weight::from_ref_time(193_469_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(12_u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Lending AccountCollateral (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn deposit_collateral() -> Weight { - Weight::from_ref_time(124_740_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(124_740_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Lending AccountCollateral (r:1 w:1) @@ -78,9 +78,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Oracle Prices (r:2 w:0) // Storage: Tokens Accounts (r:2 w:2) fn withdraw_collateral() -> Weight { - Weight::from_ref_time(156_615_000 as u64) - .saturating_add(T::DbWeight::get().reads(11 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(156_615_000_u64) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Vault Vaults (r:1 w:0) @@ -98,9 +98,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending LastBlockTimestamp (r:1 w:0) // Storage: Lending BorrowRent (r:1 w:1) fn borrow() -> Weight { - Weight::from_ref_time(419_169_000 as u64) - .saturating_add(T::DbWeight::get().reads(21 as u64)) - .saturating_add(T::DbWeight::get().writes(8 as u64)) + Weight::from_ref_time(419_169_000_u64) + .saturating_add(T::DbWeight::get().reads(21_u64)) + .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: Lending BorrowTimestamp (r:1 w:1) // Storage: Lending LastBlockTimestamp (r:1 w:0) @@ -114,9 +114,9 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowRent (r:1 w:0) // Storage: System Account (r:1 w:1) fn repay_borrow() -> Weight { - Weight::from_ref_time(301_514_000 as u64) - .saturating_add(T::DbWeight::get().reads(14 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(301_514_000_u64) + .saturating_add(T::DbWeight::get().reads(14_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Lending Markets (r:1 w:0) // Storage: Vault Vaults (r:1 w:0) @@ -127,15 +127,15 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending DebtIndex (r:1 w:0) /// The range of component `b` is `[1, 1000]`. fn liquidate(b: u32, ) -> Weight { - Weight::from_ref_time(577_340_000 as u64) + Weight::from_ref_time(577_340_000_u64) // Standard Error: 266_000 - .saturating_add(Weight::from_ref_time(35_069_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(9 as u64)) + .saturating_add(Weight::from_ref_time(35_069_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(9_u64)) } // Storage: Timestamp Now (r:1 w:0) fn now() -> Weight { - Weight::from_ref_time(4_457_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(4_457_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: Lending DebtTokenForMarket (r:1 w:0) // Storage: Tokens Accounts (r:2 w:0) @@ -146,45 +146,45 @@ impl lending::WeightInfo for WeightInfo { // Storage: Lending BorrowIndex (r:1 w:1) /// The range of component `x` is `[1, 1000]`. fn accrue_interest(x: u32, ) -> Weight { - Weight::from_ref_time(89_649_000 as u64) + Weight::from_ref_time(89_649_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(7_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(7_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } fn account_id() -> Weight { - Weight::from_ref_time(1_760_000 as u64) + Weight::from_ref_time(1_760_000_u64) } // Storage: Vault Vaults (r:1 w:0) // Storage: Vault CapitalStructure (r:1 w:0) fn available_funds() -> Weight { - Weight::from_ref_time(19_563_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(19_563_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: Tokens Accounts (r:2 w:2) fn handle_withdrawable() -> Weight { - Weight::from_ref_time(72_570_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(72_570_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: System Account (r:1 w:1) fn handle_depositable() -> Weight { - Weight::from_ref_time(125_535_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(125_535_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: Vault CapitalStructure (r:1 w:1) // Storage: System Account (r:1 w:1) fn handle_must_liquidate() -> Weight { - Weight::from_ref_time(112_571_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(112_571_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/liquidations.rs b/code/parachain/runtime/dali/src/weights/liquidations.rs index 668f402983f..d78e0457afc 100644 --- a/code/parachain/runtime/dali/src/weights/liquidations.rs +++ b/code/parachain/runtime/dali/src/weights/liquidations.rs @@ -33,9 +33,9 @@ impl liquidations::WeightInfo for WeightInfo { // Storage: Liquidations StrategyIndex (r:1 w:1) // Storage: Liquidations Strategies (r:0 w:1) fn add_liquidation_strategy() -> Weight { - Weight::from_ref_time(20_015_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(20_015_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Liquidations Strategies (r:2 w:0) // Storage: DutchAuction OrdersIndex (r:1 w:1) @@ -45,11 +45,11 @@ impl liquidations::WeightInfo for WeightInfo { // Storage: DutchAuction SellOrders (r:0 w:1) /// The range of component `x` is `[1, 9]`. fn sell(x: u32, ) -> Weight { - Weight::from_ref_time(145_970_000 as u64) + Weight::from_ref_time(145_970_000_u64) // Standard Error: 323_000 - .saturating_add(Weight::from_ref_time(4_431_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(4_431_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/membership.rs b/code/parachain/runtime/dali/src/weights/membership.rs index 529aa0f5597..adaca3a7acc 100644 --- a/code/parachain/runtime/dali/src/weights/membership.rs +++ b/code/parachain/runtime/dali/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - Weight::from_ref_time(41_331_000 as u64) + Weight::from_ref_time(41_331_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(211_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - Weight::from_ref_time(47_040_000 as u64) + Weight::from_ref_time(47_040_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(195_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - Weight::from_ref_time(47_699_000 as u64) + Weight::from_ref_time(47_699_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(212_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(212_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - Weight::from_ref_time(47_567_000 as u64) + Weight::from_ref_time(47_567_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(436_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(436_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - Weight::from_ref_time(51_033_000 as u64) + Weight::from_ref_time(51_033_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(198_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(198_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - Weight::from_ref_time(13_061_000 as u64) + Weight::from_ref_time(13_061_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(93_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(93_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - Weight::from_ref_time(4_966_000 as u64) + Weight::from_ref_time(4_966_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(5_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/mosaic.rs b/code/parachain/runtime/dali/src/weights/mosaic.rs index c76a6717a5c..4586683725f 100644 --- a/code/parachain/runtime/dali/src/weights/mosaic.rs +++ b/code/parachain/runtime/dali/src/weights/mosaic.rs @@ -32,27 +32,27 @@ pub struct WeightInfo(PhantomData); impl mosaic::WeightInfo for WeightInfo { // Storage: Mosaic Relayer (r:0 w:1) fn set_relayer() -> Weight { - Weight::from_ref_time(39_459_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(39_459_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic Relayer (r:1 w:1) fn rotate_relayer() -> Weight { - Weight::from_ref_time(46_172_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(46_172_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic NetworkInfos (r:0 w:1) fn set_network() -> Weight { - Weight::from_ref_time(49_641_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(49_641_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic AssetsInfo (r:1 w:1) fn set_budget() -> Weight { - Weight::from_ref_time(50_164_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(50_164_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic AssetsInfo (r:1 w:0) // Storage: Mosaic LocalToRemoteAsset (r:1 w:0) @@ -62,25 +62,25 @@ impl mosaic::WeightInfo for WeightInfo { // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: Mosaic Nonce (r:1 w:1) fn transfer_to() -> Weight { - Weight::from_ref_time(165_301_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(165_301_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: System Account (r:1 w:1) fn accept_transfer() -> Weight { - Weight::from_ref_time(108_775_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(108_775_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Mosaic OutgoingTransactions (r:1 w:1) // Storage: System Account (r:2 w:2) fn claim_stale_to() -> Weight { - Weight::from_ref_time(131_694_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(131_694_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) @@ -88,49 +88,49 @@ impl mosaic::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Mosaic IncomingTransactions (r:1 w:1) fn timelocked_mint() -> Weight { - Weight::from_ref_time(139_184_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(139_184_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Mosaic TimeLockPeriod (r:0 w:1) fn set_timelock_duration() -> Weight { - Weight::from_ref_time(14_200_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(14_200_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic Relayer (r:1 w:0) // Storage: Mosaic RemoteToLocalAsset (r:1 w:0) // Storage: Mosaic IncomingTransactions (r:1 w:1) // Storage: System Account (r:1 w:1) fn rescind_timelocked_mint() -> Weight { - Weight::from_ref_time(107_275_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(107_275_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Mosaic IncomingTransactions (r:1 w:1) // Storage: System Account (r:2 w:2) fn claim_to() -> Weight { - Weight::from_ref_time(149_121_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(149_121_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Mosaic NetworkInfos (r:1 w:0) // Storage: Mosaic LocalToRemoteAsset (r:1 w:1) // Storage: Mosaic RemoteToLocalAsset (r:0 w:1) fn update_asset_mapping() -> Weight { - Weight::from_ref_time(58_422_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(58_422_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Mosaic RemoteAmmWhitelist (r:1 w:1) fn add_remote_amm_id() -> Weight { - Weight::from_ref_time(22_066_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(22_066_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Mosaic RemoteAmmWhitelist (r:1 w:1) fn remove_remote_amm_id() -> Weight { - Weight::from_ref_time(23_674_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(23_674_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/multisig.rs b/code/parachain/runtime/dali/src/weights/multisig.rs index 7b1d146896d..2d3934bb61a 100644 --- a/code/parachain/runtime/dali/src/weights/multisig.rs +++ b/code/parachain/runtime/dali/src/weights/multisig.rs @@ -33,23 +33,23 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `z` is `[0, 10000]`. fn as_multi_threshold_1(z: u32, ) -> Weight { - Weight::from_ref_time(56_529_000 as u64) + Weight::from_ref_time(56_529_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(96_827_000 as u64) + Weight::from_ref_time(96_827_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(286_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(286_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -57,38 +57,38 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(111_267_000 as u64) + Weight::from_ref_time(111_267_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(264_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Multisig Multisigs (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(65_226_000 as u64) + Weight::from_ref_time(65_226_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(290_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(290_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(109_124_000 as u64) + Weight::from_ref_time(109_124_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(287_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(287_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -97,33 +97,33 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(130_334_000 as u64) + Weight::from_ref_time(130_334_000_u64) // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(572_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(572_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(4_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create(s: u32, ) -> Weight { - Weight::from_ref_time(95_894_000 as u64) + Weight::from_ref_time(95_894_000_u64) // Standard Error: 15_000 - .saturating_add(Weight::from_ref_time(299_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(299_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - Weight::from_ref_time(57_287_000 as u64) + Weight::from_ref_time(57_287_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(364_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(364_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -131,20 +131,20 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_complete(s: u32, ) -> Weight { - Weight::from_ref_time(165_669_000 as u64) + Weight::from_ref_time(165_669_000_u64) // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(642_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(642_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[2, 100]`. fn cancel_as_multi(s: u32, ) -> Weight { - Weight::from_ref_time(132_300_000 as u64) + Weight::from_ref_time(132_300_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(352_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(352_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/oracle.rs b/code/parachain/runtime/dali/src/weights/oracle.rs index efe4d01e04a..73179878cd7 100644 --- a/code/parachain/runtime/dali/src/weights/oracle.rs +++ b/code/parachain/runtime/dali/src/weights/oracle.rs @@ -34,49 +34,49 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle RewardTrackerStore (r:1 w:1) // Storage: Oracle AssetsInfo (r:1 w:1) fn add_asset_and_info() -> Weight { - Weight::from_ref_time(44_953_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(44_953_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Timestamp Now (r:1 w:0) // Storage: Oracle RewardTrackerStore (r:1 w:1) fn adjust_rewards() -> Weight { - Weight::from_ref_time(45_098_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(45_098_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Oracle ControllerToSigner (r:1 w:1) // Storage: Oracle SignerToController (r:1 w:1) // Storage: Oracle OracleStake (r:1 w:1) fn set_signer() -> Weight { - Weight::from_ref_time(141_691_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(141_691_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Oracle ControllerToSigner (r:1 w:0) // Storage: Oracle OracleStake (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_stake() -> Weight { - Weight::from_ref_time(132_493_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(132_493_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Oracle ControllerToSigner (r:1 w:0) // Storage: Oracle OracleStake (r:1 w:1) // Storage: Oracle DeclaredWithdraws (r:0 w:1) fn remove_stake() -> Weight { - Weight::from_ref_time(56_074_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(56_074_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Oracle ControllerToSigner (r:1 w:1) // Storage: Oracle DeclaredWithdraws (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Oracle SignerToController (r:0 w:1) fn reclaim_stake() -> Weight { - Weight::from_ref_time(65_348_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(65_348_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Oracle OracleStake (r:1 w:0) // Storage: Oracle Prices (r:1 w:0) @@ -85,21 +85,21 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle PrePrices (r:1 w:1) /// The range of component `p` is `[1, 25]`. fn submit_price(p: u32, ) -> Weight { - Weight::from_ref_time(80_629_000 as u64) + Weight::from_ref_time(80_629_000_u64) // Standard Error: 88_000 - .saturating_add(Weight::from_ref_time(385_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(385_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Oracle PrePrices (r:1 w:1) // Storage: Oracle AnswerInTransit (r:1 w:1) /// The range of component `p` is `[1, 25]`. fn update_pre_prices(p: u32, ) -> Weight { - Weight::from_ref_time(18_698_000 as u64) + Weight::from_ref_time(18_698_000_u64) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(392_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(392_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Oracle PriceHistory (r:1 w:1) // Storage: Oracle SignerToController (r:1 w:0) @@ -109,10 +109,10 @@ impl oracle::WeightInfo for WeightInfo { // Storage: Oracle PrePrices (r:0 w:1) /// The range of component `p` is `[1, 25]`. fn update_price(p: u32, ) -> Weight { - Weight::from_ref_time(45_137_000 as u64) + Weight::from_ref_time(45_137_000_u64) // Standard Error: 118_000 - .saturating_add(Weight::from_ref_time(6_024_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(6_024_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/pablo.rs b/code/parachain/runtime/dali/src/weights/pablo.rs index ebcb651a429..38dbc8d30a9 100644 --- a/code/parachain/runtime/dali/src/weights/pablo.rs +++ b/code/parachain/runtime/dali/src/weights/pablo.rs @@ -34,9 +34,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn create() -> Weight { - Weight::from_ref_time(72_652_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(72_652_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:5 w:5) @@ -44,9 +44,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - Weight::from_ref_time(403_307_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(8 as u64)) + Weight::from_ref_time(403_307_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens TotalIssuance (r:1 w:1) @@ -54,34 +54,34 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - Weight::from_ref_time(232_273_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(232_273_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn buy() -> Weight { - Weight::from_ref_time(198_738_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(198_738_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn swap() -> Weight { - Weight::from_ref_time(199_547_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(199_547_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn do_create_pool() -> Weight { - Weight::from_ref_time(58_314_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(58_314_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs b/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs index eedd66434aa..2fb78d44501 100644 --- a/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs +++ b/code/parachain/runtime/dali/src/weights/pallet_staking_rewards.rs @@ -35,11 +35,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Fnft Collection (r:1 w:1) /// The range of component `r` is `[1, 10]`. fn create_reward_pool(r: u32, ) -> Weight { - Weight::from_ref_time(88_726_000 as u64) + Weight::from_ref_time(88_726_000_u64) // Standard Error: 372_000 - .saturating_add(Weight::from_ref_time(1_054_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(1_054_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: Tokens Accounts (r:3 w:3) @@ -55,11 +55,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: StakingRewards Stakes (r:0 w:1) /// The range of component `r` is `[1, 10]`. fn stake(r: u32, ) -> Weight { - Weight::from_ref_time(346_706_000 as u64) + Weight::from_ref_time(346_706_000_u64) // Standard Error: 921_000 - .saturating_add(Weight::from_ref_time(1_005_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(15 as u64)) - .saturating_add(T::DbWeight::get().writes(13 as u64)) + .saturating_add(Weight::from_ref_time(1_005_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(15_u64)) + .saturating_add(T::DbWeight::get().writes(13_u64)) } // Storage: Fnft Instance (r:1 w:0) // Storage: StakingRewards Stakes (r:1 w:1) @@ -70,11 +70,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Timestamp Now (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn extend(r: u32, ) -> Weight { - Weight::from_ref_time(244_934_000 as u64) + Weight::from_ref_time(244_934_000_u64) // Standard Error: 615_000 - .saturating_add(Weight::from_ref_time(706_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11 as u64)) - .saturating_add(T::DbWeight::get().writes(8 as u64)) + .saturating_add(Weight::from_ref_time(706_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: Fnft Instance (r:1 w:1) // Storage: StakingRewards Stakes (r:1 w:1) @@ -87,11 +87,11 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Fnft OwnerInstances (r:1 w:1) /// The range of component `r` is `[1, 10]`. fn unstake(r: u32, ) -> Weight { - Weight::from_ref_time(343_031_000 as u64) + Weight::from_ref_time(343_031_000_u64) // Standard Error: 964_000 - .saturating_add(Weight::from_ref_time(11_617_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(14 as u64)) - .saturating_add(T::DbWeight::get().writes(13 as u64)) + .saturating_add(Weight::from_ref_time(11_617_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(14_u64)) + .saturating_add(T::DbWeight::get().writes(13_u64)) } // Storage: Fnft Instance (r:2 w:1) // Storage: StakingRewards Stakes (r:1 w:2) @@ -105,33 +105,33 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: System Account (r:2 w:1) /// The range of component `r` is `[1, 10]`. fn split(r: u32, ) -> Weight { - Weight::from_ref_time(434_367_000 as u64) + Weight::from_ref_time(434_367_000_u64) // Standard Error: 990_000 - .saturating_add(Weight::from_ref_time(1_461_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(18 as u64)) - .saturating_add(T::DbWeight::get().writes(15 as u64)) + .saturating_add(Weight::from_ref_time(1_461_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(18_u64)) + .saturating_add(T::DbWeight::get().writes(15_u64)) } // Storage: System Account (r:1 w:0) // Storage: StakingRewards RewardsPotIsEmpty (r:1 w:1) fn reward_accumulation_hook_reward_update_calculation() -> Weight { - Weight::from_ref_time(42_797_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(42_797_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Timestamp Now (r:1 w:0) fn unix_time_now() -> Weight { - Weight::from_ref_time(6_073_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(6_073_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn update_rewards_pool(r: u32, ) -> Weight { - Weight::from_ref_time(66_443_000 as u64) + Weight::from_ref_time(66_443_000_u64) // Standard Error: 342_000 - .saturating_add(Weight::from_ref_time(1_434_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_434_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Fnft Instance (r:1 w:0) // Storage: StakingRewards Stakes (r:1 w:1) @@ -139,19 +139,19 @@ impl pallet_staking_rewards::WeightInfo for WeightInfo< // Storage: Tokens TotalIssuance (r:1 w:0) /// The range of component `r` is `[1, 10]`. fn claim(r: u32, ) -> Weight { - Weight::from_ref_time(97_667_000 as u64) + Weight::from_ref_time(97_667_000_u64) // Standard Error: 411_000 - .saturating_add(Weight::from_ref_time(4_084_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(4_084_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: StakingRewards RewardPools (r:1 w:1) // Storage: StakingRewards RewardsPotIsEmpty (r:1 w:0) // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn add_to_rewards_pot() -> Weight { - Weight::from_ref_time(147_772_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(147_772_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/proxy.rs b/code/parachain/runtime/dali/src/weights/proxy.rs index e9f01d5e553..605c709b5af 100644 --- a/code/parachain/runtime/dali/src/weights/proxy.rs +++ b/code/parachain/runtime/dali/src/weights/proxy.rs @@ -34,8 +34,8 @@ impl proxy::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `p` is `[1, 3]`. fn proxy(_p: u32, ) -> Weight { - Weight::from_ref_time(56_404_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + Weight::from_ref_time(56_404_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -43,76 +43,76 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn proxy_announced(a: u32, _p: u32, ) -> Weight { - Weight::from_ref_time(77_364_000 as u64) + Weight::from_ref_time(77_364_000_u64) // Standard Error: 60_000 - .saturating_add(Weight::from_ref_time(506_000 as u64).saturating_mul(a as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(506_000_u64).saturating_mul(a as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn remove_announcement(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(21_146_000 as u64) + Weight::from_ref_time(21_146_000_u64) // Standard Error: 32_000 - .saturating_add(Weight::from_ref_time(624_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(624_000_u64).saturating_mul(a as u64)) // Standard Error: 851_000 - .saturating_add(Weight::from_ref_time(1_161_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_161_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn reject_announcement(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(21_184_000 as u64) + Weight::from_ref_time(21_184_000_u64) // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(588_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(588_000_u64).saturating_mul(a as u64)) // Standard Error: 671_000 - .saturating_add(Weight::from_ref_time(1_428_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_428_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn announce(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(50_946_000 as u64) + Weight::from_ref_time(50_946_000_u64) // Standard Error: 37_000 - .saturating_add(Weight::from_ref_time(712_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(712_000_u64).saturating_mul(a as u64)) // Standard Error: 986_000 - .saturating_add(Weight::from_ref_time(2_348_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_348_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn add_proxy(_p: u32, ) -> Weight { - Weight::from_ref_time(49_553_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(49_553_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxy(p: u32, ) -> Weight { - Weight::from_ref_time(42_197_000 as u64) + Weight::from_ref_time(42_197_000_u64) // Standard Error: 1_302_000 - .saturating_add(Weight::from_ref_time(3_408_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_408_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxies(_p: u32, ) -> Weight { - Weight::from_ref_time(22_690_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(22_690_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn create_pure(_: u32) -> Weight { - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } fn kill_pure(_: u32) -> Weight { - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } } diff --git a/code/parachain/runtime/dali/src/weights/scheduler.rs b/code/parachain/runtime/dali/src/weights/scheduler.rs index 42d0f4d6a3b..a1557b5c048 100644 --- a/code/parachain/runtime/dali/src/weights/scheduler.rs +++ b/code/parachain/runtime/dali/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(33_345_000 as u64) + Weight::from_ref_time(33_345_000_u64) // Standard Error: 228_000 - .saturating_add(Weight::from_ref_time(58_785_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(58_785_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(31_634_000 as u64) + Weight::from_ref_time(31_634_000_u64) // Standard Error: 206_000 - .saturating_add(Weight::from_ref_time(46_719_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(46_719_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(17_487_000 as u64) + Weight::from_ref_time(17_487_000_u64) // Standard Error: 152_000 - .saturating_add(Weight::from_ref_time(51_249_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(51_249_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(38_017_000 as u64) + Weight::from_ref_time(38_017_000_u64) // Standard Error: 187_000 - .saturating_add(Weight::from_ref_time(41_698_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(41_698_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(21_841_000 as u64) + Weight::from_ref_time(21_841_000_u64) // Standard Error: 92_000 - .saturating_add(Weight::from_ref_time(18_072_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(18_072_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(23_367_000 as u64) + Weight::from_ref_time(23_367_000_u64) // Standard Error: 63_000 - .saturating_add(Weight::from_ref_time(10_135_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(10_135_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - Weight::from_ref_time(45_854_000 as u64) + Weight::from_ref_time(45_854_000_u64) // Standard Error: 133_000 - .saturating_add(Weight::from_ref_time(30_909_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(30_909_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - Weight::from_ref_time(33_737_000 as u64) + Weight::from_ref_time(33_737_000_u64) // Standard Error: 172_000 - .saturating_add(Weight::from_ref_time(24_459_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(24_459_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - Weight::from_ref_time(41_969_000 as u64) + Weight::from_ref_time(41_969_000_u64) // Standard Error: 104_000 - .saturating_add(Weight::from_ref_time(19_111_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(19_111_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - Weight::from_ref_time(35_279_000 as u64) + Weight::from_ref_time(35_279_000_u64) // Standard Error: 93_000 - .saturating_add(Weight::from_ref_time(15_971_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(15_971_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - Weight::from_ref_time(54_184_000 as u64) + Weight::from_ref_time(54_184_000_u64) // Standard Error: 21_000 - .saturating_add(Weight::from_ref_time(203_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(203_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - Weight::from_ref_time(52_054_000 as u64) + Weight::from_ref_time(52_054_000_u64) // Standard Error: 30_000 - .saturating_add(Weight::from_ref_time(2_440_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_440_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - Weight::from_ref_time(65_707_000 as u64) + Weight::from_ref_time(65_707_000_u64) // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(193_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(193_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - Weight::from_ref_time(56_827_000 as u64) + Weight::from_ref_time(56_827_000_u64) // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(2_486_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_486_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/session.rs b/code/parachain/runtime/dali/src/weights/session.rs index 6b7f846d8a4..d10cf168f45 100644 --- a/code/parachain/runtime/dali/src/weights/session.rs +++ b/code/parachain/runtime/dali/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - Weight::from_ref_time(47_792_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(47_792_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - Weight::from_ref_time(38_337_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(38_337_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/timestamp.rs b/code/parachain/runtime/dali/src/weights/timestamp.rs index a84059d2b83..19931e9db6b 100644 --- a/code/parachain/runtime/dali/src/weights/timestamp.rs +++ b/code/parachain/runtime/dali/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - Weight::from_ref_time(23_508_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(23_508_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn on_finalize() -> Weight { - Weight::from_ref_time(7_906_000 as u64) + Weight::from_ref_time(7_906_000_u64) } } diff --git a/code/parachain/runtime/dali/src/weights/tokens.rs b/code/parachain/runtime/dali/src/weights/tokens.rs index 1e66692a5b5..5d57932c60b 100644 --- a/code/parachain/runtime/dali/src/weights/tokens.rs +++ b/code/parachain/runtime/dali/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_all() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(38_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(38_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(45_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(45_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn set_balance() -> Weight { - Weight::from_ref_time(34_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(34_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/treasury.rs b/code/parachain/runtime/dali/src/weights/treasury.rs index 320ef15db3c..e13a251d289 100644 --- a/code/parachain/runtime/dali/src/weights/treasury.rs +++ b/code/parachain/runtime/dali/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - Weight::from_ref_time(577_000 as u64) + Weight::from_ref_time(577_000_u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - Weight::from_ref_time(74_132_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(74_132_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - Weight::from_ref_time(107_301_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(107_301_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(33_790_000 as u64) + Weight::from_ref_time(33_790_000_u64) // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(312_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(312_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - Weight::from_ref_time(26_359_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(26_359_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - Weight::from_ref_time(80_112_000 as u64) + Weight::from_ref_time(80_112_000_u64) // Standard Error: 436_000 - .saturating_add(Weight::from_ref_time(81_236_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(81_236_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/dali/src/weights/utility.rs b/code/parachain/runtime/dali/src/weights/utility.rs index 355457eeec4..afc42e3ca50 100644 --- a/code/parachain/runtime/dali/src/weights/utility.rs +++ b/code/parachain/runtime/dali/src/weights/utility.rs @@ -33,33 +33,33 @@ impl utility::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - Weight::from_ref_time(74_898_000 as u64) + Weight::from_ref_time(74_898_000_u64) // Standard Error: 21_000 - .saturating_add(Weight::from_ref_time(11_752_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(11_752_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) fn as_derivative() -> Weight { - Weight::from_ref_time(22_785_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(22_785_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - Weight::from_ref_time(45_812_000 as u64) + Weight::from_ref_time(45_812_000_u64) // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(12_304_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(12_304_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } fn dispatch_as() -> Weight { - Weight::from_ref_time(34_784_000 as u64) + Weight::from_ref_time(34_784_000_u64) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - Weight::from_ref_time(49_951_000 as u64) + Weight::from_ref_time(49_951_000_u64) // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(11_721_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(11_721_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/vault.rs b/code/parachain/runtime/dali/src/weights/vault.rs index 79fb999f9fc..ad1be7813f1 100644 --- a/code/parachain/runtime/dali/src/weights/vault.rs +++ b/code/parachain/runtime/dali/src/weights/vault.rs @@ -36,9 +36,9 @@ impl vault::WeightInfo for WeightInfo { // Storage: Vault LpTokensToVaults (r:0 w:1) // Storage: Vault Vaults (r:0 w:1) fn create() -> Weight { - Weight::from_ref_time(204_212_000 as u64) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(204_212_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) @@ -46,51 +46,51 @@ impl vault::WeightInfo for WeightInfo { // Storage: Vault CapitalStructure (r:2 w:0) // Storage: System Account (r:1 w:1) fn deposit() -> Weight { - Weight::from_ref_time(197_850_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + Weight::from_ref_time(197_850_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Vault Vaults (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: Vault CapitalStructure (r:2 w:0) // Storage: Tokens TotalIssuance (r:2 w:1) fn withdraw() -> Weight { - Weight::from_ref_time(172_128_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(172_128_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Vault Vaults (r:1 w:1) fn emergency_shutdown() -> Weight { - Weight::from_ref_time(57_947_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(57_947_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) fn start_() -> Weight { - Weight::from_ref_time(44_463_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(44_463_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn add_surcharge() -> Weight { - Weight::from_ref_time(112_857_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(112_857_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:1) fn claim_surcharge() -> Weight { - Weight::from_ref_time(99_688_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(99_688_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Vault Vaults (r:1 w:1) // Storage: System Account (r:1 w:0) // Storage: Vault LpTokensToVaults (r:0 w:1) fn delete_tombstoned() -> Weight { - Weight::from_ref_time(42_146_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(42_146_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/dali/src/weights/vesting.rs b/code/parachain/runtime/dali/src/weights/vesting.rs index 28efe65ff18..30819a60e7d 100644 --- a/code/parachain/runtime/dali/src/weights/vesting.rs +++ b/code/parachain/runtime/dali/src/weights/vesting.rs @@ -36,11 +36,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 100]`. fn claim(s: u32, ) -> Weight { - Weight::from_ref_time(108_329_000 as u64) + Weight::from_ref_time(108_329_000_u64) // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(4_983_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(4_983_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Vesting VestingScheduleNonce (r:1 w:1) // Storage: Vesting VestingSchedules (r:1 w:1) @@ -48,9 +48,9 @@ impl vesting::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:1) // Storage: Tokens Locks (r:1 w:1) fn vested_transfer() -> Weight { - Weight::from_ref_time(174_740_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(174_740_000_u64) + .saturating_add(T::DbWeight::get().reads(7_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Tokens Locks (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) @@ -59,11 +59,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Vesting VestingScheduleNonce (r:1 w:1) /// The range of component `s` is `[0, 100]`. fn update_vesting_schedules(s: u32, ) -> Weight { - Weight::from_ref_time(105_639_000 as u64) + Weight::from_ref_time(105_639_000_u64) // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(3_364_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + .saturating_add(Weight::from_ref_time(3_364_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Vesting VestingSchedules (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -71,10 +71,10 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 100]`. fn claim_for(s: u32, ) -> Weight { - Weight::from_ref_time(102_377_000 as u64) + Weight::from_ref_time(102_377_000_u64) // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(4_789_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(4_789_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/assets_registry.rs b/code/parachain/runtime/picasso/src/weights/assets_registry.rs index 918ab761fac..877665ea7c9 100644 --- a/code/parachain/runtime/picasso/src/weights/assets_registry.rs +++ b/code/parachain/runtime/picasso/src/weights/assets_registry.rs @@ -35,22 +35,22 @@ impl assets_registry::WeightInfo for WeightInfo { // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) fn register_asset() -> Weight { - Weight::from_ref_time(63_995_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(63_995_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: AssetsRegistry AssetRatio (r:1 w:1) // Storage: AssetsRegistry LocalToForeign (r:0 w:1) // Storage: AssetsRegistry ForeignToLocal (r:0 w:1) fn update_asset() -> Weight { - Weight::from_ref_time(48_869_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(48_869_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: AssetsRegistry MinFeeAmounts (r:1 w:1) fn set_min_fee() -> Weight { - Weight::from_ref_time(42_380_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(42_380_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/balances.rs b/code/parachain/runtime/picasso/src/weights/balances.rs index ed9a6e40efa..d0f59af1564 100644 --- a/code/parachain/runtime/picasso/src/weights/balances.rs +++ b/code/parachain/runtime/picasso/src/weights/balances.rs @@ -32,44 +32,44 @@ pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - Weight::from_ref_time(144_081_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(144_081_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(86_262_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(86_262_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - Weight::from_ref_time(57_465_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(57_465_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - Weight::from_ref_time(66_919_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(66_919_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - Weight::from_ref_time(135_260_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(135_260_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - Weight::from_ref_time(100_596_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(100_596_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - Weight::from_ref_time(54_758_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(54_758_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/bonded_finance.rs b/code/parachain/runtime/picasso/src/weights/bonded_finance.rs index e33da5c0463..a5514da71cb 100644 --- a/code/parachain/runtime/picasso/src/weights/bonded_finance.rs +++ b/code/parachain/runtime/picasso/src/weights/bonded_finance.rs @@ -35,9 +35,9 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: BondedFinance BondOffers (r:0 w:1) fn offer() -> Weight { - Weight::from_ref_time(164_423_000 as u64) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(164_423_000_u64) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: Tokens Accounts (r:4 w:4) @@ -46,15 +46,15 @@ impl bonded_finance::WeightInfo for WeightInfo { // Storage: Vesting VestingSchedules (r:2 w:2) // Storage: Tokens Locks (r:2 w:2) fn bond() -> Weight { - Weight::from_ref_time(362_546_000 as u64) - .saturating_add(T::DbWeight::get().reads(12 as u64)) - .saturating_add(T::DbWeight::get().writes(12 as u64)) + Weight::from_ref_time(362_546_000_u64) + .saturating_add(T::DbWeight::get().reads(12_u64)) + .saturating_add(T::DbWeight::get().writes(12_u64)) } // Storage: BondedFinance BondOffers (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel() -> Weight { - Weight::from_ref_time(103_724_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(103_724_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/collator_selection.rs b/code/parachain/runtime/picasso/src/weights/collator_selection.rs index 611d7b86398..655c05886ca 100644 --- a/code/parachain/runtime/picasso/src/weights/collator_selection.rs +++ b/code/parachain/runtime/picasso/src/weights/collator_selection.rs @@ -34,21 +34,21 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - Weight::from_ref_time(22_359_000 as u64) + Weight::from_ref_time(22_359_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(7_522_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(b as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(7_522_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - Weight::from_ref_time(20_920_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(20_920_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - Weight::from_ref_time(21_327_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(21_327_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:1 w:0) @@ -57,28 +57,28 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - Weight::from_ref_time(125_033_000 as u64) + Weight::from_ref_time(125_033_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(212_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(212_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - Weight::from_ref_time(130_572_000 as u64) + Weight::from_ref_time(130_572_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(194_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(194_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: System Account (r:2 w:2) // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - Weight::from_ref_time(78_876_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + Weight::from_ref_time(78_876_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) @@ -86,13 +86,13 @@ impl collator_selection::WeightInfo for WeightInfo { // Storage: CollatorSelection Invulnerables (r:1 w:0) // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 3_157_000 - .saturating_add(Weight::from_ref_time(16_491_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(16_491_000_u64).saturating_mul(r as u64)) // Standard Error: 3_157_000 - .saturating_add(Weight::from_ref_time(86_791_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(c as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64))) + .saturating_add(Weight::from_ref_time(86_791_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/collective.rs b/code/parachain/runtime/picasso/src/weights/collective.rs index 41363956bbe..b799d66e379 100644 --- a/code/parachain/runtime/picasso/src/weights/collective.rs +++ b/code/parachain/runtime/picasso/src/weights/collective.rs @@ -38,29 +38,29 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `n` is `[1, 100]`. /// The range of component `p` is `[1, 100]`. fn set_members(m: u32, n: u32, p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 29_000 - .saturating_add(Weight::from_ref_time(20_303_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(20_303_000_u64).saturating_mul(m as u64)) // Standard Error: 29_000 - .saturating_add(Weight::from_ref_time(362_000 as u64).saturating_mul(n as u64)) + .saturating_add(Weight::from_ref_time(362_000_u64).saturating_mul(n as u64)) // Standard Error: 29_000 - .saturating_add(Weight::from_ref_time(27_188_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(27_188_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } // Storage: Council Members (r:1 w:0) // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(54_848_000 as u64) + Weight::from_ref_time(54_848_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(b as u64)) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(90_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(90_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:0) @@ -68,12 +68,12 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 1024]`. /// The range of component `m` is `[1, 100]`. fn propose_execute(b: u32, m: u32, ) -> Weight { - Weight::from_ref_time(57_208_000 as u64) + Weight::from_ref_time(57_208_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(5_000_u64).saturating_mul(b as u64)) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(183_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) + .saturating_add(Weight::from_ref_time(183_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council ProposalOf (r:1 w:1) @@ -84,25 +84,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 100]`. /// The range of component `p` is `[1, 100]`. fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(52_932_000 as u64) + Weight::from_ref_time(52_932_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(17_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(17_000_u64).saturating_mul(b as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(173_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(173_000_u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(653_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(653_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Council Members (r:1 w:0) // Storage: Council Voting (r:1 w:1) /// The range of component `m` is `[5, 100]`. fn vote(m: u32, ) -> Weight { - Weight::from_ref_time(85_570_000 as u64) + Weight::from_ref_time(85_570_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(239_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(239_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -111,13 +111,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(77_058_000 as u64) + Weight::from_ref_time(77_058_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(205_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(205_000_u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(552_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(552_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -128,15 +128,15 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(97_556_000 as u64) + Weight::from_ref_time(97_556_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(19_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(19_000_u64).saturating_mul(b as u64)) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(156_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(156_000_u64).saturating_mul(m as u64)) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(694_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(694_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -146,13 +146,13 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_disapproved(m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(75_407_000 as u64) + Weight::from_ref_time(75_407_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(280_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(280_000_u64).saturating_mul(m as u64)) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(610_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(610_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Voting (r:1 w:1) // Storage: Council Members (r:1 w:0) @@ -164,25 +164,25 @@ impl collective::WeightInfo for WeightInfo { /// The range of component `m` is `[4, 100]`. /// The range of component `p` is `[1, 100]`. fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { - Weight::from_ref_time(104_731_000 as u64) + Weight::from_ref_time(104_731_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(8_000_u64).saturating_mul(b as u64)) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(310_000 as u64).saturating_mul(m as u64)) + .saturating_add(Weight::from_ref_time(310_000_u64).saturating_mul(m as u64)) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(692_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(692_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Council Proposals (r:1 w:1) // Storage: Council Voting (r:0 w:1) // Storage: Council ProposalOf (r:0 w:1) /// The range of component `p` is `[1, 100]`. fn disapprove_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(48_967_000 as u64) + Weight::from_ref_time(48_967_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(715_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(715_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs index 117712a383e..482f3b0a8d5 100644 --- a/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs +++ b/code/parachain/runtime/picasso/src/weights/crowdloan_rewards.rs @@ -32,21 +32,21 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards TotalContributors (r:0 w:1) // Storage: CrowdloanRewards TotalRewards (r:0 w:1) fn populate(x: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 109_000 - .saturating_add(Weight::from_ref_time(6_792_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(x as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(x as u64))) + .saturating_add(Weight::from_ref_time(6_792_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(x as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x as u64))) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:1) fn initialize(x: u32, ) -> Weight { - Weight::from_ref_time(33_355_000 as u64) + Weight::from_ref_time(33_355_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) // Storage: CrowdloanRewards Rewards (r:1 w:1) @@ -54,11 +54,11 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) // Storage: CrowdloanRewards Associations (r:0 w:1) fn associate(x: u32, ) -> Weight { - Weight::from_ref_time(169_323_000 as u64) + Weight::from_ref_time(169_323_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(8_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(8_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CrowdloanRewards Associations (r:1 w:0) // Storage: CrowdloanRewards VestingBlockStart (r:1 w:0) @@ -66,13 +66,13 @@ impl crowdloan_rewards::weights::WeightInfo for WeightI // Storage: System Account (r:1 w:1) // Storage: CrowdloanRewards ClaimedRewards (r:1 w:1) fn claim(x: u32, ) -> Weight { - Weight::from_ref_time(94_034_000 as u64) + Weight::from_ref_time(94_034_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(31_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(31_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } fn unlock_rewards_for(_x: u32) -> Weight { - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } } diff --git a/code/parachain/runtime/picasso/src/weights/currency_factory.rs b/code/parachain/runtime/picasso/src/weights/currency_factory.rs index 300e949336f..55cbc40b29e 100644 --- a/code/parachain/runtime/picasso/src/weights/currency_factory.rs +++ b/code/parachain/runtime/picasso/src/weights/currency_factory.rs @@ -32,13 +32,13 @@ pub struct WeightInfo(PhantomData); impl currency_factory::WeightInfo for WeightInfo { // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) fn add_range() -> Weight { - Weight::from_ref_time(40_303_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(40_303_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: CurrencyFactory AssetMetadata (r:0 w:1) fn set_metadata() -> Weight { - Weight::from_ref_time(5_008_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(5_008_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/democracy.rs b/code/parachain/runtime/picasso/src/weights/democracy.rs index b4286144feb..49972b2d48e 100644 --- a/code/parachain/runtime/picasso/src/weights/democracy.rs +++ b/code/parachain/runtime/picasso/src/weights/democracy.rs @@ -36,44 +36,44 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - Weight::from_ref_time(98_784_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(98_784_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy DepositOf (r:1 w:1) fn second(s: u32, ) -> Weight { - Weight::from_ref_time(60_043_000 as u64) + Weight::from_ref_time(60_043_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(264_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(264_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_new(r: u32, ) -> Weight { - Weight::from_ref_time(74_274_000 as u64) + Weight::from_ref_time(74_274_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(350_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(350_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn vote_existing(r: u32, ) -> Weight { - Weight::from_ref_time(75_255_000 as u64) + Weight::from_ref_time(75_255_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(347_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(347_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - Weight::from_ref_time(34_560_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(34_560_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy NextExternal (r:1 w:1) @@ -82,82 +82,82 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn blacklist(p: u32, ) -> Weight { - Weight::from_ref_time(112_280_000 as u64) + Weight::from_ref_time(112_280_000_u64) // Standard Error: 38_000 - .saturating_add(Weight::from_ref_time(888_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(6 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + .saturating_add(Weight::from_ref_time(888_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) fn external_propose(v: u32, ) -> Weight { - Weight::from_ref_time(17_427_000 as u64) + Weight::from_ref_time(17_427_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(54_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(54_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - Weight::from_ref_time(3_287_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_287_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - Weight::from_ref_time(3_388_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(3_388_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - Weight::from_ref_time(36_128_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(36_128_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) fn veto_external(v: u32, ) -> Weight { - Weight::from_ref_time(38_292_000 as u64) + Weight::from_ref_time(38_292_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(77_000 as u64).saturating_mul(v as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(77_000_u64).saturating_mul(v as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy PublicProps (r:1 w:1) // Storage: Democracy DepositOf (r:1 w:1) // Storage: System Account (r:2 w:2) fn cancel_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(85_834_000 as u64) + Weight::from_ref_time(85_834_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(599_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(599_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - Weight::from_ref_time(22_653_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(22_653_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_queued(r: u32, ) -> Weight { - Weight::from_ref_time(42_418_000 as u64) + Weight::from_ref_time(42_418_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(3_149_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_149_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base(r: u32, ) -> Weight { - Weight::from_ref_time(7_913_000 as u64) + Weight::from_ref_time(7_913_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(6_869_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(6_869_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) @@ -166,102 +166,102 @@ impl democracy::WeightInfo for WeightInfo { // Storage: Democracy PublicProps (r:1 w:0) // Storage: Democracy ReferendumInfoOf (r:1 w:0) fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { - Weight::from_ref_time(16_163_000 as u64) + Weight::from_ref_time(16_163_000_u64) // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(6_918_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(5 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(6_918_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:3 w:3) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn delegate(r: u32, ) -> Weight { - Weight::from_ref_time(68_631_000 as u64) + Weight::from_ref_time(68_631_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(9_136_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_136_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy VotingOf (r:2 w:2) // Storage: Democracy ReferendumInfoOf (r:1 w:1) fn undelegate(r: u32, ) -> Weight { - Weight::from_ref_time(31_738_000 as u64) + Weight::from_ref_time(31_738_000_u64) // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(9_156_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(r as u64))) + .saturating_add(Weight::from_ref_time(9_156_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - Weight::from_ref_time(4_047_000 as u64) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(4_047_000_u64) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(54_012_000 as u64) + Weight::from_ref_time(54_012_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) fn note_imminent_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(35_977_000 as u64) + Weight::from_ref_time(35_977_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy Preimages (r:1 w:1) // Storage: System Account (r:1 w:0) fn reap_preimage(b: u32, ) -> Weight { - Weight::from_ref_time(52_999_000 as u64) + Weight::from_ref_time(52_999_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(b as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_remove(r: u32, ) -> Weight { - Weight::from_ref_time(49_665_000 as u64) + Weight::from_ref_time(49_665_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(130_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(130_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy VotingOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32, ) -> Weight { - Weight::from_ref_time(45_073_000 as u64) + Weight::from_ref_time(45_073_000_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(330_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(330_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32, ) -> Weight { - Weight::from_ref_time(27_479_000 as u64) + Weight::from_ref_time(27_479_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(243_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(243_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_other_vote(r: u32, ) -> Weight { - Weight::from_ref_time(27_224_000 as u64) + Weight::from_ref_time(27_224_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(255_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(255_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/frame_system.rs b/code/parachain/runtime/picasso/src/weights/frame_system.rs index 7b49982497a..07dc5f6bff8 100644 --- a/code/parachain/runtime/picasso/src/weights/frame_system.rs +++ b/code/parachain/runtime/picasso/src/weights/frame_system.rs @@ -32,45 +32,45 @@ pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { /// The range of component `b` is `[0, 3932160]`. fn remark(b: u32, ) -> Weight { - Weight::from_ref_time(4_071_000 as u64) + Weight::from_ref_time(4_071_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(b as u64)) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event(b: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(b as u64)) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - Weight::from_ref_time(17_632_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(17_632_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn set_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_506_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_506_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `i` is `[1, 1000]`. fn kill_storage(i: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(1_203_000 as u64).saturating_mul(i as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(i as u64))) + .saturating_add(Weight::from_ref_time(1_203_000_u64).saturating_mul(i as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `p` is `[1, 1000]`. fn kill_prefix(p: u32, ) -> Weight { - Weight::from_ref_time(0 as u64) + Weight::from_ref_time(0_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(2_209_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(2_209_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/identity.rs b/code/parachain/runtime/picasso/src/weights/identity.rs index 9f5063f8116..7b153de96ee 100644 --- a/code/parachain/runtime/picasso/src/weights/identity.rs +++ b/code/parachain/runtime/picasso/src/weights/identity.rs @@ -33,48 +33,48 @@ impl identity::WeightInfo for WeightInfo { // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn add_registrar(r: u32, ) -> Weight { - Weight::from_ref_time(41_932_000 as u64) + Weight::from_ref_time(41_932_000_u64) // Standard Error: 175_000 - .saturating_add(Weight::from_ref_time(1_049_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_049_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn set_identity(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(82_246_000 as u64) + Weight::from_ref_time(82_246_000_u64) // Standard Error: 277_000 - .saturating_add(Weight::from_ref_time(837_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(837_000_u64).saturating_mul(r as u64)) // Standard Error: 46_000 - .saturating_add(Weight::from_ref_time(1_132_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_132_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn set_subs_new(s: u32, ) -> Weight { - Weight::from_ref_time(76_453_000 as u64) + Weight::from_ref_time(76_453_000_u64) // Standard Error: 64_000 - .saturating_add(Weight::from_ref_time(8_170_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(8_170_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:1) /// The range of component `p` is `[1, 32]`. fn set_subs_old(p: u32, ) -> Weight { - Weight::from_ref_time(74_449_000 as u64) + Weight::from_ref_time(74_449_000_u64) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(2_882_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(2_882_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -83,81 +83,81 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight { - Weight::from_ref_time(82_866_000 as u64) + Weight::from_ref_time(82_866_000_u64) // Standard Error: 231_000 - .saturating_add(Weight::from_ref_time(1_254_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(1_254_000_u64).saturating_mul(r as u64)) // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(3_020_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(3_020_000_u64).saturating_mul(s as u64)) // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(552_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(552_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn request_judgement(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(91_504_000 as u64) + Weight::from_ref_time(91_504_000_u64) // Standard Error: 186_000 - .saturating_add(Weight::from_ref_time(326_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(326_000_u64).saturating_mul(r as u64)) // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(1_150_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_150_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 8]`. /// The range of component `x` is `[1, 32]`. fn cancel_request(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(85_352_000 as u64) + Weight::from_ref_time(85_352_000_u64) // Standard Error: 162_000 - .saturating_add(Weight::from_ref_time(232_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(232_000_u64).saturating_mul(r as u64)) // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(1_082_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_082_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fee(r: u32, ) -> Weight { - Weight::from_ref_time(21_692_000 as u64) + Weight::from_ref_time(21_692_000_u64) // Standard Error: 156_000 - .saturating_add(Weight::from_ref_time(981_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(981_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_account_id(r: u32, ) -> Weight { - Weight::from_ref_time(22_687_000 as u64) + Weight::from_ref_time(22_687_000_u64) // Standard Error: 92_000 - .saturating_add(Weight::from_ref_time(663_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(663_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:1) /// The range of component `r` is `[1, 7]`. fn set_fields(r: u32, ) -> Weight { - Weight::from_ref_time(23_213_000 as u64) + Weight::from_ref_time(23_213_000_u64) // Standard Error: 207_000 - .saturating_add(Weight::from_ref_time(710_000 as u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(710_000_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) /// The range of component `r` is `[1, 7]`. /// The range of component `x` is `[1, 32]`. fn provide_judgement(r: u32, x: u32, ) -> Weight { - Weight::from_ref_time(60_463_000 as u64) + Weight::from_ref_time(60_463_000_u64) // Standard Error: 186_000 - .saturating_add(Weight::from_ref_time(908_000 as u64).saturating_mul(r as u64)) + .saturating_add(Weight::from_ref_time(908_000_u64).saturating_mul(r as u64)) // Standard Error: 26_000 - .saturating_add(Weight::from_ref_time(1_055_000 as u64).saturating_mul(x as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_055_000_u64).saturating_mul(x as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity IdentityOf (r:1 w:1) @@ -167,53 +167,53 @@ impl identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 32]`. /// The range of component `x` is `[1, 32]`. fn kill_identity(_r: u32, s: u32, _x: u32, ) -> Weight { - Weight::from_ref_time(128_164_000 as u64) + Weight::from_ref_time(128_164_000_u64) // Standard Error: 36_000 - .saturating_add(Weight::from_ref_time(2_976_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(2_976_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn add_sub(s: u32, ) -> Weight { - Weight::from_ref_time(94_819_000 as u64) + Weight::from_ref_time(94_819_000_u64) // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(408_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(408_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn rename_sub(s: u32, ) -> Weight { - Weight::from_ref_time(36_368_000 as u64) + Weight::from_ref_time(36_368_000_u64) // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(223_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(223_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 32]`. fn remove_sub(s: u32, ) -> Weight { - Weight::from_ref_time(95_261_000 as u64) + Weight::from_ref_time(95_261_000_u64) // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(408_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(408_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) /// The range of component `s` is `[1, 31]`. fn quit_sub(s: u32, ) -> Weight { - Weight::from_ref_time(67_477_000 as u64) + Weight::from_ref_time(67_477_000_u64) // Standard Error: 30_000 - .saturating_add(Weight::from_ref_time(411_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(411_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/indices.rs b/code/parachain/runtime/picasso/src/weights/indices.rs index 30ecd1580be..658e33ddea3 100644 --- a/code/parachain/runtime/picasso/src/weights/indices.rs +++ b/code/parachain/runtime/picasso/src/weights/indices.rs @@ -32,34 +32,34 @@ pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - Weight::from_ref_time(68_112_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(68_112_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - Weight::from_ref_time(84_937_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(84_937_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - Weight::from_ref_time(70_776_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(70_776_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Indices Accounts (r:1 w:1) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - Weight::from_ref_time(72_052_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(72_052_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - Weight::from_ref_time(79_057_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(79_057_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/membership.rs b/code/parachain/runtime/picasso/src/weights/membership.rs index 8dc23143620..52585b6c54e 100644 --- a/code/parachain/runtime/picasso/src/weights/membership.rs +++ b/code/parachain/runtime/picasso/src/weights/membership.rs @@ -36,11 +36,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 99]`. fn add_member(m: u32, ) -> Weight { - Weight::from_ref_time(39_607_000 as u64) + Weight::from_ref_time(39_607_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(193_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(193_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -49,11 +49,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn remove_member(m: u32, ) -> Weight { - Weight::from_ref_time(44_834_000 as u64) + Weight::from_ref_time(44_834_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(195_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(195_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -62,11 +62,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[2, 100]`. fn swap_member(m: u32, ) -> Weight { - Weight::from_ref_time(45_826_000 as u64) + Weight::from_ref_time(45_826_000_u64) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(211_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -75,11 +75,11 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn reset_member(m: u32, ) -> Weight { - Weight::from_ref_time(46_940_000 as u64) + Weight::from_ref_time(46_940_000_u64) // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(414_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(414_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: CouncilMembership Members (r:1 w:1) // Storage: Council Proposals (r:1 w:0) @@ -88,30 +88,30 @@ impl membership::WeightInfo for WeightInfo { // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn change_key(m: u32, ) -> Weight { - Weight::from_ref_time(48_299_000 as u64) + Weight::from_ref_time(48_299_000_u64) // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(202_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(4 as u64)) + .saturating_add(Weight::from_ref_time(202_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: CouncilMembership Members (r:1 w:0) // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn set_prime(m: u32, ) -> Weight { - Weight::from_ref_time(12_536_000 as u64) + Weight::from_ref_time(12_536_000_u64) // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(87_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(87_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: CouncilMembership Prime (r:0 w:1) // Storage: Council Prime (r:0 w:1) /// The range of component `m` is `[1, 100]`. fn clear_prime(m: u32, ) -> Weight { - Weight::from_ref_time(5_071_000 as u64) + Weight::from_ref_time(5_071_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(4_000 as u64).saturating_mul(m as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(4_000_u64).saturating_mul(m as u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/multisig.rs b/code/parachain/runtime/picasso/src/weights/multisig.rs index ff807168d76..5ed92788476 100644 --- a/code/parachain/runtime/picasso/src/weights/multisig.rs +++ b/code/parachain/runtime/picasso/src/weights/multisig.rs @@ -33,23 +33,23 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `z` is `[0, 10000]`. fn as_multi_threshold_1(z: u32, ) -> Weight { - Weight::from_ref_time(61_608_000 as u64) + Weight::from_ref_time(61_608_000_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(1_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(97_466_000 as u64) + Weight::from_ref_time(97_466_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(351_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(351_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -57,38 +57,38 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(104_050_000 as u64) + Weight::from_ref_time(104_050_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(451_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(451_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Multisig Multisigs (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(65_459_000 as u64) + Weight::from_ref_time(65_459_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(319_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(319_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(108_024_000 as u64) + Weight::from_ref_time(108_024_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(331_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(331_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(3_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -97,33 +97,33 @@ impl multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(s: u32, z: u32, ) -> Weight { - Weight::from_ref_time(115_065_000 as u64) + Weight::from_ref_time(115_065_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(817_000 as u64).saturating_mul(s as u64)) + .saturating_add(Weight::from_ref_time(817_000_u64).saturating_mul(s as u64)) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(5_000 as u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(5_000_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create(s: u32, ) -> Weight { - Weight::from_ref_time(89_056_000 as u64) + Weight::from_ref_time(89_056_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(398_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(398_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - Weight::from_ref_time(58_807_000 as u64) + Weight::from_ref_time(58_807_000_u64) // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(377_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(377_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) @@ -131,20 +131,20 @@ impl multisig::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_complete(s: u32, ) -> Weight { - Weight::from_ref_time(163_338_000 as u64) + Weight::from_ref_time(163_338_000_u64) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(772_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(772_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) /// The range of component `s` is `[2, 100]`. fn cancel_as_multi(s: u32, ) -> Weight { - Weight::from_ref_time(126_595_000 as u64) + Weight::from_ref_time(126_595_000_u64) // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(425_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(425_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/pablo.rs b/code/parachain/runtime/picasso/src/weights/pablo.rs index 6c6db7187d8..b60e0ec5616 100644 --- a/code/parachain/runtime/picasso/src/weights/pablo.rs +++ b/code/parachain/runtime/picasso/src/weights/pablo.rs @@ -34,9 +34,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn create() -> Weight { - Weight::from_ref_time(62_554_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(62_554_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:5 w:5) @@ -44,9 +44,9 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn add_liquidity() -> Weight { - Weight::from_ref_time(347_743_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(8 as u64)) + Weight::from_ref_time(347_743_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens TotalIssuance (r:1 w:1) @@ -54,34 +54,34 @@ impl pablo::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn remove_liquidity() -> Weight { - Weight::from_ref_time(222_190_000 as u64) - .saturating_add(T::DbWeight::get().reads(9 as u64)) - .saturating_add(T::DbWeight::get().writes(7 as u64)) + Weight::from_ref_time(222_190_000_u64) + .saturating_add(T::DbWeight::get().reads(9_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn buy() -> Weight { - Weight::from_ref_time(191_476_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(191_476_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Pablo Pools (r:1 w:0) // Storage: Tokens Accounts (r:4 w:4) // Storage: System Account (r:2 w:1) // Storage: Pablo PriceCumulativeState (r:1 w:1) fn swap() -> Weight { - Weight::from_ref_time(184_948_000 as u64) - .saturating_add(T::DbWeight::get().reads(8 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(184_948_000_u64) + .saturating_add(T::DbWeight::get().reads(8_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: CurrencyFactory AssetIdRanges (r:1 w:1) // Storage: Pablo PoolCount (r:1 w:1) // Storage: Pablo Pools (r:0 w:1) fn do_create_pool() -> Weight { - Weight::from_ref_time(54_928_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(54_928_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/proxy.rs b/code/parachain/runtime/picasso/src/weights/proxy.rs index ae4f3eeeec3..23220a1a36d 100644 --- a/code/parachain/runtime/picasso/src/weights/proxy.rs +++ b/code/parachain/runtime/picasso/src/weights/proxy.rs @@ -34,10 +34,10 @@ impl proxy::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `p` is `[1, 3]`. fn proxy(p: u32, ) -> Weight { - Weight::from_ref_time(56_751_000 as u64) + Weight::from_ref_time(56_751_000_u64) // Standard Error: 1_424_000 - .saturating_add(Weight::from_ref_time(144_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) + .saturating_add(Weight::from_ref_time(144_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -46,37 +46,37 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn proxy_announced(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(100_739_000 as u64) + Weight::from_ref_time(100_739_000_u64) // Standard Error: 33_000 - .saturating_add(Weight::from_ref_time(679_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(679_000_u64).saturating_mul(a as u64)) // Standard Error: 898_000 - .saturating_add(Weight::from_ref_time(132_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(132_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn remove_announcement(a: u32, _p: u32, ) -> Weight { - Weight::from_ref_time(78_628_000 as u64) + Weight::from_ref_time(78_628_000_u64) // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(850_000 as u64).saturating_mul(a as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(850_000_u64).saturating_mul(a as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn reject_announcement(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(65_887_000 as u64) + Weight::from_ref_time(65_887_000_u64) // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(574_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(574_000_u64).saturating_mul(a as u64)) // Standard Error: 750_000 - .saturating_add(Weight::from_ref_time(1_493_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(1_493_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) @@ -84,45 +84,45 @@ impl proxy::WeightInfo for WeightInfo { /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 3]`. fn announce(a: u32, p: u32, ) -> Weight { - Weight::from_ref_time(85_432_000 as u64) + Weight::from_ref_time(85_432_000_u64) // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(569_000 as u64).saturating_mul(a as u64)) + .saturating_add(Weight::from_ref_time(569_000_u64).saturating_mul(a as u64)) // Standard Error: 648_000 - .saturating_add(Weight::from_ref_time(917_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(917_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn add_proxy(p: u32, ) -> Weight { - Weight::from_ref_time(72_349_000 as u64) + Weight::from_ref_time(72_349_000_u64) // Standard Error: 1_118_000 - .saturating_add(Weight::from_ref_time(2_417_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(2_417_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxy(p: u32, ) -> Weight { - Weight::from_ref_time(72_690_000 as u64) + Weight::from_ref_time(72_690_000_u64) // Standard Error: 669_000 - .saturating_add(Weight::from_ref_time(1_046_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(1_046_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Proxy Proxies (r:1 w:1) /// The range of component `p` is `[1, 3]`. fn remove_proxies(p: u32, ) -> Weight { - Weight::from_ref_time(63_884_000 as u64) + Weight::from_ref_time(63_884_000_u64) // Standard Error: 292_000 - .saturating_add(Weight::from_ref_time(11_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(11_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn create_pure(_: u32) -> Weight { - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } fn kill_pure(_: u32) -> Weight { - Weight::from_ref_time(10_000 as u64) + Weight::from_ref_time(10_000_u64) } } diff --git a/code/parachain/runtime/picasso/src/weights/scheduler.rs b/code/parachain/runtime/picasso/src/weights/scheduler.rs index f1c556e7980..501d488cf5d 100644 --- a/code/parachain/runtime/picasso/src/weights/scheduler.rs +++ b/code/parachain/runtime/picasso/src/weights/scheduler.rs @@ -36,13 +36,13 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(24_601_000 as u64) + Weight::from_ref_time(24_601_000_u64) // Standard Error: 85_000 - .saturating_add(Weight::from_ref_time(57_188_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((4 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(57_188_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) @@ -50,144 +50,144 @@ impl scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(29_522_000 as u64) + Weight::from_ref_time(29_522_000_u64) // Standard Error: 67_000 - .saturating_add(Weight::from_ref_time(44_660_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(44_660_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(24_914_000 as u64) + Weight::from_ref_time(24_914_000_u64) // Standard Error: 86_000 - .saturating_add(Weight::from_ref_time(49_059_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(49_059_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_resolved(s: u32, ) -> Weight { - Weight::from_ref_time(29_908_000 as u64) + Weight::from_ref_time(29_908_000_u64) // Standard Error: 97_000 - .saturating_add(Weight::from_ref_time(41_390_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((2 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(41_390_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(24_531_000 as u64) + Weight::from_ref_time(24_531_000_u64) // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(17_162_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(17_162_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Preimage PreimageFor (r:1 w:0) /// The range of component `s` is `[1, 50]`. fn on_initialize_aborted(s: u32, ) -> Weight { - Weight::from_ref_time(19_184_000 as u64) + Weight::from_ref_time(19_184_000_u64) // Standard Error: 29_000 - .saturating_add(Weight::from_ref_time(10_036_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(10_036_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic_named(s: u32, ) -> Weight { - Weight::from_ref_time(39_705_000 as u64) + Weight::from_ref_time(39_705_000_u64) // Standard Error: 54_000 - .saturating_add(Weight::from_ref_time(30_654_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(30_654_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:2 w:2) /// The range of component `s` is `[1, 50]`. fn on_initialize_periodic(s: u32, ) -> Weight { - Weight::from_ref_time(35_357_000 as u64) + Weight::from_ref_time(35_357_000_u64) // Standard Error: 47_000 - .saturating_add(Weight::from_ref_time(23_082_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(23_082_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize_named(s: u32, ) -> Weight { - Weight::from_ref_time(40_179_000 as u64) + Weight::from_ref_time(40_179_000_u64) // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(18_404_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(s as u64))) + .saturating_add(Weight::from_ref_time(18_404_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn on_initialize(s: u32, ) -> Weight { - Weight::from_ref_time(39_906_000 as u64) + Weight::from_ref_time(39_906_000_u64) // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(15_266_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(15_266_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule(s: u32, ) -> Weight { - Weight::from_ref_time(50_228_000 as u64) + Weight::from_ref_time(50_228_000_u64) // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(221_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(221_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - Weight::from_ref_time(47_930_000 as u64) + Weight::from_ref_time(47_930_000_u64) // Standard Error: 17_000 - .saturating_add(Weight::from_ref_time(2_454_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_454_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[0, 50]`. fn schedule_named(s: u32, ) -> Weight { - Weight::from_ref_time(60_652_000 as u64) + Weight::from_ref_time(60_652_000_u64) // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(211_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(211_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) /// The range of component `s` is `[1, 50]`. fn cancel_named(s: u32, ) -> Weight { - Weight::from_ref_time(52_149_000 as u64) + Weight::from_ref_time(52_149_000_u64) // Standard Error: 18_000 - .saturating_add(Weight::from_ref_time(2_473_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + .saturating_add(Weight::from_ref_time(2_473_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/session.rs b/code/parachain/runtime/picasso/src/weights/session.rs index 9b7d931493c..67a97a1867c 100644 --- a/code/parachain/runtime/picasso/src/weights/session.rs +++ b/code/parachain/runtime/picasso/src/weights/session.rs @@ -33,15 +33,15 @@ impl session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - Weight::from_ref_time(47_886_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(47_886_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - Weight::from_ref_time(38_464_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(38_464_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/timestamp.rs b/code/parachain/runtime/picasso/src/weights/timestamp.rs index 89ab6885a14..e3a16ab554b 100644 --- a/code/parachain/runtime/picasso/src/weights/timestamp.rs +++ b/code/parachain/runtime/picasso/src/weights/timestamp.rs @@ -33,11 +33,11 @@ impl timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - Weight::from_ref_time(24_117_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(24_117_000_u64) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn on_finalize() -> Weight { - Weight::from_ref_time(7_790_000 as u64) + Weight::from_ref_time(7_790_000_u64) } } diff --git a/code/parachain/runtime/picasso/src/weights/tokens.rs b/code/parachain/runtime/picasso/src/weights/tokens.rs index 1e66692a5b5..5d57932c60b 100644 --- a/code/parachain/runtime/picasso/src/weights/tokens.rs +++ b/code/parachain/runtime/picasso/src/weights/tokens.rs @@ -12,28 +12,28 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl orml_tokens::WeightInfo for WeightInfo { fn transfer() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_all() -> Weight { - Weight::from_ref_time(69_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(5 as u64)) - .saturating_add(RocksDbWeight::get().writes(4 as u64)) + Weight::from_ref_time(69_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(38_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(38_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn force_transfer() -> Weight { - Weight::from_ref_time(45_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(4 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(45_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } fn set_balance() -> Weight { - Weight::from_ref_time(34_000_000 as u64) - .saturating_add(RocksDbWeight::get().reads(3 as u64)) - .saturating_add(RocksDbWeight::get().writes(3 as u64)) + Weight::from_ref_time(34_000_000_u64) + .saturating_add(RocksDbWeight::get().reads(3_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/treasury.rs b/code/parachain/runtime/picasso/src/weights/treasury.rs index a621194e99b..48e0fc96079 100644 --- a/code/parachain/runtime/picasso/src/weights/treasury.rs +++ b/code/parachain/runtime/picasso/src/weights/treasury.rs @@ -31,49 +31,49 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { fn spend() -> Weight { - Weight::from_ref_time(563_000 as u64) + Weight::from_ref_time(563_000_u64) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - Weight::from_ref_time(71_290_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) + Weight::from_ref_time(71_290_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } // Storage: Treasury Proposals (r:1 w:1) // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - Weight::from_ref_time(100_117_000 as u64) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + Weight::from_ref_time(100_117_000_u64) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) /// The range of component `p` is `[0, 29]`. fn approve_proposal(p: u32, ) -> Weight { - Weight::from_ref_time(30_247_000 as u64) + Weight::from_ref_time(30_247_000_u64) // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(460_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + .saturating_add(Weight::from_ref_time(460_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - Weight::from_ref_time(21_056_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) + Weight::from_ref_time(21_056_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: System Account (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) // Storage: Treasury Proposals (r:1 w:1) /// The range of component `p` is `[0, 30]`. fn on_initialize_proposals(p: u32, ) -> Weight { - Weight::from_ref_time(80_249_000 as u64) + Weight::from_ref_time(80_249_000_u64) // Standard Error: 115_000 - .saturating_add(Weight::from_ref_time(77_193_000 as u64).saturating_mul(p as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(p as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(p as u64))) + .saturating_add(Weight::from_ref_time(77_193_000_u64).saturating_mul(p as u64)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p as u64))) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p as u64))) } } diff --git a/code/parachain/runtime/picasso/src/weights/utility.rs b/code/parachain/runtime/picasso/src/weights/utility.rs index d60e964be5f..98b8cf16f54 100644 --- a/code/parachain/runtime/picasso/src/weights/utility.rs +++ b/code/parachain/runtime/picasso/src/weights/utility.rs @@ -33,33 +33,33 @@ impl utility::WeightInfo for WeightInfo { // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - Weight::from_ref_time(44_973_000 as u64) + Weight::from_ref_time(44_973_000_u64) // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(11_193_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(11_193_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) fn as_derivative() -> Weight { - Weight::from_ref_time(22_271_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + Weight::from_ref_time(22_271_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - Weight::from_ref_time(55_138_000 as u64) + Weight::from_ref_time(55_138_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(11_670_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(11_670_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } fn dispatch_as() -> Weight { - Weight::from_ref_time(35_508_000 as u64) + Weight::from_ref_time(35_508_000_u64) } // Storage: CallFilter DisabledCalls (r:1 w:0) /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - Weight::from_ref_time(17_121_000 as u64) + Weight::from_ref_time(17_121_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(11_256_000 as u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(1 as u64)) + .saturating_add(Weight::from_ref_time(11_256_000_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) } } diff --git a/code/parachain/runtime/picasso/src/weights/vesting.rs b/code/parachain/runtime/picasso/src/weights/vesting.rs index fa4c851d8f1..90513f37dda 100644 --- a/code/parachain/runtime/picasso/src/weights/vesting.rs +++ b/code/parachain/runtime/picasso/src/weights/vesting.rs @@ -36,11 +36,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 128]`. fn claim(s: u32, ) -> Weight { - Weight::from_ref_time(106_646_000 as u64) + Weight::from_ref_time(106_646_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(4_437_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(4_437_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Vesting VestingScheduleNonce (r:1 w:1) // Storage: Vesting VestingSchedules (r:1 w:1) @@ -48,9 +48,9 @@ impl vesting::WeightInfo for WeightInfo { // Storage: System Account (r:2 w:1) // Storage: Tokens Locks (r:1 w:1) fn vested_transfer() -> Weight { - Weight::from_ref_time(162_725_000 as u64) - .saturating_add(T::DbWeight::get().reads(7 as u64)) - .saturating_add(T::DbWeight::get().writes(6 as u64)) + Weight::from_ref_time(162_725_000_u64) + .saturating_add(T::DbWeight::get().reads(7_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Tokens Locks (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) @@ -59,11 +59,11 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Vesting VestingScheduleNonce (r:1 w:1) /// The range of component `s` is `[0, 128]`. fn update_vesting_schedules(s: u32, ) -> Weight { - Weight::from_ref_time(104_345_000 as u64) + Weight::from_ref_time(104_345_000_u64) // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(2_866_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(5 as u64)) + .saturating_add(Weight::from_ref_time(2_866_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Vesting VestingSchedules (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -71,10 +71,10 @@ impl vesting::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) /// The range of component `s` is `[1, 128]`. fn claim_for(s: u32, ) -> Weight { - Weight::from_ref_time(105_194_000 as u64) + Weight::from_ref_time(105_194_000_u64) // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(4_213_000 as u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(4 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) + .saturating_add(Weight::from_ref_time(4_213_000_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } From e5823346f31eda819e09a76b0c18e28e3b6dadcf Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 15:18:36 +0100 Subject: [PATCH 40/44] chore: more clippy --- code/parachain/runtime/dali/src/lib.rs | 6 +++--- code/parachain/runtime/dali/src/xcmp.rs | 5 ++--- code/parachain/runtime/picasso/src/xcmp.rs | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 22a4dd76d82..ff1d72abf5a 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -93,7 +93,7 @@ pub use frame_support::{ PalletId, StorageValue, }; -use codec::{Codec, Encode, EncodeLike}; +use codec::Encode; use common::fees::WellKnownForeignToNativePriceConverter; use composable_traits::{ account_proxy::{AccountProxyWrapper, ProxyType}, @@ -103,7 +103,7 @@ use composable_traits::{ }; use frame_support::{ traits::{ - fungibles, ConstBool, ConstU32, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade, + fungibles, ConstU32, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade, }, weights::ConstantMultiplier, }; @@ -119,7 +119,7 @@ use pallet_ibc::{ use scale_info::TypeInfo; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; -use sp_runtime::{AccountId32, Either::*}; +use sp_runtime::Either::*; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; use sp_std::{collections::btree_map::BTreeMap, fmt::Debug, vec::Vec}; use system::{ diff --git a/code/parachain/runtime/dali/src/xcmp.rs b/code/parachain/runtime/dali/src/xcmp.rs index 517005ac48e..ddfaae65ecc 100644 --- a/code/parachain/runtime/dali/src/xcmp.rs +++ b/code/parachain/runtime/dali/src/xcmp.rs @@ -9,7 +9,6 @@ use cumulus_primitives_core::ParaId; use frame_support::{ log, parameter_types, traits::{Everything, OriginTrait, PalletInfoAccess}, - weights::Weight, }; use orml_traits::{ location::{AbsoluteReserveProvider, RelativeReserveProvider, Reserve}, @@ -20,7 +19,7 @@ use orml_xcm_support::{ }; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; -use sp_runtime::traits::{Convert, Zero}; +use sp_runtime::traits::Convert; use sp_std::{marker::PhantomData, prelude::*}; use xcm::latest::prelude::*; use xcm_builder::{ @@ -153,7 +152,7 @@ pub struct CaptureDropAssets< /// if asset put into Holding Registry of XCM VM, but did nothing to this /// or if too small to pay weight, /// it will get here -/// if asset location and origin is known, put into treasury, +/// if asset location and origin is known, put into treasury, /// else if asset location and origin not know, hash it until it will be added impl< Treasury: TakeRevenue, diff --git a/code/parachain/runtime/picasso/src/xcmp.rs b/code/parachain/runtime/picasso/src/xcmp.rs index acae0badbaf..03fa77bfd62 100644 --- a/code/parachain/runtime/picasso/src/xcmp.rs +++ b/code/parachain/runtime/picasso/src/xcmp.rs @@ -135,7 +135,7 @@ impl< let multi_assets: Vec = assets.into(); let mut can_return_on_request = vec![]; log::info!(target : "xcmp", "drop_assets"); - let mut weight = 0u64; + let mut weight = 0_u64; for asset in multi_assets { if let MultiAsset { id: Concrete(location), fun: Fungible(_amount) } = asset.clone() { if let Some(_converted) = AssetConverter::convert(location) { From ccd15829e4ee8d077f83e3078fbb0f55f0a964a0 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 15:25:36 +0100 Subject: [PATCH 41/44] feat(ci): disable GHSA about transitive substrate deps --- .github/workflows/dependency-review.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 67fa3eb91d5..b7a369350bf 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,6 +24,6 @@ jobs: - name: 'Dependency Review' uses: actions/dependency-review-action@v2 with: - # The following two GHSAs are ignored because they are casued by the static Docusaurus build. - # Please remove when Docusaurus gets updated. - allow-ghsas: GHSA-pfrx-2q88-qq97, GHSA-w5p7-h5w8-2hfq, GHSA-wcg3-cvx6-7396 + # GHSA-pfrx-2q88-qq97, GHSA-w5p7-h5w8-2hfq, GHSA-wcg3-cvx6-7396 are ignored because they are casued by the static Docusaurus build. Please remove when Docusaurus gets updated. + # GHSA-969w-q74q-9j8v, GHSA-44mr-8vmm-wjhg, GHSA-wh6w-3828-g9qf are ignored because they are transitive dependencies still used by the master branch of Substrate. Please remove when Substrate update the according dependencies. + allow-ghsas: GHSA-pfrx-2q88-qq97, GHSA-w5p7-h5w8-2hfq, GHSA-wcg3-cvx6-7396, GHSA-969w-q74q-9j8v, GHSA-44mr-8vmm-wjhg, GHSA-wh6w-3828-g9qf From 44a6a89e8da97b4dc959c09dc1537b817652cbb0 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 15:35:58 +0100 Subject: [PATCH 42/44] chore: final clippy and cargo fmt --- code/parachain/node/src/command.rs | 10 ++++------ code/parachain/node/src/service.rs | 4 ++-- code/parachain/runtime/dali/src/lib.rs | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/code/parachain/node/src/command.rs b/code/parachain/node/src/command.rs index 3f318c47f67..ddfdb306df3 100644 --- a/code/parachain/node/src/command.rs +++ b/code/parachain/node/src/command.rs @@ -270,13 +270,11 @@ pub fn run() -> Result<()> { id => panic!("Unknown Chain: {}", id), }), #[cfg(not(feature = "runtime-benchmarks"))] - BenchmarkCmd::Storage(_) => - return Err(sc_cli::Error::Input( - "Compile with --features=runtime-benchmarks \ + BenchmarkCmd::Storage(_) => Err(sc_cli::Error::Input( + "Compile with --features=runtime-benchmarks \ to enable storage benchmarks." - .into(), - ) - .into()), + .into(), + )), #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| match config.chain_spec.id() { id if id.contains("picasso") => { diff --git a/code/parachain/node/src/service.rs b/code/parachain/node/src/service.rs index 9542b49dee8..82182313ad1 100644 --- a/code/parachain/node/src/service.rs +++ b/code/parachain/node/src/service.rs @@ -24,7 +24,7 @@ use crate::{ pablo::ExtendWithPabloApi, BaseHostRuntimeApis, }, }; -use sc_client_api::{ExecutorProvider, StateBackendFor}; +use sc_client_api::StateBackendFor; use sc_executor::NativeExecutionDispatch; use sc_service::{Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; @@ -521,7 +521,7 @@ where _, >(cumulus_client_consensus_aura::ImportQueueParams { block_import: client.clone(), - client: client.clone(), + client, create_inherent_data_providers: move |_, _| async move { let time = sp_timestamp::InherentDataProvider::from_system_time(); diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index ff1d72abf5a..89c5642c76d 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -102,9 +102,7 @@ use composable_traits::{ xcm::assets::{RemoteAssetRegistryMutate, XcmAssetLocation}, }; use frame_support::{ - traits::{ - fungibles, ConstU32, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade, - }, + traits::{fungibles, ConstU32, EqualPrivilegeOnly, InstanceFilter, OnRuntimeUpgrade}, weights::ConstantMultiplier, }; use frame_system as system; From 69f1293485cb539d2a69644e4a51f5aa03782f62 Mon Sep 17 00:00:00 2001 From: hussein Date: Tue, 17 Jan 2023 17:32:28 +0100 Subject: [PATCH 43/44] chore: remove trailing whitespaces --- REVIEWERS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/REVIEWERS.md b/REVIEWERS.md index 29f8732de05..5d0e437aac2 100644 --- a/REVIEWERS.md +++ b/REVIEWERS.md @@ -9,11 +9,11 @@ Ideas in this document are taken from [Google's Engineering Practices](https://g # Creating a PR -- Make sure you read the [contributing guidelines](https://github.com/ComposableFi/composable/blob/main/docs/CONTRIBUTING.md). +- Make sure you read the [contributing guidelines](https://github.com/ComposableFi/composable/blob/main/docs/CONTRIBUTING.md). - Always branch off of `main` for both feature (`feat`) and `bugfix` branches. If you are working together with other developers on a feature and want to each have your your branch, create a `feat/{feature}/{GITHUB_USERNAME}` branch. Once the `feat/{feature}` branch has been deleted, we may delete all nested branches(!). -- Commits must be signed, as well as that all code should pass our automated checks and tests. Code will not be reviewed until all checks succeed. +- Commits must be signed, as well as that all code should pass our automated checks and tests. Code will not be reviewed until all checks succeed. - Fill in the PR template, and make sure to describe your changes well. The developer reviewing your work may be out of the loop on the need of the change, and unfamiliar with the product itself. Linking to a ticket or issue is also acceptable. @@ -36,4 +36,4 @@ In order of importance for code quality: # Handling Feedback -Explanations written only in the code review tool are not helpful to future code readers. They are acceptable only in a few circumstances, such as when you are reviewing an area you are not very familiar with and the developer explains something that normal readers of the code would have already known. Unless the reviewer's comment was completely incorrect, any non-`nit` comments should result in a new commit fixing the code, or adding a comment describing the code. \ No newline at end of file +Explanations written only in the code review tool are not helpful to future code readers. They are acceptable only in a few circumstances, such as when you are reviewing an area you are not very familiar with and the developer explains something that normal readers of the code would have already known. Unless the reviewer's comment was completely incorrect, any non-`nit` comments should result in a new commit fixing the code, or adding a comment describing the code. From 7bcf4b90d668e764de9189f832699e4f558b69e2 Mon Sep 17 00:00:00 2001 From: hussein Date: Wed, 18 Jan 2023 14:45:16 +0100 Subject: [PATCH 44/44] feat(tx-payment): move transaction payment pallets off our substrate fork --- code/Cargo.lock | 101 +- .../local-integration-tests/Cargo.toml | 5 +- .../frame/transaction-payment/Cargo.toml | 52 + .../frame/transaction-payment/README.md | 16 + .../asset-tx-payment/Cargo.toml | 64 + .../asset-tx-payment/README.md | 21 + .../asset-tx-payment/src/benchmarking.rs | 38 + .../asset-tx-payment/src/lib.rs | 416 ++++ .../asset-tx-payment/src/payment.rs | 181 ++ .../asset-tx-payment/src/tests.rs | 709 +++++++ .../asset-tx-payment/src/weights.rs | 75 + .../frame/transaction-payment/rpc/Cargo.toml | 23 + .../frame/transaction-payment/rpc/README.md | 3 + .../rpc/runtime-api/Cargo.toml | 28 + .../rpc/runtime-api/README.md | 3 + .../rpc/runtime-api/src/lib.rs | 34 + .../frame/transaction-payment/rpc/src/lib.rs | 169 ++ .../frame/transaction-payment/src/lib.rs | 1793 +++++++++++++++++ .../frame/transaction-payment/src/payment.rs | 149 ++ .../frame/transaction-payment/src/types.rs | 168 ++ code/parachain/node/Cargo.toml | 4 +- code/parachain/runtime/composable/Cargo.toml | 4 +- code/parachain/runtime/dali/Cargo.toml | 25 +- code/parachain/runtime/dali/src/lib.rs | 19 +- .../dali/src/weights/asset_tx_payment.rs | 38 + .../parachain/runtime/dali/src/weights/mod.rs | 1 + code/parachain/runtime/picasso/Cargo.toml | 21 +- code/parachain/runtime/picasso/src/lib.rs | 17 +- .../picasso/src/weights/asset_tx_payment.rs | 38 + .../runtime/picasso/src/weights/mod.rs | 3 +- code/simnode/common/Cargo.toml | 4 +- code/utils/common/Cargo.toml | 2 +- 32 files changed, 4159 insertions(+), 65 deletions(-) create mode 100644 code/parachain/frame/transaction-payment/Cargo.toml create mode 100644 code/parachain/frame/transaction-payment/README.md create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/Cargo.toml create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/README.md create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/src/benchmarking.rs create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/src/lib.rs create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/src/payment.rs create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/src/tests.rs create mode 100644 code/parachain/frame/transaction-payment/asset-tx-payment/src/weights.rs create mode 100644 code/parachain/frame/transaction-payment/rpc/Cargo.toml create mode 100644 code/parachain/frame/transaction-payment/rpc/README.md create mode 100644 code/parachain/frame/transaction-payment/rpc/runtime-api/Cargo.toml create mode 100644 code/parachain/frame/transaction-payment/rpc/runtime-api/README.md create mode 100644 code/parachain/frame/transaction-payment/rpc/runtime-api/src/lib.rs create mode 100644 code/parachain/frame/transaction-payment/rpc/src/lib.rs create mode 100644 code/parachain/frame/transaction-payment/src/lib.rs create mode 100644 code/parachain/frame/transaction-payment/src/payment.rs create mode 100644 code/parachain/frame/transaction-payment/src/types.rs create mode 100644 code/parachain/runtime/dali/src/weights/asset_tx_payment.rs create mode 100644 code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs diff --git a/code/Cargo.lock b/code/Cargo.lock index 640d9b0c278..ae033f13f80 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -1641,8 +1641,8 @@ dependencies = [ "pallet-assets", "pallet-crowdloan-rewards", "pallet-ibc", - "pallet-transaction-payment-rpc", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc 4.0.0-dev", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev", "parity-scale-codec", "picasso-runtime", "polkadot-cli", @@ -1742,8 +1742,8 @@ dependencies = [ "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev", "pallet-treasury", "pallet-utility", "pallet-vault", @@ -3254,8 +3254,8 @@ dependencies = [ "pallet-staking-rewards", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev", "pallet-treasury", "pallet-utility", "pallet-vault", @@ -5974,8 +5974,8 @@ dependencies = [ "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", @@ -7894,18 +7894,24 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", - "pallet-transaction-payment", + "orml-tokens", + "orml-traits", + "pallet-authorship", + "pallet-balances", + "pallet-transaction-payment 4.0.0-dev", "parity-scale-codec", "scale-info", "serde", + "serde_json", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -9240,6 +9246,23 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] +[[package]] +name = "pallet-transaction-payment" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "serde_json", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" @@ -9256,13 +9279,27 @@ dependencies = [ "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] +[[package]] +name = "pallet-transaction-payment-rpc" +version = "4.0.0-dev" +dependencies = [ + "jsonrpsee 0.15.1", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev", + "parity-scale-codec", + "sp-api", + "sp-blockchain", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-rpc", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "jsonrpsee 0.15.1", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "sp-api", "sp-blockchain", @@ -9271,12 +9308,22 @@ dependencies = [ "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] +[[package]] +name = "pallet-transaction-payment-rpc-runtime-api" +version = "4.0.0-dev" +dependencies = [ + "pallet-transaction-payment 4.0.0-dev", + "parity-scale-codec", + "sp-api", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "sp-api", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -9799,8 +9846,8 @@ dependencies = [ "pallet-session", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev", "pallet-treasury", "pallet-utility", "pallet-vesting 1.0.0", @@ -10068,8 +10115,8 @@ dependencies = [ "frame-benchmarking-cli", "frame-system", "frame-system-rpc-runtime-api", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "polkadot-core-primitives", "polkadot-node-core-parachains-inherent", "polkadot-primitives", @@ -10725,7 +10772,7 @@ dependencies = [ "beefy-gadget-rpc", "jsonrpsee 0.15.1", "pallet-mmr-rpc", - "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "polkadot-primitives", "sc-chain-spec", "sc-client-api", @@ -10798,8 +10845,8 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", @@ -10860,7 +10907,7 @@ dependencies = [ "pallet-session", "pallet-staking", "pallet-timestamp", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-treasury", "pallet-vesting 4.0.0-dev", "parity-scale-codec", @@ -10970,7 +11017,7 @@ dependencies = [ "pallet-babe", "pallet-im-online", "pallet-staking", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", @@ -12105,8 +12152,8 @@ dependencies = [ "pallet-sudo", "pallet-timestamp", "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", @@ -16811,7 +16858,7 @@ dependencies = [ "dali-runtime", "derive_more", "frame-system", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev", "picasso-runtime", "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", @@ -17474,8 +17521,8 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-sudo", "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "pallet-transaction-payment-rpc-runtime-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "pallet-treasury", "pallet-utility", "pallet-vesting 4.0.0-dev", @@ -17799,7 +17846,7 @@ dependencies = [ "frame-support", "frame-system", "log 0.4.17", - "pallet-transaction-payment", + "pallet-transaction-payment 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "parity-scale-codec", "polkadot-parachain", "scale-info", diff --git a/code/integration-tests/local-integration-tests/Cargo.toml b/code/integration-tests/local-integration-tests/Cargo.toml index cbfe119756a..11eb82f7080 100644 --- a/code/integration-tests/local-integration-tests/Cargo.toml +++ b/code/integration-tests/local-integration-tests/Cargo.toml @@ -55,7 +55,6 @@ session = { package = "pallet-session", git = "https://github.com/paritytech/sub smallvec = "1.6.1" sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -72,11 +71,11 @@ liquidations = { package = "pallet-liquidations", path = "../../parachain/frame/ oracle = { package = "pallet-oracle", path = "../../parachain/frame/oracle", default-features = false } primitives = { path = "../../parachain/runtime/primitives", default-features = false } vault = { package = "pallet-vault", path = "../../parachain/frame/vault", default-features = false } - +transaction-payment = { package = "pallet-transaction-payment", path = "../../parachain/frame/transaction-payment", default-features = false } # Used for the node template's RPCs system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../parachain/frame/transaction-payment", default-features = false } # Used for runtime benchmarking benchmarking = { package = "frame-benchmarking", git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.30" } diff --git a/code/parachain/frame/transaction-payment/Cargo.toml b/code/parachain/frame/transaction-payment/Cargo.toml new file mode 100644 index 00000000000..6faef688fe5 --- /dev/null +++ b/code/parachain/frame/transaction-payment/Cargo.toml @@ -0,0 +1,52 @@ +[package] +name = "pallet-transaction-payment" +version = "4.0.0-dev" +authors = ["Parity Technologies ", "Composable Developers"] +edition = "2021" +license = "Apache-2.0" +homepage = "https://substrate.io" +repository = "https://github.com/paritytech/substrate/" +description = "FRAME pallet to manage transaction payments" +readme = "README.md" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] + +[dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ + "derive", +] } +scale-info = { default-features = false, version = "2.1.1", features = [ + "derive", +] } +serde = { version = "1.0.136", optional = true } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + +[dev-dependencies] +serde_json = "1.0.85" +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + +[features] +default = ["std"] +std = [ + "codec/std", + "frame-support/std", + "frame-system/std", + "scale-info/std", + "serde", + "sp-core/std", + "sp-io/std", + "sp-runtime/std", + "sp-std/std", +] +try-runtime = ["frame-support/try-runtime"] + +runtime-benchmarks = [ + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", +] diff --git a/code/parachain/frame/transaction-payment/README.md b/code/parachain/frame/transaction-payment/README.md new file mode 100644 index 00000000000..bf114246e60 --- /dev/null +++ b/code/parachain/frame/transaction-payment/README.md @@ -0,0 +1,16 @@ +# Transaction Payment Pallet + +This pallet provides the basic logic needed to pay the absolute minimum amount needed for a +transaction to be included. This includes: + - _weight fee_: A fee proportional to amount of weight a transaction consumes. + - _length fee_: A fee proportional to the encoded length of the transaction. + - _tip_: An optional tip. Tip increases the priority of the transaction, giving it a higher + chance to be included by the transaction queue. + +Additionally, this pallet allows one to configure: + - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`]. + - A means of updating the fee for the next block, via defining a multiplier, based on the + final state of the chain at the end of the previous block. This can be configured via + [`Config::FeeMultiplierUpdate`] + +License: Apache-2.0 diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/Cargo.toml b/code/parachain/frame/transaction-payment/asset-tx-payment/Cargo.toml new file mode 100644 index 00000000000..ffd5574214e --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/Cargo.toml @@ -0,0 +1,64 @@ +[package] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" +authors = ["Parity Technologies ", "Composable Developers"] +edition = "2021" +license = "Apache-2.0" +homepage = "https://substrate.io" +repository = "https://github.com/paritytech/substrate/" +description = "pallet to manage transaction payments in assets" +readme = "README.md" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] + +[dependencies] +# Substrate dependencies +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-transaction-payment = { default-features = false, path = ".." } + +# Other dependencies +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +serde = { version = "1.0.136", optional = true } + +[dev-dependencies] +serde_json = "1.0.85" + +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.30" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + + +[features] +default = ["std"] +std = [ + "serde", + "codec/std", + "sp-std/std", + "sp-runtime/std", + "frame-support/std", + "frame-system/std", + "sp-io/std", + "sp-core/std", + "pallet-transaction-payment/std", + "frame-benchmarking/std", +] +try-runtime = ["frame-support/try-runtime"] + +runtime-benchmarks = [ + "frame-benchmarking", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-transaction-payment/runtime-benchmarks", +] diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/README.md b/code/parachain/frame/transaction-payment/asset-tx-payment/README.md new file mode 100644 index 00000000000..fc860347d85 --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/README.md @@ -0,0 +1,21 @@ +# pallet-asset-tx-payment + +## Asset Transaction Payment Pallet + +This pallet allows runtimes that include it to pay for transactions in assets other than the +native token of the chain. + +### Overview +It does this by extending transactions to include an optional `AssetId` that specifies the asset +to be used for payment (defaulting to the native token on `None`). It expects an +[`OnChargeAssetTransaction`] implementation analogously to [`pallet-transaction-payment`]. The +included [`FungiblesAdapter`] (implementing [`OnChargeAssetTransaction`]) determines the fee +amount by converting the fee calculated by [`pallet-transaction-payment`] into the desired +asset. + +### Integration +This pallet wraps FRAME's transaction payment pallet and functions as a replacement. This means +you should include both pallets in your `construct_runtime` macro, but only include this +pallet's [`SignedExtension`] ([`ChargeAssetTxPayment`]). + +License: Apache-2.0 diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/src/benchmarking.rs b/code/parachain/frame/transaction-payment/asset-tx-payment/src/benchmarking.rs new file mode 100644 index 00000000000..01c9dd69c96 --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/src/benchmarking.rs @@ -0,0 +1,38 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Benchmarks for AssetTxPayment Pallet + +#![cfg(feature = "runtime-benchmarks")] + +use super::*; +#[allow(unused_imports)] // benchmarks +use crate::Pallet as AssetTxPayment; +use frame_benchmarking::{benchmarks, whitelisted_caller}; +use frame_system::RawOrigin; + +benchmarks! { + set_payment_asset { + let caller: T::AccountId = whitelisted_caller(); + // NOTE: best effort without refactoring to support runtime for tests (need asset_id) + }: _(RawOrigin::Signed(caller.clone()), caller.clone(), <_>::default()) + verify { + let actual = >::get(&caller); + assert_eq!(actual, None); + } + impl_benchmark_test_suite!(AssetTxPayment, crate::tests::new_test_ext(), crate::tests::Runtime); +} diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/src/lib.rs b/code/parachain/frame/transaction-payment/asset-tx-payment/src/lib.rs new file mode 100644 index 00000000000..a18dd4748c5 --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/src/lib.rs @@ -0,0 +1,416 @@ +// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! # Asset Transaction Payment Pallet +//! +//! This pallet allows runtimes that include it to pay for transactions in assets other than the +//! main token of the chain. +//! +//! ## Overview + +//! It does this by extending transactions to include an optional `AssetId` that specifies the asset +//! to be used for payment (defaulting to the native token on `None`). It expects an +//! [`OnChargeAssetTransaction`] implementation analogously to [`pallet-transaction-payment`]. The +//! included [`FungiblesAdapter`] (implementing [`OnChargeAssetTransaction`]) determines the fee +//! amount by converting the fee calculated by [`pallet-transaction-payment`] into the desired +//! asset. +//! +//! ## Integration + +//! This pallet wraps FRAME's transaction payment pallet and functions as a replacement. This means +//! you should include both pallets in your `construct_runtime` macro, but only include this +//! pallet's [`SignedExtension`] ([`ChargeAssetTxPayment`]). + +#![cfg_attr(not(feature = "std"), no_std)] + +use sp_std::prelude::*; + +use codec::{Decode, Encode}; +use frame_support::{ + dispatch::{DispatchInfo, DispatchResult, GetDispatchInfo, PostDispatchInfo}, + pallet_prelude::*, + traits::{ + tokens::{ + fungibles::{Balanced, CreditOf, Inspect, MutateHold}, + BalanceConversion, WithdrawConsequence, + }, + Get, IsSubType, IsType, + }, + DefaultNoBound, +}; +use frame_system::pallet_prelude::*; + +use pallet_transaction_payment::OnChargeTransaction; +use scale_info::TypeInfo; +use sp_runtime::{ + traits::{DispatchInfoOf, Dispatchable, PostDispatchInfoOf, SignedExtension, Zero}, + transaction_validity::{ + InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction, + }, + FixedPointOperand, +}; + +#[cfg(test)] +mod tests; + +mod benchmarking; + +mod payment; +pub mod weights; +pub use payment::*; +pub use weights::*; + +// Default implementation for [`BalanceConversion`]. +pub struct OneToOneBalanceConversion; +impl BalanceConversion for OneToOneBalanceConversion { + type Error = DispatchError; + fn to_asset_balance(balance: Balance, _asset_id: AssetId) -> Result { + Ok(balance) + } +} + +// Type aliases used for interaction with `OnChargeTransaction`. +pub(crate) type OnChargeTransactionOf = + ::OnChargeTransaction; +// Balance type alias. +pub(crate) type BalanceOf = as OnChargeTransaction>::Balance; +// Liquity info type alias. +pub(crate) type LiquidityInfoOf = + as OnChargeTransaction>::LiquidityInfo; + +// Type alias used for interaction with fungibles (assets). +// Balance type alias. +pub(crate) type AssetBalanceOf = + <::Fungibles as Inspect<::AccountId>>::Balance; +/// Asset id type alias. +pub(crate) type AssetIdOf = + <::Fungibles as Inspect<::AccountId>>::AssetId; + +// Type aliases used for interaction with `OnChargeAssetTransaction`. +// Balance type alias. +pub(crate) type ChargeAssetBalanceOf = + <::OnChargeAssetTransaction as OnChargeAssetTransaction>::Balance; +// Asset id type alias. +pub(crate) type ChargeAssetIdOf = + <::OnChargeAssetTransaction as OnChargeAssetTransaction>::AssetId; +// Liquity info type alias. +pub(crate) type ChargeAssetLiquidityOf = + <::OnChargeAssetTransaction as OnChargeAssetTransaction>::LiquidityInfo; + +/// Used to pass the initial payment info from pre- to post-dispatch. +#[derive(Encode, Decode, DefaultNoBound, TypeInfo)] +pub enum InitialPayment { + /// No initial fee was payed. + Nothing, + /// The initial fee was payed in the native currency. + Native(LiquidityInfoOf), + /// The initial fee was payed in an asset. + Asset(CreditOf), +} + +pub use pallet::*; + +#[frame_support::pallet] +pub mod pallet { + use super::*; + + #[pallet::config] + pub trait Config: frame_system::Config + pallet_transaction_payment::Config { + /// The fungibles instance used to pay for transactions in assets. + type Fungibles: Balanced; + + /// The actual transaction charging logic that charges the fees. + type OnChargeAssetTransaction: OnChargeAssetTransaction; + + /// where to allow configuring default asset per user + #[pallet::constant] + type UseUserConfiguration: Get; + + type WeightInfo: WeightInfo; + + /// origin allowed to reset payment asset for any account + type ConfigurationOrigin: EnsureOrigin; + + /// Amount native assets to lock of ED. + type ConfigurationExistentialDeposit: Get>; + + type PayableCall: Parameter + + From> + + Dispatchable< + RuntimeOrigin = Self::RuntimeOrigin, + PostInfo = PostDispatchInfo, + Info = DispatchInfo, + > + GetDispatchInfo + + IsSubType> + + IsType<::RuntimeCall>; + + type Lock: MutateHold< + Self::AccountId, + AssetId = ChargeAssetIdOf, + Balance = ChargeAssetBalanceOf, + >; + + /// To covert ED to other asset amount. + type BalanceConverter: BalanceConversion< + BalanceOf, + ChargeAssetIdOf, + ChargeAssetBalanceOf, + >; + } + + #[pallet::pallet] + #[pallet::generate_store(pub(super) trait Store)] + pub struct Pallet(_); + + /// Stores default payment asset of user with ED locked. + #[pallet::storage] + #[pallet::getter(fn payment_assets)] + pub type PaymentAssets = StorageMap< + _, + Blake2_128Concat, + T::AccountId, + (ChargeAssetIdOf, ChargeAssetBalanceOf), + OptionQuery, + >; + + #[pallet::call] + impl Pallet { + /// Sets or resets payment asset. + /// + /// If `asset_id` is `None`, then native asset is used. + /// Else new asset is configured and ED is on hold. + #[pallet::weight(T::WeightInfo::set_payment_asset())] + pub fn set_payment_asset( + origin: OriginFor, + payer: T::AccountId, + asset_id: Option>, + ) -> DispatchResult { + // either configuration origin or owner of configuration + if let Err(origin) = T::ConfigurationOrigin::try_origin(origin) { + let who = ensure_signed(origin)?; + ensure!(who == payer, DispatchError::BadOrigin,) + }; + + // clean previous configuration + if let Some((asset_id, ed)) = >::get(&payer) { + T::Lock::release(asset_id, &payer, ed, true)?; + >::remove(&payer); + } + + // configure new payment asset and hold some ed + if let Some(asset_id) = asset_id { + let ed = T::BalanceConverter::to_asset_balance( + T::ConfigurationExistentialDeposit::get(), + asset_id, + ) + .map_err(|_| DispatchError::Other("Cannot convert ED to asset balance"))?; + T::Lock::hold(asset_id, &payer, ed)?; + >::insert(payer, (asset_id, ed)); + } + + Ok(()) + } + } +} + +/// Require the transactor pay for themselves and maybe include a tip to gain additional priority +/// in the queue. Allows paying via both `Currency` as well as `fungibles::Balanced`. +/// +/// Wraps the transaction logic in [`pallet_transaction_payment`] and extends it with assets. +/// An asset id of `None` falls back to the underlying transaction payment via the native currency. +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] +#[scale_info(skip_type_params(T))] +pub struct ChargeAssetTxPayment { + #[codec(compact)] + tip: BalanceOf, + asset_id: Option>, +} + +impl ChargeAssetTxPayment +where + T::RuntimeCall: Dispatchable, + AssetBalanceOf: Send + Sync + FixedPointOperand, + BalanceOf: Send + Sync + FixedPointOperand + IsType>, + ChargeAssetIdOf: Send + Sync, + CreditOf: IsType>, +{ + /// Utility constructor. Used only in client/factory code. + pub fn from(tip: BalanceOf, asset_id: Option>) -> Self { + Self { tip, asset_id } + } + + /// Fee withdrawal logic that dispatches to either `OnChargeAssetTransaction` or + /// `OnChargeTransaction`. + fn withdraw_fee( + &self, + who: &T::AccountId, + call: &T::RuntimeCall, + info: &DispatchInfoOf, + len: usize, + asset_id: Option>, + ) -> Result<(BalanceOf, InitialPayment), TransactionValidityError> { + let fee = pallet_transaction_payment::Pallet::::compute_fee(len as u32, info, self.tip); + debug_assert!(self.tip <= fee, "tip should be included in the computed fee"); + if fee.is_zero() { + Ok((fee, InitialPayment::Nothing)) + } else if let Some(asset_id) = asset_id { + T::OnChargeAssetTransaction::withdraw_fee( + who, + call, + info, + asset_id, + fee.into(), + self.tip.into(), + ) + .map(|i| (fee, InitialPayment::Asset(i.into()))) + } else { + as OnChargeTransaction>::withdraw_fee( + who, call, info, fee, self.tip, + ) + .map(|i| (fee, InitialPayment::Native(i))) + .map_err(|_| -> TransactionValidityError { InvalidTransaction::Payment.into() }) + } + } + + /// Get payment asset for this transaction. + /// + /// Will pick asset id in next order: + /// - defined in extra + /// - defined in well known call + /// - defined in configuration + /// - native + fn get_payment_asset( + &self, + who: &T::AccountId, + call: &T::RuntimeCall, + ) -> Option> { + if self.asset_id.is_some() || !::UseUserConfiguration::get() { + return self.asset_id + } + + let call = ::PayableCall::from_ref(call); + match call.is_sub_type() { + Some(Call::set_payment_asset { asset_id, .. }) => asset_id.to_owned(), + _ => >::get(who).map(|x| x.0), + } + } +} + +impl sp_std::fmt::Debug for ChargeAssetTxPayment { + #[cfg(feature = "std")] + fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { + write!(f, "ChargeAssetTxPayment<{:?}, {:?}>", self.tip, self.asset_id.encode()) + } + #[cfg(not(feature = "std"))] + fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { + Ok(()) + } +} + +impl SignedExtension for ChargeAssetTxPayment +where + T::RuntimeCall: Dispatchable, + AssetBalanceOf: Send + Sync + FixedPointOperand, + BalanceOf: Send + Sync + From + FixedPointOperand + IsType>, + ChargeAssetIdOf: Send + Sync, + CreditOf: IsType>, +{ + const IDENTIFIER: &'static str = "ChargeAssetTxPayment"; + type AccountId = T::AccountId; + type Call = T::RuntimeCall; + type AdditionalSigned = (); + type Pre = ( + // tip + BalanceOf, + // who paid the fee + Self::AccountId, + // imbalance resulting from withdrawing the fee + InitialPayment, + ); + + fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { + Ok(()) + } + + fn validate( + &self, + who: &Self::AccountId, + call: &Self::Call, + info: &DispatchInfoOf, + len: usize, + ) -> TransactionValidity { + use pallet_transaction_payment::ChargeTransactionPayment; + let asset_id = self.get_payment_asset(who, call); + let (fee, _) = self.withdraw_fee(who, call, info, len, asset_id)?; + let priority = ChargeTransactionPayment::::get_priority(info, len, self.tip, fee); + Ok(ValidTransaction { priority, ..Default::default() }) + } + + fn pre_dispatch( + self, + who: &Self::AccountId, + call: &Self::Call, + info: &DispatchInfoOf, + len: usize, + ) -> Result { + let asset_id = self.get_payment_asset(who, call); + let (_fee, initial_payment) = self.withdraw_fee(who, call, info, len, asset_id)?; + Ok((self.tip, who.clone(), initial_payment)) + } + + fn post_dispatch( + pre: Option, + info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + len: usize, + result: &DispatchResult, + ) -> Result<(), TransactionValidityError> { + if let Some((tip, who, initial_payment)) = pre { + match initial_payment { + InitialPayment::Native(already_withdrawn) => { + pallet_transaction_payment::ChargeTransactionPayment::::post_dispatch( + Some((tip, who, already_withdrawn)), + info, + post_info, + len, + result, + )?; + }, + InitialPayment::Asset(already_withdrawn) => { + let actual_fee = pallet_transaction_payment::Pallet::::compute_actual_fee( + len as u32, info, post_info, tip, + ); + T::OnChargeAssetTransaction::correct_and_deposit_fee( + &who, + info, + post_info, + actual_fee.into(), + tip.into(), + already_withdrawn.into(), + )?; + }, + InitialPayment::Nothing => { + // `actual_fee` should be zero here for any signed extrinsic. It would be + // non-zero here in case of unsigned extrinsics as they don't pay fees but + // `compute_actual_fee` is not aware of them. In both cases it's fine to just + // move ahead without adjusting the fee, though, so we do nothing. + debug_assert!(tip.is_zero(), "tip should be zero if initial fee was zero."); + }, + } + } + + Ok(()) + } +} diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/src/payment.rs b/code/parachain/frame/transaction-payment/asset-tx-payment/src/payment.rs new file mode 100644 index 00000000000..9453e7eb610 --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/src/payment.rs @@ -0,0 +1,181 @@ +// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +///! Traits and default implementation for paying transaction fees in assets. +use super::*; +use crate::Config; + +use codec::{EncodeLike, FullCodec, MaxEncodedLen}; +use frame_support::{ + traits::{ + fungibles::{Balanced, CreditOf, Inspect}, + tokens::BalanceConversion, + }, + unsigned::TransactionValidityError, +}; +use scale_info::TypeInfo; +use sp_runtime::{ + traits::{ + AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, One, PostDispatchInfoOf, + }, + transaction_validity::InvalidTransaction, +}; +use sp_std::{fmt::Debug, marker::PhantomData}; + +/// Handle withdrawing, refunding and depositing of transaction fees. +pub trait OnChargeAssetTransaction { + /// The underlying integer type in which fees are calculated. + type Balance: AtLeast32BitUnsigned + + FullCodec + + Copy + + MaybeSerializeDeserialize + + Debug + + Default + + TypeInfo + + MaxEncodedLen + + EncodeLike; + /// The type used to identify the assets used for transaction payment. + type AssetId: FullCodec + + Copy + + MaybeSerializeDeserialize + + Debug + + Default + + Eq + + TypeInfo + + MaxEncodedLen; + /// The type used to store the intermediate values between pre- and post-dispatch. + type LiquidityInfo; + + /// Before the transaction is executed the payment of the transaction fees needs to be secured. + /// + /// Note: The `fee` already includes the `tip`. + fn withdraw_fee( + who: &T::AccountId, + call: &T::RuntimeCall, + dispatch_info: &DispatchInfoOf, + asset_id: Self::AssetId, + fee: Self::Balance, + tip: Self::Balance, + ) -> Result; + + /// After the transaction was executed the actual fee can be calculated. + /// This function should refund any overpaid fees and optionally deposit + /// the corrected amount. + /// + /// Note: The `fee` already includes the `tip`. + fn correct_and_deposit_fee( + who: &T::AccountId, + dispatch_info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + corrected_fee: Self::Balance, + tip: Self::Balance, + already_withdrawn: Self::LiquidityInfo, + ) -> Result<(), TransactionValidityError>; +} + +/// Allows specifying what to do with the withdrawn asset fees. +pub trait HandleCredit> { + /// Implement to determine what to do with the withdrawn asset fees. + /// Default for `CreditOf` from the assets pallet is to burn and + /// decrease total issuance. + fn handle_credit(credit: CreditOf); +} + +/// Default implementation that just drops the credit according to the `OnDrop` in the underlying +/// imbalance type. +impl> HandleCredit for () { + fn handle_credit(_credit: CreditOf) {} +} + +/// Implements the asset transaction for a balance to asset converter (implementing +/// [`BalanceConversion`]) and a credit handler (implementing [`HandleCredit`]). +/// +/// The credit handler is given the complete fee in terms of the asset used for the transaction. +pub struct FungiblesAdapter(PhantomData<(CON, HC)>); + +/// Default implementation for a runtime instantiating this pallet, a balance to asset converter and +/// a credit handler. +impl OnChargeAssetTransaction for FungiblesAdapter +where + T: Config, + CON: BalanceConversion, AssetIdOf, AssetBalanceOf>, + HC: HandleCredit, + AssetIdOf: FullCodec + + Copy + + MaybeSerializeDeserialize + + Debug + + Default + + Eq + + TypeInfo + + MaxEncodedLen, +{ + type Balance = BalanceOf; + type AssetId = AssetIdOf; + type LiquidityInfo = CreditOf; + + /// Withdraw the predicted fee from the transaction origin. + /// + /// Note: The `fee` already includes the `tip`. + fn withdraw_fee( + who: &T::AccountId, + _call: &T::RuntimeCall, + _info: &DispatchInfoOf, + asset_id: Self::AssetId, + fee: Self::Balance, + _tip: Self::Balance, + ) -> Result { + // We don't know the precision of the underlying asset. Because the converted fee could be + // less than one (e.g. 0.5) but gets rounded down by integer division we introduce a minimum + // fee. + let min_converted_fee = if fee.is_zero() { Zero::zero() } else { One::one() }; + let converted_fee = CON::to_asset_balance(fee, asset_id) + .map_err(|_| TransactionValidityError::from(InvalidTransaction::Payment))? + .max(min_converted_fee); + let can_withdraw = + >::can_withdraw(asset_id, who, converted_fee); + if !matches!(can_withdraw, WithdrawConsequence::Success) { + return Err(InvalidTransaction::Payment.into()) + } + >::withdraw(asset_id, who, converted_fee) + .map_err(|_| TransactionValidityError::from(InvalidTransaction::Payment)) + } + + /// Hand the fee and the tip over to the `[HandleCredit]` implementation. + /// Since the predicted fee might have been too high, parts of the fee may be refunded. + /// + /// Note: The `corrected_fee` already includes the `tip`. + fn correct_and_deposit_fee( + who: &T::AccountId, + _dispatch_info: &DispatchInfoOf, + _post_info: &PostDispatchInfoOf, + corrected_fee: Self::Balance, + _tip: Self::Balance, + paid: Self::LiquidityInfo, + ) -> Result<(), TransactionValidityError> { + let min_converted_fee = if corrected_fee.is_zero() { Zero::zero() } else { One::one() }; + // Convert the corrected fee into the asset used for payment. + let converted_fee = CON::to_asset_balance(corrected_fee, paid.asset()) + .map_err(|_| -> TransactionValidityError { InvalidTransaction::Payment.into() })? + .max(min_converted_fee); + // Calculate how much refund we should return. + let (final_fee, refund) = paid.split(converted_fee); + // Refund to the account that paid the fees. If this fails, the account might have dropped + // below the existential balance. In that case we don't refund anything. + let _ = >::resolve(who, refund); + // Handle the final fee, e.g. by transferring to the block author or burning. + HC::handle_credit(final_fee); + Ok(()) + } +} diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/src/tests.rs b/code/parachain/frame/transaction-payment/asset-tx-payment/src/tests.rs new file mode 100644 index 00000000000..e1d2c85630e --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/src/tests.rs @@ -0,0 +1,709 @@ +// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use super::*; +use crate as pallet_asset_tx_payment; + +use frame_support::{ + assert_ok, + dispatch::{DispatchClass, DispatchInfo, PostDispatchInfo}, + parameter_types, + traits::{fungibles::*, ConstU32, ConstU64, ConstU8, FindAuthor}, + weights::{Weight, WeightToFee as WeightToFeeT}, + ConsensusEngineId, +}; +use frame_system as system; +use frame_system::EnsureRoot; +use pallet_balances::Call as BalancesCall; +use pallet_transaction_payment::CurrencyAdapter; +use sp_core::H256; +use sp_runtime::{ + testing::Header, + traits::{BlakeTwo256, IdentityLookup, SaturatedConversion, StaticLookup}, +}; +use std::cell::RefCell; + +type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; +type Block = frame_system::mocking::MockBlock; +type Balance = u64; +type AccountId = u64; +type AssetId = u32; + +frame_support::construct_runtime!( + pub enum Runtime where + Block = Block, + NodeBlock = Block, + UncheckedExtrinsic = UncheckedExtrinsic, + { + System: system, + Balances: pallet_balances, + TransactionPayment: pallet_transaction_payment, + Assets: orml_tokens, + Authorship: pallet_authorship, + AssetTxPayment: pallet_asset_tx_payment, + } +); + +const CALL: &::RuntimeCall = + &RuntimeCall::Balances(BalancesCall::transfer { dest: 2, value: 69 }); + +thread_local! { + static EXTRINSIC_BASE_WEIGHT: RefCell = RefCell::new(0); +} + +pub struct BlockWeights; +impl Get for BlockWeights { + fn get() -> frame_system::limits::BlockWeights { + frame_system::limits::BlockWeights::builder() + .base_block(Weight::zero()) + .for_class(DispatchClass::all(), |weights| { + weights.base_extrinsic = + Weight::from_ref_time(EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow())); + }) + .for_class(DispatchClass::non_mandatory(), |weights| { + weights.max_total = Some(Weight::from_ref_time(1024)); + }) + .build_or_panic() + } +} + +parameter_types! { + pub static WeightToFee: u64 = 1; + pub static TransactionByteFee: u64 = 1; + pub static UseUserConfiguration: bool = true; +} + +impl frame_system::Config for Runtime { + type BaseCallFilter = frame_support::traits::Everything; + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); + type RuntimeOrigin = RuntimeOrigin; + type Index = u64; + type BlockNumber = u64; + type RuntimeCall = RuntimeCall; + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = AccountId; + type Lookup = IdentityLookup; + type Header = Header; + type RuntimeEvent = RuntimeEvent; + type BlockHashCount = ConstU64<250>; + type Version = (); + type PalletInfo = PalletInfo; + type AccountData = pallet_balances::AccountData; + type OnNewAccount = (); + type OnKilledAccount = (); + type SystemWeightInfo = (); + type SS58Prefix = (); + type OnSetCode = (); + type MaxConsumers = ConstU32<16>; +} + +parameter_types! { + pub const ExistentialDeposit: u64 = 10; +} + +impl pallet_balances::Config for Runtime { + type Balance = Balance; + type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ExistentialDeposit; + type AccountStore = System; + type MaxLocks = (); + type WeightInfo = (); + type MaxReserves = ConstU32<50>; + type ReserveIdentifier = [u8; 8]; +} + +impl WeightToFeeT for WeightToFee { + type Balance = u64; + + fn weight_to_fee(weight: &Weight) -> Self::Balance { + Self::Balance::saturated_from(weight.ref_time()) + .saturating_mul(WEIGHT_TO_FEE.with(|v| *v.borrow())) + } +} + +impl WeightToFeeT for TransactionByteFee { + type Balance = u64; + + fn weight_to_fee(weight: &Weight) -> Self::Balance { + Self::Balance::saturated_from(weight.ref_time()) + .saturating_mul(TRANSACTION_BYTE_FEE.with(|v| *v.borrow())) + } +} + +impl pallet_transaction_payment::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter; + type WeightToFee = WeightToFee; + type LengthToFee = TransactionByteFee; + type FeeMultiplierUpdate = (); + type OperationalFeeMultiplier = ConstU8<5>; +} + +parameter_types! { + pub const MaxLocks: u32 = 256; +} + +orml_traits::parameter_type_with_key! { + pub ExistentialDeposits: |_a: AssetId| -> Balance { + ExistentialDeposit::get() + }; +} + +type Amount = i128; + +type ReserveIdentifier = [u8; 8]; +impl orml_tokens::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Balance = Balance; + type Amount = Amount; + type CurrencyId = AssetId; + type WeightInfo = (); + type ExistentialDeposits = ExistentialDeposits; + type OnDust = (); + type MaxLocks = MaxLocks; + type ReserveIdentifier = ReserveIdentifier; + type MaxReserves = frame_support::traits::ConstU32<2>; + type DustRemovalWhitelist = frame_support::traits::Everything; + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); + type OnSlash = (); + type OnDeposit = (); + type OnTransfer = (); +} + +pub struct HardcodedAuthor; +const BLOCK_AUTHOR: AccountId = 1234; +impl FindAuthor for HardcodedAuthor { + fn find_author<'a, I>(_: I) -> Option + where + I: 'a + IntoIterator, + { + Some(BLOCK_AUTHOR) + } +} + +impl pallet_authorship::Config for Runtime { + type FindAuthor = HardcodedAuthor; + type UncleGenerations = (); + type FilterUncle = (); + type EventHandler = (); +} + +pub struct CreditToBlockAuthor; +impl HandleCredit for CreditToBlockAuthor { + fn handle_credit(credit: CreditOf) { + if let Some(author) = pallet_authorship::Pallet::::author() { + // What to do in case paying the author fails (e.g. because `fee < min_balance`) + // default: drop the result which will trigger the `OnDrop` of the imbalance. + let _ = >::resolve(&author, credit); + } + } +} +/// Converts a balance value into an asset balance based on the ratio between the fungible's +/// minimum balance and the minimum asset balance. +pub struct BalanceToAssetBalance; +impl BalanceConversion for BalanceToAssetBalance { + type Error = (); + fn to_asset_balance(balance: Balance, _asset_id: AssetId) -> Result { + Ok(balance) + } +} + +impl pallet_asset_tx_payment::Config for Runtime { + type Fungibles = Assets; + type OnChargeAssetTransaction = FungiblesAdapter; + type UseUserConfiguration = UseUserConfiguration; + type WeightInfo = (); + type ConfigurationOrigin = EnsureRoot; + type PayableCall = RuntimeCall; + type ConfigurationExistentialDeposit = ExistentialDeposit; + type BalanceConverter = OneToOneBalanceConversion; + type Lock = Assets; +} + +pub struct ExtBuilder { + balance_factor: u64, + base_weight: u64, + byte_fee: u64, + weight_to_fee: u64, +} + +impl Default for ExtBuilder { + fn default() -> Self { + Self { balance_factor: 1, base_weight: 0, byte_fee: 1, weight_to_fee: 1 } + } +} + +impl ExtBuilder { + pub fn base_weight(mut self, base_weight: u64) -> Self { + self.base_weight = base_weight; + self + } + pub fn balance_factor(mut self, factor: u64) -> Self { + self.balance_factor = factor; + self + } + fn set_constants(&self) { + EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow_mut() = self.base_weight); + TRANSACTION_BYTE_FEE.with(|v| *v.borrow_mut() = self.byte_fee); + WEIGHT_TO_FEE.with(|v| *v.borrow_mut() = self.weight_to_fee); + } + pub fn build(self) -> sp_io::TestExternalities { + self.set_constants(); + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + pallet_balances::GenesisConfig:: { + balances: if self.balance_factor > 0 { + vec![ + (1, 10 * self.balance_factor), + (2, 20 * self.balance_factor), + (3, 30 * self.balance_factor), + (4, 40 * self.balance_factor), + (5, 50 * self.balance_factor), + (6, 60 * self.balance_factor), + ] + } else { + vec![] + }, + } + .assimilate_storage(&mut t) + .unwrap(); + t.into() + } +} + +/// create a transaction info struct from weight. Handy to avoid building the whole struct. +pub fn info_from_weight(w: u64) -> DispatchInfo { + // pays_fee: Pays::Yes -- class: DispatchClass::Normal + DispatchInfo { weight: Weight::from_ref_time(w), ..Default::default() } +} + +fn post_info_from_weight(w: u64) -> PostDispatchInfo { + PostDispatchInfo { actual_weight: Some(Weight::from_ref_time(w)), pays_fee: Default::default() } +} + +fn info_from_pays(p: Pays) -> DispatchInfo { + DispatchInfo { pays_fee: p, ..Default::default() } +} + +fn post_info_from_pays(p: Pays) -> PostDispatchInfo { + PostDispatchInfo { actual_weight: None, pays_fee: p } +} + +fn default_post_info() -> PostDispatchInfo { + PostDispatchInfo { actual_weight: None, pays_fee: Default::default() } +} + +pub fn new_test_ext() -> sp_io::TestExternalities { + ExtBuilder::default().balance_factor(100).base_weight(5).build() +} + +#[test] +fn transaction_payment_in_native_possible() { + let balance_factor = 100; + ExtBuilder::default() + .balance_factor(balance_factor) + .base_weight(5) + .build() + .execute_with(|| { + let len = 10; + let pre = ChargeAssetTxPayment::::from(0, None) + .pre_dispatch(&1, CALL, &info_from_weight(5), len) + .unwrap(); + let initial_balance = 10 * balance_factor; + assert_eq!(Balances::free_balance(1), initial_balance - 5 - 5 - 10); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(5), + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(1), initial_balance - 5 - 5 - 10); + + let pre = ChargeAssetTxPayment::::from(5 /* tipped */, None) + .pre_dispatch(&2, CALL, &info_from_weight(100), len) + .unwrap(); + let initial_balance_for_2 = 20 * balance_factor; + assert_eq!(Balances::free_balance(2), initial_balance_for_2 - 5 - 10 - 100 - 5); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(100), + &post_info_from_weight(50), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(2), initial_balance_for_2 - 5 - 10 - 50 - 5); + }); +} + +#[test] +fn transaction_payment_in_asset_possible() { + let base_weight = 5; + let balance_factor = 100; + ExtBuilder::default() + .balance_factor(balance_factor) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 1; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 5; + let len = 10; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .unwrap(); + // assert that native balance is not used + assert_eq!(Balances::free_balance(caller), 10 * balance_factor); + // check that fee was charged in the given asset + assert_eq!(Assets::balance(asset_id, &caller), balance - fee); + assert_eq!(Assets::balance(asset_id, &BLOCK_AUTHOR), 0); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(weight), + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance - fee); + // check that the block author gets rewarded + assert_eq!(Assets::balance(asset_id, &BLOCK_AUTHOR), fee); + }); +} + +#[test] +fn transaction_payment_without_fee() { + let base_weight = 5; + let balance_factor = 100; + ExtBuilder::default() + .balance_factor(balance_factor) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 1; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 5; + let len = 10; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .unwrap(); + // assert that native balance is not used + assert_eq!(Balances::free_balance(caller), 10 * balance_factor); + // check that fee was charged in the given asset + assert_eq!(Assets::balance(asset_id, &caller), balance - fee); + assert_eq!(Assets::balance(asset_id, &BLOCK_AUTHOR), 0); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(weight), + &post_info_from_pays(Pays::No), + len, + &Ok(()) + )); + // caller should be refunded + assert_eq!(Assets::balance(asset_id, &caller), balance); + // check that the block author did not get rewarded + assert_eq!(Assets::balance(asset_id, &BLOCK_AUTHOR), 0); + }); +} + +#[test] +fn asset_transaction_payment_with_tip_and_refund() { + let base_weight = 5; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 2; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 1000; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 100; + let tip = 5; + let len = 10; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee_with_tip = + (base_weight + weight + len as u64 + tip) * min_balance / ExistentialDeposit::get(); + let pre = ChargeAssetTxPayment::::from(tip, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .unwrap(); + assert_eq!(Assets::balance(asset_id, &caller), balance - fee_with_tip); + + let final_weight = 50; + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(weight), + &post_info_from_weight(final_weight), + len, + &Ok(()) + )); + let final_fee = + fee_with_tip - (weight - final_weight) * min_balance / ExistentialDeposit::get(); + assert_eq!(Assets::balance(asset_id, &caller), balance - (final_fee)); + assert_eq!(Assets::balance(asset_id, &BLOCK_AUTHOR), final_fee); + }); +} + +#[test] +fn payment_from_account_with_only_assets() { + let base_weight = 5; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 333; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + // assert that native balance is not necessary + assert_eq!(Balances::free_balance(caller), 0); + let weight = 5; + let len = 10; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .unwrap(); + assert_eq!(Balances::free_balance(caller), 0); + // check that fee was charged in the given asset + assert_eq!(Assets::balance(asset_id, &caller), balance - fee); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(weight), + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance - fee); + assert_eq!(Balances::free_balance(caller), 0); + }); +} + +#[test] +fn payment_only_with_existing_sufficient_asset() { + let base_weight = 5; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + let asset_id = 1; + let caller = 1; + let weight = 5; + let len = 10; + // pre_dispatch fails for non-existent asset + assert!(ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .is_err()); + + assert!(ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .is_err()); + }); +} + +#[test] +fn converted_fee_is_never_zero_if_input_fee_is_not() { + let base_weight = 1; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 333; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 1; + let len = 1; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); + // naive fee calculation would round down to zero + assert_eq!(fee, base_weight + weight + len as u64); + { + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_pays(Pays::No), len) + .unwrap(); + // `Pays::No` still implies no fees + assert_eq!(Assets::balance(asset_id, &caller), balance); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_pays(Pays::No), + &post_info_from_pays(Pays::No), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance); + } + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_weight(weight), len) + .unwrap(); + // check that at least one coin was charged in the given asset + assert_eq!(Assets::balance(asset_id, &caller), balance - 3); + + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_weight(weight), + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance - 3); + }); +} + +#[test] +fn post_dispatch_fee_is_zero_if_pre_dispatch_fee_is_zero() { + let base_weight = 1; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + let min_balance = ExistentialDeposit::get(); + + // mint into the caller account + let caller = 333; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 1; + let len = 1; + // we convert the from weight to fee based on the ratio between asset min balance and + // existential deposit + let fee = (base_weight + weight + len as u64) * min_balance / ExistentialDeposit::get(); + // calculated fee is greater than 0 + assert!(fee > 0); + let pre = ChargeAssetTxPayment::::from(0, Some(asset_id)) + .pre_dispatch(&caller, CALL, &info_from_pays(Pays::No), len) + .unwrap(); + // `Pays::No` implies no pre-dispatch fees + assert_eq!(Assets::balance(asset_id, &caller), balance); + let (_tip, _who, initial_payment) = ⪯ + let not_paying = match initial_payment { + &InitialPayment::Nothing => true, + _ => false, + }; + assert!(not_paying, "initial payment should be Nothing if we pass Pays::No"); + + // `Pays::Yes` on post-dispatch does not mean we pay (we never charge more than the + // initial fee) + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + Some(pre), + &info_from_pays(Pays::No), + &post_info_from_pays(Pays::Yes), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance); + }); +} + +#[test] +fn post_dispatch_fee_is_zero_if_unsigned_pre_dispatch_fee_is_zero() { + let base_weight = 1; + ExtBuilder::default() + .balance_factor(100) + .base_weight(base_weight) + .build() + .execute_with(|| { + // create the asset + let asset_id = 1; + + // mint into the caller account + let caller = 333; + let beneficiary = ::Lookup::unlookup(caller); + let balance = 100; + assert_ok!(Assets::mint_into(asset_id, &beneficiary, balance)); + assert_eq!(Assets::balance(asset_id, &caller), balance); + let weight = 1; + let len = 1; + ChargeAssetTxPayment::::pre_dispatch_unsigned( + CALL, + &info_from_weight(weight), + len, + ) + .unwrap(); + + assert_eq!(Assets::balance(asset_id, &caller), balance); + + // `Pays::Yes` on post-dispatch does not mean we pay (we never charge more than the + // initial fee) + assert_ok!(ChargeAssetTxPayment::::post_dispatch( + None, + &info_from_weight(weight), + &post_info_from_pays(Pays::Yes), + len, + &Ok(()) + )); + assert_eq!(Assets::balance(asset_id, &caller), balance); + }); +} diff --git a/code/parachain/frame/transaction-payment/asset-tx-payment/src/weights.rs b/code/parachain/frame/transaction-payment/asset-tx-payment/src/weights.rs new file mode 100644 index 00000000000..84ebb4fc1f4 --- /dev/null +++ b/code/parachain/frame/transaction-payment/asset-tx-payment/src/weights.rs @@ -0,0 +1,75 @@ +// This file is part of Substrate. + +// Copyright (C) 2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for asset_tx_payment +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-05-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/substrate +// benchmark +// pallet +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=asset_tx_payment +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --template=./.maintain/frame-weight-template.hbs +// --output=./frame/transaction-payment/asset-tx-payment/src/weights.rs + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for asset_tx_payment. +pub trait WeightInfo { + fn set_payment_asset() -> Weight; +} + +/// Weights for asset_tx_payment using the Substrate node and recommended hardware. +pub struct SubstrateWeight(PhantomData); +impl WeightInfo for SubstrateWeight { + // Storage: AssetTxPayment SetPaymentAsset (r:1 w:1) + // Storage: AssetTxPayment Calls (r:1 w:1) + fn set_payment_asset() -> Weight { + Weight::from_ref_time(51_254_000_u64) + // Standard Error: 1_000 + .saturating_add(Weight::from_ref_time(118_000)) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + // Storage: AssetTxPayment SetPaymentAsset (r:1 w:1) + // Storage: AssetTxPayment Calls (r:1 w:1) + fn set_payment_asset() -> Weight { + Weight::from_ref_time(51_254_000_u64) + // Standard Error: 1_000 + .saturating_add(Weight::from_ref_time(118_000)) + .saturating_add(RocksDbWeight::get().reads(2_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) + } +} diff --git a/code/parachain/frame/transaction-payment/rpc/Cargo.toml b/code/parachain/frame/transaction-payment/rpc/Cargo.toml new file mode 100644 index 00000000000..e07f35fe037 --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "pallet-transaction-payment-rpc" +version = "4.0.0-dev" +authors = ["Parity Technologies ", "Composable Developers"] +edition = "2021" +license = "Apache-2.0" +homepage = "https://substrate.io" +repository = "https://github.com/paritytech/substrate/" +description = "RPC interface for the transaction payment pallet." +readme = "README.md" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] + +[dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0" } +jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } +pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-blockchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } \ No newline at end of file diff --git a/code/parachain/frame/transaction-payment/rpc/README.md b/code/parachain/frame/transaction-payment/rpc/README.md new file mode 100644 index 00000000000..bf2ada1ff0a --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/README.md @@ -0,0 +1,3 @@ +RPC interface for the transaction payment pallet. + +License: Apache-2.0 diff --git a/code/parachain/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/code/parachain/frame/transaction-payment/rpc/runtime-api/Cargo.toml new file mode 100644 index 00000000000..3d2250a8c1d --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/runtime-api/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "pallet-transaction-payment-rpc-runtime-api" +version = "4.0.0-dev" +authors = ["Parity Technologies "] +edition = "2021" +license = "Apache-2.0" +homepage = "https://substrate.io" +repository = "https://github.com/paritytech/substrate/" +description = "RPC runtime API for transaction payment FRAME pallet" +readme = "README.md" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] + +[dependencies] +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } +pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, path = "../../../transaction-payment" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } + +[features] +default = ["std"] +std = [ + "codec/std", + "pallet-transaction-payment/std", + "sp-api/std", + "sp-runtime/std", +] diff --git a/code/parachain/frame/transaction-payment/rpc/runtime-api/README.md b/code/parachain/frame/transaction-payment/rpc/runtime-api/README.md new file mode 100644 index 00000000000..0d81abdb1ee --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/runtime-api/README.md @@ -0,0 +1,3 @@ +Runtime API definition for transaction payment pallet. + +License: Apache-2.0 diff --git a/code/parachain/frame/transaction-payment/rpc/runtime-api/src/lib.rs b/code/parachain/frame/transaction-payment/rpc/runtime-api/src/lib.rs new file mode 100644 index 00000000000..5a0c70138db --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/runtime-api/src/lib.rs @@ -0,0 +1,34 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Runtime API definition for transaction payment pallet. + +#![cfg_attr(not(feature = "std"), no_std)] + +use codec::Codec; +use sp_runtime::traits::MaybeDisplay; + +pub use pallet_transaction_payment::{FeeDetails, InclusionFee, RuntimeDispatchInfo}; + +sp_api::decl_runtime_apis! { + pub trait TransactionPaymentApi where + Balance: Codec + MaybeDisplay, + { + fn query_info(uxt: Block::Extrinsic, len: u32) -> RuntimeDispatchInfo; + fn query_fee_details(uxt: Block::Extrinsic, len: u32) -> FeeDetails; + } +} diff --git a/code/parachain/frame/transaction-payment/rpc/src/lib.rs b/code/parachain/frame/transaction-payment/rpc/src/lib.rs new file mode 100644 index 00000000000..75ec42321ef --- /dev/null +++ b/code/parachain/frame/transaction-payment/rpc/src/lib.rs @@ -0,0 +1,169 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! RPC interface for the transaction payment pallet. + +use std::{convert::TryInto, sync::Arc}; + +use codec::{Codec, Decode}; +use jsonrpsee::{ + core::{async_trait, Error as JsonRpseeError, RpcResult}, + proc_macros::rpc, + types::error::{CallError, ErrorCode, ErrorObject}, +}; +use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, InclusionFee, RuntimeDispatchInfo}; +use sp_api::ProvideRuntimeApi; +use sp_blockchain::HeaderBackend; +use sp_core::Bytes; +use sp_rpc::number::NumberOrHex; +use sp_runtime::{ + generic::BlockId, + traits::{Block as BlockT, MaybeDisplay}, +}; + +pub use pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi as TransactionPaymentRuntimeApi; + +#[rpc(client, server)] +pub trait TransactionPaymentApi { + #[method(name = "payment_queryInfo")] + fn query_info(&self, encoded_xt: Bytes, at: Option) -> RpcResult; + + #[method(name = "payment_queryFeeDetails")] + fn query_fee_details( + &self, + encoded_xt: Bytes, + at: Option, + ) -> RpcResult>; +} + +/// Provides RPC methods to query a dispatchable's class, weight and fee. +pub struct TransactionPayment { + /// Shared reference to the client. + client: Arc, + _marker: std::marker::PhantomData

, +} + +impl TransactionPayment { + /// Creates a new instance of the TransactionPayment Rpc helper. + pub fn new(client: Arc) -> Self { + Self { client, _marker: Default::default() } + } +} + +/// Error type of this RPC api. +pub enum Error { + /// The transaction was not decodable. + DecodeError, + /// The call to runtime failed. + RuntimeError, +} + +impl From for i32 { + fn from(e: Error) -> i32 { + match e { + Error::RuntimeError => 1, + Error::DecodeError => 2, + } + } +} + +#[async_trait] +impl + TransactionPaymentApiServer<::Hash, RuntimeDispatchInfo> + for TransactionPayment +where + Block: BlockT, + C: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, + C::Api: TransactionPaymentRuntimeApi, + Balance: Codec + MaybeDisplay + Copy + TryInto + Send + Sync + 'static, +{ + fn query_info( + &self, + encoded_xt: Bytes, + at: Option, + ) -> RpcResult> { + let api = self.client.runtime_api(); + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + + let encoded_len = encoded_xt.len() as u32; + + let uxt: Block::Extrinsic = Decode::decode(&mut &*encoded_xt).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::DecodeError.into(), + "Unable to query dispatch info.", + Some(format!("{:?}", e)), + )) + })?; + api.query_info(&at, uxt, encoded_len).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::RuntimeError.into(), + "Unable to query dispatch info.", + Some(e.to_string()), + )) + .into() + }) + } + + fn query_fee_details( + &self, + encoded_xt: Bytes, + at: Option, + ) -> RpcResult> { + let api = self.client.runtime_api(); + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + + let encoded_len = encoded_xt.len() as u32; + + let uxt: Block::Extrinsic = Decode::decode(&mut &*encoded_xt).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::DecodeError.into(), + "Unable to query fee details.", + Some(format!("{:?}", e)), + )) + })?; + let fee_details = api.query_fee_details(&at, uxt, encoded_len).map_err(|e| { + CallError::Custom(ErrorObject::owned( + Error::RuntimeError.into(), + "Unable to query fee details.", + Some(e.to_string()), + )) + })?; + + let try_into_rpc_balance = |value: Balance| { + value.try_into().map_err(|_| { + JsonRpseeError::Call(CallError::Custom(ErrorObject::owned( + ErrorCode::InvalidParams.code(), + format!("{} doesn't fit in NumberOrHex representation", value), + None::<()>, + ))) + }) + }; + + Ok(FeeDetails { + inclusion_fee: if let Some(inclusion_fee) = fee_details.inclusion_fee { + Some(InclusionFee { + base_fee: try_into_rpc_balance(inclusion_fee.base_fee)?, + len_fee: try_into_rpc_balance(inclusion_fee.len_fee)?, + adjusted_weight_fee: try_into_rpc_balance(inclusion_fee.adjusted_weight_fee)?, + }) + } else { + None + }, + tip: Default::default(), + }) + } +} diff --git a/code/parachain/frame/transaction-payment/src/lib.rs b/code/parachain/frame/transaction-payment/src/lib.rs new file mode 100644 index 00000000000..7bac81b906b --- /dev/null +++ b/code/parachain/frame/transaction-payment/src/lib.rs @@ -0,0 +1,1793 @@ +// This file is part of Substrate. + +// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! # Transaction Payment Pallet +//! +//! This pallet provides the basic logic needed to pay the absolute minimum amount needed for a +//! transaction to be included. This includes: +//! - _base fee_: This is the minimum amount a user pays for a transaction. It is declared +//! as a base _weight_ in the runtime and converted to a fee using `WeightToFee`. +//! - _weight fee_: A fee proportional to amount of weight a transaction consumes. +//! - _length fee_: A fee proportional to the encoded length of the transaction. +//! - _tip_: An optional tip. Tip increases the priority of the transaction, giving it a higher +//! chance to be included by the transaction queue. +//! +//! The base fee and adjusted weight and length fees constitute the _inclusion fee_, which is +//! the minimum fee for a transaction to be included in a block. +//! +//! The formula of final fee: +//! ```ignore +//! inclusion_fee = base_fee + length_fee + [targeted_fee_adjustment * weight_fee]; +//! final_fee = inclusion_fee + tip; +//! ``` +//! +//! - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on +//! the congestion of the network. +//! +//! Additionally, this pallet allows one to configure: +//! - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`]. +//! - A means of updating the fee for the next block, via defining a multiplier, based on the +//! final state of the chain at the end of the previous block. This can be configured via +//! [`Config::FeeMultiplierUpdate`] +//! - How the fees are paid via [`Config::OnChargeTransaction`]. + +#![cfg_attr(not(feature = "std"), no_std)] + +use codec::{Decode, Encode, MaxEncodedLen}; +use scale_info::TypeInfo; + +use sp_runtime::{ + traits::{ + Convert, DispatchInfoOf, Dispatchable, One, PostDispatchInfoOf, SaturatedConversion, + Saturating, SignedExtension, Zero, + }, + transaction_validity::{ + TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransaction, + }, + FixedPointNumber, FixedPointOperand, FixedU128, Perquintill, RuntimeDebug, +}; +use sp_std::prelude::*; + +use frame_support::{ + dispatch::{ + DispatchClass, DispatchInfo, DispatchResult, GetDispatchInfo, Pays, PostDispatchInfo, + }, + traits::{EstimateCallFee, Get}, + weights::{Weight, WeightToFee}, +}; + +mod payment; +mod types; + +pub use pallet::*; +pub use payment::*; +pub use types::{FeeDetails, InclusionFee, RuntimeDispatchInfo}; + +/// Fee multiplier. +pub type Multiplier = FixedU128; + +type BalanceOf = <::OnChargeTransaction as OnChargeTransaction>::Balance; + +/// A struct to update the weight multiplier per block. It implements `Convert`, meaning that it can convert the previous multiplier to the next one. This should +/// be called on `on_finalize` of a block, prior to potentially cleaning the weight data from the +/// system pallet. +/// +/// given: +/// s = previous block weight +/// s'= ideal block weight +/// m = maximum block weight +/// diff = (s - s')/m +/// v = 0.00001 +/// t1 = (v * diff) +/// t2 = (v * diff)^2 / 2 +/// then: +/// next_multiplier = prev_multiplier * (1 + t1 + t2) +/// +/// Where `(s', v)` must be given as the `Get` implementation of the `T` generic type. Moreover, `M` +/// must provide the minimum allowed value for the multiplier. Note that a runtime should ensure +/// with tests that the combination of this `M` and `V` is not such that the multiplier can drop to +/// zero and never recover. +/// +/// note that `s'` is interpreted as a portion in the _normal transaction_ capacity of the block. +/// For example, given `s' == 0.25` and `AvailableBlockRatio = 0.75`, then the target fullness is +/// _0.25 of the normal capacity_ and _0.1875 of the entire block_. +/// +/// This implementation implies the bound: +/// - `v ≤ p / k * (s − s')` +/// - or, solving for `p`: `p >= v * k * (s - s')` +/// +/// where `p` is the amount of change over `k` blocks. +/// +/// Hence: +/// - in a fully congested chain: `p >= v * k * (1 - s')`. +/// - in an empty chain: `p >= v * k * (-s')`. +/// +/// For example, when all blocks are full and there are 28800 blocks per day (default in +/// `substrate-node`) and v == 0.00001, s' == 0.1875, we'd have: +/// +/// p >= 0.00001 * 28800 * 0.8125 +/// p >= 0.234 +/// +/// Meaning that fees can change by around ~23% per day, given extreme congestion. +/// +/// More info can be found at: +/// +pub struct TargetedFeeAdjustment(sp_std::marker::PhantomData<(T, S, V, M)>); + +/// Something that can convert the current multiplier to the next one. +pub trait MultiplierUpdate: Convert { + /// Minimum multiplier + fn min() -> Multiplier; + /// Target block saturation level + fn target() -> Perquintill; + /// Variability factor + fn variability() -> Multiplier; +} + +impl MultiplierUpdate for () { + fn min() -> Multiplier { + Default::default() + } + fn target() -> Perquintill { + Default::default() + } + fn variability() -> Multiplier { + Default::default() + } +} + +impl MultiplierUpdate for TargetedFeeAdjustment +where + T: frame_system::Config, + S: Get, + V: Get, + M: Get, +{ + fn min() -> Multiplier { + M::get() + } + fn target() -> Perquintill { + S::get() + } + fn variability() -> Multiplier { + V::get() + } +} + +impl Convert for TargetedFeeAdjustment +where + T: frame_system::Config, + S: Get, + V: Get, + M: Get, +{ + fn convert(previous: Multiplier) -> Multiplier { + // Defensive only. The multiplier in storage should always be at most positive. Nonetheless + // we recover here in case of errors, because any value below this would be stale and can + // never change. + let min_multiplier = M::get(); + let previous = previous.max(min_multiplier); + + let weights = T::BlockWeights::get(); + // the computed ratio is only among the normal class. + let normal_max_weight = + weights.get(DispatchClass::Normal).max_total.unwrap_or(weights.max_block); + let current_block_weight = >::block_weight(); + let normal_block_weight = + current_block_weight.get(DispatchClass::Normal).min(normal_max_weight); + + // TODO: Handle all weight dimensions + let normal_max_weight = normal_max_weight.ref_time(); + let normal_block_weight = normal_block_weight.ref_time(); + + let s = S::get(); + let v = V::get(); + + let target_weight = (s * normal_max_weight) as u128; + let block_weight = normal_block_weight as u128; + + // determines if the first_term is positive + let positive = block_weight >= target_weight; + let diff_abs = block_weight.max(target_weight) - block_weight.min(target_weight); + + // defensive only, a test case assures that the maximum weight diff can fit in Multiplier + // without any saturation. + let diff = Multiplier::saturating_from_rational(diff_abs, normal_max_weight.max(1)); + let diff_squared = diff.saturating_mul(diff); + + let v_squared_2 = v.saturating_mul(v) / Multiplier::saturating_from_integer(2); + + let first_term = v.saturating_mul(diff); + let second_term = v_squared_2.saturating_mul(diff_squared); + + if positive { + let excess = first_term.saturating_add(second_term).saturating_mul(previous); + previous.saturating_add(excess).max(min_multiplier) + } else { + // Defensive-only: first_term > second_term. Safe subtraction. + let negative = first_term.saturating_sub(second_term).saturating_mul(previous); + previous.saturating_sub(negative).max(min_multiplier) + } + } +} + +/// A struct to make the fee multiplier a constant +pub struct ConstFeeMultiplier>(sp_std::marker::PhantomData); + +impl> MultiplierUpdate for ConstFeeMultiplier { + fn min() -> Multiplier { + M::get() + } + fn target() -> Perquintill { + Default::default() + } + fn variability() -> Multiplier { + Default::default() + } +} + +impl Convert for ConstFeeMultiplier +where + M: Get, +{ + fn convert(_previous: Multiplier) -> Multiplier { + Self::min() + } +} + +/// Storage releases of the pallet. +#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)] +enum Releases { + /// Original version of the pallet. + V1Ancient, + /// One that bumps the usage to FixedU128 from FixedI128. + V2, +} + +impl Default for Releases { + fn default() -> Self { + Releases::V1Ancient + } +} + +/// Default value for NextFeeMultiplier. This is used in genesis and is also used in +/// NextFeeMultiplierOnEmpty() to provide a value when none exists in storage. +const MULTIPLIER_DEFAULT_VALUE: Multiplier = Multiplier::from_u32(1); + +#[frame_support::pallet] +pub mod pallet { + use super::*; + use frame_support::pallet_prelude::*; + use frame_system::pallet_prelude::*; + + #[pallet::pallet] + #[pallet::generate_store(pub(super) trait Store)] + pub struct Pallet(_); + + #[pallet::config] + pub trait Config: frame_system::Config { + /// The overarching event type. + type RuntimeEvent: From> + IsType<::RuntimeEvent>; + + /// Handler for withdrawing, refunding and depositing the transaction fee. + /// Transaction fees are withdrawn before the transaction is executed. + /// After the transaction was executed the transaction weight can be + /// adjusted, depending on the used resources by the transaction. If the + /// transaction weight is lower than expected, parts of the transaction fee + /// might be refunded. In the end the fees can be deposited. + type OnChargeTransaction: OnChargeTransaction; + + /// A fee mulitplier for `Operational` extrinsics to compute "virtual tip" to boost their + /// `priority` + /// + /// This value is multipled by the `final_fee` to obtain a "virtual tip" that is later + /// added to a tip component in regular `priority` calculations. + /// It means that a `Normal` transaction can front-run a similarly-sized `Operational` + /// extrinsic (with no tip), by including a tip value greater than the virtual tip. + /// + /// ```rust,ignore + /// // For `Normal` + /// let priority = priority_calc(tip); + /// + /// // For `Operational` + /// let virtual_tip = (inclusion_fee + tip) * OperationalFeeMultiplier; + /// let priority = priority_calc(tip + virtual_tip); + /// ``` + /// + /// Note that since we use `final_fee` the multiplier applies also to the regular `tip` + /// sent with the transaction. So, not only does the transaction get a priority bump based + /// on the `inclusion_fee`, but we also amplify the impact of tips applied to `Operational` + /// transactions. + #[pallet::constant] + type OperationalFeeMultiplier: Get; + + /// Convert a weight value into a deductible fee based on the currency type. + type WeightToFee: WeightToFee>; + + /// Convert a length value into a deductible fee based on the currency type. + type LengthToFee: WeightToFee>; + + /// Update the multiplier of the next block, based on the previous block's weight. + type FeeMultiplierUpdate: MultiplierUpdate; + } + + #[pallet::type_value] + pub fn NextFeeMultiplierOnEmpty() -> Multiplier { + MULTIPLIER_DEFAULT_VALUE + } + + #[pallet::storage] + #[pallet::getter(fn next_fee_multiplier)] + #[allow(clippy::disallowed_types)] + pub type NextFeeMultiplier = + StorageValue<_, Multiplier, ValueQuery, NextFeeMultiplierOnEmpty>; + + #[pallet::storage] + #[allow(clippy::disallowed_types)] + pub(super) type StorageVersion = StorageValue<_, Releases, ValueQuery>; + + #[pallet::genesis_config] + pub struct GenesisConfig { + pub multiplier: Multiplier, + } + + #[cfg(feature = "std")] + impl Default for GenesisConfig { + fn default() -> Self { + Self { multiplier: MULTIPLIER_DEFAULT_VALUE } + } + } + + #[pallet::genesis_build] + impl GenesisBuild for GenesisConfig { + fn build(&self) { + StorageVersion::::put(Releases::V2); + NextFeeMultiplier::::put(self.multiplier); + } + } + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] + pub enum Event { + /// A transaction fee `actual_fee`, of which `tip` was added to the minimum inclusion fee, + /// has been paid by `who`. + TransactionFeePaid { who: T::AccountId, actual_fee: BalanceOf, tip: BalanceOf }, + } + + #[pallet::hooks] + impl Hooks> for Pallet { + fn on_finalize(_: T::BlockNumber) { + >::mutate(|fm| { + *fm = T::FeeMultiplierUpdate::convert(*fm); + }); + } + + fn integrity_test() { + // given weight == u64, we build multipliers from `diff` of two weight values, which can + // at most be maximum block weight. Make sure that this can fit in a multiplier without + // loss. + assert!( + ::max_value() >= + Multiplier::checked_from_integer::( + T::BlockWeights::get().max_block.ref_time().try_into().unwrap_or(0) + ) + .unwrap_or_else(FixedU128::zero), + ); + + let target = T::FeeMultiplierUpdate::target() * + T::BlockWeights::get().get(DispatchClass::Normal).max_total.expect( + "Setting `max_total` for `Normal` dispatch class is not compatible with \ + `transaction-payment` pallet.", + ); + // add 1 percent; + let addition = target / 100; + if addition == Weight::zero() { + // this is most likely because in a test setup we set everything to () + // or to `ConstFeeMultiplier`. + return + } + + #[cfg(any(feature = "std", test))] + sp_io::TestExternalities::new_empty().execute_with(|| { + // This is the minimum value of the multiplier. Make sure that if we collapse to + // this value, we can recover with a reasonable amount of traffic. For this test we + // assert that if we collapse to minimum, the trend will be positive with a weight + // value which is 1% more than the target. + let min_value = T::FeeMultiplierUpdate::min(); + + let target = target + addition; + + >::set_block_consumed_resources(target, 0); + let next = T::FeeMultiplierUpdate::convert(min_value); + assert!( + next > min_value, + "The minimum bound of the multiplier is too low. When \ + block saturation is more than target by 1% and multiplier is minimal then \ + the multiplier doesn't increase." + ); + }); + } + } +} + +impl Pallet +where + BalanceOf: FixedPointOperand, +{ + /// Query the data that we know about the fee of a given `call`. + /// + /// This pallet is not and cannot be aware of the internals of a signed extension, for example + /// a tip. It only interprets the extrinsic as some encoded value and accounts for its weight + /// and length, the runtime's extrinsic base weight, and the current fee multiplier. + /// + /// All dispatchables must be annotated with weight and will have some fee info. This function + /// always returns. + pub fn query_info( + unchecked_extrinsic: Extrinsic, + len: u32, + ) -> RuntimeDispatchInfo> + where + T::RuntimeCall: Dispatchable, + { + // NOTE: we can actually make it understand `ChargeTransactionPayment`, but would be some + // hassle for sure. We have to make it aware of the index of `ChargeTransactionPayment` in + // `Extra`. Alternatively, we could actually execute the tx's per-dispatch and record the + // balance of the sender before and after the pipeline.. but this is way too much hassle for + // a very very little potential gain in the future. + let dispatch_info = ::get_dispatch_info(&unchecked_extrinsic); + + let partial_fee = if unchecked_extrinsic.is_signed().unwrap_or(false) { + Self::compute_fee(len, &dispatch_info, 0u32.into()) + } else { + // Unsigned extrinsics have no partial fee. + 0u32.into() + }; + + let DispatchInfo { weight, class, .. } = dispatch_info; + + RuntimeDispatchInfo { weight, class, partial_fee } + } + + /// Query the detailed fee of a given `call`. + pub fn query_fee_details( + unchecked_extrinsic: Extrinsic, + len: u32, + ) -> FeeDetails> + where + T::RuntimeCall: Dispatchable, + { + let dispatch_info = ::get_dispatch_info(&unchecked_extrinsic); + + let tip = 0u32.into(); + + if unchecked_extrinsic.is_signed().unwrap_or(false) { + Self::compute_fee_details(len, &dispatch_info, tip) + } else { + // Unsigned extrinsics have no inclusion fee. + FeeDetails { inclusion_fee: None, tip } + } + } + + /// Query information of a dispatch class, weight, and fee of a given encoded `Call`. + pub fn query_call_info(call: T::RuntimeCall, len: u32) -> RuntimeDispatchInfo> + where + T::RuntimeCall: Dispatchable + GetDispatchInfo, + { + let dispatch_info = ::get_dispatch_info(&call); + let DispatchInfo { weight, class, .. } = dispatch_info; + + RuntimeDispatchInfo { + weight, + class, + partial_fee: Self::compute_fee(len, &dispatch_info, 0u32.into()), + } + } + + /// Query fee details of a given encoded `Call`. + pub fn query_call_fee_details(call: T::RuntimeCall, len: u32) -> FeeDetails> + where + T::RuntimeCall: Dispatchable + GetDispatchInfo, + { + let dispatch_info = ::get_dispatch_info(&call); + let tip = 0u32.into(); + + Self::compute_fee_details(len, &dispatch_info, tip) + } + + /// Compute the final fee value for a particular transaction. + pub fn compute_fee( + len: u32, + info: &DispatchInfoOf, + tip: BalanceOf, + ) -> BalanceOf + where + T::RuntimeCall: Dispatchable, + { + Self::compute_fee_details(len, info, tip).final_fee() + } + + /// Compute the fee details for a particular transaction. + pub fn compute_fee_details( + len: u32, + info: &DispatchInfoOf, + tip: BalanceOf, + ) -> FeeDetails> + where + T::RuntimeCall: Dispatchable, + { + Self::compute_fee_raw(len, info.weight, tip, info.pays_fee, info.class) + } + + /// Compute the actual post dispatch fee for a particular transaction. + /// + /// Identical to `compute_fee` with the only difference that the post dispatch corrected + /// weight is used for the weight fee calculation. + pub fn compute_actual_fee( + len: u32, + info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + tip: BalanceOf, + ) -> BalanceOf + where + T::RuntimeCall: Dispatchable, + { + Self::compute_actual_fee_details(len, info, post_info, tip).final_fee() + } + + /// Compute the actual post dispatch fee details for a particular transaction. + pub fn compute_actual_fee_details( + len: u32, + info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + tip: BalanceOf, + ) -> FeeDetails> + where + T::RuntimeCall: Dispatchable, + { + Self::compute_fee_raw( + len, + post_info.calc_actual_weight(info), + tip, + post_info.pays_fee(info), + info.class, + ) + } + + fn compute_fee_raw( + len: u32, + weight: Weight, + tip: BalanceOf, + pays_fee: Pays, + class: DispatchClass, + ) -> FeeDetails> { + if pays_fee == Pays::Yes { + // the adjustable part of the fee. + let unadjusted_weight_fee = Self::weight_to_fee(weight); + let multiplier = Self::next_fee_multiplier(); + // final adjusted weight fee. + let adjusted_weight_fee = multiplier.saturating_mul_int(unadjusted_weight_fee); + + // length fee. this is adjusted via `LengthToFee`. + let len_fee = Self::length_to_fee(len); + + let base_fee = Self::weight_to_fee(T::BlockWeights::get().get(class).base_extrinsic); + FeeDetails { + inclusion_fee: Some(InclusionFee { base_fee, len_fee, adjusted_weight_fee }), + tip, + } + } else { + FeeDetails { inclusion_fee: None, tip } + } + } + + fn length_to_fee(length: u32) -> BalanceOf { + T::LengthToFee::weight_to_fee(&Weight::from_ref_time(length as u64)) + } + + fn weight_to_fee(weight: Weight) -> BalanceOf { + // cap the weight to the maximum defined in runtime, otherwise it will be the + // `Bounded` maximum of its data type, which is not desired. + let capped_weight = weight.min(T::BlockWeights::get().max_block); + T::WeightToFee::weight_to_fee(&capped_weight) + } +} + +impl Convert> for Pallet +where + T: Config, + BalanceOf: FixedPointOperand, +{ + /// Compute the fee for the specified weight. + /// + /// This fee is already adjusted by the per block fee adjustment factor and is therefore the + /// share that the weight contributes to the overall fee of a transaction. It is mainly + /// for informational purposes and not used in the actual fee calculation. + fn convert(weight: Weight) -> BalanceOf { + >::get().saturating_mul_int(Self::weight_to_fee(weight)) + } +} + +/// Require the transactor pay for themselves and maybe include a tip to gain additional priority +/// in the queue. +/// +/// # Transaction Validity +/// +/// This extension sets the `priority` field of `TransactionValidity` depending on the amount +/// of tip being paid per weight unit. +/// +/// Operational transactions will receive an additional priority bump, so that they are normally +/// considered before regular transactions. +#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] +#[scale_info(skip_type_params(T))] +pub struct ChargeTransactionPayment(#[codec(compact)] BalanceOf); + +impl ChargeTransactionPayment +where + T::RuntimeCall: Dispatchable, + BalanceOf: Send + Sync + FixedPointOperand, +{ + /// utility constructor. Used only in client/factory code. + pub fn from(fee: BalanceOf) -> Self { + Self(fee) + } + + /// Returns the tip as being choosen by the transaction sender. + pub fn tip(&self) -> BalanceOf { + self.0 + } + + fn withdraw_fee( + &self, + who: &T::AccountId, + call: &T::RuntimeCall, + info: &DispatchInfoOf, + len: usize, + ) -> Result< + ( + BalanceOf, + <::OnChargeTransaction as OnChargeTransaction>::LiquidityInfo, + ), + TransactionValidityError, + > { + let tip = self.0; + let fee = Pallet::::compute_fee(len as u32, info, tip); + + <::OnChargeTransaction as OnChargeTransaction>::withdraw_fee( + who, call, info, fee, tip, + ) + .map(|i| (fee, i)) + } + + /// Get an appropriate priority for a transaction with the given `DispatchInfo`, encoded length + /// and user-included tip. + /// + /// The priority is based on the amount of `tip` the user is willing to pay per unit of either + /// `weight` or `length`, depending which one is more limiting. For `Operational` extrinsics + /// we add a "virtual tip" to the calculations. + /// + /// The formula should simply be `tip / bounded_{weight|length}`, but since we are using + /// integer division, we have no guarantees it's going to give results in any reasonable + /// range (might simply end up being zero). Hence we use a scaling factor: + /// `tip * (max_block_{weight|length} / bounded_{weight|length})`, since given current + /// state of-the-art blockchains, number of per-block transactions is expected to be in a + /// range reasonable enough to not saturate the `Balance` type while multiplying by the tip. + pub fn get_priority( + info: &DispatchInfoOf, + len: usize, + tip: BalanceOf, + final_fee: BalanceOf, + ) -> TransactionPriority { + // Calculate how many such extrinsics we could fit into an empty block and take + // the limitting factor. + let max_block_weight = T::BlockWeights::get().max_block; + let max_block_length = *T::BlockLength::get().max.get(info.class) as u64; + + // TODO: Take into account all dimensions of weight + let max_block_weight = max_block_weight.ref_time(); + let info_weight = info.weight.ref_time(); + + let bounded_weight = info_weight.clamp(1, max_block_weight); + let bounded_length = (len as u64).clamp(1, max_block_length); + + let max_tx_per_block_weight = max_block_weight / bounded_weight; + let max_tx_per_block_length = max_block_length / bounded_length; + // Given our current knowledge this value is going to be in a reasonable range - i.e. + // less than 10^9 (2^30), so multiplying by the `tip` value is unlikely to overflow the + // balance type. We still use saturating ops obviously, but the point is to end up with some + // `priority` distribution instead of having all transactions saturate the priority. + let max_tx_per_block = max_tx_per_block_length + .min(max_tx_per_block_weight) + .saturated_into::>(); + let max_reward = |val: BalanceOf| val.saturating_mul(max_tx_per_block); + + // To distribute no-tip transactions a little bit, we increase the tip value by one. + // This means that given two transactions without a tip, smaller one will be preferred. + let tip = tip.saturating_add(One::one()); + let scaled_tip = max_reward(tip); + + match info.class { + DispatchClass::Normal => { + // For normal class we simply take the `tip_per_weight`. + scaled_tip + }, + DispatchClass::Mandatory => { + // Mandatory extrinsics should be prohibited (e.g. by the [`CheckWeight`] + // extensions), but just to be safe let's return the same priority as `Normal` here. + scaled_tip + }, + DispatchClass::Operational => { + // A "virtual tip" value added to an `Operational` extrinsic. + // This value should be kept high enough to allow `Operational` extrinsics + // to get in even during congestion period, but at the same time low + // enough to prevent a possible spam attack by sending invalid operational + // extrinsics which push away regular transactions from the pool. + let fee_multiplier = T::OperationalFeeMultiplier::get().saturated_into(); + let virtual_tip = final_fee.saturating_mul(fee_multiplier); + let scaled_virtual_tip = max_reward(virtual_tip); + + scaled_tip.saturating_add(scaled_virtual_tip) + }, + } + .saturated_into::() + } +} + +impl sp_std::fmt::Debug for ChargeTransactionPayment { + #[cfg(feature = "std")] + fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { + write!(f, "ChargeTransactionPayment<{:?}>", self.0) + } + #[cfg(not(feature = "std"))] + fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { + Ok(()) + } +} + +impl SignedExtension for ChargeTransactionPayment +where + BalanceOf: Send + Sync + From + FixedPointOperand, + T::RuntimeCall: Dispatchable, +{ + const IDENTIFIER: &'static str = "ChargeTransactionPayment"; + type AccountId = T::AccountId; + type Call = T::RuntimeCall; + type AdditionalSigned = (); + type Pre = ( + // tip + BalanceOf, + // who paid the fee - this is an option to allow for a Default impl. + Self::AccountId, + // imbalance resulting from withdrawing the fee + <::OnChargeTransaction as OnChargeTransaction>::LiquidityInfo, + ); + fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { + Ok(()) + } + + fn validate( + &self, + who: &Self::AccountId, + call: &Self::Call, + info: &DispatchInfoOf, + len: usize, + ) -> TransactionValidity { + let (final_fee, _) = self.withdraw_fee(who, call, info, len)?; + let tip = self.0; + Ok(ValidTransaction { + priority: Self::get_priority(info, len, tip, final_fee), + ..Default::default() + }) + } + + fn pre_dispatch( + self, + who: &Self::AccountId, + call: &Self::Call, + info: &DispatchInfoOf, + len: usize, + ) -> Result { + let (_fee, imbalance) = self.withdraw_fee(who, call, info, len)?; + Ok((self.0, who.clone(), imbalance)) + } + + fn post_dispatch( + maybe_pre: Option, + info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + len: usize, + _result: &DispatchResult, + ) -> Result<(), TransactionValidityError> { + if let Some((tip, who, imbalance)) = maybe_pre { + let actual_fee = Pallet::::compute_actual_fee(len as u32, info, post_info, tip); + T::OnChargeTransaction::correct_and_deposit_fee( + &who, info, post_info, actual_fee, tip, imbalance, + )?; + Pallet::::deposit_event(Event::::TransactionFeePaid { who, actual_fee, tip }); + } + Ok(()) + } +} + +impl EstimateCallFee> + for Pallet +where + BalanceOf: FixedPointOperand, + T::RuntimeCall: Dispatchable, +{ + fn estimate_call_fee(call: &AnyCall, post_info: PostDispatchInfo) -> BalanceOf { + let len = call.encoded_size() as u32; + let info = call.get_dispatch_info(); + Self::compute_actual_fee(len, &info, &post_info, Zero::zero()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate as pallet_transaction_payment; + + use codec::Encode; + + use sp_core::H256; + use sp_runtime::{ + testing::{Header, TestXt}, + traits::{BlakeTwo256, IdentityLookup, One}, + transaction_validity::InvalidTransaction, + }; + + use frame_support::{ + assert_noop, assert_ok, + dispatch::{DispatchClass, DispatchInfo, GetDispatchInfo, PostDispatchInfo}, + parameter_types, + traits::{ConstU32, ConstU64, Currency, GenesisBuild, Imbalance, OnUnbalanced}, + weights::{Weight, WeightToFee as WeightToFeeT}, + }; + use frame_system as system; + use pallet_balances::Call as BalancesCall; + + type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; + type Block = frame_system::mocking::MockBlock; + + frame_support::construct_runtime!( + pub enum Runtime where + Block = Block, + NodeBlock = Block, + UncheckedExtrinsic = UncheckedExtrinsic, + { + System: system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event}, + } + ); + + const CALL: &::RuntimeCall = + &RuntimeCall::Balances(BalancesCall::transfer { dest: 2, value: 69 }); + + parameter_types! { + static ExtrinsicBaseWeight: Weight = Weight::zero(); + } + + pub struct BlockWeights; + impl Get for BlockWeights { + fn get() -> frame_system::limits::BlockWeights { + frame_system::limits::BlockWeights::builder() + .base_block(Weight::zero()) + .for_class(DispatchClass::all(), |weights| { + weights.base_extrinsic = ExtrinsicBaseWeight::get().into(); + }) + .for_class(DispatchClass::non_mandatory(), |weights| { + weights.max_total = Weight::from_ref_time(1024).into(); + }) + .build_or_panic() + } + } + + parameter_types! { + pub static WeightToFee: u64 = 1; + pub static TransactionByteFee: u64 = 1; + pub static OperationalFeeMultiplier: u8 = 5; + } + + impl frame_system::Config for Runtime { + type BaseCallFilter = frame_support::traits::Everything; + type BlockWeights = BlockWeights; + type BlockLength = (); + type DbWeight = (); + type RuntimeOrigin = RuntimeOrigin; + type Index = u64; + type BlockNumber = u64; + type RuntimeCall = RuntimeCall; + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type Header = Header; + type RuntimeEvent = RuntimeEvent; + type BlockHashCount = ConstU64<250>; + type Version = (); + type PalletInfo = PalletInfo; + type AccountData = pallet_balances::AccountData; + type OnNewAccount = (); + type OnKilledAccount = (); + type SystemWeightInfo = (); + type SS58Prefix = (); + type OnSetCode = (); + type MaxConsumers = ConstU32<16>; + } + + impl pallet_balances::Config for Runtime { + type Balance = u64; + type RuntimeEvent = RuntimeEvent; + type DustRemoval = (); + type ExistentialDeposit = ConstU64<1>; + type AccountStore = System; + type MaxLocks = (); + type MaxReserves = (); + type ReserveIdentifier = [u8; 8]; + type WeightInfo = (); + } + + impl WeightToFeeT for WeightToFee { + type Balance = u64; + + fn weight_to_fee(weight: &Weight) -> Self::Balance { + Self::Balance::saturated_from(weight.ref_time()) + .saturating_mul(WEIGHT_TO_FEE.with(|v| *v.borrow())) + } + } + + impl WeightToFeeT for TransactionByteFee { + type Balance = u64; + + fn weight_to_fee(weight: &Weight) -> Self::Balance { + Self::Balance::saturated_from(weight.ref_time()) + .saturating_mul(TRANSACTION_BYTE_FEE.with(|v| *v.borrow())) + } + } + + parameter_types! { + static TipUnbalancedAmount: u64 = 0; + static FeeUnbalancedAmount: u64 = 0; + } + + pub struct DealWithFees; + impl OnUnbalanced> for DealWithFees { + fn on_unbalanceds( + mut fees_then_tips: impl Iterator>, + ) { + if let Some(fees) = fees_then_tips.next() { + FeeUnbalancedAmount::mutate(|a| *a += fees.peek()); + if let Some(tips) = fees_then_tips.next() { + TipUnbalancedAmount::mutate(|a| *a += tips.peek()); + } + } + } + } + + impl Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type OnChargeTransaction = CurrencyAdapter; + type OperationalFeeMultiplier = OperationalFeeMultiplier; + type WeightToFee = WeightToFee; + type LengthToFee = TransactionByteFee; + type FeeMultiplierUpdate = (); + } + + pub struct ExtBuilder { + balance_factor: u64, + base_weight: Weight, + byte_fee: u64, + weight_to_fee: u64, + initial_multiplier: Option, + } + + impl Default for ExtBuilder { + fn default() -> Self { + Self { + balance_factor: 1, + base_weight: Weight::zero(), + byte_fee: 1, + weight_to_fee: 1, + initial_multiplier: None, + } + } + } + + impl ExtBuilder { + pub fn base_weight(mut self, base_weight: Weight) -> Self { + self.base_weight = base_weight; + self + } + pub fn byte_fee(mut self, byte_fee: u64) -> Self { + self.byte_fee = byte_fee; + self + } + pub fn weight_fee(mut self, weight_to_fee: u64) -> Self { + self.weight_to_fee = weight_to_fee; + self + } + pub fn balance_factor(mut self, factor: u64) -> Self { + self.balance_factor = factor; + self + } + pub fn with_initial_multiplier(mut self, multiplier: Multiplier) -> Self { + self.initial_multiplier = Some(multiplier); + self + } + fn set_constants(&self) { + ExtrinsicBaseWeight::mutate(|v| *v = self.base_weight); + TRANSACTION_BYTE_FEE.with(|v| *v.borrow_mut() = self.byte_fee); + WEIGHT_TO_FEE.with(|v| *v.borrow_mut() = self.weight_to_fee); + } + pub fn build(self) -> sp_io::TestExternalities { + self.set_constants(); + let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + pallet_balances::GenesisConfig:: { + balances: if self.balance_factor > 0 { + vec![ + (1, 10 * self.balance_factor), + (2, 20 * self.balance_factor), + (3, 30 * self.balance_factor), + (4, 40 * self.balance_factor), + (5, 50 * self.balance_factor), + (6, 60 * self.balance_factor), + ] + } else { + vec![] + }, + } + .assimilate_storage(&mut t) + .unwrap(); + + if let Some(multiplier) = self.initial_multiplier { + let genesis = pallet::GenesisConfig { multiplier }; + GenesisBuild::::assimilate_storage(&genesis, &mut t).unwrap(); + } + + t.into() + } + } + + /// create a transaction info struct from weight. Handy to avoid building the whole struct. + pub fn info_from_weight(w: Weight) -> DispatchInfo { + // pays_fee: Pays::Yes -- class: DispatchClass::Normal + DispatchInfo { weight: w, ..Default::default() } + } + + fn post_info_from_weight(w: Weight) -> PostDispatchInfo { + PostDispatchInfo { actual_weight: Some(w), pays_fee: Default::default() } + } + + fn post_info_from_pays(p: Pays) -> PostDispatchInfo { + PostDispatchInfo { actual_weight: None, pays_fee: p } + } + + fn default_post_info() -> PostDispatchInfo { + PostDispatchInfo { actual_weight: None, pays_fee: Default::default() } + } + + #[test] + fn signed_extension_transaction_payment_work() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(5)) + .build() + .execute_with(|| { + let len = 10; + let pre = ChargeTransactionPayment::::from(0) + .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_ref_time(5)), len) + .unwrap(); + assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10); + + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info_from_weight(Weight::from_ref_time(5)), + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(1), 100 - 5 - 5 - 10); + assert_eq!(FeeUnbalancedAmount::get(), 5 + 5 + 10); + assert_eq!(TipUnbalancedAmount::get(), 0); + + FeeUnbalancedAmount::mutate(|a| *a = 0); + + let pre = ChargeTransactionPayment::::from(5 /* tipped */) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .unwrap(); + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); + + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info_from_weight(Weight::from_ref_time(100)), + &post_info_from_weight(Weight::from_ref_time(50)), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 50 - 5); + assert_eq!(FeeUnbalancedAmount::get(), 5 + 10 + 50); + assert_eq!(TipUnbalancedAmount::get(), 5); + }); + } + + #[test] + fn signed_extension_transaction_payment_multiplied_refund_works() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(5)) + .build() + .execute_with(|| { + let len = 10; + >::put(Multiplier::saturating_from_rational(3, 2)); + + let pre = ChargeTransactionPayment::::from(5 /* tipped */) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .unwrap(); + // 5 base fee, 10 byte fee, 3/2 * 100 weight fee, 5 tip + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 150 - 5); + + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info_from_weight(Weight::from_ref_time(100)), + &post_info_from_weight(Weight::from_ref_time(50)), + len, + &Ok(()) + )); + // 75 (3/2 of the returned 50 units of weight) is refunded + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 75 - 5); + }); + } + + #[test] + fn signed_extension_transaction_payment_is_bounded() { + ExtBuilder::default().balance_factor(1000).byte_fee(0).build().execute_with(|| { + // maximum weight possible + assert_ok!(ChargeTransactionPayment::::from(0).pre_dispatch( + &1, + CALL, + &info_from_weight(Weight::MAX), + 10 + )); + // fee will be proportional to what is the actual maximum weight in the runtime. + assert_eq!( + Balances::free_balance(&1), + (10000 - + ::BlockWeights::get().max_block.ref_time()) as u64 + ); + }); + } + + #[test] + fn signed_extension_allows_free_transactions() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(100)) + .balance_factor(0) + .build() + .execute_with(|| { + // 1 ain't have a penny. + assert_eq!(Balances::free_balance(1), 0); + + let len = 100; + + // This is a completely free (and thus wholly insecure/DoS-ridden) transaction. + let operational_transaction = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Operational, + pays_fee: Pays::No, + }; + assert_ok!(ChargeTransactionPayment::::from(0).validate( + &1, + CALL, + &operational_transaction, + len + )); + + // like a InsecureFreeNormal + let free_transaction = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Normal, + pays_fee: Pays::Yes, + }; + assert_noop!( + ChargeTransactionPayment::::from(0).validate( + &1, + CALL, + &free_transaction, + len + ), + TransactionValidityError::Invalid(InvalidTransaction::Payment), + ); + }); + } + + #[test] + fn signed_ext_length_fee_is_also_updated_per_congestion() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(5)) + .balance_factor(10) + .build() + .execute_with(|| { + // all fees should be x1.5 + >::put(Multiplier::saturating_from_rational(3, 2)); + let len = 10; + + assert_ok!( + ChargeTransactionPayment::::from(10) // tipped + .pre_dispatch(&1, CALL, &info_from_weight(Weight::from_ref_time(3)), len) + ); + assert_eq!( + Balances::free_balance(1), + 100 // original + - 10 // tip + - 5 // base + - 10 // len + - (3 * 3 / 2) // adjusted weight + ); + }) + } + + #[test] + fn query_info_and_fee_details_works() { + let call = RuntimeCall::Balances(BalancesCall::transfer { dest: 2, value: 69 }); + let origin = 111111; + let extra = (); + let xt = TestXt::new(call.clone(), Some((origin, extra))); + let info = xt.get_dispatch_info(); + let ext = xt.encode(); + let len = ext.len() as u32; + + let unsigned_xt = TestXt::<_, ()>::new(call, None); + let unsigned_xt_info = unsigned_xt.get_dispatch_info(); + + ExtBuilder::default() + .base_weight(Weight::from_ref_time(5)) + .weight_fee(2) + .build() + .execute_with(|| { + // all fees should be x1.5 + >::put(Multiplier::saturating_from_rational(3, 2)); + + assert_eq!( + TransactionPayment::query_info(xt.clone(), len), + RuntimeDispatchInfo { + weight: info.weight, + class: info.class, + partial_fee: 5 * 2 /* base * weight_fee */ + + len as u64 /* len * 1 */ + + info.weight.min(BlockWeights::get().max_block).ref_time() as u64 * 2 * 3 / 2 /* weight */ + }, + ); + + assert_eq!( + TransactionPayment::query_info(unsigned_xt.clone(), len), + RuntimeDispatchInfo { + weight: unsigned_xt_info.weight, + class: unsigned_xt_info.class, + partial_fee: 0, + }, + ); + + assert_eq!( + TransactionPayment::query_fee_details(xt, len), + FeeDetails { + inclusion_fee: Some(InclusionFee { + base_fee: 5 * 2, + len_fee: len as u64, + adjusted_weight_fee: info + .weight + .min(BlockWeights::get().max_block) + .ref_time() as u64 * 2 * 3 / 2 + }), + tip: 0, + }, + ); + + assert_eq!( + TransactionPayment::query_fee_details(unsigned_xt, len), + FeeDetails { inclusion_fee: None, tip: 0 }, + ); + }); + } + + #[test] + fn query_call_info_and_fee_details_works() { + let call = RuntimeCall::Balances(BalancesCall::transfer { dest: 2, value: 69 }); + let info = call.get_dispatch_info(); + let encoded_call = call.encode(); + let len = encoded_call.len() as u32; + + ExtBuilder::default() + .base_weight(Weight::from_ref_time(5)) + .weight_fee(2) + .build() + .execute_with(|| { + // all fees should be x1.5 + >::put(Multiplier::saturating_from_rational(3, 2)); + + assert_eq!( + TransactionPayment::query_call_info(call.clone(), len), + RuntimeDispatchInfo { + weight: info.weight, + class: info.class, + partial_fee: 5 * 2 /* base * weight_fee */ + + len as u64 /* len * 1 */ + + info.weight.min(BlockWeights::get().max_block).ref_time() as u64 * 2 * 3 / 2 /* weight */ + }, + ); + + assert_eq!( + TransactionPayment::query_call_fee_details(call, len), + FeeDetails { + inclusion_fee: Some(InclusionFee { + base_fee: 5 * 2, /* base * weight_fee */ + len_fee: len as u64, /* len * 1 */ + adjusted_weight_fee: info + .weight + .min(BlockWeights::get().max_block) + .ref_time() as u64 * 2 * 3 / 2 /* weight * weight_fee * multipler */ + }), + tip: 0, + }, + ); + }); + } + + #[test] + fn compute_fee_works_without_multiplier() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(100)) + .byte_fee(10) + .balance_factor(0) + .build() + .execute_with(|| { + // Next fee multiplier is zero + assert_eq!(>::get(), Multiplier::one()); + + // Tip only, no fees works + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Operational, + pays_fee: Pays::No, + }; + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 10), 10); + // No tip, only base fee works + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 0), 100); + // Tip + base fee works + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 69), 169); + // Len (byte fee) + base fee works + assert_eq!(Pallet::::compute_fee(42, &dispatch_info, 0), 520); + // Weight fee + base fee works + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(1000), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 0), 1100); + }); + } + + #[test] + fn compute_fee_works_with_multiplier() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(100)) + .byte_fee(10) + .balance_factor(0) + .build() + .execute_with(|| { + // Add a next fee multiplier. Fees will be x3/2. + >::put(Multiplier::saturating_from_rational(3, 2)); + // Base fee is unaffected by multiplier + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 0), 100); + + // Everything works together :) + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(123), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + // 123 weight, 456 length, 100 base + assert_eq!( + Pallet::::compute_fee(456, &dispatch_info, 789), + 100 + (3 * 123 / 2) + 4560 + 789, + ); + }); + } + + #[test] + fn compute_fee_works_with_negative_multiplier() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(100)) + .byte_fee(10) + .balance_factor(0) + .build() + .execute_with(|| { + // Add a next fee multiplier. All fees will be x1/2. + >::put(Multiplier::saturating_from_rational(1, 2)); + + // Base fee is unaffected by multiplier. + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(0), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + assert_eq!(Pallet::::compute_fee(0, &dispatch_info, 0), 100); + + // Everything works together. + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(123), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + // 123 weight, 456 length, 100 base + assert_eq!( + Pallet::::compute_fee(456, &dispatch_info, 789), + 100 + (123 / 2) + 4560 + 789, + ); + }); + } + + #[test] + fn compute_fee_does_not_overflow() { + ExtBuilder::default() + .base_weight(Weight::from_ref_time(100)) + .byte_fee(10) + .balance_factor(0) + .build() + .execute_with(|| { + // Overflow is handled + let dispatch_info = DispatchInfo { + weight: Weight::MAX, + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + assert_eq!( + Pallet::::compute_fee(u32::MAX, &dispatch_info, u64::MAX), + u64::MAX + ); + }); + } + + #[test] + fn refund_does_not_recreate_account() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(5)) + .build() + .execute_with(|| { + // So events are emitted + System::set_block_number(10); + let len = 10; + let pre = ChargeTransactionPayment::::from(5 /* tipped */) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .unwrap(); + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); + + // kill the account between pre and post dispatch + assert_ok!(Balances::transfer(Some(2).into(), 3, Balances::free_balance(2))); + assert_eq!(Balances::free_balance(2), 0); + + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info_from_weight(Weight::from_ref_time(100)), + &post_info_from_weight(Weight::from_ref_time(50)), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(2), 0); + // Transfer Event + System::assert_has_event(RuntimeEvent::Balances( + pallet_balances::Event::Transfer { from: 2, to: 3, amount: 80 }, + )); + // Killed Event + System::assert_has_event(RuntimeEvent::System(system::Event::KilledAccount { + account: 2, + })); + }); + } + + #[test] + fn actual_weight_higher_than_max_refunds_nothing() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(5)) + .build() + .execute_with(|| { + let len = 10; + let pre = ChargeTransactionPayment::::from(5 /* tipped */) + .pre_dispatch(&2, CALL, &info_from_weight(Weight::from_ref_time(100)), len) + .unwrap(); + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); + + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info_from_weight(Weight::from_ref_time(100)), + &post_info_from_weight(Weight::from_ref_time(101)), + len, + &Ok(()) + )); + assert_eq!(Balances::free_balance(2), 200 - 5 - 10 - 100 - 5); + }); + } + + #[test] + fn zero_transfer_on_free_transaction() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(5)) + .build() + .execute_with(|| { + // So events are emitted + System::set_block_number(10); + let len = 10; + let dispatch_info = DispatchInfo { + weight: Weight::from_ref_time(100), + pays_fee: Pays::No, + class: DispatchClass::Normal, + }; + let user = 69; + let pre = ChargeTransactionPayment::::from(0) + .pre_dispatch(&user, CALL, &dispatch_info, len) + .unwrap(); + assert_eq!(Balances::total_balance(&user), 0); + assert_ok!(ChargeTransactionPayment::::post_dispatch( + Some(pre), + &dispatch_info, + &default_post_info(), + len, + &Ok(()) + )); + assert_eq!(Balances::total_balance(&user), 0); + // TransactionFeePaid Event + System::assert_has_event(RuntimeEvent::TransactionPayment( + pallet_transaction_payment::Event::TransactionFeePaid { + who: user, + actual_fee: 0, + tip: 0, + }, + )); + }); + } + + #[test] + fn refund_consistent_with_actual_weight() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(7)) + .build() + .execute_with(|| { + let info = info_from_weight(Weight::from_ref_time(100)); + let post_info = post_info_from_weight(Weight::from_ref_time(33)); + let prev_balance = Balances::free_balance(2); + let len = 10; + let tip = 5; + + >::put(Multiplier::saturating_from_rational(5, 4)); + + let pre = ChargeTransactionPayment::::from(tip) + .pre_dispatch(&2, CALL, &info, len) + .unwrap(); + + ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info, + &post_info, + len, + &Ok(()), + ) + .unwrap(); + + let refund_based_fee = prev_balance - Balances::free_balance(2); + let actual_fee = + Pallet::::compute_actual_fee(len as u32, &info, &post_info, tip); + + // 33 weight, 10 length, 7 base, 5 tip + assert_eq!(actual_fee, 7 + 10 + (33 * 5 / 4) + 5); + assert_eq!(refund_based_fee, actual_fee); + }); + } + + #[test] + fn should_alter_operational_priority() { + let tip = 5; + let len = 10; + + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let normal = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Normal, + pays_fee: Pays::Yes, + }; + let priority = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &normal, len) + .unwrap() + .priority; + + assert_eq!(priority, 60); + + let priority = ChargeTransactionPayment::(2 * tip) + .validate(&2, CALL, &normal, len) + .unwrap() + .priority; + + assert_eq!(priority, 110); + }); + + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let op = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + let priority = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &op, len) + .unwrap() + .priority; + assert_eq!(priority, 5810); + + let priority = ChargeTransactionPayment::(2 * tip) + .validate(&2, CALL, &op, len) + .unwrap() + .priority; + assert_eq!(priority, 6110); + }); + } + + #[test] + fn no_tip_has_some_priority() { + let tip = 0; + let len = 10; + + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let normal = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Normal, + pays_fee: Pays::Yes, + }; + let priority = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &normal, len) + .unwrap() + .priority; + + assert_eq!(priority, 10); + }); + + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let op = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + let priority = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &op, len) + .unwrap() + .priority; + assert_eq!(priority, 5510); + }); + } + + #[test] + fn higher_tip_have_higher_priority() { + let get_priorities = |tip: u64| { + let mut priority1 = 0; + let mut priority2 = 0; + let len = 10; + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let normal = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Normal, + pays_fee: Pays::Yes, + }; + priority1 = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &normal, len) + .unwrap() + .priority; + }); + + ExtBuilder::default().balance_factor(100).build().execute_with(|| { + let op = DispatchInfo { + weight: Weight::from_ref_time(100), + class: DispatchClass::Operational, + pays_fee: Pays::Yes, + }; + priority2 = ChargeTransactionPayment::(tip) + .validate(&2, CALL, &op, len) + .unwrap() + .priority; + }); + + (priority1, priority2) + }; + + let mut prev_priorities = get_priorities(0); + + for tip in 1..3 { + let priorities = get_priorities(tip); + assert!(prev_priorities.0 < priorities.0); + assert!(prev_priorities.1 < priorities.1); + prev_priorities = priorities; + } + } + + #[test] + fn post_info_can_change_pays_fee() { + ExtBuilder::default() + .balance_factor(10) + .base_weight(Weight::from_ref_time(7)) + .build() + .execute_with(|| { + let info = info_from_weight(Weight::from_ref_time(100)); + let post_info = post_info_from_pays(Pays::No); + let prev_balance = Balances::free_balance(2); + let len = 10; + let tip = 5; + + >::put(Multiplier::saturating_from_rational(5, 4)); + + let pre = ChargeTransactionPayment::::from(tip) + .pre_dispatch(&2, CALL, &info, len) + .unwrap(); + + ChargeTransactionPayment::::post_dispatch( + Some(pre), + &info, + &post_info, + len, + &Ok(()), + ) + .unwrap(); + + let refund_based_fee = prev_balance - Balances::free_balance(2); + let actual_fee = + Pallet::::compute_actual_fee(len as u32, &info, &post_info, tip); + + // Only 5 tip is paid + assert_eq!(actual_fee, 5); + assert_eq!(refund_based_fee, actual_fee); + }); + } + + #[test] + fn genesis_config_works() { + ExtBuilder::default() + .with_initial_multiplier(Multiplier::from_u32(100)) + .build() + .execute_with(|| { + assert_eq!( + >::get(), + Multiplier::saturating_from_integer(100) + ); + }); + } + + #[test] + fn genesis_default_works() { + ExtBuilder::default().build().execute_with(|| { + assert_eq!(>::get(), Multiplier::saturating_from_integer(1)); + }); + } +} diff --git a/code/parachain/frame/transaction-payment/src/payment.rs b/code/parachain/frame/transaction-payment/src/payment.rs new file mode 100644 index 00000000000..fc538a369cc --- /dev/null +++ b/code/parachain/frame/transaction-payment/src/payment.rs @@ -0,0 +1,149 @@ +/// ! Traits and default implementation for paying transaction fees. +use crate::Config; + +use codec::{FullCodec, MaxEncodedLen}; +use sp_runtime::{ + traits::{ + AtLeast32BitUnsigned, DispatchInfoOf, MaybeSerializeDeserialize, PostDispatchInfoOf, + Saturating, Zero, + }, + transaction_validity::InvalidTransaction, +}; +use sp_std::{fmt::Debug, marker::PhantomData}; + +use frame_support::{ + traits::{Currency, ExistenceRequirement, Imbalance, OnUnbalanced, WithdrawReasons}, + unsigned::TransactionValidityError, +}; + +type NegativeImbalanceOf = + ::AccountId>>::NegativeImbalance; + +/// Handle withdrawing, refunding and depositing of transaction fees. +pub trait OnChargeTransaction { + /// The underlying integer type in which fees are calculated. + type Balance: AtLeast32BitUnsigned + + FullCodec + + Copy + + MaybeSerializeDeserialize + + Debug + + Default + + scale_info::TypeInfo + + MaxEncodedLen; + type LiquidityInfo: Default; + + /// Before the transaction is executed the payment of the transaction fees + /// need to be secured. + /// + /// Note: The `fee` already includes the `tip`. + fn withdraw_fee( + who: &T::AccountId, + call: &T::RuntimeCall, + dispatch_info: &DispatchInfoOf, + fee: Self::Balance, + tip: Self::Balance, + ) -> Result; + + /// After the transaction was executed the actual fee can be calculated. + /// This function should refund any overpaid fees and optionally deposit + /// the corrected amount. + /// + /// Note: The `fee` already includes the `tip`. + fn correct_and_deposit_fee( + who: &T::AccountId, + dispatch_info: &DispatchInfoOf, + post_info: &PostDispatchInfoOf, + corrected_fee: Self::Balance, + tip: Self::Balance, + already_withdrawn: Self::LiquidityInfo, + ) -> Result<(), TransactionValidityError>; +} + +/// Implements the transaction payment for a pallet implementing the `Currency` +/// trait (eg. the pallet_balances) using an unbalance handler (implementing +/// `OnUnbalanced`). +/// +/// The unbalance handler is given 2 unbalanceds in [`OnUnbalanced::on_unbalanceds`]: fee and +/// then tip. +pub struct CurrencyAdapter(PhantomData<(C, OU)>); + +/// Default implementation for a Currency and an OnUnbalanced handler. +/// +/// The unbalance handler is given 2 unbalanceds in [`OnUnbalanced::on_unbalanceds`]: fee and +/// then tip. +impl OnChargeTransaction for CurrencyAdapter +where + T: Config, + C: Currency<::AccountId>, + C::PositiveImbalance: Imbalance< + ::AccountId>>::Balance, + Opposite = C::NegativeImbalance, + >, + C::NegativeImbalance: Imbalance< + ::AccountId>>::Balance, + Opposite = C::PositiveImbalance, + >, + OU: OnUnbalanced>, +{ + type LiquidityInfo = Option>; + type Balance = ::AccountId>>::Balance; + + /// Withdraw the predicted fee from the transaction origin. + /// + /// Note: The `fee` already includes the `tip`. + fn withdraw_fee( + who: &T::AccountId, + _call: &T::RuntimeCall, + _info: &DispatchInfoOf, + fee: Self::Balance, + tip: Self::Balance, + ) -> Result { + if fee.is_zero() { + return Ok(None) + } + + let withdraw_reason = if tip.is_zero() { + WithdrawReasons::TRANSACTION_PAYMENT + } else { + WithdrawReasons::TRANSACTION_PAYMENT | WithdrawReasons::TIP + }; + + match C::withdraw(who, fee, withdraw_reason, ExistenceRequirement::KeepAlive) { + Ok(imbalance) => Ok(Some(imbalance)), + Err(_) => Err(InvalidTransaction::Payment.into()), + } + } + + /// Hand the fee and the tip over to the `[OnUnbalanced]` implementation. + /// Since the predicted fee might have been too high, parts of the fee may + /// be refunded. + /// + /// Note: The `corrected_fee` already includes the `tip`. + fn correct_and_deposit_fee( + who: &T::AccountId, + _dispatch_info: &DispatchInfoOf, + _post_info: &PostDispatchInfoOf, + corrected_fee: Self::Balance, + tip: Self::Balance, + already_withdrawn: Self::LiquidityInfo, + ) -> Result<(), TransactionValidityError> { + if let Some(paid) = already_withdrawn { + // Calculate how much refund we should return + let refund_amount = paid.peek().saturating_sub(corrected_fee); + // refund to the the account that paid the fees. If this fails, the + // account might have dropped below the existential balance. In + // that case we don't refund anything. + let refund_imbalance = C::deposit_into_existing(who, refund_amount) + .unwrap_or_else(|_| C::PositiveImbalance::zero()); + // merge the imbalance caused by paying the fees and refunding parts of it again. + let adjusted_paid = paid + .offset(refund_imbalance) + .same() + .map_err(|_| TransactionValidityError::Invalid(InvalidTransaction::Payment))?; + // Call someone else to handle the imbalance (fee and tip separately) + let (tip, fee) = adjusted_paid.split(tip); + OU::on_unbalanceds(Some(fee).into_iter().chain(Some(tip))); + } + Ok(()) + } +} diff --git a/code/parachain/frame/transaction-payment/src/types.rs b/code/parachain/frame/transaction-payment/src/types.rs new file mode 100644 index 00000000000..1f41ba7b0b7 --- /dev/null +++ b/code/parachain/frame/transaction-payment/src/types.rs @@ -0,0 +1,168 @@ +// This file is part of Substrate. + +// Copyright (C) 2021-2022 Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Types for transaction-payment RPC. + +use codec::{Decode, Encode}; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +use sp_runtime::traits::{AtLeast32BitUnsigned, Zero}; +use sp_std::prelude::*; + +use frame_support::{dispatch::DispatchClass, weights::Weight}; + +/// The base fee and adjusted weight and length fees constitute the _inclusion fee_. +#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +pub struct InclusionFee { + /// This is the minimum amount a user pays for a transaction. It is declared + /// as a base _weight_ in the runtime and converted to a fee using `WeightToFee`. + pub base_fee: Balance, + /// The length fee, the amount paid for the encoded length (in bytes) of the transaction. + pub len_fee: Balance, + /// + /// - `targeted_fee_adjustment`: This is a multiplier that can tune the final fee based on the + /// congestion of the network. + /// - `weight_fee`: This amount is computed based on the weight of the transaction. Weight + /// accounts for the execution time of a transaction. + /// + /// adjusted_weight_fee = targeted_fee_adjustment * weight_fee + pub adjusted_weight_fee: Balance, +} + +impl InclusionFee { + /// Returns the total of inclusion fee. + /// + /// ```ignore + /// inclusion_fee = base_fee + len_fee + adjusted_weight_fee + /// ``` + pub fn inclusion_fee(&self) -> Balance { + self.base_fee + .saturating_add(self.len_fee) + .saturating_add(self.adjusted_weight_fee) + } +} + +/// The `FeeDetails` is composed of: +/// - (Optional) `inclusion_fee`: Only the `Pays::Yes` transaction can have the inclusion fee. +/// - `tip`: If included in the transaction, the tip will be added on top. Only signed +/// transactions can have a tip. +#[derive(Encode, Decode, Clone, Eq, PartialEq)] +#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +pub struct FeeDetails { + /// The minimum fee for a transaction to be included in a block. + pub inclusion_fee: Option>, + // Do not serialize and deserialize `tip` as we actually can not pass any tip to the RPC. + #[cfg_attr(feature = "std", serde(skip))] + pub tip: Balance, +} + +impl FeeDetails { + /// Returns the final fee. + /// + /// ```ignore + /// final_fee = inclusion_fee + tip; + /// ``` + pub fn final_fee(&self) -> Balance { + self.inclusion_fee + .as_ref() + .map(|i| i.inclusion_fee()) + .unwrap_or_else(|| Zero::zero()) + .saturating_add(self.tip) + } +} + +/// Information related to a dispatchable's class, weight, and fee that can be queried from the +/// runtime. +#[derive(Eq, PartialEq, Encode, Decode, Default)] +#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[cfg_attr(feature = "std", serde(bound(serialize = "Balance: std::fmt::Display")))] +#[cfg_attr(feature = "std", serde(bound(deserialize = "Balance: std::str::FromStr")))] +pub struct RuntimeDispatchInfo { + /// Weight of this dispatch. + pub weight: Weight, + /// Class of this dispatch. + pub class: DispatchClass, + /// The inclusion fee of this dispatch. + /// + /// This does not include a tip or anything else that + /// depends on the signature (i.e. depends on a `SignedExtension`). + #[cfg_attr(feature = "std", serde(with = "serde_balance"))] + pub partial_fee: Balance, +} + +#[cfg(feature = "std")] +mod serde_balance { + use serde::{Deserialize, Deserializer, Serializer}; + + pub fn serialize( + t: &T, + serializer: S, + ) -> Result { + serializer.serialize_str(&t.to_string()) + } + + pub fn deserialize<'de, D: Deserializer<'de>, T: std::str::FromStr>( + deserializer: D, + ) -> Result { + let s = String::deserialize(deserializer)?; + s.parse::().map_err(|_| serde::de::Error::custom("Parse from string failed")) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn should_serialize_and_deserialize_properly_with_string() { + let info = RuntimeDispatchInfo { + weight: Weight::from_ref_time(5), + class: DispatchClass::Normal, + partial_fee: 1_000_000_u64, + }; + + let json_str = r#"{"weight":{"ref_time":5},"class":"normal","partialFee":"1000000"}"#; + + assert_eq!(serde_json::to_string(&info).unwrap(), json_str); + assert_eq!(serde_json::from_str::>(json_str).unwrap(), info); + + // should not panic + serde_json::to_value(&info).unwrap(); + } + + #[test] + fn should_serialize_and_deserialize_properly_large_value() { + let info = RuntimeDispatchInfo { + weight: Weight::from_ref_time(5), + class: DispatchClass::Normal, + partial_fee: u128::max_value(), + }; + + let json_str = r#"{"weight":{"ref_time":5},"class":"normal","partialFee":"340282366920938463463374607431768211455"}"#; + + assert_eq!(serde_json::to_string(&info).unwrap(), json_str); + assert_eq!(serde_json::from_str::>(json_str).unwrap(), info); + + // should not panic + serde_json::to_value(&info).unwrap(); + } +} diff --git a/code/parachain/node/Cargo.toml b/code/parachain/node/Cargo.toml index b6ed45a52f3..a9015867c74 100644 --- a/code/parachain/node/Cargo.toml +++ b/code/parachain/node/Cargo.toml @@ -37,14 +37,14 @@ lending-rpc = { path = "../frame/lending/rpc" } lending-runtime-api = { path = "../frame/lending/runtime-api" } pablo-rpc = { path = "../frame/pablo/rpc" } pablo-runtime-api = { path = "../frame/pablo/runtime-api" } +pallet-transaction-payment-rpc = { path = "../frame/transaction-payment/rpc" } +pallet-transaction-payment-rpc-runtime-api = { path = "../frame/transaction-payment/rpc/runtime-api" } pallet-ibc = { git = "https://github.com/ComposableFi/centauri", rev = "f0d44fe83c078b2d9fb040337c8152f037ba817d" } # FRAME Dependencies frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } diff --git a/code/parachain/runtime/composable/Cargo.toml b/code/parachain/runtime/composable/Cargo.toml index de9f54fb9ae..96cc948424d 100644 --- a/code/parachain/runtime/composable/Cargo.toml +++ b/code/parachain/runtime/composable/Cargo.toml @@ -60,7 +60,6 @@ session = { package = "pallet-session", git = "https://github.com/paritytech/sub smallvec = "1.6.1" sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -76,10 +75,11 @@ governance-registry = { package = "pallet-governance-registry", path = "../../fr oracle = { package = "pallet-oracle", path = "../../frame/oracle", default-features = false, optional = true } primitives = { path = "../primitives", default-features = false } vault = { package = "pallet-vault", path = "../../frame/vault", default-features = false, optional = true } +transaction-payment = { package = "pallet-transaction-payment", path = "../../frame/transaction-payment", default-features = false } # Used for the node template's RPCs system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../frame/transaction-payment/rpc/runtime-api", default-features = false } # local RPCs assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } diff --git a/code/parachain/runtime/dali/Cargo.toml b/code/parachain/runtime/dali/Cargo.toml index 6478d637615..cd151c25073 100644 --- a/code/parachain/runtime/dali/Cargo.toml +++ b/code/parachain/runtime/dali/Cargo.toml @@ -60,23 +60,21 @@ scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } smallvec = "1.6.1" -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } proxy = { package = "pallet-proxy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # local modules -assets = { package = "pallet-assets", path = '../../frame/assets', default-features = false } -assets-registry = { package = "pallet-assets-registry", path = '../../frame/assets-registry', default-features = false } +assets = { package = "pallet-assets", path = "../../frame/assets", default-features = false } +assets-registry = { package = "pallet-assets-registry", path = "../../frame/assets-registry", default-features = false } bonded-finance = { package = "pallet-bonded-finance", path = "../../frame/bonded-finance", default-features = false } call-filter = { package = "pallet-call-filter", path = "../../frame/call-filter", default-features = false } common = { path = "../common", default-features = false } -composable-support = { path = '../../frame/composable-support', default-features = false } +composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } -crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/crowdloan-rewards', default-features = false } +crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = "../../frame/crowdloan-rewards", default-features = false } currency-factory = { package = "pallet-currency-factory", path = "../../frame/currency-factory", default-features = false } dex-router = { package = "pallet-dex-router", path = "../../frame/dex-router", default-features = false } dutch-auction = { package = "pallet-dutch-auction", path = "../../frame/dutch-auction", default-features = false } @@ -91,6 +89,8 @@ pallet-staking-rewards = { path = "../../frame/staking-rewards", default-feature primitives = { path = "../primitives", default-features = false } vault = { package = "pallet-vault", path = "../../frame/vault", default-features = false } vesting = { package = "pallet-vesting", path = "../../frame/vesting", default-features = false } +asset-tx-payment = { package = "pallet-asset-tx-payment", path = "../../frame/transaction-payment/asset-tx-payment", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", path = "../../frame/transaction-payment", default-features = false } # cosmwasm support cosmwasm = { package = "pallet-cosmwasm", path = "../../frame/cosmwasm", default-features = false } @@ -98,14 +98,14 @@ hex = { version = "0.4.0", default-features = false } # Used for the node template's RPCs system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../frame/transaction-payment/rpc/runtime-api", default-features = false } # local RPCs -assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } -cosmwasm-runtime-api = { path = '../../frame/cosmwasm/runtime-api', default-features = false } -crowdloan-rewards-runtime-api = { path = '../../frame/crowdloan-rewards/runtime-api', default-features = false } -lending-runtime-api = { path = '../../frame/lending/runtime-api', default-features = false } -pablo-runtime-api = { path = '../../frame/pablo/runtime-api', default-features = false } +assets-runtime-api = { path = "../../frame/assets/runtime-api", default-features = false } +cosmwasm-runtime-api = { path = "../../frame/cosmwasm/runtime-api", default-features = false } +crowdloan-rewards-runtime-api = { path = "../../frame/crowdloan-rewards/runtime-api", default-features = false } +lending-runtime-api = { path = "../../frame/lending/runtime-api", default-features = false } +pablo-runtime-api = { path = "../../frame/pablo/runtime-api", default-features = false } # Used for runtime benchmarking codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ @@ -211,6 +211,7 @@ runtime-benchmarks = [ "pallet-staking-rewards/runtime-benchmarks", "cosmwasm/runtime-benchmarks", "pallet-ibc/runtime-benchmarks", + "asset-tx-payment/runtime-benchmarks", ] std = [ "assets-registry/std", diff --git a/code/parachain/runtime/dali/src/lib.rs b/code/parachain/runtime/dali/src/lib.rs index 89c5642c76d..c55f3052106 100644 --- a/code/parachain/runtime/dali/src/lib.rs +++ b/code/parachain/runtime/dali/src/lib.rs @@ -84,7 +84,9 @@ pub use frame_support::{ construct_runtime, pallet_prelude::DispatchClass, parameter_types, - traits::{Contains, Everything, Get, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, + traits::{ + ConstBool, Contains, Everything, Get, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo, + }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, IdentityFee, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients, @@ -374,12 +376,25 @@ impl asset_tx_payment::HandleCredit for TransferToTreasuryOrD } impl asset_tx_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; type Fungibles = Tokens; type OnChargeAssetTransaction = asset_tx_payment::FungiblesAdapter< PriceConverter, TransferToTreasuryOrDrop, >; + + type UseUserConfiguration = ConstBool; + + type WeightInfo = weights::asset_tx_payment::WeightInfo; + + type ConfigurationOrigin = EnsureRootOrHalfNativeCouncil; + + type ConfigurationExistentialDeposit = NativeExistentialDeposit; + + type PayableCall = RuntimeCall; + + type Lock = Assets; + + type BalanceConverter = PriceConverter; } impl sudo::Config for Runtime { diff --git a/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs b/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs new file mode 100644 index 00000000000..0a25fd673c1 --- /dev/null +++ b/code/parachain/runtime/dali/src/weights/asset_tx_payment.rs @@ -0,0 +1,38 @@ +//! Autogenerated weights for `asset_tx_payment` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-08-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/release/composable +// benchmark +// pallet +// --chain=dali-dev +// --execution=wasm +// --wasm-execution=compiled +// --wasm-instantiation-strategy=legacy-instance-reuse +// --pallet=* +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --output=runtime/dali/src/weights +// --log +// error + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `currency_factory`. +pub struct WeightInfo(PhantomData); +impl asset_tx_payment::WeightInfo for WeightInfo { + fn set_payment_asset() -> Weight { + Weight::from_ref_time(26_387_000) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} diff --git a/code/parachain/runtime/dali/src/weights/mod.rs b/code/parachain/runtime/dali/src/weights/mod.rs index 60009a6930f..1f990eae8dd 100644 --- a/code/parachain/runtime/dali/src/weights/mod.rs +++ b/code/parachain/runtime/dali/src/weights/mod.rs @@ -1,4 +1,5 @@ #![allow(clippy::unnecessary_cast)] +pub mod asset_tx_payment; pub mod assets_registry; pub mod balances; pub mod bonded_finance; diff --git a/code/parachain/runtime/picasso/Cargo.toml b/code/parachain/runtime/picasso/Cargo.toml index 2ae053c57a8..f66e39b3af5 100644 --- a/code/parachain/runtime/picasso/Cargo.toml +++ b/code/parachain/runtime/picasso/Cargo.toml @@ -44,7 +44,6 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } # modules -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } aura = { package = "pallet-aura", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -63,7 +62,6 @@ session = { package = "pallet-session", git = "https://github.com/paritytech/sub smallvec = "1.6.1" sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } @@ -71,28 +69,30 @@ utility = { package = "pallet-utility", git = "https://github.com/paritytech/sub log = { version = "0.4.14", default-features = false } # local modules -assets = { package = "pallet-assets", path = '../../frame/assets', default-features = false } -assets-registry = { package = "pallet-assets-registry", path = '../../frame/assets-registry', default-features = false } +assets = { package = "pallet-assets", path = "../../frame/assets", default-features = false } +assets-registry = { package = "pallet-assets-registry", path = "../../frame/assets-registry", default-features = false } bonded-finance = { package = "pallet-bonded-finance", path = "../../frame/bonded-finance", default-features = false } call-filter = { package = "pallet-call-filter", path = "../../frame/call-filter", default-features = false } common = { path = "../common", default-features = false } composable-support = { path = "../../frame/composable-support", default-features = false } composable-traits = { path = "../../frame/composable-traits", default-features = false } -crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/crowdloan-rewards', default-features = false } +crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = "../../frame/crowdloan-rewards", default-features = false } currency-factory = { package = "pallet-currency-factory", path = "../../frame/currency-factory", default-features = false } governance-registry = { package = "pallet-governance-registry", path = "../../frame/governance-registry", default-features = false } pablo = { package = "pallet-pablo", path = "../../frame/pablo", default-features = false } primitives = { path = "../primitives", default-features = false } vesting = { package = "pallet-vesting", path = "../../frame/vesting", default-features = false } +asset-tx-payment = { package = "pallet-asset-tx-payment", path = "../../frame/transaction-payment/asset-tx-payment", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", path = "../../frame/transaction-payment", default-features = false } # Used for the node template's RPCs system-rpc-runtime-api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } -transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "../../frame/transaction-payment/rpc/runtime-api", default-features = false } # local RPCs -assets-runtime-api = { path = '../../frame/assets/runtime-api', default-features = false } -crowdloan-rewards-runtime-api = { path = '../../frame/crowdloan-rewards/runtime-api', default-features = false } -pablo-runtime-api = { path = '../../frame/pablo/runtime-api', default-features = false } +assets-runtime-api = { path = "../../frame/assets/runtime-api", default-features = false } +crowdloan-rewards-runtime-api = { path = "../../frame/crowdloan-rewards/runtime-api", default-features = false } +pablo-runtime-api = { path = "../../frame/pablo/runtime-api", default-features = false } # Used for runtime benchmarking codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ @@ -164,8 +164,7 @@ runtime-benchmarks = [ "vesting/runtime-benchmarks", "bonded-finance/runtime-benchmarks", "common/runtime-benchmarks", - # FIXUP(hussein) - # "asset-tx-payment/runtime-benchmarks", + "asset-tx-payment/runtime-benchmarks", "proxy/runtime-benchmarks", "pablo/runtime-benchmarks", ] diff --git a/code/parachain/runtime/picasso/src/lib.rs b/code/parachain/runtime/picasso/src/lib.rs index 39787c5362f..c5b509e4516 100644 --- a/code/parachain/runtime/picasso/src/lib.rs +++ b/code/parachain/runtime/picasso/src/lib.rs @@ -414,12 +414,25 @@ impl asset_tx_payment::HandleCredit for TransferToTreasuryOrD } impl asset_tx_payment::Config for Runtime { - type RuntimeEvent = RuntimeEvent; type Fungibles = Tokens; type OnChargeAssetTransaction = asset_tx_payment::FungiblesAdapter< PriceConverter, TransferToTreasuryOrDrop, >; + + type UseUserConfiguration = ConstBool; + + type WeightInfo = weights::asset_tx_payment::WeightInfo; + + type ConfigurationOrigin = EnsureRootOrTwoThirdNativeCouncil; + + type ConfigurationExistentialDeposit = NativeExistentialDeposit; + + type PayableCall = RuntimeCall; + + type Lock = Assets; + + type BalanceConverter = PriceConverter; } impl sudo::Config for Runtime { @@ -623,7 +636,7 @@ impl scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type PreimageProvider = Preimage; type NoPreimagePostponement = NoPreimagePostponement; - type WeightInfo = scheduler::weights::SubstrateWeight; + type WeightInfo = weights::scheduler::WeightInfo; } parameter_types! { diff --git a/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs b/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs new file mode 100644 index 00000000000..ec7bef02f8c --- /dev/null +++ b/code/parachain/runtime/picasso/src/weights/asset_tx_payment.rs @@ -0,0 +1,38 @@ +//! Autogenerated weights for `asset_tx_payment` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-08-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/release/composable +// benchmark +// pallet +// --chain=picasso-dev +// --execution=wasm +// --wasm-execution=compiled +// --wasm-instantiation-strategy=legacy-instance-reuse +// --pallet=* +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --output=runtime/picasso/src/weights +// --log +// error + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `currency_factory`. +pub struct WeightInfo(PhantomData); +impl asset_tx_payment::WeightInfo for WeightInfo { + fn set_payment_asset() -> Weight { + Weight::from_ref_time(26_387_000) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} diff --git a/code/parachain/runtime/picasso/src/weights/mod.rs b/code/parachain/runtime/picasso/src/weights/mod.rs index 3155845e273..4c80e2851b2 100644 --- a/code/parachain/runtime/picasso/src/weights/mod.rs +++ b/code/parachain/runtime/picasso/src/weights/mod.rs @@ -1,4 +1,5 @@ #![allow(clippy::unnecessary_cast)] +pub mod asset_tx_payment; pub mod assets_registry; pub mod balances; pub mod bonded_finance; @@ -12,9 +13,9 @@ pub mod identity; pub mod indices; pub mod membership; pub mod multisig; -// pub mod scheduler; pub mod pablo; pub mod proxy; +pub mod scheduler; pub mod session; pub mod timestamp; pub mod tokens; diff --git a/code/simnode/common/Cargo.toml b/code/simnode/common/Cargo.toml index 33ec94483ed..4ddfd7ee4bb 100644 --- a/code/simnode/common/Cargo.toml +++ b/code/simnode/common/Cargo.toml @@ -9,7 +9,6 @@ substrate-simnode = { git = "https://github.com/polytope-labs/substrate-simnode" frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } @@ -23,7 +22,8 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -asset-tx-payment = { package = "pallet-asset-tx-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.30" } +asset-tx-payment = { package = "pallet-asset-tx-payment", path = "../../parachain/frame/transaction-payment", default-features = false } +transaction-payment = { package = "pallet-transaction-payment", path = "../../parachain/frame/transaction-payment", default-features = false } common = { path = "../../parachain/runtime/common" } composable-runtime = { path = "../../parachain/runtime/composable" } diff --git a/code/utils/common/Cargo.toml b/code/utils/common/Cargo.toml index d064ac8a9b9..993869976aa 100644 --- a/code/utils/common/Cargo.toml +++ b/code/utils/common/Cargo.toml @@ -13,4 +13,4 @@ picasso-runtime = { path = "../../parachain/runtime/picasso" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +transaction-payment = { package = "pallet-transaction-payment", path = "../../parachain/frame/transaction-payment", default-features = false }