diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e39b9c046..83b3d1660 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -17,6 +17,9 @@ jobs: run: shell: bash steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler # Ensure that at most one benchmark worklow runs across all workflows - name: Turnstyle uses: softprops/turnstyle@v1 diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml index 02b4857cd..c7b2785c0 100644 --- a/.github/workflows/migration.yml +++ b/.github/workflows/migration.yml @@ -11,6 +11,9 @@ jobs: name: Test migration runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4af14a7ae..ecff426c4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,6 +14,9 @@ jobs: name: Format runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 @@ -45,6 +48,9 @@ jobs: "standalone" ] steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 @@ -60,6 +66,9 @@ jobs: name: Quick check benchmarks runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 @@ -72,6 +81,9 @@ jobs: name: Tests runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 @@ -103,6 +115,9 @@ jobs: name: Fuzz runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 49b2fe453..1c4af3b64 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -10,6 +10,9 @@ jobs: name: Test Try Runtime runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v3 @@ -27,6 +30,9 @@ jobs: name: Test Try Runtime runs-on: ubuntu-latest steps: + - name: Install ProtoBuf Compiler + run: | + sudo apt-get install protobuf-compiler - name: Checkout repository uses: actions/checkout@v3 diff --git a/Cargo.lock b/Cargo.lock index bb4ae6a7a..46d0b186f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug 0.3.0", ] @@ -65,7 +65,7 @@ checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "ghash", "subtle", @@ -139,6 +139,12 @@ dependencies = [ "derive_arbitrary", ] +[[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" @@ -306,9 +312,9 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" +checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" dependencies = [ "async-std", "async-trait", @@ -431,6 +437,12 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + [[package]] name = "battery-station-runtime" version = "0.3.8" @@ -505,6 +517,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-std", "sp-transaction-pool", "sp-version", "substrate-fixed", @@ -540,14 +553,14 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "async-trait", "beefy-primitives", "fnv", "futures 0.3.25", "futures-timer", - "hex", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -557,6 +570,7 @@ dependencies = [ "sc-finality-grandpa", "sc-keystore", "sc-network", + "sc-network-common", "sc-network-gossip", "sc-utils", "sp-api", @@ -576,7 +590,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -596,32 +610,30 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "beefy-primitives", "sp-api", + "sp-runtime", ] [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", + "serde", "sp-api", "sp-application-crypto", "sp-core", + "sp-io", + "sp-mmr-primitives", "sp-runtime", "sp-std", ] -[[package]] -name = "bimap" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" - [[package]] name = "bincode" version = "1.3.3" @@ -633,9 +645,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -940,7 +952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", - "cipher 0.3.0", + "cipher", "cpufeatures", "zeroize", ] @@ -953,7 +965,7 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] @@ -995,16 +1007,6 @@ dependencies = [ "generic-array 0.14.6", ] -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "ckb-merkle-mountain-range" version = "0.3.2" @@ -1022,31 +1024,29 @@ checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", + "is-terminal", "once_cell", "strsim", "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -1057,22 +1057,13 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - [[package]] name = "coarsetime" version = "0.1.22" @@ -1226,19 +1217,21 @@ dependencies = [ [[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", @@ -1253,33 +1246,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", @@ -1289,15 +1282,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", @@ -1306,9 +1299,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", @@ -1446,24 +1439,13 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", -] - -[[package]] -name = "cuckoofilter" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" -dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", + "cipher", ] [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "clap", "parity-scale-codec", @@ -1478,12 +1460,11 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "cumulus-relay-chain-interface", "futures 0.3.25", "parity-scale-codec", "parking_lot 0.12.1", @@ -1502,7 +1483,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1512,7 +1493,6 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sc-consensus", - "sp-api", "sp-blockchain", "sp-consensus", "sp-runtime", @@ -1523,7 +1503,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1531,7 +1511,6 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.25", "parking_lot 0.12.1", - "sc-client-api", "sc-consensus", "sp-api", "sp-block-builder", @@ -1547,11 +1526,10 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-relay-chain-interface", - "derive_more", "futures 0.3.25", "futures-timer", "parity-scale-codec", @@ -1560,7 +1538,6 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "sc-client-api", - "sp-api", "sp-blockchain", "sp-consensus", "sp-core", @@ -1572,7 +1549,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1586,7 +1563,6 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-consensus", - "sp-api", "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime", @@ -1596,7 +1572,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1605,26 +1581,21 @@ dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", "parking_lot 0.12.1", - "polkadot-overseer", "polkadot-primitives", "sc-client-api", "sc-consensus", - "sc-consensus-babe", "sc-service", - "sc-telemetry", - "sc-tracing", "sp-api", "sp-blockchain", "sp-consensus", "sp-core", "sp-runtime", - "tracing", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1636,13 +1607,12 @@ dependencies = [ "sp-runtime", "sp-std", "xcm", - "xcm-executor", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1653,11 +1623,9 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "log", - "pallet-balances", "parity-scale-codec", "polkadot-parachain", "scale-info", - "serde", "sp-core", "sp-externalities", "sp-inherents", @@ -1667,13 +1635,12 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1684,14 +1651,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -1701,7 +1667,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1720,9 +1686,8 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ - "frame-support", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -1736,7 +1701,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1759,7 +1724,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "futures 0.3.25", @@ -1772,18 +1737,14 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "frame-support", "log", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", "sp-runtime", "sp-std", - "sp-trie", "xcm", "xcm-builder", "xcm-executor", @@ -1792,7 +1753,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1804,39 +1765,31 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-client-api", - "sc-consensus-babe", - "sc-network", "sc-sysinfo", "sc-telemetry", "sc-tracing", "sp-api", - "sp-blockchain", "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "tracing", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "cumulus-primitives-core", - "derive_more", "futures 0.3.25", "jsonrpsee-core", "parity-scale-codec", - "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", "sp-state-machine", "thiserror", ] @@ -1844,7 +1797,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "async-trait", "backoff", @@ -1854,11 +1807,12 @@ dependencies = [ "futures-timer", "jsonrpsee", "parity-scale-codec", - "parking_lot 0.12.1", "polkadot-service", "sc-client-api", "sc-rpc-api", "sp-api", + "sp-authority-discovery", + "sp-consensus-babe", "sp-core", "sp-runtime", "sp-state-machine", @@ -1871,7 +1825,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2035,6 +1989,12 @@ dependencies = [ "syn", ] +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.8.1" @@ -2115,6 +2075,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -2229,9 +2195,9 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2", @@ -2453,7 +2419,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -2474,9 +2440,9 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -2501,6 +2467,15 @@ dependencies = [ "miniz_oxide 0.5.4", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2510,7 +2485,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", ] @@ -2524,10 +2499,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -2550,9 +2531,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", + "array-bytes", "chrono", "clap", "comfy-table", @@ -2562,7 +2544,6 @@ dependencies = [ "gethostname", "handlebars", "hash-db", - "hex", "itertools", "kvdb", "lazy_static", @@ -2601,7 +2582,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2612,7 +2593,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2628,7 +2609,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -2657,7 +2638,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bitflags", "frame-metadata", @@ -2682,13 +2663,14 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-tracing", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "cfg-expr", @@ -2702,7 +2684,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2714,7 +2696,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -2724,7 +2706,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "log", @@ -2736,12 +2718,13 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", + "sp-weights", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -2756,7 +2739,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-api", @@ -2765,7 +2748,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "parity-scale-codec", @@ -2780,18 +2763,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" -[[package]] -name = "fs-swap" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" -dependencies = [ - "lazy_static", - "libc", - "libloading 0.5.2", - "winapi", -] - [[package]] name = "fs2" version = "0.4.3" @@ -3176,12 +3147,6 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" -[[package]] -name = "hex_fmt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" - [[package]] name = "hmac" version = "0.8.1" @@ -3360,9 +3325,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" +checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" dependencies = [ "async-io", "core-foundation", @@ -3387,9 +3352,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -3416,15 +3381,6 @@ dependencies = [ "serde", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] - [[package]] name = "instant" version = "0.1.12" @@ -3449,12 +3405,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" @@ -3468,7 +3418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3504,7 +3454,7 @@ dependencies = [ "hermit-abi 0.2.6", "io-lifetimes 1.0.4", "rustix 0.36.7", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3707,8 +3657,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "bitvec", @@ -3731,10 +3681,12 @@ dependencies = [ "pallet-bounties", "pallet-child-bounties", "pallet-collective", + "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-gilt", "pallet-grandpa", "pallet-identity", @@ -3749,7 +3701,9 @@ dependencies = [ "pallet-offences-benchmarking", "pallet-preimage", "pallet-proxy", + "pallet-ranked-collective", "pallet-recovery", + "pallet-referenda", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", @@ -3763,6 +3717,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -3800,14 +3755,16 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] @@ -3821,9 +3778,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" +checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" dependencies = [ "parity-util-mem", "smallvec", @@ -3831,9 +3788,9 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" +checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" dependencies = [ "kvdb", "parity-util-mem", @@ -3842,15 +3799,13 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" +checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" dependencies = [ - "fs-swap", "kvdb", "log", "num_cpus", - "owning_ref", "parity-util-mem", "parking_lot 0.12.1", "regex", @@ -3887,16 +3842,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - [[package]] name = "libloading" version = "0.7.4" @@ -3921,9 +3866,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.46.1" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" +checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" dependencies = [ "bytes", "futures 0.3.25", @@ -3931,12 +3876,8 @@ dependencies = [ "getrandom 0.2.8", "instant", "lazy_static", - "libp2p-autonat", "libp2p-core", - "libp2p-deflate", "libp2p-dns", - "libp2p-floodsub", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-mdns", @@ -3944,49 +3885,24 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-plaintext", - "libp2p-pnet", - "libp2p-relay", - "libp2p-rendezvous", "libp2p-request-response", "libp2p-swarm", "libp2p-swarm-derive", "libp2p-tcp", - "libp2p-uds", "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] -[[package]] -name = "libp2p-autonat" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" -dependencies = [ - "async-trait", - "futures 0.3.25", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-request-response", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.8.5", -] - [[package]] name = "libp2p-core" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" +checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" dependencies = [ "asn1_der", "bs58", @@ -3997,7 +3913,6 @@ dependencies = [ "futures-timer", "instant", "lazy_static", - "libsecp256k1", "log", "multiaddr", "multihash", @@ -4007,7 +3922,6 @@ dependencies = [ "prost", "prost-build", "rand 0.8.5", - "ring", "rw-stream-sink", "sha2 0.10.6", "smallvec", @@ -4017,22 +3931,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "libp2p-deflate" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" -dependencies = [ - "flate2", - "futures 0.3.25", - "libp2p-core", -] - [[package]] name = "libp2p-dns" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" +checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" dependencies = [ "async-std-resolver", "futures 0.3.25", @@ -4043,57 +3946,11 @@ dependencies = [ "trust-dns-resolver", ] -[[package]] -name = "libp2p-floodsub" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" -dependencies = [ - "cuckoofilter", - "fnv", - "futures 0.3.25", - "libp2p-core", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.7.3", - "smallvec", -] - -[[package]] -name = "libp2p-gossipsub" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" -dependencies = [ - "asynchronous-codec", - "base64 0.13.1", - "byteorder", - "bytes", - "fnv", - "futures 0.3.25", - "hex_fmt", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "prometheus-client", - "prost", - "prost-build", - "rand 0.7.3", - "regex", - "sha2 0.10.6", - "smallvec", - "unsigned-varint", - "wasm-timer", -] - [[package]] name = "libp2p-identify" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" +checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" dependencies = [ "asynchronous-codec", "futures 0.3.25", @@ -4101,7 +3958,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.8", + "lru 0.8.1", "prost", "prost-build", "prost-codec", @@ -4112,9 +3969,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.38.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" +checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -4129,7 +3986,7 @@ dependencies = [ "log", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sha2 0.10.6", "smallvec", "thiserror", @@ -4140,16 +3997,15 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.38.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" +checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" dependencies = [ "async-io", "data-encoding", "dns-parser", "futures 0.3.25", "if-watch", - "lazy_static", "libp2p-core", "libp2p-swarm", "log", @@ -4161,25 +4017,23 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" +checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" dependencies = [ "libp2p-core", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", - "libp2p-relay", "libp2p-swarm", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" +checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" dependencies = [ "asynchronous-codec", "bytes", @@ -4188,16 +4042,16 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" +checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", @@ -4217,105 +4071,25 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" -dependencies = [ - "futures 0.3.25", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "rand 0.7.3", - "void", -] - -[[package]] -name = "libp2p-plaintext" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" -dependencies = [ - "asynchronous-codec", - "bytes", - "futures 0.3.25", - "libp2p-core", - "log", - "prost", - "prost-build", - "unsigned-varint", - "void", -] - -[[package]] -name = "libp2p-pnet" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5a702574223aa55d8878bdc8bf55c84a6086f87ddaddc28ce730b4caa81538" -dependencies = [ - "futures 0.3.25", - "log", - "pin-project", - "rand 0.8.5", - "salsa20", - "sha3", -] - -[[package]] -name = "libp2p-relay" -version = "0.10.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" +checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" dependencies = [ - "asynchronous-codec", - "bytes", - "either", "futures 0.3.25", "futures-timer", "instant", "libp2p-core", "libp2p-swarm", "log", - "pin-project", - "prost", - "prost-build", - "prost-codec", "rand 0.8.5", - "smallvec", - "static_assertions", - "thiserror", - "void", -] - -[[package]] -name = "libp2p-rendezvous" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" -dependencies = [ - "asynchronous-codec", - "bimap", - "futures 0.3.25", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.8.5", - "sha2 0.10.6", - "thiserror", - "unsigned-varint", "void", ] [[package]] name = "libp2p-request-response" -version = "0.19.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" +checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" dependencies = [ "async-trait", "bytes", @@ -4324,16 +4098,16 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.37.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" +checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" dependencies = [ "either", "fnv", @@ -4343,7 +4117,7 @@ dependencies = [ "libp2p-core", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", "void", @@ -4351,48 +4125,36 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" +checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" dependencies = [ + "heck", "quote", "syn", ] [[package]] name = "libp2p-tcp" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" +checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" dependencies = [ "async-io", "futures 0.3.25", "futures-timer", "if-watch", - "ipnet", "libc", "libp2p-core", "log", "socket2", ] -[[package]] -name = "libp2p-uds" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" -dependencies = [ - "async-std", - "futures 0.3.25", - "libp2p-core", - "log", -] - [[package]] name = "libp2p-wasm-ext" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" +checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" dependencies = [ "futures 0.3.25", "js-sys", @@ -4404,9 +4166,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.36.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" +checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" dependencies = [ "either", "futures 0.3.25", @@ -4423,12 +4185,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.38.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" +checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12" dependencies = [ "futures 0.3.25", "libp2p-core", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -4436,9 +4199,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -4542,12 +4305,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" @@ -4674,11 +4431,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.7", ] [[package]] @@ -4710,9 +4467,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" dependencies = [ "hash-db", "hashbrown 0.12.3", @@ -4730,9 +4487,9 @@ dependencies = [ [[package]] name = "memory_units" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "merlin" @@ -4790,13 +4547,40 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", +] + +[[package]] +name = "mockall" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +dependencies = [ + "cfg-if 1.0.0", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +dependencies = [ + "cfg-if 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "moonbeam-vrf" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "nimbus-primitives", "parity-scale-codec", @@ -4884,9 +4668,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", "futures 0.3.25", @@ -5009,7 +4793,7 @@ dependencies = [ [[package]] name = "nimbus-consensus" version = "0.9.0" -source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -5040,7 +4824,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "async-trait", "frame-benchmarking", @@ -5097,6 +4881,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num-bigint" version = "0.2.6" @@ -5108,6 +4898,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.3" @@ -5144,7 +4945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg", - "num-bigint", + "num-bigint 0.2.6", "num-integer", "num-traits", ] @@ -5156,6 +4957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -5182,12 +4984,12 @@ dependencies = [ [[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", ] @@ -5227,8 +5029,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" -version = "0.0.1" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43" dependencies = [ "async-trait", "dyn-clonable", @@ -5243,8 +5046,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.1" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a" dependencies = [ "expander 0.0.6", "itertools", @@ -5267,7 +5071,7 @@ dependencies = [ [[package]] name = "orml-asset-registry" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "frame-system", @@ -5286,7 +5090,7 @@ dependencies = [ [[package]] name = "orml-benchmarking" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5306,7 +5110,7 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "frame-system", @@ -5323,7 +5127,7 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "frame-system", @@ -5338,7 +5142,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -5356,7 +5160,7 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "frame-system", @@ -5371,7 +5175,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "parity-scale-codec", @@ -5385,7 +5189,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "frame-support", "orml-traits", @@ -5399,7 +5203,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/zeitgeistpm/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.29#d231a39d4583445d1af7326a9e6e78ba744ce6e9" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.32#f336875e48599b5e9500b301385259354821f01f" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -5423,15 +5227,6 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "packed_simd_2" version = "0.3.8" @@ -5445,7 +5240,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -5461,7 +5256,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "frame-benchmarking", "frame-support", @@ -5481,7 +5276,7 @@ dependencies = [ [[package]] name = "pallet-author-mapping" version = "2.0.5" -source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "frame-benchmarking", "frame-support", @@ -5499,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-author-slot-filter" version = "0.9.0" -source = "git+https://github.com/zeitgeistpm/nimbus?branch=moonbeam-polkadot-v0.9.29#9cb2d9280c4f99bf4ea5acbe57b731dfad1c0e23" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "frame-benchmarking", "frame-support", @@ -5517,7 +5312,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -5533,7 +5328,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -5548,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5572,7 +5367,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5592,7 +5387,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5607,7 +5402,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "beefy-primitives", "frame-support", @@ -5623,13 +5418,13 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", - "hex", "log", "pallet-beefy", "pallet-mmr", @@ -5646,7 +5441,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5664,7 +5459,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5683,7 +5478,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5697,17 +5492,36 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-conviction-voting" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "assert_matches", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5716,13 +5530,14 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", + "pallet-election-provider-support-benchmarking", "parity-scale-codec", "rand 0.7.3", "scale-info", @@ -5739,7 +5554,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5752,7 +5567,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5767,10 +5582,31 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-fast-unstake" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "frame-benchmarking", + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-staking", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", +] + [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5785,7 +5621,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5808,7 +5644,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5824,7 +5660,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5844,7 +5680,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5861,7 +5697,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -5878,7 +5714,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5896,7 +5732,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5911,11 +5747,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-io", @@ -5926,7 +5763,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -5943,7 +5780,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5955,6 +5792,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", + "sp-runtime-interface", "sp-staking", "sp-std", ] @@ -5962,7 +5800,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-api", @@ -5972,7 +5810,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -5989,7 +5827,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6012,7 +5850,7 @@ dependencies = [ [[package]] name = "pallet-parachain-staking" version = "3.0.0" -source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "frame-benchmarking", "frame-support", @@ -6030,11 +5868,12 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -6046,7 +5885,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6061,7 +5900,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -6072,16 +5911,52 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-ranked-collective" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-referenda" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "assert_matches", "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "serde", + "sp-arithmetic", "sp-io", "sp-runtime", "sp-std", @@ -6090,7 +5965,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6106,7 +5981,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -6127,7 +6002,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6143,7 +6018,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -6157,7 +6032,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6180,7 +6055,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6191,7 +6066,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "sp-arithmetic", @@ -6200,7 +6075,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -6214,7 +6089,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6232,7 +6107,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6251,7 +6126,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -6267,7 +6142,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6277,23 +6152,25 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", + "sp-weights", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", "sp-runtime", + "sp-weights", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6310,7 +6187,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6326,7 +6203,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -6338,10 +6215,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-whitelist" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-xcm" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "frame-system", @@ -6358,8 +6250,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-benchmarking", "frame-support", @@ -6376,14 +6268,13 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/cumulus?branch=moonbeam-polkadot-v0.9.29#e4f9bb8949e12e174ec6350cef81e556a5c94b5f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.32#6abd385ce49f7feb882218646410feb063404b77" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "serde", ] [[package]] @@ -6440,9 +6331,9 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-util-mem" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" dependencies = [ "cfg-if 1.0.0", "hashbrown 0.12.3", @@ -6476,9 +6367,9 @@ dependencies = [ [[package]] name = "parity-wasm" -version = "0.42.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" @@ -6531,7 +6422,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6662,6 +6553,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -6682,8 +6584,8 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot-approval-distribution" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "polkadot-node-network-protocol", @@ -6697,8 +6599,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "polkadot-node-network-protocol", @@ -6711,13 +6613,13 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "derive_more", "fatality", "futures 0.3.25", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6734,12 +6636,12 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "fatality", "futures 0.3.25", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6755,8 +6657,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "clap", "frame-benchmarking-cli", @@ -6781,8 +6683,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6821,10 +6723,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "always-assert", + "bitvec", "fatality", "futures 0.3.25", "futures-timer", @@ -6842,8 +6745,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6855,13 +6758,15 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "derive_more", "fatality", "futures 0.3.25", - "lru 0.7.8", + "futures-timer", + "indexmap", + "lru 0.8.1", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6878,8 +6783,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6892,8 +6797,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "futures-timer", @@ -6912,8 +6817,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "always-assert", "async-trait", @@ -6936,8 +6841,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "parity-scale-codec", @@ -6954,15 +6859,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitvec", "derive_more", "futures 0.3.25", "futures-timer", "kvdb", - "lru 0.7.8", + "lru 0.8.1", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -6983,8 +6888,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitvec", "futures 0.3.25", @@ -7003,8 +6908,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitvec", "fatality", @@ -7022,8 +6927,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", @@ -7037,8 +6942,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "futures 0.3.25", @@ -7055,8 +6960,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "polkadot-node-subsystem", @@ -7070,8 +6975,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "futures-timer", @@ -7087,13 +6992,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "fatality", "futures 0.3.25", "kvdb", - "lru 0.7.8", + "lru 0.8.1", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7106,8 +7011,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "futures 0.3.25", @@ -7123,8 +7028,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitvec", "fatality", @@ -7141,8 +7046,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "always-assert", "assert_matches", @@ -7153,7 +7058,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", - "polkadot-node-subsystem-util", + "polkadot-node-metrics", "polkadot-parachain", "rand 0.8.5", "rayon", @@ -7173,8 +7078,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "polkadot-node-primitives", @@ -7189,8 +7094,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "futures 0.3.25", "memory-lru", @@ -7205,8 +7110,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-std", "lazy_static", @@ -7223,8 +7128,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bs58", "futures 0.3.25", @@ -7242,8 +7147,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "derive_more", @@ -7257,6 +7162,7 @@ dependencies = [ "rand 0.8.5", "sc-authority-discovery", "sc-network", + "sc-network-common", "strum", "thiserror", "tracing-gum", @@ -7264,8 +7170,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bounded-vec", "futures 0.3.25", @@ -7286,8 +7192,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7296,8 +7202,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "derive_more", @@ -7319,8 +7225,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "derive_more", @@ -7328,7 +7234,7 @@ dependencies = [ "futures 0.3.25", "itertools", "kvdb", - "lru 0.7.8", + "lru 0.8.1", "parity-db", "parity-scale-codec", "parity-util-mem", @@ -7352,13 +7258,13 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "futures 0.3.25", "futures-timer", - "lru 0.7.8", + "lru 0.8.1", "orchestra", "parity-util-mem", "parking_lot 0.12.1", @@ -7375,8 +7281,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "derive_more", "frame-support", @@ -7392,8 +7298,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "env_logger 0.9.3", "kusama-runtime", @@ -7407,8 +7313,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitvec", "frame-system", @@ -7437,8 +7343,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7469,8 +7375,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "bitvec", @@ -7496,6 +7402,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", @@ -7557,8 +7464,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "bitvec", @@ -7604,20 +7511,22 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bs58", "parity-scale-codec", @@ -7628,8 +7537,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "bitflags", "bitvec", @@ -7671,8 +7580,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "async-trait", "beefy-gadget", @@ -7684,7 +7593,7 @@ dependencies = [ "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.8", + "lru 0.8.1", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -7775,8 +7684,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -7796,8 +7705,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7806,8 +7715,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "bitvec", @@ -7867,8 +7776,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-benchmarking", "frame-system", @@ -7930,7 +7839,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -7962,11 +7871,51 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "primitive-types" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", @@ -7978,7 +7927,8 @@ dependencies = [ [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4" dependencies = [ "coarsetime", "crossbeam-queue", @@ -8049,21 +7999,21 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", "itoa", - "owning_ref", + "parking_lot 0.12.1", "prometheus-client-derive-text-encode", ] [[package]] name = "prometheus-client-derive-text-encode" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", @@ -8072,9 +8022,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -8082,31 +8032,31 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", - "cfg-if 1.0.0", - "cmake", "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn", "tempfile", "which", ] [[package]] name = "prost-codec" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" dependencies = [ "asynchronous-codec", "bytes", @@ -8117,9 +8067,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -8130,9 +8080,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -8336,7 +8286,7 @@ dependencies = [ "derive_more", "fs-err", "itertools", - "static_init", + "static_init 0.5.2", "thiserror", ] @@ -8362,9 +8312,9 @@ dependencies = [ [[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", @@ -8398,25 +8348,12 @@ 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", -] - [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "env_logger 0.9.3", - "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -8425,6 +8362,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-version", + "substrate-rpc-client", ] [[package]] @@ -8474,9 +8412,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -8484,8 +8422,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -8503,23 +8441,37 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", + "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-multisig", "pallet-offences", + "pallet-preimage", "pallet-proxy", + "pallet-recovery", + "pallet-scheduler", "pallet-session", + "pallet-society", "pallet-staking", "pallet-sudo", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", "pallet-utility", + "pallet-vesting", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -8545,6 +8497,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "static_assertions", "substrate-wasm-builder", "xcm", "xcm-builder", @@ -8553,14 +8506,16 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] @@ -8635,20 +8590,6 @@ dependencies = [ "semver 1.0.16", ] -[[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", -] - [[package]] name = "rustix" version = "0.35.13" @@ -8660,7 +8601,7 @@ dependencies = [ "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -8674,7 +8615,7 @@ dependencies = [ "io-lifetimes 1.0.4", "libc", "linux-raw-sys 0.1.4", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -8742,15 +8683,6 @@ dependencies = [ "rustc_version 0.2.3", ] -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher 0.4.3", -] - [[package]] name = "same-file" version = "1.0.6" @@ -8763,7 +8695,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "sp-core", @@ -8774,7 +8706,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -8801,7 +8733,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "futures-timer", @@ -8824,7 +8756,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8840,7 +8772,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -8857,7 +8789,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8868,13 +8800,13 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "chrono", "clap", "fdlimit", "futures 0.3.25", - "hex", "libp2p", "log", "names", @@ -8886,6 +8818,7 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", + "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -8907,7 +8840,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "fnv", "futures 0.3.25", @@ -8935,7 +8868,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "kvdb", @@ -8960,7 +8893,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -8984,7 +8917,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -9013,14 +8946,14 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "fork-tree", "futures 0.3.25", "log", "merlin", - "num-bigint", + "num-bigint 0.2.6", "num-rational 0.2.4", "num-traits", "parity-scale-codec", @@ -9055,7 +8988,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "jsonrpsee", @@ -9077,7 +9010,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9090,7 +9023,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "assert_matches", "async-trait", @@ -9124,7 +9057,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -9142,14 +9075,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-timestamp", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "lazy_static", "lru 0.7.8", @@ -9176,7 +9108,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "environmental", "parity-scale-codec", @@ -9192,7 +9124,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "parity-scale-codec", @@ -9207,15 +9139,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "cfg-if 1.0.0", "libc", "log", "once_cell", "parity-scale-codec", - "parity-wasm 0.42.2", - "rustix 0.33.7", + "parity-wasm 0.45.0", "rustix 0.35.13", "sc-allocator", "sc-executor-common", @@ -9228,16 +9159,16 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ahash", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures 0.3.25", "futures-timer", - "hex", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9269,7 +9200,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "finality-grandpa", "futures 0.3.25", @@ -9290,7 +9221,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ansi_term", "futures 0.3.25", @@ -9307,10 +9238,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "async-trait", - "hex", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -9322,8 +9253,9 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "async-trait", "asynchronous-codec", "bitflags", @@ -9334,7 +9266,6 @@ dependencies = [ "fork-tree", "futures 0.3.25", "futures-timer", - "hex", "ip_network", "libp2p", "linked-hash-map", @@ -9345,7 +9276,6 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "prost", - "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -9364,20 +9294,41 @@ dependencies = [ "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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "cid", + "futures 0.3.25", + "libp2p", + "log", + "prost", + "prost-build", + "sc-client-api", + "sc-network-common", + "sp-blockchain", + "sp-runtime", + "thiserror", + "unsigned-varint", + "void", +] + [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "bitflags", "bytes", "futures 0.3.25", + "futures-timer", "libp2p", + "linked_hash_set", "parity-scale-codec", "prost-build", "sc-consensus", @@ -9388,13 +9339,14 @@ dependencies = [ "sp-consensus", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ahash", "futures 0.3.25", @@ -9412,10 +9364,10 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "futures 0.3.25", - "hex", "libp2p", "log", "parity-scale-codec", @@ -9433,14 +9385,15 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "fork-tree", "futures 0.3.25", - "hex", "libp2p", "log", "lru 0.7.8", + "mockall", "parity-scale-codec", "prost", "prost-build", @@ -9448,6 +9401,7 @@ dependencies = [ "sc-consensus", "sc-network-common", "sc-peerset", + "sc-utils", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -9458,16 +9412,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-network-transactions" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "array-bytes", + "futures 0.3.25", + "hex", + "libp2p", + "log", + "parity-scale-codec", + "pin-project", + "sc-network-common", + "sc-peerset", + "sp-consensus", + "sp-runtime", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "bytes", "fnv", "futures 0.3.25", "futures-timer", - "hex", "hyper", "hyper-rustls", "libp2p", @@ -9491,7 +9464,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "libp2p", @@ -9504,7 +9477,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9513,7 +9486,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "hash-db", @@ -9543,7 +9516,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "jsonrpsee", @@ -9566,7 +9539,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "jsonrpsee", @@ -9576,10 +9549,29 @@ dependencies = [ "tokio", ] +[[package]] +name = "sc-rpc-spec-v2" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "futures 0.3.25", + "hex", + "jsonrpsee", + "parity-scale-codec", + "sc-chain-spec", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "directories", @@ -9603,12 +9595,15 @@ 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", + "sc-rpc-spec-v2", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -9635,6 +9630,7 @@ dependencies = [ "sp-transaction-storage-proof", "sp-trie", "sp-version", + "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -9646,7 +9642,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "parity-scale-codec", @@ -9660,7 +9656,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9679,7 +9675,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "libc", @@ -9698,7 +9694,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "chrono", "futures 0.3.25", @@ -9716,7 +9712,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ansi_term", "atty", @@ -9747,7 +9743,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9758,8 +9754,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "async-trait", "futures 0.3.25", "futures-timer", "linked-hash-map", @@ -9784,8 +9781,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "async-trait", "futures 0.3.25", "log", "serde", @@ -9797,7 +9795,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "futures-timer", @@ -9839,7 +9837,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -9890,6 +9888,7 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der", "generic-array 0.14.6", + "pkcs8", "subtle", "zeroize", ] @@ -10020,7 +10019,7 @@ dependencies = [ [[package]] name = "session-keys-primitives" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/moonbeam?tag=v0.27.2-a#cf8094af82c8324378f18ac4b4a647cc06705c33" +source = "git+https://github.com/zeitgeistpm/external#fc957f4629c4a4ee650d912e5d1cf1d50c1a2126" dependencies = [ "async-trait", "frame-support", @@ -10170,8 +10169,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "enumn", "parity-scale-codec", @@ -10247,7 +10246,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -10265,7 +10264,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "proc-macro-crate", @@ -10277,7 +10276,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10290,7 +10289,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "integer-sqrt", "num-traits", @@ -10305,7 +10304,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10318,7 +10317,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "parity-scale-codec", @@ -10330,7 +10329,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-api", @@ -10342,7 +10341,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures 0.3.25", "log", @@ -10360,7 +10359,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -10379,7 +10378,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "parity-scale-codec", @@ -10397,7 +10396,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "merlin", @@ -10420,7 +10419,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10434,7 +10433,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10447,18 +10446,18 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "base58", "bitflags", - "blake2-rfc", + "blake2", "byteorder", "dyn-clonable", "ed25519-zebra", "futures 0.3.25", "hash-db", "hash256-std-hasher", - "hex", "impl-serde", "lazy_static", "libsecp256k1", @@ -10493,7 +10492,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "byteorder", @@ -10507,7 +10506,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -10518,7 +10517,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10527,7 +10526,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -10537,7 +10536,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "environmental", "parity-scale-codec", @@ -10548,7 +10547,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "finality-grandpa", "log", @@ -10566,7 +10565,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10580,10 +10579,9 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", - "ed25519-dalek", "futures 0.3.25", "hash-db", "libsecp256k1", @@ -10607,7 +10605,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "lazy_static", "sp-core", @@ -10618,7 +10616,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures 0.3.25", @@ -10635,7 +10633,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "thiserror", "zstd", @@ -10644,10 +10642,11 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-core", @@ -10659,7 +10658,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10673,7 +10672,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "sp-api", "sp-core", @@ -10683,7 +10682,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "backtrace", "lazy_static", @@ -10693,7 +10692,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "rustc-hash", "serde", @@ -10703,7 +10702,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "either", "hash256-std-hasher", @@ -10720,12 +10719,13 @@ dependencies = [ "sp-core", "sp-io", "sp-std", + "sp-weights", ] [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10743,7 +10743,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "proc-macro-crate", @@ -10755,7 +10755,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "parity-scale-codec", @@ -10769,7 +10769,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10783,7 +10783,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -10794,7 +10794,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -10816,12 +10816,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10834,7 +10834,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "log", "sp-core", @@ -10847,7 +10847,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures-timer", @@ -10863,7 +10863,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-std", @@ -10875,7 +10875,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "sp-api", "sp-runtime", @@ -10884,7 +10884,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "log", @@ -10900,7 +10900,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ahash", "hash-db", @@ -10923,11 +10923,11 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "scale-info", "serde", "sp-core-hashing-proc-macro", @@ -10940,7 +10940,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10951,7 +10951,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-trait-for-tuples", "log", @@ -10961,12 +10961,38 @@ dependencies = [ "wasmtime", ] +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" version = "1.38.0" @@ -11003,7 +11029,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", ] [[package]] @@ -11019,6 +11060,19 @@ dependencies = [ "syn", ] +[[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", + "quote", + "syn", +] + [[package]] name = "statrs" version = "0.15.0" @@ -11076,7 +11130,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "platforms 2.0.0", ] @@ -11095,7 +11149,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.25", @@ -11116,7 +11170,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "futures-util", "hyper", @@ -11126,10 +11180,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-rpc-client" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "async-trait", + "jsonrpsee", + "log", + "sc-rpc-api", + "serde", + "sp-runtime", +] + [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "jsonrpsee", "log", @@ -11150,11 +11217,11 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "async-trait", "futures 0.3.25", - "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -11176,7 +11243,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ansi_term", "build-helper", @@ -11275,6 +11342,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + [[package]] name = "test-case" version = "2.2.2" @@ -11299,22 +11372,18 @@ dependencies = [ [[package]] name = "test-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.38" @@ -11374,9 +11443,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.4.3+5.2.1-patched.2" +version = "0.5.2+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" dependencies = [ "cc", "fs_extra", @@ -11445,7 +11514,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -11573,8 +11642,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -11584,8 +11653,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -11662,9 +11731,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -11676,30 +11745,30 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", "thiserror", "tinyvec", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if 1.0.0", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", + "tracing", "trust-dns-proto", ] @@ -11712,11 +11781,10 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/zeitgeistpm/substrate?branch=moonbeam-polkadot-v0.9.29#b7176298ae07e18077b13521e6e0ef678a557aa2" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "clap", "frame-try-runtime", - "jsonrpsee", "log", "parity-scale-codec", "remote-externalities", @@ -11732,6 +11800,8 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-version", + "sp-weights", + "substrate-rpc-client", "zstd", ] @@ -11747,7 +11817,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.6", "rand 0.8.5", "static_assertions", @@ -12025,11 +12095,11 @@ dependencies = [ [[package]] name = "wasm-instrument" -version = "0.1.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" dependencies = [ - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", ] [[package]] @@ -12049,58 +12119,63 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.9.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "downcast-rs", - "libc", - "libm 0.2.6", - "memory_units", - "num-rational 0.2.4", - "num-traits", - "parity-wasm 0.42.2", + "parity-wasm 0.45.0", "wasmi-validation", + "wasmi_core", ] [[package]] name = "wasmi-validation" -version = "0.4.1" +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.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ - "parity-wasm 0.42.2", + "downcast-rs", + "libm 0.2.6", + "memory_units", + "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", - "object 0.28.4", + "object 0.29.0", "once_cell", "paste", "psm", "rayon", - "region", "serde", "target-lexicon", "wasmparser", @@ -12109,14 +12184,23 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi", + "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", @@ -12124,19 +12208,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", - "winapi", + "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", @@ -12146,8 +12230,7 @@ dependencies = [ "cranelift-wasm", "gimli 0.26.2", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -12156,17 +12239,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 0.26.2", "indexmap", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -12176,9 +12258,9 @@ 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 0.17.0", "anyhow", @@ -12187,38 +12269,36 @@ dependencies = [ "cpp_demangle", "gimli 0.26.2", "log", - "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", + "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", @@ -12227,21 +12307,21 @@ dependencies = [ "mach", "memfd", "memoffset 0.6.5", - "more-asserts", + "paste", "rand 0.8.5", - "region", - "rustix 0.33.7", + "rustix 0.35.13", "thiserror", + "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "winapi", + "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", @@ -12289,8 +12369,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "beefy-primitives", "bitvec", @@ -12314,6 +12394,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", @@ -12378,14 +12459,16 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] @@ -12449,6 +12532,19 @@ dependencies = [ "windows_x86_64_msvc 0.34.0", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -12476,6 +12572,12 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" @@ -12488,6 +12590,12 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + [[package]] name = "windows_i686_gnu" version = "0.42.1" @@ -12500,6 +12608,12 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + [[package]] name = "windows_i686_msvc" version = "0.42.1" @@ -12512,6 +12626,12 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" @@ -12530,6 +12650,12 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" @@ -12567,8 +12693,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12581,8 +12707,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-support", "frame-system", @@ -12602,7 +12728,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/zeitgeistpm/xcm-simulator?branch=moonbeam-polkadot-v0.9.29#4d235aab4d2ab8527aceb8b5849ca4eb18a08a08" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=158a6bd2768c679563efa891aa17329635b2764b#158a6bd2768c679563efa891aa17329635b2764b" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -12627,8 +12753,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "frame-benchmarking", "frame-support", @@ -12645,8 +12771,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.29" -source = "git+https://github.com/zeitgeistpm/polkadot?branch=moonbeam-polkadot-v0.9.29#91a493ceb0db61c9208dfe8c18e3886b1e5f119b" +version = "0.9.32" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.32#c71e872afed296d1825b15ea4b2a74750c1ba647" dependencies = [ "Inflector", "proc-macro2", @@ -12844,6 +12970,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", + "sp-std", "sp-transaction-pool", "sp-version", "substrate-fixed", diff --git a/node/Cargo.toml b/node/Cargo.toml index a66b5e24b..9b8bf813d 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,99 +3,99 @@ name = "zeitgeist" path = "./src/main.rs" [build-dependencies] -substrate-build-script-utils = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +substrate-build-script-utils = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } [dependencies] -pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment-rpc = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-basic-authorship = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-cli = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" } -sc-client-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-consensus = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-executor = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" } -sc-keystore = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-rpc = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-rpc-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-service = { branch = "moonbeam-polkadot-v0.9.29", features = ["wasmtime"], git = "https://github.com/zeitgeistpm/substrate" } -sc-sysinfo = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-telemetry = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-transaction-pool-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-blockchain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-consensus = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-core = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-keyring = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-session = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-storage = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-trie = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -substrate-frame-rpc-system = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-transaction-payment = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-basic-authorship = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-cli = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" } +sc-client-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-executor = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" } +sc-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-rpc = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-rpc-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-service = { branch = "polkadot-v0.9.32", features = ["wasmtime"], git = "https://github.com/paritytech/substrate" } +sc-sysinfo = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-telemetry = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-transaction-pool-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-block-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-blockchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-consensus = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-inherents = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-keyring = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-offchain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-session = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-storage = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-transaction-pool = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-trie = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +substrate-frame-rpc-system = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } # Try-Runtime -try-runtime-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +try-runtime-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } # Benchmark -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -frame-benchmarking-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +frame-benchmarking-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } # Cumulus -cumulus-client-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-client-collator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-client-consensus-common = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-client-consensus-relay-chain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-client-network = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-client-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-parachain-inherent = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-relay-chain-inprocess-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-relay-chain-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-relay-chain-rpc-interface = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/cumulus", optional = true } +cumulus-client-cli = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-client-collator = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-client-consensus-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-client-consensus-relay-chain = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-client-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-client-service = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-core = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-parachain-inherent = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-relay-chain-inprocess-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-relay-chain-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-relay-chain-rpc-interface = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/cumulus", optional = true } # Parachain -moonbeam-vrf = { tag = "v0.27.2-a", git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -nimbus-consensus = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-parachain-staking = { tag = "v0.27.2-a", git = "https://github.com/zeitgeistpm/moonbeam", optional = true } +moonbeam-vrf = { git = "https://github.com/zeitgeistpm/external", optional = true } +nimbus-consensus = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } parity-scale-codec = { optional = true, version = "3.0.0" } -sc-chain-spec = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sc-network = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sc-network-common = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sc-tracing = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +sc-chain-spec = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sc-network = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sc-network-common = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sc-tracing = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } serde = { features = ["derive"], optional = true, version = "1.0.144" } -session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -sp-keystore = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -substrate-prometheus-endpoint = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +sp-keystore = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +substrate-prometheus-endpoint = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } # Polkadot -polkadot-cli = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-test-service = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true } +polkadot-cli = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-parachain = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-primitives = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-test-service = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true } # Standalone -sc-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sc-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +sc-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sc-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-consensus-aura = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-finality-grandpa = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } # Utility cfg-if = { version = "1.0.0" } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.9", features = ["derive"] } hex-literal = { version = "0.3.4" } jsonrpsee = { version = "0.15.1", features = ["server"] } log = { optional = true, version = "0.4.17" } @@ -157,6 +157,8 @@ parachain = [ runtime-benchmarks = [ "battery-station-runtime?/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", + "frame-benchmarking-cli/runtime-benchmarks", + "polkadot-cli?/runtime-benchmarks", "polkadot-service?/runtime-benchmarks", "zeitgeist-runtime?/runtime-benchmarks", ] diff --git a/node/src/benchmarking.rs b/node/src/benchmarking.rs index 9845c461b..d893ff953 100644 --- a/node/src/benchmarking.rs +++ b/node/src/benchmarking.rs @@ -163,7 +163,7 @@ pub fn create_benchmark_extrinsic_zeitgeist< >( client: &FullClient, sender: sp_core::sr25519::Pair, - call: zeitgeist_runtime::Call, + call: zeitgeist_runtime::RuntimeCall, nonce: u32, ) -> zeitgeist_runtime::UncheckedExtrinsic { let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); @@ -221,7 +221,7 @@ pub fn create_benchmark_extrinsic_battery_station< >( client: &FullClient, sender: sp_core::sr25519::Pair, - call: battery_station_runtime::Call, + call: battery_station_runtime::RuntimeCall, nonce: u32, ) -> battery_station_runtime::UncheckedExtrinsic { let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); diff --git a/node/src/cli.rs b/node/src/cli.rs index e0609c5eb..0446312c5 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -442,84 +442,84 @@ impl sc_client_api::BlockBackend for Client { impl sc_client_api::StorageProvider for Client { fn storage( &self, - id: &BlockId, + hash: &::Hash, key: &StorageKey, ) -> sp_blockchain::Result> { - match_client!(self, storage(id, key)) + match_client!(self, storage(hash, key)) } fn storage_keys( &self, - id: &BlockId, + hash: &::Hash, key_prefix: &StorageKey, ) -> sp_blockchain::Result> { - match_client!(self, storage_keys(id, key_prefix)) + match_client!(self, storage_keys(hash, key_prefix)) } fn storage_hash( &self, - id: &BlockId, + hash: &::Hash, key: &StorageKey, ) -> sp_blockchain::Result::Hash>> { - match_client!(self, storage_hash(id, key)) + match_client!(self, storage_hash(hash, key)) } fn storage_pairs( &self, - id: &BlockId, + hash: &::Hash, key_prefix: &StorageKey, ) -> sp_blockchain::Result> { - match_client!(self, storage_pairs(id, key_prefix)) + match_client!(self, storage_pairs(hash, key_prefix)) } fn storage_keys_iter<'a>( &self, - id: &BlockId, + hash: &::Hash, prefix: Option<&'a StorageKey>, start_key: Option<&StorageKey>, ) -> sp_blockchain::Result< KeyIterator<'a, >::State, Block>, > { - match_client!(self, storage_keys_iter(id, prefix, start_key)) + match_client!(self, storage_keys_iter(hash, prefix, start_key)) } fn child_storage( &self, - id: &BlockId, + hash: &::Hash, child_info: &ChildInfo, key: &StorageKey, ) -> sp_blockchain::Result> { - match_client!(self, child_storage(id, child_info, key)) + match_client!(self, child_storage(hash, child_info, key)) } fn child_storage_keys( &self, - id: &BlockId, + hash: &::Hash, child_info: &ChildInfo, key_prefix: &StorageKey, ) -> sp_blockchain::Result> { - match_client!(self, child_storage_keys(id, child_info, key_prefix)) + match_client!(self, child_storage_keys(hash, child_info, key_prefix)) } fn child_storage_keys_iter<'a>( &self, - id: &BlockId, + hash: &::Hash, child_info: ChildInfo, prefix: Option<&'a StorageKey>, start_key: Option<&StorageKey>, ) -> sp_blockchain::Result< KeyIterator<'a, >::State, Block>, > { - match_client!(self, child_storage_keys_iter(id, child_info, prefix, start_key)) + match_client!(self, child_storage_keys_iter(hash, child_info, prefix, start_key)) } fn child_storage_hash( &self, - id: &BlockId, + hash: &::Hash, child_info: &ChildInfo, key: &StorageKey, ) -> sp_blockchain::Result::Hash>> { - match_client!(self, child_storage_hash(id, child_info, key)) + match_client!(self, child_storage_hash(hash, child_info, key)) } } diff --git a/node/src/command.rs b/node/src/command.rs index 40f02340f..c0ef23837 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -115,6 +115,11 @@ pub fn run() -> sc_cli::Result<()> { BenchmarkCmd::Machine(cmd) => { runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())) } + #[cfg(not(feature = "runtime-benchmarks"))] + BenchmarkCmd::Storage(_) => Err("Storage benchmarking can be enabled with \ + `--features runtime-benchmarks`." + .into()), + #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => match chain_spec { #[cfg(feature = "with-zeitgeist-runtime")] spec if spec.is_zeitgeist() => runner.sync_run(|config| { diff --git a/node/src/service/service_parachain.rs b/node/src/service/service_parachain.rs index 9129f3279..b9adec1c1 100644 --- a/node/src/service/service_parachain.rs +++ b/node/src/service/service_parachain.rs @@ -20,7 +20,6 @@ use crate::{ service::{AdditionalRuntimeApiCollection, RuntimeApiCollection}, POLKADOT_BLOCK_DURATION, SOFT_DEADLINE_PERCENT, }; -use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_common::ParachainConsensus; use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ @@ -291,7 +290,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(), @@ -323,6 +322,7 @@ where keystore: params.keystore_container.sync_keystore(), network: network.clone(), rpc_builder, + tx_handler_controller, system_rpc_tx, task_manager: &mut task_manager, telemetry: telemetry.as_mut(), @@ -390,7 +390,6 @@ where relay_chain_interface, relay_chain_slot_duration, import_queue, - collator_options: CollatorOptions { relay_chain_rpc_url: Default::default() }, }; start_full_node(params)?; diff --git a/node/src/service/service_standalone.rs b/node/src/service/service_standalone.rs index e35731387..6fe00885c 100644 --- a/node/src/service/service_standalone.rs +++ b/node/src/service/service_standalone.rs @@ -19,7 +19,7 @@ //! Service and ServiceFactory implementation. Specialized wrapper over substrate service. use crate::service::{AdditionalRuntimeApiCollection, RuntimeApiCollection}; -use sc_client_api::{BlockBackend, ExecutorProvider}; +use sc_client_api::BlockBackend; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; use sc_finality_grandpa::{grandpa_peers_set_config, protocol_standard_name, SharedVoterState}; @@ -96,7 +96,7 @@ where Vec::default(), )); - let (network, system_rpc_tx, network_starter) = + let (network, system_rpc_tx, tx_handler_controller, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, client: client.clone(), @@ -142,6 +142,7 @@ where task_manager: &mut task_manager, transaction_pool: transaction_pool.clone(), rpc_builder: rpc_builder, + tx_handler_controller: tx_handler_controller, backend, system_rpc_tx, config, @@ -170,12 +171,9 @@ where telemetry.as_ref().map(|x| x.handle()), ); - let can_author_with = - sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); - let slot_duration = sc_consensus_aura::slot_duration(&*client)?; - let aura = sc_consensus_aura::start_aura::( + let aura = sc_consensus_aura::start_aura::( StartAuraParams { slot_duration, client, @@ -191,12 +189,11 @@ where slot_duration, ); - Ok((timestamp, slot)) + Ok((slot, timestamp)) }, force_authoring, backoff_authoring_blocks, keystore: keystore_container.sync_keystore(), - can_author_with, sync_oracle: network.clone(), justification_sync_link: network.clone(), block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32), @@ -341,7 +338,7 @@ where let slot_duration = sc_consensus_aura::slot_duration(&*client)?; - let import_queue = sc_consensus_aura::import_queue::( + let import_queue = sc_consensus_aura::import_queue::( ImportQueueParams { block_import: grandpa_block_import.clone(), justification_import: Some(Box::new(grandpa_block_import.clone())), @@ -355,12 +352,9 @@ where slot_duration, ); - Ok((timestamp, slot)) + Ok((slot, timestamp)) }, spawner: &task_manager.spawn_essential_handle(), - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new( - client.executor().clone(), - ), registry: config.prometheus_registry(), check_for_equivocation: Default::default(), telemetry: telemetry.as_ref().map(|x| x.handle()), diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 38ffb0fac..8de2c8957 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,15 +1,15 @@ [dependencies] arbitrary = { default-features = false, optional = true, version = "1.0" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.144" } -sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } [dev-dependencies] test-case = "2.0.2" diff --git a/runtime/battery-station/Cargo.toml b/runtime/battery-station/Cargo.toml index c1c862cc5..5ebb54694 100644 --- a/runtime/battery-station/Cargo.toml +++ b/runtime/battery-station/Cargo.toml @@ -1,86 +1,88 @@ [build-dependencies] -substrate-wasm-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +substrate-wasm-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } [dependencies] -frame-executive = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-sudo = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-executive = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +pallet-balances = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-bounties = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-collective = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-democracy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-identity = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-membership = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-multisig = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-preimage = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-proxy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-scheduler = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-sudo = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-treasury = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-vesting = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } +polkadot-primitives = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-session = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-version = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-block-builder = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-inherents = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-offchain = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-session = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-std = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-transaction-pool = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-version = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" } # Try-Runtime -frame-try-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } +frame-try-runtime = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } # Benchmark -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } -frame-system-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } +frame-system-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } # Cumulus -cumulus-pallet-dmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-parachain-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -parachain-info = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } +cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-xcm = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +parachain-info = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } # Parachain +nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-mapping = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-slot-filter = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } -nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } # Polkadot -polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } +polkadot-parachain = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } # Standalone -pallet-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +pallet-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-consensus-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-finality-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } # Utility cfg-if = { version = "1.0.0" } @@ -88,17 +90,16 @@ hex-literal = { default-features = false, optional = true, version = "0.3.4" } log = { version = "0.4.17", default-features = false, optional = true } # XCM -orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-unknown-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-xcm-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-xtokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-runtime-parachains = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -rococo-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm-executor = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } +orml-asset-registry = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-unknown-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-xcm-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-xtokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +pallet-xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-runtime-parachains = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +rococo-runtime = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm-builder = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm-executor = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } # Zeitgeist @@ -117,9 +118,9 @@ zrml-swaps = { default-features = false, path = "../../zrml/swaps" } zrml-swaps-runtime-api = { default-features = false, path = "../../zrml/swaps/runtime-api" } [dev-dependencies] -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } test-case = "2.0.2" -xcm-emulator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/xcm-simulator" } +xcm-emulator = { rev = "158a6bd2768c679563efa891aa17329635b2764b", git = "https://github.com/shaunxw/xcm-simulator" } [features] default = ["std"] @@ -153,7 +154,6 @@ parachain = [ "orml-xcm-support", "orml-xtokens", "pallet-xcm", - "polkadot-primitives", "polkadot-runtime-parachains", "rococo-runtime", "xcm-builder", @@ -170,7 +170,7 @@ runtime-benchmarks = [ "cumulus-pallet-xcmp-queue?/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", - "frame-system-benchmarking", + "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "hex-literal", "orml-asset-registry?/runtime-benchmarks", @@ -241,6 +241,7 @@ std = [ "pallet-utility/std", "pallet-vesting/std", "parity-scale-codec/std", + "polkadot-primitives/std", "scale-info/std", "sp-api/std", "sp-block-builder/std", @@ -300,7 +301,6 @@ std = [ "orml-xcm-support?/std", "orml-xtokens?/std", "pallet-xcm?/std", - "polkadot-primitives?/std", "polkadot-runtime-parachains?/std", "rococo-runtime?/std", "xcm-builder?/std", diff --git a/runtime/battery-station/src/integration_tests/xcm/setup.rs b/runtime/battery-station/src/integration_tests/xcm/setup.rs index 1ef5f52b0..df2ebbae0 100644 --- a/runtime/battery-station/src/integration_tests/xcm/setup.rs +++ b/runtime/battery-station/src/integration_tests/xcm/setup.rs @@ -18,7 +18,8 @@ use crate::{ xcm_config::config::{battery_station, general_key}, - AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Origin, Runtime, System, + AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Runtime, RuntimeOrigin, + System, }; use frame_support::{assert_ok, traits::GenesisBuild}; use orml_traits::asset_registry::AssetMetadata; @@ -133,7 +134,7 @@ pub(super) fn register_foreign_ztg(additional_meta: Option) { additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_ZTG_ID))); + assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_ZTG_ID))); } pub(super) fn register_foreign_sibling(additional_meta: Option) { @@ -147,7 +148,11 @@ pub(super) fn register_foreign_sibling(additional_meta: Option) additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_SIBLING_ID))); + assert_ok!(AssetRegistry::register_asset( + RuntimeOrigin::root(), + meta, + Some(FOREIGN_SIBLING_ID) + )); } pub(super) fn register_foreign_parent(additional_meta: Option) { @@ -161,7 +166,7 @@ pub(super) fn register_foreign_parent(additional_meta: Option) { additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_PARENT_ID))); + assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_PARENT_ID))); } #[inline] diff --git a/runtime/battery-station/src/integration_tests/xcm/test_net.rs b/runtime/battery-station/src/integration_tests/xcm/test_net.rs index ce93bca74..bd7e87b94 100644 --- a/runtime/battery-station/src/integration_tests/xcm/test_net.rs +++ b/runtime/battery-station/src/integration_tests/xcm/test_net.rs @@ -18,10 +18,13 @@ use crate::{ parameters::ZeitgeistTreasuryAccount, xcm_config::config::battery_station, AccountId, - CurrencyId, DmpQueue, Origin, Runtime, XcmpQueue, + CurrencyId, DmpQueue, Runtime, RuntimeOrigin, XcmpQueue, }; use frame_support::{traits::GenesisBuild, weights::Weight}; -use polkadot_primitives::v2::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; +use polkadot_primitives::{ + runtime_api::runtime_decl_for_ParachainHost::ParachainHostV3, + v2::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}, +}; use polkadot_runtime_parachains::configuration::HostConfiguration; use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; @@ -38,7 +41,7 @@ decl_test_relay_chain! { decl_test_parachain! { pub struct Zeitgeist { Runtime = Runtime, - Origin = Origin, + RuntimeOrigin = RuntimeOrigin, XcmpMessageHandler = XcmpQueue, DmpMessageHandler = DmpQueue, new_ext = para_ext(battery_station::ID), @@ -48,7 +51,7 @@ decl_test_parachain! { decl_test_parachain! { pub struct Sibling { Runtime = Runtime, - Origin = Origin, + RuntimeOrigin = RuntimeOrigin, XcmpMessageHandler = XcmpQueue, DmpMessageHandler = DmpQueue, new_ext = para_ext(PARA_ID_SIBLING), diff --git a/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs b/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs index 890326ab6..77631353a 100644 --- a/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs +++ b/runtime/battery-station/src/integration_tests/xcm/tests/transfers.rs @@ -26,7 +26,7 @@ use crate::{ test_net::{RococoNet, Sibling, TestNet, Zeitgeist}, }, xcm_config::{config::battery_station, fees::default_per_second}, - AssetRegistry, Balance, Balances, CurrencyId, Origin, Tokens, XTokens, + AssetRegistry, Balance, Balances, CurrencyId, RuntimeOrigin, Tokens, XTokens, ZeitgeistTreasuryAccount, }; @@ -58,7 +58,7 @@ fn transfer_ztg_to_sibling() { assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance); assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), CurrencyId::Ztg, transfer_amount, Box::new( @@ -71,7 +71,7 @@ fn transfer_ztg_to_sibling() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Alice's balance is initial_balance - amount_transferred @@ -128,7 +128,7 @@ fn transfer_ztg_sibling_to_zeitgeist() { assert_eq!(Balances::free_balance(&zeitgeist_parachain_account()), 0); assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()), bob_initial_balance); assert_ok!(XTokens::transfer( - Origin::signed(BOB.into()), + RuntimeOrigin::signed(BOB.into()), FOREIGN_ZTG_ID, transfer_amount, Box::new( @@ -141,7 +141,7 @@ fn transfer_ztg_sibling_to_zeitgeist() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Bobs's balance is initial balance - amount transferred @@ -187,7 +187,7 @@ fn transfer_roc_from_relay_chain() { assert!(initial_balance >= transfer_amount); assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets( - rococo_runtime::Origin::signed(ALICE.into()), + rococo_runtime::RuntimeOrigin::signed(ALICE.into()), Box::new(Parachain(battery_station::ID).into().into()), Box::new(Junction::AccountId32 { network: NetworkId::Any, id: BOB }.into().into()), Box::new((Here, transfer_amount).into()), @@ -215,7 +215,7 @@ fn transfer_roc_to_relay_chain() { assert!(initial_balance >= transfer_amount); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), FOREIGN_PARENT_ID, transfer_amount, Box::new( @@ -225,7 +225,7 @@ fn transfer_roc_to_relay_chain() { ) .into() ), - 4_000_000_000 + xcm_emulator::Limited(4_000_000_000) )); assert_eq!( @@ -235,7 +235,7 @@ fn transfer_roc_to_relay_chain() { }); RococoNet::execute_with(|| { - assert_eq!(rococo_runtime::Balances::free_balance(&BOB.into()), 948_894_198_216); + assert_eq!(rococo_runtime::Balances::free_balance(&BOB.into()), 999_988_806_429); }); } @@ -274,7 +274,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() { assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance); assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), CurrencyId::Ztg, transfer_amount, Box::new( @@ -287,7 +287,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Alice's balance is initial_balance - amount_transferred diff --git a/runtime/battery-station/src/lib.rs b/runtime/battery-station/src/lib.rs index 8e2f6b1b0..ed7b8c43a 100644 --- a/runtime/battery-station/src/lib.rs +++ b/runtime/battery-station/src/lib.rs @@ -102,8 +102,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { pub struct IsCallable; // Currently disables Court, Rikiddo and creation of markets using Court. -impl Contains for IsCallable { - fn contains(call: &Call) -> bool { +impl Contains for IsCallable { + fn contains(call: &RuntimeCall) -> bool { use zeitgeist_primitives::types::{ MarketDisputeMechanism::Court, ScoringRule::RikiddoSigmoidFeeMarketEma, }; @@ -113,9 +113,9 @@ impl Contains for IsCallable { #[allow(clippy::match_like_matches_macro)] match call { - Call::Court(_) => false, - Call::LiquidityMining(_) => false, - Call::PredictionMarkets(inner_call) => { + RuntimeCall::Court(_) => false, + RuntimeCall::LiquidityMining(_) => false, + RuntimeCall::PredictionMarkets(inner_call) => { match inner_call { // Disable Rikiddo markets create_market { scoring_rule: RikiddoSigmoidFeeMarketEma, .. } => false, @@ -146,8 +146,8 @@ create_runtime_with_additional_pallets!( ); impl pallet_sudo::Config for Runtime { - type Call = Call; - type Event = Event; + type RuntimeCall = RuntimeCall; + type RuntimeEvent = RuntimeEvent; } impl_config_traits!(); diff --git a/runtime/battery-station/src/parachain_params.rs b/runtime/battery-station/src/parachain_params.rs index 270e3b1f4..d602239bd 100644 --- a/runtime/battery-station/src/parachain_params.rs +++ b/runtime/battery-station/src/parachain_params.rs @@ -23,7 +23,7 @@ )] #![cfg(feature = "parachain")] -use super::{parameters::MAXIMUM_BLOCK_WEIGHT, Origin, ParachainInfo}; +use super::{parameters::MAXIMUM_BLOCK_WEIGHT, ParachainInfo, RuntimeOrigin}; use frame_support::{parameter_types, weights::Weight}; use orml_traits::parameter_type_with_key; use sp_runtime::{Perbill, Percent}; @@ -44,7 +44,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Any; pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); - pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); + pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub UnitWeightCost: u64 = 200_000_000; // Staking diff --git a/runtime/battery-station/src/parameters.rs b/runtime/battery-station/src/parameters.rs index bca43038d..eb8e91107 100644 --- a/runtime/battery-station/src/parameters.rs +++ b/runtime/battery-station/src/parameters.rs @@ -24,10 +24,12 @@ use super::VERSION; use frame_support::{ + dispatch::DispatchClass, parameter_types, + traits::WithdrawReasons, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, - DispatchClass, Weight, + Weight, }, PalletId, }; @@ -46,7 +48,8 @@ use frame_support::traits::LockIdentifier; pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = - Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2); + Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2) + .set_proof_size(polkadot_primitives::v2::MAX_POV_SIZE as u64); pub(crate) const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); pub(crate) const FEES_AND_TIPS_TREASURY_PERCENTAGE: u32 = 100; pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0; @@ -349,6 +352,8 @@ parameter_types! { // Vesting pub const MinVestedTransfer: Balance = ExistentialDeposit::get(); + pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons = + WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE); } #[cfg(feature = "with-global-disputes")] diff --git a/runtime/battery-station/src/xcm_config/config.rs b/runtime/battery-station/src/xcm_config/config.rs index b60d79506..003801fda 100644 --- a/runtime/battery-station/src/xcm_config/config.rs +++ b/runtime/battery-station/src/xcm_config/config.rs @@ -17,9 +17,9 @@ use super::fees::{native_per_second, FixedConversionRateProvider}; use crate::{ - AccountId, Ancestry, AssetManager, AssetRegistry, Balance, Call, CurrencyId, MaxInstructions, - Origin, ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork, - UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount, + AccountId, Ancestry, AssetManager, AssetRegistry, Balance, CurrencyId, MaxInstructions, + ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork, RuntimeCall, + RuntimeOrigin, UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount, }; use frame_support::{parameter_types, traits::Everything, WeakBoundedVec}; @@ -70,8 +70,7 @@ impl Config for XcmConfig { /// Additional filters that specify whether the XCM instruction should be executed at all. type Barrier = Barrier; /// The outer call dispatch type. - type Call = Call; - type CallDispatcher = Call; + type RuntimeCall = RuntimeCall; /// Combinations of (Location, Asset) pairs which are trusted as reserves. // Trust the parent chain, sibling parachains and children chains of this chain. type IsReserve = MultiNativeAsset; @@ -90,7 +89,7 @@ impl Config for XcmConfig { /// The means of determining an XCM message's weight. // Adds UnitWeightCost per instruction plus the weight of each instruction. // The total number of instructions are bounded by MaxInstructions - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; /// How to send an onward XCM message. type XcmSender = XcmRouter; } @@ -262,7 +261,7 @@ impl Convert for AccountIdToMultiLocation { } /// No local origins on this chain are allowed to dispatch XCM sends/executions. -pub type LocalOriginToLocation = SignedToAccountId32; +pub type LocalOriginToLocation = SignedToAccountId32; /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used /// when determining ownership of accounts for asset transacting and when attempting to use XCM @@ -283,18 +282,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 convert 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, ); /// The means for routing XCM messages which are not for local execution into the right message diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index fae491e83..c35c07394 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,31 +1,31 @@ [dependencies] # Pallets -cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-mapping = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-slot-filter = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-balances = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-bounties = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-collective = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-democracy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-identity = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-membership = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-multisig = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-preimage = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-proxy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-scheduler = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-treasury = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-vesting = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } # Utility cfg-if = { version = "1.0.0" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index ff1ae26ce..bee05ab00 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -46,19 +46,33 @@ pub mod weights; macro_rules! decl_common_types { {} => { use sp_runtime::generic; - use frame_support::traits::{Currency, Imbalance, OnUnbalanced, NeverEnsureOrigin, TryStateSelect}; + use frame_support::traits::{Currency, Imbalance, OnRuntimeUpgrade, OnUnbalanced, NeverEnsureOrigin, TryStateSelect}; pub type Block = generic::Block; type Address = sp_runtime::MultiAddress; + // Migration for scheduler pallet to move from a plain RuntimeCall to a CallOrHash. + pub struct SchedulerMigrationV1toV4; + impl OnRuntimeUpgrade for SchedulerMigrationV1toV4 { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + Scheduler::migrate_v1_to_v4() + } + } + pub type Executive = frame_executive::Executive< Runtime, Block, frame_system::ChainContext, Runtime, AllPalletsWithSystem, - zrml_prediction_markets::migrations::AddOutsiderBond, + ( + SchedulerMigrationV1toV4, + pallet_multisig::migrations::v1::MigrateToV1, + pallet_preimage::migration::v1::Migration, + pallet_democracy::migrations::v1::Migration, + zrml_prediction_markets::migrations::AddOutsiderBond, + ), >; pub type Header = generic::Header; @@ -74,8 +88,8 @@ macro_rules! decl_common_types { CheckWeight, ChargeTransactionPayment, ); - pub type SignedPayload = generic::SignedPayload; - pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; + pub type SignedPayload = generic::SignedPayload; + pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; // Governance type AdvisoryCommitteeInstance = pallet_collective::Instance1; @@ -361,7 +375,7 @@ macro_rules! impl_config_traits { // Configure Pallets #[cfg(feature = "parachain")] impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExecuteOverweightOrigin = EnsureRootOrHalfTechnicalCommittee; type XcmExecutor = xcm_executor::XcmExecutor; } @@ -370,7 +384,7 @@ macro_rules! impl_config_traits { impl cumulus_pallet_parachain_system::Config for Runtime { type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; type DmpMessageHandler = DmpQueue; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); type OutboundXcmpMessageSource = XcmpQueue; type ReservedDmpWeight = crate::parachain_params::ReservedDmpWeight; @@ -381,7 +395,7 @@ macro_rules! impl_config_traits { #[cfg(feature = "parachain")] impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = xcm_executor::XcmExecutor; } @@ -390,7 +404,7 @@ macro_rules! impl_config_traits { type ChannelInfo = ParachainSystem; type ControllerOrigin = EnsureRootOrTwoThirdsTechnicalCommittee; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExecuteOverweightOrigin = EnsureRootOrHalfTechnicalCommittee; type VersionWrapper = (); type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo; @@ -405,9 +419,9 @@ macro_rules! impl_config_traits { type BlockLength = RuntimeBlockLength; type BlockNumber = BlockNumber; type BlockWeights = RuntimeBlockWeights; - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = RocksDbWeight; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = generic::Header; @@ -420,7 +434,7 @@ macro_rules! impl_config_traits { type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; #[cfg(not(feature = "parachain"))] type OnSetCode = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = SS58Prefix; type SystemWeightInfo = weights::frame_system::WeightInfo; @@ -446,14 +460,14 @@ macro_rules! impl_config_traits { impl pallet_author_mapping::Config for Runtime { type DepositAmount = CollatorDeposit; type DepositCurrency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Keys = session_keys_primitives::VrfId; type WeightInfo = weights::pallet_author_mapping::WeightInfo; } #[cfg(feature = "parachain")] impl pallet_author_slot_filter::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type RandomnessSource = RandomnessCollectiveFlip; type PotentialAuthors = ParachainStaking; type WeightInfo = weights::pallet_author_slot_filter::WeightInfo; @@ -461,8 +475,7 @@ macro_rules! impl_config_traits { #[cfg(not(feature = "parachain"))] impl pallet_grandpa::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; type KeyOwnerProofSystem = (); type KeyOwnerProof = ; + type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = Nothing; // ^ Disable dispatchable execute on the XCM pallet. // Needs to be `Everything` for local testing. type XcmExecutor = xcm_executor::XcmExecutor; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Nothing; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; // ^ Override for AdvertisedXcmVersion default @@ -509,7 +522,7 @@ macro_rules! impl_config_traits { type CandidateBondLessDelay = CandidateBondLessDelay; type Currency = Balances; type DelegationBondLessDelay = DelegationBondLessDelay; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LeaveCandidatesDelay = LeaveCandidatesDelay; type LeaveDelegatorsDelay = LeaveDelegatorsDelay; type MaxBottomDelegationsPerCandidate = MaxBottomDelegationsPerCandidate; @@ -523,6 +536,7 @@ macro_rules! impl_config_traits { type MinSelectedCandidates = MinSelectedCandidates; type MonetaryGovernanceOrigin = EnsureRoot; type OnCollatorPayout = (); + type PayoutCollatorReward = (); type OnNewRound = (); type RevokeDelegationDelay = RevokeDelegationDelay; type RewardPaymentDelay = RewardPaymentDelay; @@ -536,7 +550,7 @@ macro_rules! impl_config_traits { type AuthorityOrigin = AsEnsureOriginWithArg; type Balance = Balance; type CustomMetadata = CustomMetadata; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -547,25 +561,35 @@ macro_rules! impl_config_traits { type WeightInfo = weights::orml_currencies::WeightInfo; } + pub struct CurrencyHooks(sp_std::marker::PhantomData); + impl orml_traits::currency::MutationHooks for CurrencyHooks { + type OnDust = orml_tokens::TransferDust; + type OnKilledTokenAccount = (); + type OnNewTokenAccount = (); + type OnSlash = (); + type PostDeposit = (); + type PostTransfer = (); + type PreDeposit = (); + type PreTransfer = (); + } + impl orml_tokens::Config for Runtime { type Amount = Amount; type Balance = Balance; + type CurrencyHooks = CurrencyHooks; type CurrencyId = CurrencyId; type DustRemovalWhitelist = DustRemovalWhitelist; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type OnDust = orml_tokens::TransferDust; - type OnKilledTokenAccount = (); - type OnNewTokenAccount = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::orml_tokens::WeightInfo; } #[cfg(feature = "parachain")] impl orml_unknown_tokens::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; } #[cfg(feature = "parachain")] @@ -575,14 +599,14 @@ macro_rules! impl_config_traits { type BaseXcmWeight = BaseXcmWeight; type CurrencyId = CurrencyId; type CurrencyIdConvert = AssetConvert; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type LocationInverter = LocationInverter; type MaxAssetsForTransfer = MaxAssetsForTransfer; type MinXcmFee = ParachainMinFee; type MultiLocationsFilter = Everything; type ReserveProvider = orml_traits::location::AbsoluteReserveProvider; type SelfLocation = SelfLocation; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type XcmExecutor = xcm_executor::XcmExecutor; } @@ -590,7 +614,7 @@ macro_rules! impl_config_traits { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; @@ -600,40 +624,39 @@ macro_rules! impl_config_traits { impl pallet_collective::Config for Runtime { type DefaultVote = PrimeDefaultVote; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = AdvisoryCommitteeMaxMembers; type MaxProposals = AdvisoryCommitteeMaxProposals; type MotionDuration = AdvisoryCommitteeMotionDuration; - type Origin = Origin; - type Proposal = Call; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; type WeightInfo = weights::pallet_collective::WeightInfo; } impl pallet_collective::Config for Runtime { type DefaultVote = PrimeDefaultVote; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = CouncilMaxMembers; type MaxProposals = CouncilMaxProposals; type MotionDuration = CouncilMotionDuration; - type Origin = Origin; - type Proposal = Call; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; type WeightInfo = weights::pallet_collective::WeightInfo; } impl pallet_collective::Config for Runtime { type DefaultVote = PrimeDefaultVote; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = TechnicalCommitteeMaxMembers; type MaxProposals = TechnicalCommitteeMaxProposals; type MotionDuration = TechnicalCommitteeMotionDuration; - type Origin = Origin; - type Proposal = Call; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; type WeightInfo = weights::pallet_collective::WeightInfo; } impl pallet_democracy::Config for Runtime { - type Proposal = Call; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type EnactmentPeriod = EnactmentPeriod; type LaunchPeriod = LaunchPeriod; @@ -664,20 +687,21 @@ macro_rules! impl_config_traits { /// Origin for anyone able to veto proposals. type VetoOrigin = pallet_collective::EnsureMember; type CooloffPeriod = CooloffPeriod; - type PreimageByteDeposit = PreimageByteDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type Slash = Treasury; type Scheduler = Scheduler; type PalletsOrigin = OriginCaller; type MaxVotes = MaxVotes; type WeightInfo = weights::pallet_democracy::WeightInfo; type MaxProposals = MaxProposals; + type Preimages = Preimage; + type MaxBlacklisted = ConstU32<100>; + type MaxDeposits = ConstU32<100>; } impl pallet_identity::Config for Runtime { type BasicDeposit = BasicDeposit; type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type FieldDeposit = FieldDeposit; type ForceOrigin = EnsureRootOrTwoThirdsAdvisoryCommittee; type MaxAdditionalFields = MaxAdditionalFields; @@ -691,7 +715,7 @@ macro_rules! impl_config_traits { impl pallet_membership::Config for Runtime { type AddOrigin = EnsureRootOrTwoThirdsCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = AdvisoryCommitteeMaxMembers; type MembershipChanged = AdvisoryCommittee; type MembershipInitialized = AdvisoryCommittee; @@ -704,7 +728,7 @@ macro_rules! impl_config_traits { impl pallet_membership::Config for Runtime { type AddOrigin = EnsureRootOrThreeFourthsCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = CouncilMaxMembers; type MembershipChanged = Council; type MembershipInitialized = Council; @@ -717,7 +741,7 @@ macro_rules! impl_config_traits { impl pallet_membership::Config for Runtime { type AddOrigin = EnsureRootOrTwoThirdsCouncil; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxMembers = TechnicalCommitteeMaxMembers; type MembershipChanged = TechnicalCommittee; type MembershipInitialized = TechnicalCommittee; @@ -729,8 +753,8 @@ macro_rules! impl_config_traits { } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -740,31 +764,30 @@ macro_rules! impl_config_traits { impl pallet_preimage::Config for Runtime { type WeightInfo = weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } - 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::CancelProxy => { - matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement { .. })) + matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })) } ProxyType::Governance => matches!( c, - Call::Democracy(..) - | Call::Council(..) - | Call::TechnicalCommittee(..) - | Call::AdvisoryCommittee(..) - | Call::Treasury(..) + RuntimeCall::Democracy(..) + | RuntimeCall::Council(..) + | RuntimeCall::TechnicalCommittee(..) + | RuntimeCall::AdvisoryCommittee(..) + | RuntimeCall::Treasury(..) ), #[cfg(feature = "parachain")] - ProxyType::Staking => matches!(c, Call::ParachainStaking(..)), + ProxyType::Staking => matches!(c, RuntimeCall::ParachainStaking(..)), #[cfg(not(feature = "parachain"))] ProxyType::Staking => false, } @@ -781,8 +804,8 @@ macro_rules! impl_config_traits { } impl pallet_proxy::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type ProxyType = ProxyType; type ProxyDepositBase = ProxyDepositBase; @@ -798,17 +821,16 @@ macro_rules! impl_config_traits { impl pallet_randomness_collective_flip::Config for Runtime {} impl pallet_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 MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = weights::pallet_scheduler::WeightInfo; type OriginPrivilegeCmp = EqualPrivilegeOnly; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } // Timestamp @@ -854,7 +876,7 @@ macro_rules! impl_config_traits { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type LengthToFee = ConstantMultiplier; type OnChargeTransaction = @@ -868,7 +890,7 @@ macro_rules! impl_config_traits { type Burn = Burn; type BurnDestination = (); type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxApprovals = MaxApprovals; type OnSlash = (); type PalletId = TreasuryPalletId; @@ -892,23 +914,24 @@ macro_rules! impl_config_traits { type CuratorDepositMin = CuratorDepositMin; type CuratorDepositMultiplier = CuratorDepositMultiplier; type DataDepositPerByte = DataDepositPerByte; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = weights::pallet_bounties::WeightInfo; } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = weights::pallet_utility::WeightInfo; } impl pallet_vesting::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = sp_runtime::traits::ConvertInto; type MinVestedTransfer = MinVestedTransfer; + type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons; type WeightInfo = weights::pallet_vesting::WeightInfo; // `VestingInfo` encode length is 36bytes. 28 schedules gets encoded as 1009 bytes, which is the @@ -923,7 +946,7 @@ macro_rules! impl_config_traits { type AuthorizedDisputeResolutionOrigin = EnsureRootOrMoreThanHalfAdvisoryCommittee; type CorrectionPeriod = CorrectionPeriod; type DisputeResolution = zrml_prediction_markets::Pallet; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type PalletId = AuthorizedPalletId; type WeightInfo = zrml_authorized::weights::WeightInfo; @@ -932,7 +955,7 @@ macro_rules! impl_config_traits { impl zrml_court::Config for Runtime { type CourtCaseDuration = CourtCaseDuration; type DisputeResolution = zrml_prediction_markets::Pallet; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type PalletId = CourtPalletId; type Random = RandomnessCollectiveFlip; @@ -942,7 +965,7 @@ macro_rules! impl_config_traits { } impl zrml_liquidity_mining::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type MarketId = MarketId; type PalletId = LiquidityMiningPalletId; @@ -987,7 +1010,7 @@ macro_rules! impl_config_traits { type DestroyOrigin = EnsureRootOrAllAdvisoryCommittee; type DisputeBond = DisputeBond; type DisputeFactor = DisputeFactor; - type Event = Event; + type RuntimeEvent = RuntimeEvent; #[cfg(feature = "with-global-disputes")] type GlobalDisputes = GlobalDisputes; #[cfg(feature = "with-global-disputes")] @@ -1042,7 +1065,7 @@ macro_rules! impl_config_traits { impl zrml_simple_disputes::Config for Runtime { type DisputeResolution = zrml_prediction_markets::Pallet; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type PalletId = SimpleDisputesPalletId; } @@ -1050,7 +1073,7 @@ macro_rules! impl_config_traits { #[cfg(feature = "with-global-disputes")] impl zrml_global_disputes::Config for Runtime { type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type GlobalDisputeLockId = GlobalDisputeLockId; type GlobalDisputesPalletId = GlobalDisputesPalletId; type MarketCommons = MarketCommons; @@ -1063,7 +1086,7 @@ macro_rules! impl_config_traits { } impl zrml_swaps::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExitFee = ExitFee; type FixedTypeU = FixedU128; type FixedTypeS = FixedI128; @@ -1089,7 +1112,7 @@ macro_rules! impl_config_traits { } impl zrml_styx::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SetBurnAmountOrigin = EnsureRootOrHalfCouncil; type Currency = Balances; type WeightInfo = zrml_styx::weights::WeightInfo; @@ -1323,17 +1346,17 @@ macro_rules! create_runtime_api { } } - impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi + impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentCallApi for Runtime { fn query_call_info( - call: Call, + call: RuntimeCall, len: u32, ) -> pallet_transaction_payment::RuntimeDispatchInfo { TransactionPayment::query_call_info(call, len) } fn query_call_fee_details( - call: Call, + call: RuntimeCall, len: u32, ) -> pallet_transaction_payment::FeeDetails { TransactionPayment::query_call_fee_details(call, len) @@ -1794,7 +1817,7 @@ macro_rules! create_common_tests { mod common_tests { mod fees { use crate::*; - use frame_support::weights::{DispatchClass, Weight}; + use frame_support::{dispatch::DispatchClass, weights::Weight}; use sp_core::H256; use sp_runtime::traits::Convert; diff --git a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs index 2a79c580f..a1dcae571 100644 --- a/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/runtime/common/src/weights/cumulus_pallet_xcmp_queue.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for cumulus_pallet_xcmp_queue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,13 +51,13 @@ pub struct WeightInfo(PhantomData); impl cumulus_pallet_xcmp_queue::weights::WeightInfo for WeightInfo { // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_u32() -> Weight { - Weight::from_ref_time(13_891_000) + Weight::from_ref_time(5_117_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_weight() -> Weight { - Weight::from_ref_time(13_630_000) + Weight::from_ref_time(4_929_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/frame_system.rs b/runtime/common/src/weights/frame_system.rs index a818f1049..4ff36d522 100644 --- a/runtime/common/src/weights/frame_system.rs +++ b/runtime/common/src/weights/frame_system.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for frame_system //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -50,41 +50,41 @@ use frame_support::{ pub struct WeightInfo(PhantomData); impl frame_system::weights::WeightInfo for WeightInfo { fn remark(b: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into())) + Weight::from_ref_time(14_250_344) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(221).saturating_mul(b.into())) } fn remark_with_event(b: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(b.into())) + Weight::from_ref_time(8_451_000) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(1_022).saturating_mul(b.into())) } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - Weight::from_ref_time(15_370_000) + Weight::from_ref_time(5_344_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Skipped Metadata (r:0 w:0) fn set_storage(i: u32) -> Weight { - Weight::from_ref_time(8_585_000) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(1_059_000).saturating_mul(i.into())) + Weight::from_ref_time(2_566_000) + // Standard Error: 641 + .saturating_add(Weight::from_ref_time(422_592).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_storage(i: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(1_075_000).saturating_mul(i.into())) + Weight::from_ref_time(171_591) + // Standard Error: 1_072 + .saturating_add(Weight::from_ref_time(374_557).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_prefix(p: u32) -> Weight { - Weight::from_ref_time(4_159_000) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(2_234_000).saturating_mul(p.into())) + Weight::from_ref_time(3_820_435) + // Standard Error: 1_116 + .saturating_add(Weight::from_ref_time(802_972).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) } } diff --git a/runtime/common/src/weights/mod.rs b/runtime/common/src/weights/mod.rs index 7651cf806..02d4ad48c 100644 --- a/runtime/common/src/weights/mod.rs +++ b/runtime/common/src/weights/mod.rs @@ -19,8 +19,8 @@ cfg_if::cfg_if! { if #[cfg(feature = "parachain")] { pub mod cumulus_pallet_xcmp_queue; - pub mod pallet_author_inherent; pub mod pallet_author_mapping; + pub mod pallet_author_inherent; pub mod pallet_author_slot_filter; pub mod pallet_parachain_staking; } else { diff --git a/runtime/common/src/weights/orml_currencies.rs b/runtime/common/src/weights/orml_currencies.rs index 134ebe24e..56f819471 100644 --- a/runtime/common/src/weights/orml_currencies.rs +++ b/runtime/common/src/weights/orml_currencies.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for orml_currencies //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -49,13 +49,13 @@ impl orml_currencies::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_non_native_currency() -> Weight { - Weight::from_ref_time(76_920_000) + Weight::from_ref_time(32_440_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: System Account (r:1 w:1) fn transfer_native_currency() -> Weight { - Weight::from_ref_time(56_290_000) + Weight::from_ref_time(26_112_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -63,19 +63,19 @@ impl orml_currencies::WeightInfo for WeightInfo { // Storage: Tokens TotalIssuance (r:1 w:1) // Storage: System Account (r:1 w:1) fn update_balance_non_native_currency() -> Weight { - Weight::from_ref_time(53_350_000) + Weight::from_ref_time(21_841_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: System Account (r:1 w:1) fn update_balance_native_currency_creating() -> Weight { - Weight::from_ref_time(52_710_000) + Weight::from_ref_time(21_761_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:1 w:1) fn update_balance_native_currency_killing() -> Weight { - Weight::from_ref_time(48_730_000) + Weight::from_ref_time(19_903_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/orml_tokens.rs b/runtime/common/src/weights/orml_tokens.rs index fd20584e7..35439a294 100644 --- a/runtime/common/src/weights/orml_tokens.rs +++ b/runtime/common/src/weights/orml_tokens.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for orml_tokens //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -49,28 +49,28 @@ impl orml_tokens::WeightInfo for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - Weight::from_ref_time(76_440_000) + Weight::from_ref_time(32_422_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - Weight::from_ref_time(78_740_000) + Weight::from_ref_time(33_839_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(61_710_000) + Weight::from_ref_time(26_131_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Tokens Accounts (r:2 w:2) // Storage: System Account (r:2 w:1) fn force_transfer() -> Weight { - Weight::from_ref_time(68_460_000) + Weight::from_ref_time(29_017_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -78,7 +78,7 @@ impl orml_tokens::WeightInfo for WeightInfo { // Storage: Tokens TotalIssuance (r:1 w:1) // Storage: System Account (r:1 w:1) fn set_balance() -> Weight { - Weight::from_ref_time(51_830_000) + Weight::from_ref_time(21_766_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/runtime/common/src/weights/pallet_author_inherent.rs b/runtime/common/src/weights/pallet_author_inherent.rs index 58c692e04..32d3ad1f3 100644 --- a/runtime/common/src/weights/pallet_author_inherent.rs +++ b/runtime/common/src/weights/pallet_author_inherent.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_author_inherent //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -56,7 +56,7 @@ impl pallet_author_inherent::weights::WeightInfo for We // Storage: AuthorFilter EligibleCount (r:1 w:0) // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0) fn kick_off_authorship_validation() -> Weight { - Weight::from_ref_time(47_670_000) + Weight::from_ref_time(17_682_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/pallet_author_mapping.rs b/runtime/common/src/weights/pallet_author_mapping.rs index c2c35e486..c209eb3a7 100644 --- a/runtime/common/src/weights/pallet_author_mapping.rs +++ b/runtime/common/src/weights/pallet_author_mapping.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_author_mapping //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -53,14 +53,14 @@ impl pallet_author_mapping::weights::WeightInfo for Wei // Storage: System Account (r:1 w:1) // Storage: AuthorMapping NimbusLookup (r:0 w:1) fn add_association() -> Weight { - Weight::from_ref_time(59_320_000) + Weight::from_ref_time(22_888_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: AuthorMapping MappingWithDeposit (r:2 w:2) // Storage: AuthorMapping NimbusLookup (r:0 w:1) fn update_association() -> Weight { - Weight::from_ref_time(42_141_000) + Weight::from_ref_time(19_480_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -68,7 +68,7 @@ impl pallet_author_mapping::weights::WeightInfo for Wei // Storage: System Account (r:1 w:1) // Storage: AuthorMapping NimbusLookup (r:0 w:1) fn clear_association() -> Weight { - Weight::from_ref_time(54_180_000) + Weight::from_ref_time(25_500_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -76,14 +76,14 @@ impl pallet_author_mapping::weights::WeightInfo for Wei // Storage: AuthorMapping MappingWithDeposit (r:1 w:1) // Storage: System Account (r:1 w:1) fn remove_keys() -> Weight { - Weight::from_ref_time(66_530_000) + Weight::from_ref_time(28_334_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: AuthorMapping NimbusLookup (r:1 w:1) // Storage: AuthorMapping MappingWithDeposit (r:2 w:2) fn set_keys() -> Weight { - Weight::from_ref_time(52_730_000) + Weight::from_ref_time(21_788_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/runtime/common/src/weights/pallet_author_slot_filter.rs b/runtime/common/src/weights/pallet_author_slot_filter.rs index b59599ff7..05125ed59 100644 --- a/runtime/common/src/weights/pallet_author_slot_filter.rs +++ b/runtime/common/src/weights/pallet_author_slot_filter.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_author_slot_filter //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,6 +51,6 @@ pub struct WeightInfo(PhantomData); impl pallet_author_slot_filter::weights::WeightInfo for WeightInfo { // Storage: AuthorFilter EligibleCount (r:0 w:1) fn set_eligible() -> Weight { - Weight::from_ref_time(24_640_000).saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(9_073_000).saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_balances.rs b/runtime/common/src/weights/pallet_balances.rs index 3497719e2..c36932388 100644 --- a/runtime/common/src/weights/pallet_balances.rs +++ b/runtime/common/src/weights/pallet_balances.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_balances //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,43 +51,43 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::weights::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - Weight::from_ref_time(75_550_000) + Weight::from_ref_time(31_432_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - Weight::from_ref_time(61_350_000) + Weight::from_ref_time(23_506_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - Weight::from_ref_time(44_461_000) + Weight::from_ref_time(17_067_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - Weight::from_ref_time(47_560_000) + Weight::from_ref_time(19_078_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:2 w:2) fn force_transfer() -> Weight { - Weight::from_ref_time(74_281_000) + Weight::from_ref_time(31_192_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - Weight::from_ref_time(65_200_000) + Weight::from_ref_time(26_679_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - Weight::from_ref_time(37_050_000) + Weight::from_ref_time(14_123_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/pallet_bounties.rs b/runtime/common/src/weights/pallet_bounties.rs index d4f205867..8883f6ee5 100644 --- a/runtime/common/src/weights/pallet_bounties.rs +++ b/runtime/common/src/weights/pallet_bounties.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_bounties //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -53,42 +53,42 @@ impl pallet_bounties::weights::WeightInfo for WeightInf // Storage: Bounties BountyDescriptions (r:0 w:1) // Storage: Bounties Bounties (r:0 w:1) fn propose_bounty(d: u32) -> Weight { - Weight::from_ref_time(54_421_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(d.into())) + Weight::from_ref_time(22_070_891) + // Standard Error: 7 + .saturating_add(Weight::from_ref_time(513).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Bounties Bounties (r:1 w:1) // Storage: Bounties BountyApprovals (r:1 w:1) fn approve_bounty() -> Weight { - Weight::from_ref_time(28_180_000) + Weight::from_ref_time(9_036_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Bounties Bounties (r:1 w:1) fn propose_curator() -> Weight { - Weight::from_ref_time(23_090_000) + Weight::from_ref_time(8_789_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Bounties Bounties (r:1 w:1) // Storage: System Account (r:1 w:1) fn unassign_curator() -> Weight { - Weight::from_ref_time(61_871_000) + Weight::from_ref_time(25_810_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Bounties Bounties (r:1 w:1) // Storage: System Account (r:1 w:1) fn accept_curator() -> Weight { - Weight::from_ref_time(51_330_000) + Weight::from_ref_time(21_446_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Bounties Bounties (r:1 w:1) fn award_bounty() -> Weight { - Weight::from_ref_time(47_600_000) + Weight::from_ref_time(16_247_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -96,14 +96,14 @@ impl pallet_bounties::weights::WeightInfo for WeightInf // Storage: System Account (r:3 w:3) // Storage: Bounties BountyDescriptions (r:0 w:1) fn claim_bounty() -> Weight { - Weight::from_ref_time(116_790_000) + Weight::from_ref_time(50_791_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: Bounties Bounties (r:1 w:1) // Storage: Bounties BountyDescriptions (r:0 w:1) fn close_bounty_proposed() -> Weight { - Weight::from_ref_time(63_830_000) + Weight::from_ref_time(26_410_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -111,23 +111,23 @@ impl pallet_bounties::weights::WeightInfo for WeightInf // Storage: System Account (r:3 w:3) // Storage: Bounties BountyDescriptions (r:0 w:1) fn close_bounty_active() -> Weight { - Weight::from_ref_time(90_651_000) + Weight::from_ref_time(39_490_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: Bounties Bounties (r:1 w:1) fn extend_bounty_expiry() -> Weight { - Weight::from_ref_time(40_350_000) + Weight::from_ref_time(16_379_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Bounties BountyApprovals (r:1 w:1) - // Storage: Bounties Bounties (r:1 w:1) - // Storage: System Account (r:1 w:1) + // Storage: Bounties Bounties (r:2 w:2) + // Storage: System Account (r:3 w:3) fn spend_funds(b: u32) -> Weight { - Weight::from_ref_time(24_132_000) - // Standard Error: 235_000 - .saturating_add(Weight::from_ref_time(46_899_000).saturating_mul(b.into())) + Weight::from_ref_time(19_140_664) + // Standard Error: 26_913 + .saturating_add(Weight::from_ref_time(18_448_072).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into()))) } diff --git a/runtime/common/src/weights/pallet_collective.rs b/runtime/common/src/weights/pallet_collective.rs index 6e19990f0..383666603 100644 --- a/runtime/common/src/weights/pallet_collective.rs +++ b/runtime/common/src/weights/pallet_collective.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_collective //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,16 +51,14 @@ pub struct WeightInfo(PhantomData); impl pallet_collective::weights::WeightInfo for WeightInfo { // Storage: AdvisoryCommittee Members (r:1 w:1) // Storage: AdvisoryCommittee Proposals (r:1 w:0) - // Storage: AdvisoryCommittee Voting (r:255 w:255) // Storage: AdvisoryCommittee Prime (r:0 w:1) - fn set_members(m: u32, n: u32, p: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 195_000 - .saturating_add(Weight::from_ref_time(41_182_000).saturating_mul(m.into())) - // Standard Error: 195_000 - .saturating_add(Weight::from_ref_time(210_000).saturating_mul(n.into())) - // Standard Error: 76_000 - .saturating_add(Weight::from_ref_time(21_533_000).saturating_mul(p.into())) + // Storage: AdvisoryCommittee Voting (r:255 w:255) + fn set_members(m: u32, _n: u32, p: u32) -> Weight { + Weight::from_ref_time(12_092_000) + // Standard Error: 120_533 + .saturating_add(Weight::from_ref_time(9_830_156).saturating_mul(m.into())) + // Standard Error: 47_324 + .saturating_add(Weight::from_ref_time(5_530_913).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -68,21 +66,21 @@ impl pallet_collective::weights::WeightInfo for WeightI } // Storage: AdvisoryCommittee Members (r:1 w:0) fn execute(b: u32, m: u32) -> Weight { - Weight::from_ref_time(38_237_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(b.into())) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(40_000).saturating_mul(m.into())) + Weight::from_ref_time(13_910_710) + // Standard Error: 39 + .saturating_add(Weight::from_ref_time(1_329).saturating_mul(b.into())) + // Standard Error: 409 + .saturating_add(Weight::from_ref_time(13_307).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1)) } // Storage: AdvisoryCommittee Members (r:1 w:0) // Storage: AdvisoryCommittee ProposalOf (r:1 w:0) fn propose_execute(b: u32, m: u32) -> Weight { - Weight::from_ref_time(44_582_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(b.into())) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(14_000).saturating_mul(m.into())) + Weight::from_ref_time(15_156_779) + // Standard Error: 36 + .saturating_add(Weight::from_ref_time(1_439).saturating_mul(b.into())) + // Standard Error: 378 + .saturating_add(Weight::from_ref_time(17_083).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2)) } // Storage: AdvisoryCommittee Members (r:1 w:0) @@ -91,22 +89,22 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee ProposalCount (r:1 w:1) // Storage: AdvisoryCommittee Voting (r:0 w:1) fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { - Weight::from_ref_time(37_436_000) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(20_000).saturating_mul(b.into())) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(39_000).saturating_mul(m.into())) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(279_000).saturating_mul(p.into())) + Weight::from_ref_time(22_819_241) + // Standard Error: 354 + .saturating_add(Weight::from_ref_time(4_011).saturating_mul(b.into())) + // Standard Error: 3_707 + .saturating_add(Weight::from_ref_time(35_095).saturating_mul(m.into())) + // Standard Error: 1_427 + .saturating_add(Weight::from_ref_time(90_320).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } // Storage: AdvisoryCommittee Members (r:1 w:0) // Storage: AdvisoryCommittee Voting (r:1 w:1) fn vote(m: u32) -> Weight { - Weight::from_ref_time(75_377_000) - // Standard Error: 18_000 - .saturating_add(Weight::from_ref_time(454_000).saturating_mul(m.into())) + Weight::from_ref_time(34_942_963) + // Standard Error: 5_250 + .saturating_add(Weight::from_ref_time(43_923).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -115,9 +113,9 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Proposals (r:1 w:1) // Storage: AdvisoryCommittee ProposalOf (r:0 w:1) fn close_early_disapproved(_m: u32, p: u32) -> Weight { - Weight::from_ref_time(125_780_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(208_000).saturating_mul(p.into())) + Weight::from_ref_time(31_521_383) + // Standard Error: 1_768 + .saturating_add(Weight::from_ref_time(91_263).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -126,13 +124,13 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee ProposalOf (r:1 w:1) // Storage: AdvisoryCommittee Proposals (r:1 w:1) fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { - Weight::from_ref_time(50_328_000) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(14_000).saturating_mul(b.into())) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(134_000).saturating_mul(m.into())) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(320_000).saturating_mul(p.into())) + Weight::from_ref_time(27_750_291) + // Standard Error: 381 + .saturating_add(Weight::from_ref_time(3_284).saturating_mul(b.into())) + // Standard Error: 4_030 + .saturating_add(Weight::from_ref_time(77_635).saturating_mul(m.into())) + // Standard Error: 1_532 + .saturating_add(Weight::from_ref_time(101_653).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -142,9 +140,9 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Proposals (r:1 w:1) // Storage: AdvisoryCommittee ProposalOf (r:0 w:1) fn close_disapproved(_m: u32, p: u32) -> Weight { - Weight::from_ref_time(77_551_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(224_000).saturating_mul(p.into())) + Weight::from_ref_time(35_447_953) + // Standard Error: 1_843 + .saturating_add(Weight::from_ref_time(82_511).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -154,13 +152,13 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee ProposalOf (r:1 w:1) // Storage: AdvisoryCommittee Proposals (r:1 w:1) fn close_approved(b: u32, m: u32, p: u32) -> Weight { - Weight::from_ref_time(23_404_000) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(30_000).saturating_mul(b.into())) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(288_000).saturating_mul(m.into())) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(360_000).saturating_mul(p.into())) + Weight::from_ref_time(32_560_116) + // Standard Error: 378 + .saturating_add(Weight::from_ref_time(1_465).saturating_mul(b.into())) + // Standard Error: 4_008 + .saturating_add(Weight::from_ref_time(62_930).saturating_mul(m.into())) + // Standard Error: 1_523 + .saturating_add(Weight::from_ref_time(101_811).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -168,9 +166,9 @@ impl pallet_collective::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Voting (r:0 w:1) // Storage: AdvisoryCommittee ProposalOf (r:0 w:1) fn disapprove_proposal(p: u32) -> Weight { - Weight::from_ref_time(48_539_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(202_000).saturating_mul(p.into())) + Weight::from_ref_time(20_281_170) + // Standard Error: 1_763 + .saturating_add(Weight::from_ref_time(84_565).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/runtime/common/src/weights/pallet_democracy.rs b/runtime/common/src/weights/pallet_democracy.rs index ab69d96f6..de3816890 100644 --- a/runtime/common/src/weights/pallet_democracy.rs +++ b/runtime/common/src/weights/pallet_democracy.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_democracy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -54,122 +54,99 @@ impl pallet_democracy::weights::WeightInfo for WeightIn // Storage: Democracy Blacklist (r:1 w:0) // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - Weight::from_ref_time(85_600_000) + Weight::from_ref_time(41_898_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Democracy DepositOf (r:1 w:1) - fn second(s: u32) -> Weight { - Weight::from_ref_time(60_373_000) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(160_000).saturating_mul(s.into())) + fn second() -> Weight { + Weight::from_ref_time(35_120_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // 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(82_360_000) - // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(175_000).saturating_mul(r.into())) + fn vote_new() -> Weight { + Weight::from_ref_time(41_886_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // 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(78_219_000) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(234_000).saturating_mul(r.into())) + fn vote_existing() -> Weight { + Weight::from_ref_time(41_576_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - Weight::from_ref_time(40_670_000) + Weight::from_ref_time(14_658_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy Blacklist (r:0 w:1) - // Storage: Democracy DepositOf (r:1 w:1) - // Storage: System Account (r:2 w:2) - fn blacklist(p: u32) -> Weight { - Weight::from_ref_time(105_157_000) - // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(412_000).saturating_mul(p.into())) + fn blacklist() -> Weight { + Weight::from_ref_time(67_163_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(7)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:0) - fn external_propose(v: u32) -> Weight { - Weight::from_ref_time(31_020_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(16_000).saturating_mul(v.into())) + fn external_propose() -> Weight { + Weight::from_ref_time(11_206_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - Weight::from_ref_time(10_040_000).saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(3_060_000).saturating_add(T::DbWeight::get().writes(1)) } // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - Weight::from_ref_time(9_880_000).saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(3_068_000).saturating_add(T::DbWeight::get().writes(1)) } // 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(40_500_000) + Weight::from_ref_time(15_630_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Democracy NextExternal (r:1 w:1) // Storage: Democracy Blacklist (r:1 w:1) - fn veto_external(v: u32) -> Weight { - Weight::from_ref_time(44_735_000) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(37_000).saturating_mul(v.into())) + fn veto_external() -> Weight { + Weight::from_ref_time(19_253_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // 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_644_000) - // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(307_000).saturating_mul(p.into())) + fn cancel_proposal() -> Weight { + Weight::from_ref_time(58_487_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - Weight::from_ref_time(43_850_000).saturating_add(T::DbWeight::get().writes(1)) - } - // Storage: Scheduler Lookup (r:1 w:1) - // Storage: Scheduler Agenda (r:1 w:1) - fn cancel_queued(r: u32) -> Weight { - Weight::from_ref_time(49_773_000) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(801_000).saturating_mul(r.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) + Weight::from_ref_time(9_790_000).saturating_add(T::DbWeight::get().writes(1)) } // Storage: Democracy LowestUnbaked (r:1 w:1) // Storage: Democracy ReferendumCount (r:1 w:0) - // Storage: Democracy ReferendumInfoOf (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) fn on_initialize_base(r: u32) -> Weight { - Weight::from_ref_time(29_677_000) - // Standard Error: 32_000 - .saturating_add(Weight::from_ref_time(3_533_000).saturating_mul(r.into())) + Weight::from_ref_time(8_978_113) + // Standard Error: 4_589 + .saturating_add(Weight::from_ref_time(1_536_205).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -179,33 +156,33 @@ impl pallet_democracy::weights::WeightInfo for WeightIn // Storage: Democracy LastTabledWasExternal (r:1 w:0) // Storage: Democracy NextExternal (r:1 w:0) // Storage: Democracy PublicProps (r:1 w:0) - // Storage: Democracy ReferendumInfoOf (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:2 w:0) fn on_initialize_base_with_launch_period(r: u32) -> Weight { - Weight::from_ref_time(31_642_000) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(3_606_000).saturating_mul(r.into())) + Weight::from_ref_time(10_988_037) + // Standard Error: 4_483 + .saturating_add(Weight::from_ref_time(1_538_250).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Democracy VotingOf (r:3 w:3) - // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Balances Locks (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) fn delegate(r: u32) -> Weight { - Weight::from_ref_time(92_827_000) - // Standard Error: 52_000 - .saturating_add(Weight::from_ref_time(5_479_000).saturating_mul(r.into())) + Weight::from_ref_time(33_942_458) + // Standard Error: 6_275 + .saturating_add(Weight::from_ref_time(2_384_438).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into()))) } // Storage: Democracy VotingOf (r:2 w:2) - // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:2 w:2) fn undelegate(r: u32) -> Weight { - Weight::from_ref_time(51_753_000) - // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(5_388_000).saturating_mul(r.into())) + Weight::from_ref_time(20_552_008) + // Standard Error: 4_945 + .saturating_add(Weight::from_ref_time(2_352_801).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -213,40 +190,15 @@ impl pallet_democracy::weights::WeightInfo for WeightIn } // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - Weight::from_ref_time(10_700_000).saturating_add(T::DbWeight::get().writes(1)) - } - // Storage: Democracy Preimages (r:1 w:1) - fn note_preimage(b: u32) -> Weight { - Weight::from_ref_time(54_036_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(1)) - } - // Storage: Democracy Preimages (r:1 w:1) - fn note_imminent_preimage(b: u32) -> Weight { - Weight::from_ref_time(42_055_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(1)) - } - // Storage: Democracy Preimages (r:1 w:1) - // Storage: System Account (r:1 w:1) - fn reap_preimage(b: u32) -> Weight { - Weight::from_ref_time(71_620_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) + Weight::from_ref_time(4_079_000).saturating_add(T::DbWeight::get().writes(1)) } // 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(57_238_000) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(146_000).saturating_mul(r.into())) + Weight::from_ref_time(23_309_726) + // Standard Error: 1_610 + .saturating_add(Weight::from_ref_time(51_836).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -254,27 +206,27 @@ impl pallet_democracy::weights::WeightInfo for WeightIn // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn unlock_set(r: u32) -> Weight { - Weight::from_ref_time(55_627_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(214_000).saturating_mul(r.into())) + Weight::from_ref_time(23_116_641) + // Standard Error: 932 + .saturating_add(Weight::from_ref_time(78_997).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Democracy ReferendumInfoOf (r:1 w:1) // Storage: Democracy VotingOf (r:1 w:1) fn remove_vote(r: u32) -> Weight { - Weight::from_ref_time(35_445_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(251_000).saturating_mul(r.into())) + Weight::from_ref_time(13_637_289) + // Standard Error: 991 + .saturating_add(Weight::from_ref_time(83_991).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // 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(36_669_000) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(221_000).saturating_mul(r.into())) + Weight::from_ref_time(14_220_574) + // Standard Error: 3_420 + .saturating_add(Weight::from_ref_time(81_496).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/common/src/weights/pallet_identity.rs b/runtime/common/src/weights/pallet_identity.rs index 21325ec38..7a1ec50f4 100644 --- a/runtime/common/src/weights/pallet_identity.rs +++ b/runtime/common/src/weights/pallet_identity.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_identity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,19 +51,19 @@ pub struct WeightInfo(PhantomData); impl pallet_identity::weights::WeightInfo for WeightInfo { // Storage: Identity Registrars (r:1 w:1) fn add_registrar(r: u32) -> Weight { - Weight::from_ref_time(32_453_000) - // Standard Error: 71_000 - .saturating_add(Weight::from_ref_time(830_000).saturating_mul(r.into())) + Weight::from_ref_time(12_045_217) + // Standard Error: 5_701 + .saturating_add(Weight::from_ref_time(411_913).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity IdentityOf (r:1 w:1) fn set_identity(r: u32, x: u32) -> Weight { - Weight::from_ref_time(57_592_000) - // Standard Error: 79_000 - .saturating_add(Weight::from_ref_time(453_000).saturating_mul(r.into())) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(614_000).saturating_mul(x.into())) + Weight::from_ref_time(23_218_766) + // Standard Error: 21_173 + .saturating_add(Weight::from_ref_time(396_383).saturating_mul(r.into())) + // Standard Error: 2_459 + .saturating_add(Weight::from_ref_time(216_337).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -71,9 +71,9 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:1 w:1) fn set_subs_new(s: u32) -> Weight { - Weight::from_ref_time(57_926_000) - // Standard Error: 76_000 - .saturating_add(Weight::from_ref_time(4_193_000).saturating_mul(s.into())) + Weight::from_ref_time(20_621_097) + // Standard Error: 5_753 + .saturating_add(Weight::from_ref_time(1_822_204).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -83,9 +83,9 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity SubsOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:1) fn set_subs_old(p: u32) -> Weight { - Weight::from_ref_time(50_949_000) - // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(1_846_000).saturating_mul(p.into())) + Weight::from_ref_time(21_538_109) + // Standard Error: 5_896 + .saturating_add(Weight::from_ref_time(819_934).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) @@ -94,64 +94,70 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity IdentityOf (r:1 w:1) // Storage: Identity SuperOf (r:0 w:64) fn clear_identity(r: u32, s: u32, x: u32) -> Weight { - Weight::from_ref_time(61_225_000) - // Standard Error: 216_000 - .saturating_add(Weight::from_ref_time(442_000).saturating_mul(r.into())) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(1_828_000).saturating_mul(s.into())) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(236_000).saturating_mul(x.into())) + Weight::from_ref_time(24_817_395) + // Standard Error: 18_666 + .saturating_add(Weight::from_ref_time(261_241).saturating_mul(r.into())) + // Standard Error: 2_173 + .saturating_add(Weight::from_ref_time(813_003).saturating_mul(s.into())) + // Standard Error: 2_173 + .saturating_add(Weight::from_ref_time(97_431).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) - fn request_judgement(_r: u32, x: u32) -> Weight { - Weight::from_ref_time(68_611_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(616_000).saturating_mul(x.into())) + fn request_judgement(r: u32, x: u32) -> Weight { + Weight::from_ref_time(24_883_132) + // Standard Error: 8_677 + .saturating_add(Weight::from_ref_time(391_028).saturating_mul(r.into())) + // Standard Error: 1_007 + .saturating_add(Weight::from_ref_time(209_582).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity IdentityOf (r:1 w:1) - fn cancel_request(_r: u32, x: u32) -> Weight { - Weight::from_ref_time(75_094_000) - // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(550_000).saturating_mul(x.into())) + fn cancel_request(r: u32, x: u32) -> Weight { + Weight::from_ref_time(23_411_702) + // Standard Error: 8_263 + .saturating_add(Weight::from_ref_time(261_255).saturating_mul(r.into())) + // Standard Error: 959 + .saturating_add(Weight::from_ref_time(207_342).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity Registrars (r:1 w:1) fn set_fee(r: u32) -> Weight { - Weight::from_ref_time(18_492_000) - // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(339_000).saturating_mul(r.into())) + Weight::from_ref_time(6_373_117) + // Standard Error: 3_180 + .saturating_add(Weight::from_ref_time(272_816).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity Registrars (r:1 w:1) fn set_account_id(r: u32) -> Weight { - Weight::from_ref_time(17_817_000) - // Standard Error: 52_000 - .saturating_add(Weight::from_ref_time(709_000).saturating_mul(r.into())) + Weight::from_ref_time(6_536_881) + // Standard Error: 3_217 + .saturating_add(Weight::from_ref_time(268_060).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity Registrars (r:1 w:1) - fn set_fields(_r: u32) -> Weight { - Weight::from_ref_time(20_985_000) + fn set_fields(r: u32) -> Weight { + Weight::from_ref_time(6_379_872) + // Standard Error: 3_198 + .saturating_add(Weight::from_ref_time(284_984).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Identity Registrars (r:1 w:0) // Storage: Identity IdentityOf (r:1 w:1) fn provide_judgement(r: u32, x: u32) -> Weight { - Weight::from_ref_time(44_404_000) - // Standard Error: 84_000 - .saturating_add(Weight::from_ref_time(865_000).saturating_mul(r.into())) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(993_000).saturating_mul(x.into())) + Weight::from_ref_time(18_544_167) + // Standard Error: 8_411 + .saturating_add(Weight::from_ref_time(298_269).saturating_mul(r.into())) + // Standard Error: 859 + .saturating_add(Weight::from_ref_time(347_720).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -159,12 +165,14 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity IdentityOf (r:1 w:1) // Storage: System Account (r:2 w:2) // Storage: Identity SuperOf (r:0 w:64) - fn kill_identity(_r: u32, s: u32, x: u32) -> Weight { - Weight::from_ref_time(109_373_000) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(1_657_000).saturating_mul(s.into())) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(75_000).saturating_mul(x.into())) + fn kill_identity(r: u32, s: u32, x: u32) -> Weight { + Weight::from_ref_time(33_739_768) + // Standard Error: 21_993 + .saturating_add(Weight::from_ref_time(179_160).saturating_mul(r.into())) + // Standard Error: 2_560 + .saturating_add(Weight::from_ref_time(816_776).saturating_mul(s.into())) + // Standard Error: 2_560 + .saturating_add(Weight::from_ref_time(93_630).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -173,18 +181,18 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) fn add_sub(s: u32) -> Weight { - Weight::from_ref_time(75_288_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(50_000).saturating_mul(s.into())) + Weight::from_ref_time(26_774_459) + // Standard Error: 2_099 + .saturating_add(Weight::from_ref_time(142_653).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Identity IdentityOf (r:1 w:0) // Storage: Identity SuperOf (r:1 w:1) fn rename_sub(s: u32) -> Weight { - Weight::from_ref_time(29_243_000) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(188_000).saturating_mul(s.into())) + Weight::from_ref_time(11_263_610) + // Standard Error: 1_038 + .saturating_add(Weight::from_ref_time(68_019).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -192,18 +200,18 @@ impl pallet_identity::weights::WeightInfo for WeightInf // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) fn remove_sub(s: u32) -> Weight { - Weight::from_ref_time(71_661_000) - // Standard Error: 15_000 - .saturating_add(Weight::from_ref_time(227_000).saturating_mul(s.into())) + Weight::from_ref_time(29_027_542) + // Standard Error: 2_964 + .saturating_add(Weight::from_ref_time(102_862).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Identity SuperOf (r:1 w:1) // Storage: Identity SubsOf (r:1 w:1) fn quit_sub(s: u32) -> Weight { - Weight::from_ref_time(57_480_000) - // Standard Error: 17_000 - .saturating_add(Weight::from_ref_time(184_000).saturating_mul(s.into())) + Weight::from_ref_time(20_501_723) + // Standard Error: 1_836 + .saturating_add(Weight::from_ref_time(126_775).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/common/src/weights/pallet_membership.rs b/runtime/common/src/weights/pallet_membership.rs index d5291f4cc..dc18101ec 100644 --- a/runtime/common/src/weights/pallet_membership.rs +++ b/runtime/common/src/weights/pallet_membership.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_membership //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -54,9 +54,9 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Members (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn add_member(m: u32) -> Weight { - Weight::from_ref_time(44_484_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(37_000).saturating_mul(m.into())) + Weight::from_ref_time(15_790_016) + // Standard Error: 647 + .saturating_add(Weight::from_ref_time(31_177).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -66,9 +66,9 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Members (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn remove_member(m: u32) -> Weight { - Weight::from_ref_time(47_524_000) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(77_000).saturating_mul(m.into())) + Weight::from_ref_time(17_898_825) + // Standard Error: 616 + .saturating_add(Weight::from_ref_time(27_596).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -78,9 +78,9 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Members (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn swap_member(m: u32) -> Weight { - Weight::from_ref_time(46_637_000) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(128_000).saturating_mul(m.into())) + Weight::from_ref_time(17_795_029) + // Standard Error: 628 + .saturating_add(Weight::from_ref_time(36_370).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -90,9 +90,9 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Members (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn reset_member(m: u32) -> Weight { - Weight::from_ref_time(46_814_000) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(267_000).saturating_mul(m.into())) + Weight::from_ref_time(17_561_643) + // Standard Error: 691 + .saturating_add(Weight::from_ref_time(104_626).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -102,9 +102,9 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommittee Members (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn change_key(m: u32) -> Weight { - Weight::from_ref_time(48_470_000) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(89_000).saturating_mul(m.into())) + Weight::from_ref_time(18_510_706) + // Standard Error: 686 + .saturating_add(Weight::from_ref_time(34_672).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -112,15 +112,18 @@ impl pallet_membership::weights::WeightInfo for WeightI // Storage: AdvisoryCommitteeMembership Prime (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) fn set_prime(m: u32) -> Weight { - Weight::from_ref_time(18_199_000) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(72_000).saturating_mul(m.into())) + Weight::from_ref_time(6_527_451) + // Standard Error: 269 + .saturating_add(Weight::from_ref_time(10_485).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: AdvisoryCommitteeMembership Prime (r:0 w:1) // Storage: AdvisoryCommittee Prime (r:0 w:1) - fn clear_prime(_m: u32) -> Weight { - Weight::from_ref_time(11_622_000).saturating_add(T::DbWeight::get().writes(2)) + fn clear_prime(m: u32) -> Weight { + Weight::from_ref_time(3_713_794) + // Standard Error: 136 + .saturating_add(Weight::from_ref_time(834).saturating_mul(m.into())) + .saturating_add(T::DbWeight::get().writes(2)) } } diff --git a/runtime/common/src/weights/pallet_multisig.rs b/runtime/common/src/weights/pallet_multisig.rs index 15e72f97e..431e903fa 100644 --- a/runtime/common/src/weights/pallet_multisig.rs +++ b/runtime/common/src/weights/pallet_multisig.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_multisig //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -50,99 +50,65 @@ use frame_support::{ pub struct WeightInfo(PhantomData); impl pallet_multisig::weights::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32) -> Weight { - Weight::from_ref_time(40_350_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into())) + Weight::from_ref_time(15_009_826) + // Standard Error: 4 + .saturating_add(Weight::from_ref_time(279).saturating_mul(z.into())) } // Storage: MultiSig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - fn as_multi_create(_s: u32, z: u32) -> Weight { - Weight::from_ref_time(98_340_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(z.into())) + fn as_multi_create(s: u32, z: u32) -> Weight { + Weight::from_ref_time(26_652_211) + // Standard Error: 1_415 + .saturating_add(Weight::from_ref_time(94_659).saturating_mul(s.into())) + // Standard Error: 13 + .saturating_add(Weight::from_ref_time(1_052).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:1) - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - fn as_multi_create_store(s: u32, z: u32) -> Weight { - Weight::from_ref_time(89_465_000) - // Standard Error: 19_000 - .saturating_add(Weight::from_ref_time(14_000).saturating_mul(s.into())) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(z.into())) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(2)) - } - // Storage: MultiSig Multisigs (r:1 w:1) fn as_multi_approve(s: u32, z: u32) -> Weight { - Weight::from_ref_time(48_826_000) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(139_000).saturating_mul(s.into())) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(z.into())) + Weight::from_ref_time(20_049_942) + // Standard Error: 908 + .saturating_add(Weight::from_ref_time(84_603).saturating_mul(s.into())) + // Standard Error: 8 + .saturating_add(Weight::from_ref_time(995).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:1) - fn as_multi_approve_store(s: u32, z: u32) -> Weight { - Weight::from_ref_time(73_692_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(110_000).saturating_mul(s.into())) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(z.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) - } - // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn as_multi_complete(s: u32, z: u32) -> Weight { - Weight::from_ref_time(91_645_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(105_000).saturating_mul(s.into())) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(z.into())) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(3)) + Weight::from_ref_time(27_852_359) + // Standard Error: 1_356 + .saturating_add(Weight::from_ref_time(117_468).saturating_mul(s.into())) + // Standard Error: 13 + .saturating_add(Weight::from_ref_time(1_031).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) } // Storage: MultiSig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn approve_as_multi_create(s: u32) -> Weight { - Weight::from_ref_time(59_874_000) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(182_000).saturating_mul(s.into())) + Weight::from_ref_time(24_697_515) + // Standard Error: 1_850 + .saturating_add(Weight::from_ref_time(97_497).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:0) fn approve_as_multi_approve(s: u32) -> Weight { - Weight::from_ref_time(43_800_000) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(173_000).saturating_mul(s.into())) + Weight::from_ref_time(17_670_882) + // Standard Error: 1_328 + .saturating_add(Weight::from_ref_time(94_493).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:1) - // Storage: System Account (r:1 w:1) - fn approve_as_multi_complete(s: u32) -> Weight { - Weight::from_ref_time(103_694_000) - // Standard Error: 17_000 - .saturating_add(Weight::from_ref_time(194_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(3)) - } - // Storage: MultiSig Multisigs (r:1 w:1) - // Storage: MultiSig Calls (r:1 w:1) fn cancel_as_multi(s: u32) -> Weight { - Weight::from_ref_time(89_339_000) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(197_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(2)) + Weight::from_ref_time(24_687_555) + // Standard Error: 1_647 + .saturating_add(Weight::from_ref_time(108_089).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/runtime/common/src/weights/pallet_parachain_staking.rs b/runtime/common/src/weights/pallet_parachain_staking.rs index f20df184a..7f8ea8f17 100644 --- a/runtime/common/src/weights/pallet_parachain_staking.rs +++ b/runtime/common/src/weights/pallet_parachain_staking.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_parachain_staking //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,39 +51,39 @@ pub struct WeightInfo(PhantomData); impl pallet_parachain_staking::weights::WeightInfo for WeightInfo { // Storage: ParachainStaking InflationConfig (r:1 w:1) fn set_staking_expectations() -> Weight { - Weight::from_ref_time(36_750_000) + Weight::from_ref_time(22_959_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainStaking InflationConfig (r:1 w:1) // Storage: ParachainStaking Round (r:1 w:0) fn set_inflation() -> Weight { - Weight::from_ref_time(94_430_000) + Weight::from_ref_time(53_944_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainStaking ParachainBondInfo (r:1 w:1) fn set_parachain_bond_account() -> Weight { - Weight::from_ref_time(33_460_000) + Weight::from_ref_time(12_549_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainStaking ParachainBondInfo (r:1 w:1) fn set_parachain_bond_reserve_percent() -> Weight { - Weight::from_ref_time(32_350_000) + Weight::from_ref_time(12_385_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainStaking TotalSelected (r:1 w:1) // Storage: ParachainStaking Round (r:1 w:0) fn set_total_selected() -> Weight { - Weight::from_ref_time(36_990_000) + Weight::from_ref_time(14_233_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: ParachainStaking CollatorCommission (r:1 w:1) fn set_collator_commission() -> Weight { - Weight::from_ref_time(31_200_000) + Weight::from_ref_time(12_029_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -91,7 +91,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking TotalSelected (r:1 w:0) // Storage: ParachainStaking InflationConfig (r:1 w:1) fn set_blocks_per_round() -> Weight { - Weight::from_ref_time(99_720_000) + Weight::from_ref_time(35_350_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -104,9 +104,9 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking TopDelegations (r:0 w:1) // Storage: ParachainStaking BottomDelegations (r:0 w:1) fn join_candidates(x: u32) -> Weight { - Weight::from_ref_time(105_148_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(369_000).saturating_mul(x.into())) + Weight::from_ref_time(32_869_323) + // Standard Error: 1_610 + .saturating_add(Weight::from_ref_time(193_154).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(7)) } @@ -114,9 +114,9 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking Round (r:1 w:0) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn schedule_leave_candidates(x: u32) -> Weight { - Weight::from_ref_time(118_551_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(313_000).saturating_mul(x.into())) + Weight::from_ref_time(25_820_357) + // Standard Error: 1_488 + .saturating_add(Weight::from_ref_time(174_057).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -131,9 +131,9 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking BottomDelegations (r:1 w:1) // Storage: ParachainStaking Total (r:1 w:1) fn execute_leave_candidates(x: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 226_000 - .saturating_add(Weight::from_ref_time(44_890_000).saturating_mul(x.into())) + Weight::from_ref_time(62_477_000) + // Standard Error: 41_796 + .saturating_add(Weight::from_ref_time(15_946_001).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(5)) @@ -142,23 +142,23 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking CandidateInfo (r:1 w:1) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn cancel_leave_candidates(x: u32) -> Weight { - Weight::from_ref_time(115_324_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(358_000).saturating_mul(x.into())) + Weight::from_ref_time(23_095_410) + // Standard Error: 1_510 + .saturating_add(Weight::from_ref_time(190_401).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: ParachainStaking CandidateInfo (r:1 w:1) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn go_offline() -> Weight { - Weight::from_ref_time(52_570_000) + Weight::from_ref_time(20_218_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: ParachainStaking CandidateInfo (r:1 w:1) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn go_online() -> Weight { - Weight::from_ref_time(51_920_000) + Weight::from_ref_time(20_722_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -168,14 +168,14 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: Balances Locks (r:1 w:1) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn candidate_bond_more() -> Weight { - Weight::from_ref_time(97_240_000) + Weight::from_ref_time(34_948_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: ParachainStaking CandidateInfo (r:1 w:1) // Storage: ParachainStaking Round (r:1 w:0) fn schedule_candidate_bond_less() -> Weight { - Weight::from_ref_time(47_370_000) + Weight::from_ref_time(19_230_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -186,13 +186,13 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: System Account (r:1 w:1) // Storage: ParachainStaking CandidatePool (r:1 w:1) fn execute_candidate_bond_less() -> Weight { - Weight::from_ref_time(94_561_000) + Weight::from_ref_time(40_550_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: ParachainStaking CandidateInfo (r:1 w:1) fn cancel_candidate_bond_less() -> Weight { - Weight::from_ref_time(50_120_000) + Weight::from_ref_time(17_798_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -203,12 +203,10 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking CandidatePool (r:1 w:1) // Storage: Balances Locks (r:1 w:1) // Storage: ParachainStaking Total (r:1 w:1) - fn delegate(x: u32, y: u32) -> Weight { - Weight::from_ref_time(221_620_000) - // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(372_000).saturating_mul(x.into())) - // Standard Error: 15_000 - .saturating_add(Weight::from_ref_time(527_000).saturating_mul(y.into())) + fn delegate(_x: u32, y: u32) -> Weight { + Weight::from_ref_time(98_852_381) + // Standard Error: 3_632 + .saturating_add(Weight::from_ref_time(74_937).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(7)) } @@ -216,7 +214,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking Round (r:1 w:0) // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) fn schedule_leave_delegators() -> Weight { - Weight::from_ref_time(63_370_000) + Weight::from_ref_time(21_612_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -231,9 +229,9 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn execute_leave_delegators(x: u32) -> Weight { - Weight::from_ref_time(27_207_000) - // Standard Error: 226_000 - .saturating_add(Weight::from_ref_time(34_240_000).saturating_mul(x.into())) + Weight::from_ref_time(17_452_622) + // Standard Error: 21_795 + .saturating_add(Weight::from_ref_time(13_924_996).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -242,7 +240,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking DelegatorState (r:1 w:1) // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) fn cancel_leave_delegators() -> Weight { - Weight::from_ref_time(52_221_000) + Weight::from_ref_time(20_919_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -250,7 +248,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) // Storage: ParachainStaking Round (r:1 w:0) fn schedule_revoke_delegation() -> Weight { - Weight::from_ref_time(51_631_000) + Weight::from_ref_time(22_510_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -263,7 +261,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking CandidatePool (r:1 w:1) // Storage: ParachainStaking Total (r:1 w:1) fn delegator_bond_more() -> Weight { - Weight::from_ref_time(109_970_000) + Weight::from_ref_time(47_725_000) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().writes(7)) } @@ -271,7 +269,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) // Storage: ParachainStaking Round (r:1 w:0) fn schedule_delegator_bond_less() -> Weight { - Weight::from_ref_time(51_671_000) + Weight::from_ref_time(22_039_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -286,7 +284,7 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking CandidatePool (r:1 w:1) // Storage: ParachainStaking Total (r:1 w:1) fn execute_revoke_delegation() -> Weight { - Weight::from_ref_time(138_000_000) + Weight::from_ref_time(62_301_000) .saturating_add(T::DbWeight::get().reads(10)) .saturating_add(T::DbWeight::get().writes(8)) } @@ -300,59 +298,72 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking CandidatePool (r:1 w:1) // Storage: ParachainStaking Total (r:1 w:1) fn execute_delegator_bond_less() -> Weight { - Weight::from_ref_time(121_801_000) + Weight::from_ref_time(51_233_000) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(8)) } // Storage: ParachainStaking DelegatorState (r:1 w:1) // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) fn cancel_revoke_delegation() -> Weight { - Weight::from_ref_time(49_720_000) + Weight::from_ref_time(21_273_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: ParachainStaking DelegatorState (r:1 w:1) // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1) fn cancel_delegator_bond_less() -> Weight { - Weight::from_ref_time(61_280_000) + Weight::from_ref_time(26_229_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: ParachainStaking Round (r:1 w:1) // Storage: ParachainStaking Points (r:1 w:0) - // Storage: ParachainStaking Staked (r:1 w:2) + // Storage: ParachainStaking Staked (r:1 w:1) // Storage: ParachainStaking InflationConfig (r:1 w:0) // Storage: ParachainStaking ParachainBondInfo (r:1 w:0) - // Storage: System Account (r:302 w:301) + // Storage: System Account (r:1 w:1) // Storage: ParachainStaking CollatorCommission (r:1 w:0) + // Storage: ParachainStaking DelayedPayouts (r:0 w:1) + fn prepare_staking_payouts() -> Weight { + Weight::from_ref_time(30_172_000) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:0) + // Storage: ParachainStaking TopDelegations (r:1 w:0) + fn get_rewardable_delegators(y: u32) -> Weight { + Weight::from_ref_time(9_044_052) + // Standard Error: 934 + .saturating_add(Weight::from_ref_time(166_721).saturating_mul(y.into())) + .saturating_add(T::DbWeight::get().reads(2)) + } // Storage: ParachainStaking CandidatePool (r:1 w:0) // Storage: ParachainStaking TotalSelected (r:1 w:0) - // Storage: ParachainStaking CandidateInfo (r:9 w:0) - // Storage: ParachainStaking DelegationScheduledRequests (r:9 w:0) - // Storage: ParachainStaking TopDelegations (r:9 w:0) - // Storage: ParachainStaking AutoCompoundingDelegations (r:9 w:0) - // Storage: ParachainStaking Total (r:1 w:0) - // Storage: ParachainStaking AwardedPts (r:2 w:1) - // Storage: ParachainStaking AtStake (r:1 w:10) + // Storage: ParachainStaking CandidateInfo (r:1 w:0) + // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:0) + // Storage: ParachainStaking TopDelegations (r:1 w:0) + // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:0) // Storage: ParachainStaking SelectedCandidates (r:0 w:1) - // Storage: ParachainStaking DelayedPayouts (r:0 w:1) - fn round_transition_on_initialize(x: u32, y: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 1_640_000 - .saturating_add(Weight::from_ref_time(58_147_000).saturating_mul(x.into())) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(398_000).saturating_mul(y.into())) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(x.into()))) + // Storage: ParachainStaking AtStake (r:0 w:1) + fn select_top_candidates(x: u32, y: u32) -> Weight { + Weight::from_ref_time(19_457_000) + // Standard Error: 194_470 + .saturating_add(Weight::from_ref_time(14_446_541).saturating_mul(x.into())) + // Standard Error: 96_977 + .saturating_add(Weight::from_ref_time(2_854_011).saturating_mul(y.into())) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(x.into()))) + .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(x.into()))) } // Storage: ParachainStaking DelayedPayouts (r:1 w:0) // Storage: ParachainStaking Points (r:1 w:0) - // Storage: ParachainStaking AwardedPts (r:2 w:1) - // Storage: ParachainStaking AtStake (r:1 w:1) + // Storage: ParachainStaking AtStake (r:2 w:1) + // Storage: ParachainStaking AwardedPts (r:1 w:1) // Storage: System Account (r:1 w:1) fn pay_one_collator_reward(y: u32) -> Weight { - Weight::from_ref_time(74_512_000) - // Standard Error: 78_000 - .saturating_add(Weight::from_ref_time(18_939_000).saturating_mul(y.into())) + Weight::from_ref_time(41_033_942) + // Standard Error: 5_622 + .saturating_add(Weight::from_ref_time(7_673_326).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(y.into()))) .saturating_add(T::DbWeight::get().writes(3)) @@ -360,16 +371,16 @@ impl pallet_parachain_staking::weights::WeightInfo for } // Storage: ParachainStaking Round (r:1 w:0) fn base_on_initialize() -> Weight { - Weight::from_ref_time(15_540_000).saturating_add(T::DbWeight::get().reads(1)) + Weight::from_ref_time(5_312_000).saturating_add(T::DbWeight::get().reads(1)) } // Storage: ParachainStaking DelegatorState (r:1 w:0) // Storage: ParachainStaking AutoCompoundingDelegations (r:1 w:1) fn set_auto_compound(x: u32, y: u32) -> Weight { - Weight::from_ref_time(172_244_000) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(387_000).saturating_mul(x.into())) - // Standard Error: 35_000 - .saturating_add(Weight::from_ref_time(30_000).saturating_mul(y.into())) + Weight::from_ref_time(42_718_871) + // Standard Error: 2_814 + .saturating_add(Weight::from_ref_time(161_876).saturating_mul(x.into())) + // Standard Error: 8_425 + .saturating_add(Weight::from_ref_time(104_510).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -383,12 +394,18 @@ impl pallet_parachain_staking::weights::WeightInfo for // Storage: ParachainStaking Total (r:1 w:1) // Storage: ParachainStaking BottomDelegations (r:1 w:1) fn delegate_with_auto_compound(x: u32, y: u32, _z: u32) -> Weight { - Weight::from_ref_time(290_047_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(115_000).saturating_mul(x.into())) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(184_000).saturating_mul(y.into())) + Weight::from_ref_time(100_631_109) + // Standard Error: 2_763 + .saturating_add(Weight::from_ref_time(81_505).saturating_mul(x.into())) + // Standard Error: 2_763 + .saturating_add(Weight::from_ref_time(48_166).saturating_mul(y.into())) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().writes(8)) } + // Storage: System Account (r:1 w:1) + fn mint_collator_reward() -> Weight { + Weight::from_ref_time(18_241_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } } diff --git a/runtime/common/src/weights/pallet_preimage.rs b/runtime/common/src/weights/pallet_preimage.rs index cd9b38b90..0e47fa95b 100644 --- a/runtime/common/src/weights/pallet_preimage.rs +++ b/runtime/common/src/weights/pallet_preimage.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_preimage //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -49,88 +49,87 @@ use frame_support::{ /// Weight functions for pallet_preimage (automatically generated) pub struct WeightInfo(PhantomData); impl pallet_preimage::weights::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) fn note_preimage(s: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2)) + Weight::from_ref_time(21_280_000) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(1_231).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) fn note_requested_preimage(s: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(14_404_000) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(1_233).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) fn note_no_deposit_preimage(s: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(3_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(13_424_000) + // Standard Error: 1 + .saturating_add(Weight::from_ref_time(1_231).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - Weight::from_ref_time(97_561_000) + Weight::from_ref_time(28_640_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - Weight::from_ref_time(68_920_000) + Weight::from_ref_time(16_748_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_preimage() -> Weight { - Weight::from_ref_time(93_040_000) + Weight::from_ref_time(15_219_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - Weight::from_ref_time(72_890_000) + Weight::from_ref_time(6_886_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_unnoted_preimage() -> Weight { - Weight::from_ref_time(47_821_000) + Weight::from_ref_time(13_170_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - Weight::from_ref_time(18_310_000) + Weight::from_ref_time(6_794_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - Weight::from_ref_time(74_260_000) + Weight::from_ref_time(16_478_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - Weight::from_ref_time(38_170_000) + Weight::from_ref_time(6_985_000) .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(2)) + .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - Weight::from_ref_time(20_180_000) + Weight::from_ref_time(6_886_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/pallet_proxy.rs b/runtime/common/src/weights/pallet_proxy.rs index 940a3f950..54077497e 100644 --- a/runtime/common/src/weights/pallet_proxy.rs +++ b/runtime/common/src/weights/pallet_proxy.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_proxy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,40 +51,38 @@ pub struct WeightInfo(PhantomData); impl pallet_proxy::weights::WeightInfo for WeightInfo { // Storage: Proxy Proxies (r:1 w:0) fn proxy(p: u32) -> Weight { - Weight::from_ref_time(39_097_000) - // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(94_000).saturating_mul(p.into())) + Weight::from_ref_time(14_846_152) + // Standard Error: 3_656 + .saturating_add(Weight::from_ref_time(20_035).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn proxy_announced(a: u32, p: u32) -> Weight { - Weight::from_ref_time(71_706_000) - // Standard Error: 26_000 - .saturating_add(Weight::from_ref_time(185_000).saturating_mul(a.into())) - // Standard Error: 27_000 - .saturating_add(Weight::from_ref_time(78_000).saturating_mul(p.into())) + Weight::from_ref_time(29_808_110) + // Standard Error: 3_086 + .saturating_add(Weight::from_ref_time(68_700).saturating_mul(a.into())) + // Standard Error: 3_189 + .saturating_add(Weight::from_ref_time(27_747).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) - fn remove_announcement(a: u32, p: u32) -> Weight { - Weight::from_ref_time(48_284_000) - // Standard Error: 18_000 - .saturating_add(Weight::from_ref_time(166_000).saturating_mul(a.into())) - // Standard Error: 18_000 - .saturating_add(Weight::from_ref_time(69_000).saturating_mul(p.into())) + fn remove_announcement(a: u32, _p: u32) -> Weight { + Weight::from_ref_time(21_154_842) + // Standard Error: 2_354 + .saturating_add(Weight::from_ref_time(67_662).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn reject_announcement(a: u32, _p: u32) -> Weight { - Weight::from_ref_time(52_265_000) - // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(84_000).saturating_mul(a.into())) + Weight::from_ref_time(20_587_474) + // Standard Error: 2_191 + .saturating_add(Weight::from_ref_time(91_044).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -92,52 +90,52 @@ impl pallet_proxy::weights::WeightInfo for WeightInfo Weight { - Weight::from_ref_time(64_000_000) - // Standard Error: 26_000 - .saturating_add(Weight::from_ref_time(117_000).saturating_mul(a.into())) - // Standard Error: 26_000 - .saturating_add(Weight::from_ref_time(91_000).saturating_mul(p.into())) + Weight::from_ref_time(25_960_647) + // Standard Error: 3_453 + .saturating_add(Weight::from_ref_time(90_065).saturating_mul(a.into())) + // Standard Error: 3_567 + .saturating_add(Weight::from_ref_time(54_574).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Proxy Proxies (r:1 w:1) fn add_proxy(p: u32) -> Weight { - Weight::from_ref_time(48_885_000) - // Standard Error: 76_000 - .saturating_add(Weight::from_ref_time(439_000).saturating_mul(p.into())) + Weight::from_ref_time(21_515_673) + // Standard Error: 9_730 + .saturating_add(Weight::from_ref_time(27_609).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxy(p: u32) -> Weight { - Weight::from_ref_time(52_080_000) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(146_000).saturating_mul(p.into())) + Weight::from_ref_time(20_632_234) + // Standard Error: 2_374 + .saturating_add(Weight::from_ref_time(68_381).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxies(p: u32) -> Weight { - Weight::from_ref_time(46_847_000) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(19_000).saturating_mul(p.into())) + Weight::from_ref_time(17_793_375) + // Standard Error: 1_672 + .saturating_add(Weight::from_ref_time(42_726).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) - fn anonymous(p: u32) -> Weight { - Weight::from_ref_time(55_708_000) - // Standard Error: 16_000 - .saturating_add(Weight::from_ref_time(50_000).saturating_mul(p.into())) + fn create_pure(p: u32) -> Weight { + Weight::from_ref_time(22_473_896) + // Standard Error: 1_953 + .saturating_add(Weight::from_ref_time(15_155).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Proxy Proxies (r:1 w:1) - fn kill_anonymous(p: u32) -> Weight { - Weight::from_ref_time(46_563_000) - // Standard Error: 30_000 - .saturating_add(Weight::from_ref_time(250_000).saturating_mul(p.into())) + fn kill_pure(p: u32) -> Weight { + Weight::from_ref_time(18_850_050) + // Standard Error: 1_796 + .saturating_add(Weight::from_ref_time(42_672).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/runtime/common/src/weights/pallet_scheduler.rs b/runtime/common/src/weights/pallet_scheduler.rs index 81509db9a..5af128495 100644 --- a/runtime/common/src/weights/pallet_scheduler.rs +++ b/runtime/common/src/weights/pallet_scheduler.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_scheduler //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -49,149 +49,77 @@ use frame_support::{ /// Weight functions for pallet_scheduler (automatically generated) pub struct WeightInfo(PhantomData); impl pallet_scheduler::weights::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - fn on_initialize_periodic_named_resolved(s: u32) -> Weight { - Weight::from_ref_time(77_951_000) - // Standard Error: 354_000 - .saturating_add(Weight::from_ref_time(33_430_000).saturating_mul(s.into())) + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + Weight::from_ref_time(3_351_000) .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s.into()))) } // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - fn on_initialize_named_resolved(s: u32) -> Weight { - Weight::from_ref_time(30_364_000) - // Standard Error: 290_000 - .saturating_add(Weight::from_ref_time(28_276_000).saturating_mul(s.into())) + fn service_agenda_base(s: u32) -> Weight { + Weight::from_ref_time(5_402_281) + // Standard Error: 2_213 + .saturating_add(Weight::from_ref_time(239_796).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s.into()))) } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - fn on_initialize_periodic_resolved(s: u32) -> Weight { - Weight::from_ref_time(15_153_000) - // Standard Error: 630_000 - .saturating_add(Weight::from_ref_time(30_716_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s.into()))) - .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s.into()))) + fn service_task_base() -> Weight { + Weight::from_ref_time(6_133_000) } - // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) - fn on_initialize_resolved(s: u32) -> Weight { - Weight::from_ref_time(29_624_000) - // Standard Error: 210_000 - .saturating_add(Weight::from_ref_time(26_634_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s.into()))) - .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s.into()))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - fn on_initialize_named_aborted(s: u32) -> Weight { - Weight::from_ref_time(18_753_000) - // Standard Error: 74_000 - .saturating_add(Weight::from_ref_time(10_211_000).saturating_mul(s.into())) + fn service_task_fetched(s: u32) -> Weight { + Weight::from_ref_time(15_508_000) + // Standard Error: 6 + .saturating_add(Weight::from_ref_time(902).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(2)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - fn on_initialize_aborted(s: u32) -> Weight { - Weight::from_ref_time(12_642_000) - // Standard Error: 91_000 - .saturating_add(Weight::from_ref_time(5_181_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) - .saturating_add(T::DbWeight::get().writes(2)) - } - // Storage: Scheduler Agenda (r:2 w:2) // Storage: Scheduler Lookup (r:0 w:1) - fn on_initialize_periodic_named(s: u32) -> Weight { - Weight::from_ref_time(57_881_000) - // Standard Error: 117_000 - .saturating_add(Weight::from_ref_time(16_508_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) - .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s.into()))) + fn service_task_named() -> Weight { + Weight::from_ref_time(7_623_000).saturating_add(T::DbWeight::get().writes(1)) } - // Storage: Scheduler Agenda (r:2 w:2) - fn on_initialize_periodic(s: u32) -> Weight { - Weight::from_ref_time(32_402_000) - // Standard Error: 103_000 - .saturating_add(Weight::from_ref_time(13_081_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) - .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) + fn service_task_periodic() -> Weight { + Weight::from_ref_time(6_381_000) } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - fn on_initialize_named(s: u32) -> Weight { - Weight::from_ref_time(39_741_000) - // Standard Error: 73_000 - .saturating_add(Weight::from_ref_time(11_308_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(1)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) + fn execute_dispatch_signed() -> Weight { + Weight::from_ref_time(2_668_000) } - // Storage: Scheduler Agenda (r:1 w:1) - fn on_initialize(s: u32) -> Weight { - Weight::from_ref_time(34_782_000) - // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(9_525_000).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(1)) - .saturating_add(T::DbWeight::get().writes(1)) + fn execute_dispatch_unsigned() -> Weight { + Weight::from_ref_time(2_690_000) } // Storage: Scheduler Agenda (r:1 w:1) fn schedule(s: u32) -> Weight { - Weight::from_ref_time(42_112_000) - // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(179_000).saturating_mul(s.into())) + Weight::from_ref_time(14_386_290) + // Standard Error: 8_210 + .saturating_add(Weight::from_ref_time(290_508).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Scheduler Agenda (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) fn cancel(s: u32) -> Weight { - Weight::from_ref_time(40_100_000) - // Standard Error: 21_000 - .saturating_add(Weight::from_ref_time(996_000).saturating_mul(s.into())) + Weight::from_ref_time(14_618_067) + // Standard Error: 2_673 + .saturating_add(Weight::from_ref_time(244_365).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn schedule_named(s: u32) -> Weight { - Weight::from_ref_time(44_125_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(242_000).saturating_mul(s.into())) + Weight::from_ref_time(17_125_968) + // Standard Error: 3_579 + .saturating_add(Weight::from_ref_time(283_692).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Scheduler Lookup (r:1 w:1) // Storage: Scheduler Agenda (r:1 w:1) fn cancel_named(s: u32) -> Weight { - Weight::from_ref_time(42_315_000) - // Standard Error: 44_000 - .saturating_add(Weight::from_ref_time(1_239_000).saturating_mul(s.into())) + Weight::from_ref_time(16_091_884) + // Standard Error: 2_674 + .saturating_add(Weight::from_ref_time(274_337).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/common/src/weights/pallet_timestamp.rs b/runtime/common/src/weights/pallet_timestamp.rs index c93a29aa3..02f45199b 100644 --- a/runtime/common/src/weights/pallet_timestamp.rs +++ b/runtime/common/src/weights/pallet_timestamp.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_timestamp //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -52,11 +52,11 @@ impl pallet_timestamp::weights::WeightInfo for WeightIn // Storage: Timestamp Now (r:1 w:1) // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - Weight::from_ref_time(27_600_000) + Weight::from_ref_time(8_108_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } fn on_finalize() -> Weight { - Weight::from_ref_time(10_360_000) + Weight::from_ref_time(3_570_000) } } diff --git a/runtime/common/src/weights/pallet_treasury.rs b/runtime/common/src/weights/pallet_treasury.rs index 22d82ca1f..7a7fe4d36 100644 --- a/runtime/common/src/weights/pallet_treasury.rs +++ b/runtime/common/src/weights/pallet_treasury.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_treasury //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -50,33 +50,33 @@ use frame_support::{ pub struct WeightInfo(PhantomData); impl pallet_treasury::weights::WeightInfo for WeightInfo { fn spend() -> Weight { - Weight::from_ref_time(280_000) + Weight::from_ref_time(95_000) } // Storage: Treasury ProposalCount (r:1 w:1) // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - Weight::from_ref_time(60_380_000) + Weight::from_ref_time(20_565_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Treasury Proposals (r:1 w:1) fn reject_proposal() -> Weight { - Weight::from_ref_time(72_761_000) + Weight::from_ref_time(24_762_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Treasury Proposals (r:1 w:0) // Storage: Treasury Approvals (r:1 w:1) fn approve_proposal(p: u32) -> Weight { - Weight::from_ref_time(27_423_000) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(174_000).saturating_mul(p.into())) + Weight::from_ref_time(10_471_736) + // Standard Error: 1_016 + .saturating_add(Weight::from_ref_time(105_175).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Treasury Approvals (r:1 w:1) fn remove_approval() -> Weight { - Weight::from_ref_time(19_090_000) + Weight::from_ref_time(6_422_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -85,9 +85,9 @@ impl pallet_treasury::weights::WeightInfo for WeightInf // Storage: Bounties BountyApprovals (r:1 w:1) // Storage: Treasury Proposals (r:2 w:2) fn on_initialize_proposals(p: u32) -> Weight { - Weight::from_ref_time(43_929_000) - // Standard Error: 358_000 - .saturating_add(Weight::from_ref_time(45_522_000).saturating_mul(p.into())) + Weight::from_ref_time(38_410_434) + // Standard Error: 20_814 + .saturating_add(Weight::from_ref_time(18_295_935).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2)) diff --git a/runtime/common/src/weights/pallet_utility.rs b/runtime/common/src/weights/pallet_utility.rs index fe36785fd..ea56ed59f 100644 --- a/runtime/common/src/weights/pallet_utility.rs +++ b/runtime/common/src/weights/pallet_utility.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_utility //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -50,24 +50,24 @@ use frame_support::{ pub struct WeightInfo(PhantomData); impl pallet_utility::weights::WeightInfo for WeightInfo { fn batch(c: u32) -> Weight { - Weight::from_ref_time(73_233_000) - // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(6_159_000).saturating_mul(c.into())) + Weight::from_ref_time(31_466_915) + // Standard Error: 2_630 + .saturating_add(Weight::from_ref_time(2_383_207).saturating_mul(c.into())) } fn as_derivative() -> Weight { - Weight::from_ref_time(10_870_000) + Weight::from_ref_time(4_073_000) } fn batch_all(c: u32) -> Weight { - Weight::from_ref_time(44_965_000) - // Standard Error: 48_000 - .saturating_add(Weight::from_ref_time(6_460_000).saturating_mul(c.into())) + Weight::from_ref_time(33_997_301) + // Standard Error: 3_559 + .saturating_add(Weight::from_ref_time(2_433_000).saturating_mul(c.into())) } fn dispatch_as() -> Weight { - Weight::from_ref_time(23_170_000) + Weight::from_ref_time(9_493_000) } fn force_batch(c: u32) -> Weight { - Weight::from_ref_time(35_547_000) - // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(6_274_000).saturating_mul(c.into())) + Weight::from_ref_time(25_346_023) + // Standard Error: 3_911 + .saturating_add(Weight::from_ref_time(2_393_869).saturating_mul(c.into())) } } diff --git a/runtime/common/src/weights/pallet_vesting.rs b/runtime/common/src/weights/pallet_vesting.rs index 09a8a1a66..8f70164d4 100644 --- a/runtime/common/src/weights/pallet_vesting.rs +++ b/runtime/common/src/weights/pallet_vesting.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_vesting //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -51,19 +51,21 @@ pub struct WeightInfo(PhantomData); impl pallet_vesting::weights::WeightInfo for WeightInfo { // Storage: Vesting Vesting (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - fn vest_locked(_l: u32, _s: u32) -> Weight { - Weight::from_ref_time(74_193_000) + fn vest_locked(l: u32, s: u32) -> Weight { + Weight::from_ref_time(28_454_811) + // Standard Error: 2_342 + .saturating_add(Weight::from_ref_time(30_427).saturating_mul(l.into())) + // Standard Error: 4_167 + .saturating_add(Weight::from_ref_time(10_709).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Vesting Vesting (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - fn vest_unlocked(l: u32, s: u32) -> Weight { - Weight::from_ref_time(59_403_000) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(142_000).saturating_mul(l.into())) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(76_000).saturating_mul(s.into())) + fn vest_unlocked(l: u32, _s: u32) -> Weight { + Weight::from_ref_time(28_053_460) + // Standard Error: 2_049 + .saturating_add(Weight::from_ref_time(24_548).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -71,9 +73,9 @@ impl pallet_vesting::weights::WeightInfo for WeightInfo // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn vest_other_locked(l: u32, _s: u32) -> Weight { - Weight::from_ref_time(69_282_000) - // Standard Error: 17_000 - .saturating_add(Weight::from_ref_time(33_000).saturating_mul(l.into())) + Weight::from_ref_time(28_646_528) + // Standard Error: 2_267 + .saturating_add(Weight::from_ref_time(14_776).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -81,51 +83,51 @@ impl pallet_vesting::weights::WeightInfo for WeightInfo // Storage: Balances Locks (r:1 w:1) // Storage: System Account (r:1 w:1) fn vest_other_unlocked(l: u32, _s: u32) -> Weight { - Weight::from_ref_time(64_138_000) - // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(101_000).saturating_mul(l.into())) + Weight::from_ref_time(29_263_562) + // Standard Error: 2_411 + .saturating_add(Weight::from_ref_time(2_655).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Vesting Vesting (r:1 w:1) // Storage: System Account (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - fn vested_transfer(l: u32, s: u32) -> Weight { - Weight::from_ref_time(89_063_000) - // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(74_000).saturating_mul(l.into())) - // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(240_000).saturating_mul(s.into())) + fn vested_transfer(l: u32, _s: u32) -> Weight { + Weight::from_ref_time(40_625_249) + // Standard Error: 2_877 + .saturating_add(Weight::from_ref_time(30_587).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Vesting Vesting (r:1 w:1) // Storage: System Account (r:2 w:2) // Storage: Balances Locks (r:1 w:1) - fn force_vested_transfer(_l: u32, s: u32) -> Weight { - Weight::from_ref_time(95_489_000) - // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(44_000).saturating_mul(s.into())) + fn force_vested_transfer(l: u32, s: u32) -> Weight { + Weight::from_ref_time(38_574_791) + // Standard Error: 6_754 + .saturating_add(Weight::from_ref_time(40_472).saturating_mul(l.into())) + // Standard Error: 12_017 + .saturating_add(Weight::from_ref_time(33_756).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } // Storage: Vesting Vesting (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn not_unlocking_merge_schedules(l: u32, _s: u32) -> Weight { - Weight::from_ref_time(67_438_000) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(158_000).saturating_mul(l.into())) + Weight::from_ref_time(28_978_945) + // Standard Error: 1_850 + .saturating_add(Weight::from_ref_time(38_600).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: Vesting Vesting (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { - Weight::from_ref_time(67_798_000) - // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(48_000).saturating_mul(l.into())) - // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(115_000).saturating_mul(s.into())) + Weight::from_ref_time(29_199_036) + // Standard Error: 2_331 + .saturating_add(Weight::from_ref_time(15_809).saturating_mul(l.into())) + // Standard Error: 4_306 + .saturating_add(Weight::from_ref_time(16_241).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/runtime/zeitgeist/Cargo.toml b/runtime/zeitgeist/Cargo.toml index 931420377..417df6562 100644 --- a/runtime/zeitgeist/Cargo.toml +++ b/runtime/zeitgeist/Cargo.toml @@ -1,84 +1,86 @@ [build-dependencies] -substrate-wasm-builder = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +substrate-wasm-builder = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } [dependencies] -frame-executive = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-bounties = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-collective = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-democracy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-identity = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-membership = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-multisig = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-preimage = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-proxy = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-scheduler = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-transaction-payment-rpc-runtime-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-vesting = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-executive = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-currencies = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } +pallet-balances = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-bounties = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-collective = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-democracy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-identity = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-membership = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-multisig = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-preimage = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-proxy = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-scheduler = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-transaction-payment-rpc-runtime-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-treasury = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-vesting = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } +polkadot-primitives = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-block-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-inherents = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-offchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-session = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-transaction-pool = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-version = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-block-builder = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-inherents = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-offchain = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-session = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-std = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-transaction-pool = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-version = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" } # Try-Runtime -frame-try-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } +frame-try-runtime = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } # Benchmark -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } -frame-system-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } +frame-system-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } # Cumulus -cumulus-pallet-dmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-parachain-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-pallet-xcmp-queue = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -cumulus-primitives-utility = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } -parachain-info = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/cumulus", optional = true } +cumulus-pallet-dmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-parachain-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-xcm = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-pallet-xcmp-queue = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +cumulus-primitives-utility = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } +parachain-info = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/cumulus", optional = true } # Parachain -nimbus-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-inherent = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-author-mapping = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -pallet-author-slot-filter = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/nimbus", optional = true } -pallet-parachain-staking = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } -session-keys-primitives = { tag = "v0.27.2-a", default-features = false, git = "https://github.com/zeitgeistpm/moonbeam", optional = true } +nimbus-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-inherent = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-mapping = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-author-slot-filter = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +pallet-parachain-staking = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } +session-keys-primitives = { default-features = false, git = "https://github.com/zeitgeistpm/external", optional = true } # Polkadot -polkadot-parachain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } +polkadot-parachain = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } # Standalone -pallet-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -pallet-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-consensus-aura = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-finality-grandpa = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +pallet-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +pallet-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-consensus-aura = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-finality-grandpa = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } # Utility cfg-if = { version = "1.0.0" } @@ -86,17 +88,16 @@ hex-literal = { default-features = false, optional = true, version = "0.3.4" } log = { version = "0.4.17", default-features = false, optional = true } # XCM -orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-unknown-tokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-xcm-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-xtokens = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -pallet-xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-primitives = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -polkadot-runtime-parachains = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm-builder = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } -xcm-executor = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/polkadot", optional = true } +orml-asset-registry = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-unknown-tokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-xcm-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-xtokens = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +pallet-xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-runtime = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +polkadot-runtime-parachains = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm-builder = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } +xcm-executor = { branch = "release-v0.9.32", default-features = false, git = "https://github.com/paritytech/polkadot", optional = true } # Zeitgeist @@ -115,9 +116,9 @@ zrml-swaps = { default-features = false, path = "../../zrml/swaps" } zrml-swaps-runtime-api = { default-features = false, path = "../../zrml/swaps/runtime-api" } [dev-dependencies] -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } test-case = "2.0.2" -xcm-emulator = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/xcm-simulator" } +xcm-emulator = { rev = "158a6bd2768c679563efa891aa17329635b2764b", git = "https://github.com/shaunxw/xcm-simulator" } [features] default = ["std"] @@ -147,7 +148,6 @@ parachain = [ # XCM "polkadot-runtime", - "polkadot-primitives", "polkadot-runtime-parachains", "orml-asset-registry", "orml-unknown-tokens", @@ -168,7 +168,7 @@ runtime-benchmarks = [ "cumulus-pallet-xcmp-queue?/runtime-benchmarks", "frame-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", - "frame-system-benchmarking", + "frame-system-benchmarking/runtime-benchmarks", "frame-system/runtime-benchmarks", "hex-literal", "polkadot-runtime?/runtime-benchmarks", @@ -237,6 +237,7 @@ std = [ "pallet-utility/std", "pallet-vesting/std", "parity-scale-codec/std", + "polkadot-primitives/std", "scale-info/std", "sp-api/std", "sp-block-builder/std", @@ -280,7 +281,6 @@ std = [ # XCM "polkadot-runtime?/std", - "polkadot-primitives?/std", "polkadot-runtime-parachains?/std", "orml-asset-registry?/std", "orml-unknown-tokens?/std", diff --git a/runtime/zeitgeist/src/integration_tests/xcm/setup.rs b/runtime/zeitgeist/src/integration_tests/xcm/setup.rs index d92c9430f..8cceae716 100644 --- a/runtime/zeitgeist/src/integration_tests/xcm/setup.rs +++ b/runtime/zeitgeist/src/integration_tests/xcm/setup.rs @@ -18,7 +18,8 @@ use crate::{ xcm_config::config::{general_key, zeitgeist}, - AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Origin, Runtime, System, + AccountId, AssetRegistry, Balance, CurrencyId, ExistentialDeposit, Runtime, RuntimeOrigin, + System, }; use frame_support::{assert_ok, traits::GenesisBuild}; use orml_traits::asset_registry::AssetMetadata; @@ -133,7 +134,7 @@ pub(super) fn register_foreign_ztg(additional_meta: Option) { additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_ZTG_ID))); + assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_ZTG_ID))); } pub(super) fn register_foreign_sibling(additional_meta: Option) { @@ -147,7 +148,11 @@ pub(super) fn register_foreign_sibling(additional_meta: Option) additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_SIBLING_ID))); + assert_ok!(AssetRegistry::register_asset( + RuntimeOrigin::root(), + meta, + Some(FOREIGN_SIBLING_ID) + )); } pub(super) fn register_foreign_parent(additional_meta: Option) { @@ -161,7 +166,7 @@ pub(super) fn register_foreign_parent(additional_meta: Option) { additional: additional_meta.unwrap_or_default(), }; - assert_ok!(AssetRegistry::register_asset(Origin::root(), meta, Some(FOREIGN_PARENT_ID))); + assert_ok!(AssetRegistry::register_asset(RuntimeOrigin::root(), meta, Some(FOREIGN_PARENT_ID))); } #[inline] diff --git a/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs b/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs index 0b90d1f9e..5a62e099b 100644 --- a/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs +++ b/runtime/zeitgeist/src/integration_tests/xcm/test_net.rs @@ -18,7 +18,7 @@ use crate::{ parameters::ZeitgeistTreasuryAccount, xcm_config::config::zeitgeist, AccountId, CurrencyId, - DmpQueue, Origin, Runtime, XcmpQueue, + DmpQueue, Runtime, RuntimeOrigin, XcmpQueue, }; use frame_support::{traits::GenesisBuild, weights::Weight}; use polkadot_primitives::v2::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; @@ -38,7 +38,7 @@ decl_test_relay_chain! { decl_test_parachain! { pub struct Zeitgeist { Runtime = Runtime, - Origin = Origin, + RuntimeOrigin = RuntimeOrigin, XcmpMessageHandler = XcmpQueue, DmpMessageHandler = DmpQueue, new_ext = para_ext(zeitgeist::ID), @@ -48,7 +48,7 @@ decl_test_parachain! { decl_test_parachain! { pub struct Sibling { Runtime = Runtime, - Origin = Origin, + RuntimeOrigin = RuntimeOrigin, XcmpMessageHandler = XcmpQueue, DmpMessageHandler = DmpQueue, new_ext = para_ext(PARA_ID_SIBLING), diff --git a/runtime/zeitgeist/src/integration_tests/xcm/tests/transfers.rs b/runtime/zeitgeist/src/integration_tests/xcm/tests/transfers.rs index f95da672f..316fb19d1 100644 --- a/runtime/zeitgeist/src/integration_tests/xcm/tests/transfers.rs +++ b/runtime/zeitgeist/src/integration_tests/xcm/tests/transfers.rs @@ -26,7 +26,7 @@ use crate::{ test_net::{PolkadotNet, Sibling, TestNet, Zeitgeist}, }, xcm_config::{config::zeitgeist, fees::default_per_second}, - AssetRegistry, Balance, Balances, CurrencyId, Origin, Tokens, XTokens, + AssetRegistry, Balance, Balances, CurrencyId, RuntimeOrigin, Tokens, XTokens, ZeitgeistTreasuryAccount, }; @@ -58,7 +58,7 @@ fn transfer_ztg_to_sibling() { assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance); assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), CurrencyId::Ztg, transfer_amount, Box::new( @@ -71,7 +71,7 @@ fn transfer_ztg_to_sibling() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Alice's balance is initial_balance - amount_transferred @@ -128,7 +128,7 @@ fn transfer_ztg_sibling_to_zeitgeist() { assert_eq!(Balances::free_balance(&zeitgeist_parachain_account()), 0); assert_eq!(Tokens::free_balance(FOREIGN_ZTG_ID, &BOB.into()), bob_initial_balance); assert_ok!(XTokens::transfer( - Origin::signed(BOB.into()), + RuntimeOrigin::signed(BOB.into()), FOREIGN_ZTG_ID, transfer_amount, Box::new( @@ -141,7 +141,7 @@ fn transfer_ztg_sibling_to_zeitgeist() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Bobs's balance is initial balance - amount transferred @@ -187,7 +187,7 @@ fn transfer_dot_from_relay_chain() { assert!(initial_balance >= transfer_amount); assert_ok!(polkadot_runtime::XcmPallet::reserve_transfer_assets( - polkadot_runtime::Origin::signed(ALICE.into()), + polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), Box::new(Parachain(zeitgeist::ID).into().into()), Box::new(Junction::AccountId32 { network: NetworkId::Any, id: BOB }.into().into()), Box::new((Here, transfer_amount).into()), @@ -215,7 +215,7 @@ fn transfer_dot_to_relay_chain() { assert!(initial_balance >= transfer_amount); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), FOREIGN_PARENT_ID, transfer_amount, Box::new( @@ -225,7 +225,7 @@ fn transfer_dot_to_relay_chain() { ) .into() ), - 4_000_000_000 + xcm_emulator::Limited(4_000_000_000) )); assert_eq!( @@ -235,7 +235,7 @@ fn transfer_dot_to_relay_chain() { }); PolkadotNet::execute_with(|| { - assert_eq!(polkadot_runtime::Balances::free_balance(&BOB.into()), 19_530_582_548); + assert_eq!(polkadot_runtime::Balances::free_balance(&BOB.into()), 19_573_469_824); }); } @@ -274,7 +274,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() { assert_eq!(Balances::free_balance(&ALICE.into()), alice_initial_balance); assert_eq!(Balances::free_balance(&sibling_parachain_account()), 0); assert_ok!(XTokens::transfer( - Origin::signed(ALICE.into()), + RuntimeOrigin::signed(ALICE.into()), CurrencyId::Ztg, transfer_amount, Box::new( @@ -287,7 +287,7 @@ fn transfer_ztg_to_sibling_with_custom_fee() { ) .into() ), - 4_000_000_000, + xcm_emulator::Limited(4_000_000_000), )); // Confirm that Alice's balance is initial_balance - amount_transferred diff --git a/runtime/zeitgeist/src/lib.rs b/runtime/zeitgeist/src/lib.rs index 71477fd01..4b3c6a8cc 100644 --- a/runtime/zeitgeist/src/lib.rs +++ b/runtime/zeitgeist/src/lib.rs @@ -102,8 +102,8 @@ pub struct IsCallable; // Currently disables Court, Rikiddo and creation of markets using Court or SimpleDisputes // dispute mechanism. -impl Contains for IsCallable { - fn contains(call: &Call) -> bool { +impl Contains for IsCallable { + fn contains(call: &RuntimeCall) -> bool { #[cfg(feature = "parachain")] use cumulus_pallet_dmp_queue::Call::service_overweight; use frame_system::Call::{ @@ -125,10 +125,10 @@ impl Contains for IsCallable { #[allow(clippy::match_like_matches_macro)] match call { // Membership is managed by the respective Membership instance - Call::AdvisoryCommittee(set_members { .. }) => false, + RuntimeCall::AdvisoryCommittee(set_members { .. }) => false, // See "balance.set_balance" - Call::AssetManager(update_balance { .. }) => false, - Call::Balances(inner_call) => { + RuntimeCall::AssetManager(update_balance { .. }) => false, + RuntimeCall::Balances(inner_call) => { match inner_call { // Balances should not be set. All newly generated tokens be minted by well // known and approved processes, like staking. However, this could be used @@ -143,12 +143,12 @@ impl Contains for IsCallable { } } // Membership is managed by the respective Membership instance - Call::Council(set_members { .. }) => false, - Call::Court(_) => false, + RuntimeCall::Council(set_members { .. }) => false, + RuntimeCall::Court(_) => false, #[cfg(feature = "parachain")] - Call::DmpQueue(service_overweight { .. }) => false, - Call::LiquidityMining(_) => false, - Call::PredictionMarkets(inner_call) => { + RuntimeCall::DmpQueue(service_overweight { .. }) => false, + RuntimeCall::LiquidityMining(_) => false, + RuntimeCall::PredictionMarkets(inner_call) => { match inner_call { // Disable Rikiddo markets create_market { scoring_rule: RikiddoSigmoidFeeMarketEma, .. } => false, @@ -163,7 +163,7 @@ impl Contains for IsCallable { _ => true, } } - Call::System(inner_call) => { + RuntimeCall::System(inner_call) => { match inner_call { // Some "waste" storage will never impact proper operation. // Cleaning up storage should be done by pallets or independent migrations. @@ -184,9 +184,9 @@ impl Contains for IsCallable { } } // Membership is managed by the respective Membership instance - Call::TechnicalCommittee(set_members { .. }) => false, + RuntimeCall::TechnicalCommittee(set_members { .. }) => false, // There should be no reason to force vested transfer. - Call::Vesting(force_vested_transfer { .. }) => false, + RuntimeCall::Vesting(force_vested_transfer { .. }) => false, _ => true, } } diff --git a/runtime/zeitgeist/src/parachain_params.rs b/runtime/zeitgeist/src/parachain_params.rs index c2a81c52c..ba42d6728 100644 --- a/runtime/zeitgeist/src/parachain_params.rs +++ b/runtime/zeitgeist/src/parachain_params.rs @@ -23,7 +23,7 @@ )] #![cfg(feature = "parachain")] -use super::{parameters::MAXIMUM_BLOCK_WEIGHT, Origin, ParachainInfo}; +use super::{parameters::MAXIMUM_BLOCK_WEIGHT, ParachainInfo, RuntimeOrigin}; use frame_support::{parameter_types, weights::Weight}; use orml_traits::parameter_type_with_key; use sp_runtime::{Perbill, Percent}; @@ -44,7 +44,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); - pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); + pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub UnitWeightCost: u64 = 200_000_000; // Staking diff --git a/runtime/zeitgeist/src/parameters.rs b/runtime/zeitgeist/src/parameters.rs index e0ebcbd56..56c8e5b27 100644 --- a/runtime/zeitgeist/src/parameters.rs +++ b/runtime/zeitgeist/src/parameters.rs @@ -24,10 +24,12 @@ use super::VERSION; use frame_support::{ + dispatch::DispatchClass, parameter_types, + traits::WithdrawReasons, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, - DispatchClass, Weight, + Weight, }, PalletId, }; @@ -46,7 +48,8 @@ use frame_support::traits::LockIdentifier; pub(crate) const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); pub(crate) const MAXIMUM_BLOCK_WEIGHT: Weight = - Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2); + Weight::from_ref_time(WEIGHT_PER_SECOND.ref_time() / 2) + .set_proof_size(polkadot_primitives::v2::MAX_POV_SIZE as u64); pub(crate) const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); pub(crate) const FEES_AND_TIPS_TREASURY_PERCENTAGE: u32 = 100; pub(crate) const FEES_AND_TIPS_BURN_PERCENTAGE: u32 = 0; @@ -349,6 +352,8 @@ parameter_types! { // Vesting pub const MinVestedTransfer: Balance = ExistentialDeposit::get(); + pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons = + WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE); } #[cfg(feature = "with-global-disputes")] diff --git a/runtime/zeitgeist/src/xcm_config/config.rs b/runtime/zeitgeist/src/xcm_config/config.rs index c8312fda6..888b97a3c 100644 --- a/runtime/zeitgeist/src/xcm_config/config.rs +++ b/runtime/zeitgeist/src/xcm_config/config.rs @@ -17,9 +17,9 @@ use super::fees::{native_per_second, FixedConversionRateProvider}; use crate::{ - AccountId, Ancestry, AssetManager, AssetRegistry, Balance, Call, CurrencyId, MaxInstructions, - Origin, ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork, - UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount, + AccountId, Ancestry, AssetManager, AssetRegistry, Balance, CurrencyId, MaxInstructions, + ParachainInfo, ParachainSystem, PolkadotXcm, RelayChainOrigin, RelayNetwork, RuntimeCall, + RuntimeOrigin, UnitWeightCost, UnknownTokens, XcmpQueue, ZeitgeistTreasuryAccount, }; use frame_support::{parameter_types, traits::Everything, WeakBoundedVec}; @@ -70,8 +70,7 @@ impl Config for XcmConfig { /// Additional filters that specify whether the XCM instruction should be executed at all. type Barrier = Barrier; /// The outer call dispatch type. - type Call = Call; - type CallDispatcher = Call; + type RuntimeCall = RuntimeCall; /// Combinations of (Location, Asset) pairs which are trusted as reserves. // Trust the parent chain, sibling parachains and children chains of this chain. type IsReserve = MultiNativeAsset; @@ -90,7 +89,7 @@ impl Config for XcmConfig { /// The means of determining an XCM message's weight. // Adds UnitWeightCost per instruction plus the weight of each instruction. // The total number of instructions are bounded by MaxInstructions - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; /// How to send an onward XCM message. type XcmSender = XcmRouter; } @@ -262,7 +261,7 @@ impl Convert for AccountIdToMultiLocation { } /// No local origins on this chain are allowed to dispatch XCM sends/executions. -pub type LocalOriginToLocation = SignedToAccountId32; +pub type LocalOriginToLocation = SignedToAccountId32; /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used /// when determining ownership of accounts for asset transacting and when attempting to use XCM @@ -283,18 +282,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 convert 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, ); /// The means for routing XCM messages which are not for local execution into the right message diff --git a/zrml/authorized/Cargo.toml b/zrml/authorized/Cargo.toml index 7f2098d5f..95c2850de 100644 --- a/zrml/authorized/Cargo.toml +++ b/zrml/authorized/Cargo.toml @@ -1,17 +1,17 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-market-commons = { default-features = false, path = "../market-commons" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/authorized/src/lib.rs b/zrml/authorized/src/lib.rs index 64619a232..0fb633207 100644 --- a/zrml/authorized/src/lib.rs +++ b/zrml/authorized/src/lib.rs @@ -121,7 +121,7 @@ mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// Event - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The period, in which the authority can correct the outcome of a market. /// This value must not be zero. @@ -141,7 +141,7 @@ mod pallet { >; /// The origin that is allowed to resolved disupute in Authorized dispute mechanism. - type AuthorizedDisputeResolutionOrigin: EnsureOrigin; + type AuthorizedDisputeResolutionOrigin: EnsureOrigin; /// Identifier of this pallet #[pallet::constant] @@ -194,7 +194,7 @@ mod pallet { type BlockNumber = T::BlockNumber; type MarketId = MarketIdOf; type Moment = MomentOf; - type Origin = T::Origin; + type Origin = T::RuntimeOrigin; fn on_dispute( disputes: &[MarketDispute], diff --git a/zrml/authorized/src/mock.rs b/zrml/authorized/src/mock.rs index 53e3a07eb..f34cdc7bc 100644 --- a/zrml/authorized/src/mock.rs +++ b/zrml/authorized/src/mock.rs @@ -133,7 +133,7 @@ impl DisputeResolutionApi for MockResolution { } impl crate::Config for Runtime { - type Event = (); + type RuntimeEvent = (); type CorrectionPeriod = CorrectionPeriod; type DisputeResolution = MockResolution; type MarketCommons = MarketCommons; @@ -155,9 +155,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -166,7 +166,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -178,7 +178,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/authorized/src/tests.rs b/zrml/authorized/src/tests.rs index f1a0901d1..3682ac5e1 100644 --- a/zrml/authorized/src/tests.rs +++ b/zrml/authorized/src/tests.rs @@ -20,7 +20,7 @@ use crate::{ market_mock, - mock::{Authorized, AuthorizedDisputeResolutionUser, ExtBuilder, Origin, Runtime, BOB}, + mock::{Authorized, AuthorizedDisputeResolutionUser, ExtBuilder, Runtime, RuntimeOrigin, BOB}, mock_storage::pallet as mock_storage, AuthorizedOutcomeReports, Error, }; @@ -36,7 +36,7 @@ fn authorize_market_outcome_inserts_a_new_outcome() { ExtBuilder::default().build().execute_with(|| { Markets::::insert(0, market_mock::()); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) )); @@ -55,7 +55,7 @@ fn authorize_market_outcome_does_not_reset_dispute_resolution() { Markets::::insert(0, market_mock::()); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1), )); @@ -69,7 +69,7 @@ fn authorize_market_outcome_does_not_reset_dispute_resolution() { assert_eq!(mock_storage::MarketIdsPerDisputeBlock::::get(resolve_at_0), vec![0]); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(2) )); @@ -88,7 +88,7 @@ fn authorize_market_outcome_fails_if_market_does_not_exist() { ExtBuilder::default().build().execute_with(|| { assert_noop!( Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) ), @@ -105,7 +105,7 @@ fn authorize_market_outcome_fails_on_non_authorized_market() { Markets::::insert(0, market); assert_noop!( Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) ), @@ -122,7 +122,7 @@ fn authorize_market_outcome_fails_on_undisputed_market() { Markets::::insert(0, market); assert_noop!( Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) ), @@ -137,7 +137,7 @@ fn authorize_market_outcome_fails_on_invalid_report() { Markets::::insert(0, market_mock::()); assert_noop!( Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Categorical(123) ), @@ -151,7 +151,11 @@ fn authorize_market_outcome_fails_on_unauthorized_account() { ExtBuilder::default().build().execute_with(|| { Markets::::insert(0, market_mock::()); assert_noop!( - Authorized::authorize_market_outcome(Origin::signed(BOB), 0, OutcomeReport::Scalar(1)), + Authorized::authorize_market_outcome( + RuntimeOrigin::signed(BOB), + 0, + OutcomeReport::Scalar(1) + ), DispatchError::BadOrigin, ); }); @@ -183,7 +187,7 @@ fn on_resolution_removes_stored_outcomes() { let market = market_mock::(); Markets::::insert(0, &market); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(2) )); @@ -199,12 +203,12 @@ fn on_resolution_returns_the_reported_outcome() { Markets::::insert(0, &market); // Authorize outcome, then overwrite it. assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) )); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(2) )); @@ -221,12 +225,12 @@ fn authorized_market_outcome_can_handle_multiple_markets() { Markets::::insert(0, market_mock::()); Markets::::insert(1, market_mock::()); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(123) )); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 1, OutcomeReport::Scalar(456) )); @@ -250,7 +254,7 @@ fn get_auto_resolve_works() { let market = market_mock::(); Markets::::insert(0, &market); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Scalar(1) )); diff --git a/zrml/authorized/src/weights.rs b/zrml/authorized/src/weights.rs index 685066985..51e818f23 100644 --- a/zrml/authorized/src/weights.rs +++ b/zrml/authorized/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_authorized //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -57,16 +57,16 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1) // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1) fn authorize_market_outcome_first_report(m: u32) -> Weight { - Weight::from_ref_time(38_444_000) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(173_000).saturating_mul(m.into())) + Weight::from_ref_time(15_718_181) + // Standard Error: 220 + .saturating_add(Weight::from_ref_time(93_904).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: MarketCommons Markets (r:1 w:0) // Storage: Authorized AuthorizedOutcomeReports (r:1 w:1) fn authorize_market_outcome_existing_report() -> Weight { - Weight::from_ref_time(30_850_000) + Weight::from_ref_time(11_771_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/zrml/court/Cargo.toml b/zrml/court/Cargo.toml index 096c6da68..4ff800939 100644 --- a/zrml/court/Cargo.toml +++ b/zrml/court/Cargo.toml @@ -1,20 +1,20 @@ [dependencies] arrayvec = { default-features = false, version = "0.7" } -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } rand = { default-features = false, features = ["alloc", "std_rng"], version = "0.8" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-market-commons = { default-features = false, path = "../market-commons" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/court/src/lib.rs b/zrml/court/src/lib.rs index cc258e378..70083ce65 100644 --- a/zrml/court/src/lib.rs +++ b/zrml/court/src/lib.rs @@ -161,7 +161,7 @@ mod pallet { >; /// Event - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Market commons type MarketCommons: MarketCommonsPalletApi< @@ -509,7 +509,7 @@ mod pallet { type BlockNumber = T::BlockNumber; type MarketId = MarketIdOf; type Moment = MomentOf; - type Origin = T::Origin; + type Origin = T::RuntimeOrigin; fn on_dispute( disputes: &[MarketDispute], diff --git a/zrml/court/src/mock.rs b/zrml/court/src/mock.rs index 8152b44b7..9167f6dc3 100644 --- a/zrml/court/src/mock.rs +++ b/zrml/court/src/mock.rs @@ -116,7 +116,7 @@ impl DisputeResolutionApi for NoopResolution { impl crate::Config for Runtime { type CourtCaseDuration = CourtCaseDuration; type DisputeResolution = NoopResolution; - type Event = (); + type RuntimeEvent = (); type MarketCommons = MarketCommons; type PalletId = CourtPalletId; type Random = RandomnessCollectiveFlip; @@ -133,9 +133,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -144,7 +144,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -156,7 +156,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/court/src/tests.rs b/zrml/court/src/tests.rs index 46624e6a5..48fc37a10 100644 --- a/zrml/court/src/tests.rs +++ b/zrml/court/src/tests.rs @@ -20,8 +20,8 @@ use crate::{ mock::{ - Balances, Court, ExtBuilder, Origin, RandomnessCollectiveFlip, Runtime, System, ALICE, BOB, - CHARLIE, INITIAL_BALANCE, + Balances, Court, ExtBuilder, RandomnessCollectiveFlip, Runtime, RuntimeOrigin, System, + ALICE, BOB, CHARLIE, INITIAL_BALANCE, }, Error, Juror, JurorStatus, Jurors, MarketOf, RequestedJurors, Votes, }; @@ -68,11 +68,11 @@ const DEFAULT_SET_OF_JURORS: &[(u128, Juror)] = &[ #[test] fn exit_court_successfully_removes_a_juror_and_frees_balances() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Court::join_court(Origin::signed(ALICE))); + assert_ok!(Court::join_court(RuntimeOrigin::signed(ALICE))); assert_eq!(Jurors::::iter().count(), 1); assert_eq!(Balances::free_balance(ALICE), 998 * BASE); assert_eq!(Balances::reserved_balance_named(&Court::reserve_id(), &ALICE), 2 * BASE); - assert_ok!(Court::exit_court(Origin::signed(ALICE))); + assert_ok!(Court::exit_court(RuntimeOrigin::signed(ALICE))); assert_eq!(Jurors::::iter().count(), 0); assert_eq!(Balances::free_balance(ALICE), INITIAL_BALANCE); assert_eq!(Balances::reserved_balance_named(&Court::reserve_id(), &ALICE), 0); @@ -83,7 +83,7 @@ fn exit_court_successfully_removes_a_juror_and_frees_balances() { fn exit_court_will_not_remove_an_unknown_juror() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Court::exit_court(Origin::signed(ALICE)), + Court::exit_court(RuntimeOrigin::signed(ALICE)), Error::::JurorDoesNotExists ); }); @@ -93,12 +93,12 @@ fn exit_court_will_not_remove_an_unknown_juror() { fn join_court_reserves_balance_according_to_the_number_of_jurors() { ExtBuilder::default().build().execute_with(|| { assert_eq!(Balances::free_balance(ALICE), 1000 * BASE); - assert_ok!(Court::join_court(Origin::signed(ALICE))); + assert_ok!(Court::join_court(RuntimeOrigin::signed(ALICE))); assert_eq!(Balances::free_balance(ALICE), 998 * BASE); assert_eq!(Balances::reserved_balance_named(&Court::reserve_id(), &ALICE), 2 * BASE); assert_eq!(Balances::free_balance(BOB), 1000 * BASE); - assert_ok!(Court::join_court(Origin::signed(BOB))); + assert_ok!(Court::join_court(RuntimeOrigin::signed(BOB))); assert_eq!(Balances::free_balance(BOB), 996 * BASE); assert_eq!(Balances::reserved_balance_named(&Court::reserve_id(), &BOB), 4 * BASE); }); @@ -107,7 +107,7 @@ fn join_court_reserves_balance_according_to_the_number_of_jurors() { #[test] fn join_court_successfully_stores_a_juror() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Court::join_court(Origin::signed(ALICE))); + assert_ok!(Court::join_court(RuntimeOrigin::signed(ALICE))); assert_eq!( Jurors::::iter().next().unwrap(), (ALICE, Juror { status: JurorStatus::Ok }) @@ -118,9 +118,9 @@ fn join_court_successfully_stores_a_juror() { #[test] fn join_court_will_not_insert_an_already_stored_juror() { ExtBuilder::default().build().execute_with(|| { - assert_ok!(Court::join_court(Origin::signed(ALICE))); + assert_ok!(Court::join_court(RuntimeOrigin::signed(ALICE))); assert_noop!( - Court::join_court(Origin::signed(ALICE)), + Court::join_court(RuntimeOrigin::signed(ALICE)), Error::::JurorAlreadyExists ); }); @@ -154,11 +154,11 @@ fn on_resolution_denies_non_court_markets() { fn on_dispute_stores_jurors_that_should_vote() { ExtBuilder::default().build().execute_with(|| { setup_blocks(123); - let _ = Court::join_court(Origin::signed(ALICE)); - let _ = Court::join_court(Origin::signed(BOB)); + let _ = Court::join_court(RuntimeOrigin::signed(ALICE)); + let _ = Court::join_court(RuntimeOrigin::signed(BOB)); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); assert_noop!( - Court::join_court(Origin::signed(ALICE)), + Court::join_court(RuntimeOrigin::signed(ALICE)), Error::::JurorAlreadyExists ); assert_eq!(RequestedJurors::::iter().count(), 2); @@ -170,13 +170,13 @@ fn on_dispute_stores_jurors_that_should_vote() { fn on_resolution_awards_winners_and_slashes_losers() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); - Court::join_court(Origin::signed(CHARLIE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); + Court::join_court(RuntimeOrigin::signed(CHARLIE)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(BOB), 0, OutcomeReport::Scalar(2)).unwrap(); - Court::vote(Origin::signed(CHARLIE), 0, OutcomeReport::Scalar(3)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(2)).unwrap(); + Court::vote(RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Scalar(3)).unwrap(); let _ = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); assert_eq!(Balances::free_balance(ALICE), 998 * BASE + 3 * BASE); assert_eq!(Balances::reserved_balance_named(&Court::reserve_id(), &ALICE), 2 * BASE); @@ -191,13 +191,13 @@ fn on_resolution_awards_winners_and_slashes_losers() { fn on_resolution_decides_market_outcome_based_on_the_majority() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); - Court::join_court(Origin::signed(CHARLIE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); + Court::join_court(RuntimeOrigin::signed(CHARLIE)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); let outcome = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); assert_eq!(outcome, Some(OutcomeReport::Scalar(1))); }); @@ -207,9 +207,9 @@ fn on_resolution_decides_market_outcome_based_on_the_majority() { fn on_resolution_sets_late_jurors_as_tardy() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); let _ = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); assert_eq!(Jurors::::get(ALICE).unwrap().status, JurorStatus::Ok); @@ -221,13 +221,13 @@ fn on_resolution_sets_late_jurors_as_tardy() { fn on_resolution_sets_jurors_that_voted_on_the_second_most_voted_outcome_as_tardy() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); - Court::join_court(Origin::signed(CHARLIE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); + Court::join_court(RuntimeOrigin::signed(CHARLIE)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); let _ = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); assert_eq!(Jurors::::get(CHARLIE).unwrap().status, JurorStatus::Tardy); }); @@ -237,10 +237,10 @@ fn on_resolution_sets_jurors_that_voted_on_the_second_most_voted_outcome_as_tard fn on_resolution_punishes_tardy_jurors_that_failed_to_vote_a_second_time() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); Court::set_stored_juror_as_tardy(&BOB).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); let _ = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); let join_court_stake = 40000000000; @@ -255,13 +255,13 @@ fn on_resolution_punishes_tardy_jurors_that_failed_to_vote_a_second_time() { fn on_resolution_removes_requested_jurors_and_votes() { ExtBuilder::default().build().execute_with(|| { setup_blocks(2); - Court::join_court(Origin::signed(ALICE)).unwrap(); - Court::join_court(Origin::signed(BOB)).unwrap(); - Court::join_court(Origin::signed(CHARLIE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(ALICE)).unwrap(); + Court::join_court(RuntimeOrigin::signed(BOB)).unwrap(); + Court::join_court(RuntimeOrigin::signed(CHARLIE)).unwrap(); Court::on_dispute(&[], &0, &DEFAULT_MARKET).unwrap(); - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); - Court::vote(Origin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(1)).unwrap(); + Court::vote(RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Scalar(2)).unwrap(); let _ = Court::on_resolution(&[], &0, &DEFAULT_MARKET).unwrap(); assert_eq!(RequestedJurors::::iter().count(), 0); assert_eq!(Votes::::iter().count(), 0); @@ -318,7 +318,7 @@ fn random_jurors_returns_a_subset_of_jurors() { fn vote_will_not_accept_unknown_accounts() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(0)), + Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(0)), Error::::OnlyJurorsCanVote ); }); @@ -327,8 +327,8 @@ fn vote_will_not_accept_unknown_accounts() { #[test] fn vote_will_stored_outcome_from_a_juror() { ExtBuilder::default().build().execute_with(|| { - let _ = Court::join_court(Origin::signed(ALICE)); - let _ = Court::vote(Origin::signed(ALICE), 0, OutcomeReport::Scalar(0)); + let _ = Court::join_court(RuntimeOrigin::signed(ALICE)); + let _ = Court::vote(RuntimeOrigin::signed(ALICE), 0, OutcomeReport::Scalar(0)); assert_eq!(Votes::::get(ALICE, 0).unwrap(), (0, OutcomeReport::Scalar(0))); }); } diff --git a/zrml/court/src/weights.rs b/zrml/court/src/weights.rs index 96b5e68a9..c1344abd2 100644 --- a/zrml/court/src/weights.rs +++ b/zrml/court/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_court //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -60,7 +60,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Court RequestedJurors (r:1 w:0) // Storage: Court Votes (r:1 w:0) fn exit_court() -> Weight { - Weight::from_ref_time(76_500_000) + Weight::from_ref_time(32_565_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -68,14 +68,14 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Court CounterForJurors (r:1 w:1) // Storage: Balances Reserves (r:1 w:1) fn join_court() -> Weight { - Weight::from_ref_time(54_370_000) + Weight::from_ref_time(23_581_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: Court Jurors (r:1 w:0) // Storage: Court Votes (r:0 w:1) fn vote() -> Weight { - Weight::from_ref_time(25_540_000) + Weight::from_ref_time(10_028_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/zrml/global-disputes/Cargo.toml b/zrml/global-disputes/Cargo.toml index dde21457d..25a78dbba 100644 --- a/zrml/global-disputes/Cargo.toml +++ b/zrml/global-disputes/Cargo.toml @@ -1,11 +1,11 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-std = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-std = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-market-commons = { default-features = false, path = "../market-commons" } @@ -14,9 +14,9 @@ num-traits = { version = "0.2.15", default-features = false, optional = true } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } test-case = "2.0.2" diff --git a/zrml/global-disputes/src/benchmarks.rs b/zrml/global-disputes/src/benchmarks.rs index 2c7788b31..ef5d2bec9 100644 --- a/zrml/global-disputes/src/benchmarks.rs +++ b/zrml/global-disputes/src/benchmarks.rs @@ -47,7 +47,7 @@ where T::Currency::deposit_creating(caller, BalanceOf::::max_value() / 2u128.saturated_into()); } -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { frame_system::Pallet::::assert_last_event(generic_event.into()); } diff --git a/zrml/global-disputes/src/lib.rs b/zrml/global-disputes/src/lib.rs index 5d442f72a..8798937ba 100644 --- a/zrml/global-disputes/src/lib.rs +++ b/zrml/global-disputes/src/lib.rs @@ -58,7 +58,7 @@ mod pallet { /// The currency implementation used to lock tokens for voting. type Currency: LockableCurrency; - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The vote lock identifier. #[pallet::constant] diff --git a/zrml/global-disputes/src/mock.rs b/zrml/global-disputes/src/mock.rs index f865ca367..82750e2ed 100644 --- a/zrml/global-disputes/src/mock.rs +++ b/zrml/global-disputes/src/mock.rs @@ -63,7 +63,7 @@ parameter_types! { impl crate::Config for Runtime { type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type GlobalDisputeLockId = GlobalDisputeLockId; type GlobalDisputesPalletId = GlobalDisputesPalletId; type MarketCommons = MarketCommons; @@ -83,9 +83,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -94,7 +94,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -106,7 +106,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/global-disputes/src/tests.rs b/zrml/global-disputes/src/tests.rs index 4af2596ba..f070a6be2 100644 --- a/zrml/global-disputes/src/tests.rs +++ b/zrml/global-disputes/src/tests.rs @@ -83,7 +83,7 @@ fn add_vote_outcome_works() { let free_balance_reward_account = Balances::free_balance(GlobalDisputes::reward_account(&market_id)); assert_ok!(GlobalDisputes::add_vote_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), )); @@ -112,7 +112,7 @@ fn add_vote_outcome_fails_if_no_global_dispute_present() { let market_id = 0u128; assert_noop!( GlobalDisputes::add_vote_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), ), @@ -131,7 +131,7 @@ fn add_vote_outcome_fails_if_global_dispute_finished() { assert_noop!( GlobalDisputes::add_vote_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), ), @@ -158,7 +158,7 @@ fn add_vote_outcome_fails_if_outcome_already_exists() { ); assert_noop!( GlobalDisputes::add_vote_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), ), @@ -180,7 +180,7 @@ fn add_vote_outcome_fails_if_balance_too_low() { .unwrap(); assert_noop!( GlobalDisputes::add_vote_outcome( - Origin::signed(POOR_PAUL), + RuntimeOrigin::signed(POOR_PAUL), market_id, OutcomeReport::Scalar(20), ), @@ -216,11 +216,11 @@ fn reward_outcome_owner_works_for_multiple_owners() { let free_balance_bob_before = Balances::free_balance(&BOB); let free_balance_charlie_before = Balances::free_balance(&CHARLIE); - assert_ok!(GlobalDisputes::purge_outcomes(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::purge_outcomes(RuntimeOrigin::signed(ALICE), market_id,)); System::assert_last_event(Event::::OutcomesFullyCleaned { market_id }.into()); - assert_ok!(GlobalDisputes::reward_outcome_owner(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::reward_outcome_owner(RuntimeOrigin::signed(ALICE), market_id,)); System::assert_last_event( Event::::OutcomeOwnersRewarded { @@ -264,9 +264,9 @@ fn reward_outcome_owner_has_dust() { }; >::insert(market_id, winner_info); - assert_ok!(GlobalDisputes::purge_outcomes(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::purge_outcomes(RuntimeOrigin::signed(ALICE), market_id,)); - assert_ok!(GlobalDisputes::reward_outcome_owner(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::reward_outcome_owner(RuntimeOrigin::signed(ALICE), market_id,)); // 100 * BASE = 1_000_000_000_000 checked_div 6 = 166_666_666_666 // 166_666_666_666 * 6 = 999_999_999_996 so 4 left @@ -297,13 +297,13 @@ fn reward_outcome_owner_works_for_one_owner() { }; >::insert(market_id, winner_info); - assert_ok!(GlobalDisputes::purge_outcomes(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::purge_outcomes(RuntimeOrigin::signed(ALICE), market_id,)); System::assert_last_event(Event::::OutcomesFullyCleaned { market_id }.into()); let free_balance_alice_before = Balances::free_balance(&ALICE); - assert_ok!(GlobalDisputes::reward_outcome_owner(Origin::signed(ALICE), market_id)); + assert_ok!(GlobalDisputes::reward_outcome_owner(RuntimeOrigin::signed(ALICE), market_id)); System::assert_last_event( Event::::OutcomeOwnersRewarded { market_id, owners: vec![ALICE] }.into(), @@ -332,7 +332,7 @@ fn reward_outcome_owner_works_for_no_reward_funds() { }; >::insert(market_id, winner_info); - assert_ok!(GlobalDisputes::purge_outcomes(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::purge_outcomes(RuntimeOrigin::signed(ALICE), market_id,)); System::assert_last_event(Event::::OutcomesFullyCleaned { market_id }.into()); @@ -344,7 +344,7 @@ fn reward_outcome_owner_works_for_no_reward_funds() { // so no loosers, who provided the VotingOutcomeFee assert!(reward_account_free_balance.is_zero()); - assert_ok!(GlobalDisputes::reward_outcome_owner(Origin::signed(ALICE), market_id)); + assert_ok!(GlobalDisputes::reward_outcome_owner(RuntimeOrigin::signed(ALICE), market_id)); System::assert_last_event( Event::::OutcomeOwnersRewardedWithNoFunds { market_id }.into(), @@ -391,7 +391,7 @@ fn vote_fails_if_amount_below_min_outcome_vote_amount() { assert_noop!( GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(40), MinOutcomeVoteAmount::get() - 1, @@ -422,7 +422,7 @@ fn vote_fails_for_insufficient_funds() { // Paul does not have 50 * BASE assert_noop!( GlobalDisputes::vote_on_outcome( - Origin::signed(POOR_PAUL), + RuntimeOrigin::signed(POOR_PAUL), market_id, OutcomeReport::Scalar(0), 50 * BASE @@ -440,28 +440,28 @@ fn determine_voting_winner_sets_the_last_outcome_for_same_vote_balances_as_the_c setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(0), 42 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(20), 42 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(40), 42 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(60), 42 * BASE @@ -485,7 +485,7 @@ fn vote_on_outcome_check_event() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(60), 42 * BASE @@ -537,7 +537,7 @@ fn reserve_before_init_vote_outcome_is_not_allowed_for_voting() { assert_noop!( GlobalDisputes::vote_on_outcome( - Origin::signed(*disputor), + RuntimeOrigin::signed(*disputor), market_id, OutcomeReport::Scalar(0), arbitrary_amount + 1 @@ -546,7 +546,7 @@ fn reserve_before_init_vote_outcome_is_not_allowed_for_voting() { ); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(*disputor), + RuntimeOrigin::signed(*disputor), market_id, OutcomeReport::Scalar(0), arbitrary_amount @@ -573,7 +573,7 @@ fn transfer_fails_with_fully_locked_balance() { let arbitrary_amount = 42 * BASE; assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(*disputor), + RuntimeOrigin::signed(*disputor), market_id, OutcomeReport::Scalar(0), free_balance_disputor_before - arbitrary_amount @@ -586,10 +586,10 @@ fn transfer_fails_with_fully_locked_balance() { ); assert_noop!( - Balances::transfer(Origin::signed(*disputor), BOB, arbitrary_amount + 1), + Balances::transfer(RuntimeOrigin::signed(*disputor), BOB, arbitrary_amount + 1), pallet_balances::Error::::LiquidityRestrictions ); - assert_ok!(Balances::transfer(Origin::signed(*disputor), BOB, arbitrary_amount)); + assert_ok!(Balances::transfer(RuntimeOrigin::signed(*disputor), BOB, arbitrary_amount)); }); } @@ -605,7 +605,7 @@ fn reserve_fails_with_fully_locked_balance() { let arbitrary_amount = 42 * BASE; assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(*disputor), + RuntimeOrigin::signed(*disputor), market_id, OutcomeReport::Scalar(0), free_balance_disputor_before - arbitrary_amount @@ -633,26 +633,26 @@ fn determine_voting_winner_works_four_outcome_votes() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(0), 10 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(20), 10 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(40), 11 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(60), 10 * BASE @@ -680,25 +680,25 @@ fn determine_voting_winner_works_three_outcome_votes() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), 30 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(40), 50 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(0), 10 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(0), 41 * BASE @@ -724,25 +724,25 @@ fn determine_voting_winner_works_two_outcome_votes() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(60), 10 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(20), 50 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(60), 20 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(60), 21 * BASE @@ -768,7 +768,7 @@ fn determine_voting_winner_works_with_accumulated_votes_for_alice() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), BASE @@ -776,7 +776,7 @@ fn determine_voting_winner_works_with_accumulated_votes_for_alice() { check_outcome_sum(&market_id, OutcomeReport::Scalar(20), BASE); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(0), 10 * BASE @@ -784,7 +784,7 @@ fn determine_voting_winner_works_with_accumulated_votes_for_alice() { check_outcome_sum(&market_id, OutcomeReport::Scalar(0), 10 * BASE); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), 10 * BASE @@ -792,7 +792,7 @@ fn determine_voting_winner_works_with_accumulated_votes_for_alice() { check_outcome_sum(&market_id, OutcomeReport::Scalar(20), 11 * BASE); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(0), 40 * BASE @@ -802,7 +802,7 @@ fn determine_voting_winner_works_with_accumulated_votes_for_alice() { // Now Alice wins again assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(20), 40 * BASE @@ -826,14 +826,14 @@ fn reward_outcome_owner_cleans_outcome_info() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(0), 10 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(20), 10 * BASE @@ -845,14 +845,14 @@ fn reward_outcome_owner_cleans_outcome_info() { assert!(GlobalDisputes::determine_voting_winner(&market_id).is_some()); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); - assert_ok!(GlobalDisputes::purge_outcomes(Origin::signed(ALICE), market_id,)); + assert_ok!(GlobalDisputes::purge_outcomes(RuntimeOrigin::signed(ALICE), market_id,)); System::assert_last_event(Event::::OutcomesFullyCleaned { market_id }.into()); - assert_ok!(GlobalDisputes::reward_outcome_owner(Origin::signed(BOB), market_id,)); + assert_ok!(GlobalDisputes::reward_outcome_owner(RuntimeOrigin::signed(BOB), market_id,)); assert_eq!(>::iter_prefix(market_id).next(), None); }); @@ -866,7 +866,7 @@ fn unlock_clears_lock_info() { setup_vote_outcomes_with_hundred(&market_id); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(0), 50 * BASE @@ -876,7 +876,7 @@ fn unlock_clears_lock_info() { assert_eq!(>::get(ALICE), vec![(market_id, 50 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![]); }); @@ -917,7 +917,7 @@ fn vote_fails_if_outcome_does_not_exist() { assert_noop!( GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(42), 50 * BASE @@ -944,25 +944,25 @@ fn locking_works_for_one_market() { assert!(Balances::locks(EVE).is_empty()); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id, OutcomeReport::Scalar(0), 50 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Scalar(20), 40 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Scalar(40), 30 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), market_id, OutcomeReport::Scalar(60), 20 * BASE @@ -982,7 +982,7 @@ fn locking_works_for_one_market() { assert_eq!(>::get(ALICE), vec![(market_id, 50 * BASE)]); assert_eq!(Balances::locks(ALICE), vec![the_lock(50 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![]); assert!(Balances::locks(ALICE).is_empty()); @@ -993,7 +993,7 @@ fn locking_works_for_one_market() { assert_eq!(>::get(EVE), vec![(market_id, 20 * BASE)]); assert_eq!(Balances::locks(EVE), vec![the_lock(20 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); assert_eq!(>::get(BOB), vec![]); assert!(Balances::locks(BOB).is_empty()); assert_eq!(>::get(CHARLIE), vec![(market_id, 30 * BASE)]); @@ -1001,13 +1001,13 @@ fn locking_works_for_one_market() { assert_eq!(>::get(EVE), vec![(market_id, 20 * BASE)]); assert_eq!(Balances::locks(EVE), vec![the_lock(20 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(CHARLIE), CHARLIE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(CHARLIE), CHARLIE)); assert_eq!(>::get(CHARLIE), vec![]); assert!(Balances::locks(CHARLIE).is_empty()); assert_eq!(>::get(EVE), vec![(market_id, 20 * BASE)]); assert_eq!(Balances::locks(EVE), vec![the_lock(20 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(EVE), EVE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(EVE), EVE)); assert_eq!(>::get(EVE), vec![]); assert!(Balances::locks(EVE).is_empty()); }); @@ -1028,26 +1028,26 @@ fn locking_works_for_two_markets_with_stronger_first_unlock() { assert!(Balances::locks(BOB).is_empty()); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id_1, OutcomeReport::Scalar(0), 50 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id_1, OutcomeReport::Scalar(20), 40 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id_2, OutcomeReport::Scalar(0), 30 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id_2, OutcomeReport::Scalar(20), 20 * BASE @@ -1072,7 +1072,7 @@ fn locking_works_for_two_markets_with_stronger_first_unlock() { vec![(market_id_1, 50 * BASE), (market_id_2, 30 * BASE)] ); assert_eq!(Balances::locks(ALICE), vec![the_lock(50 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![(market_id_2, 30 * BASE)]); assert_eq!(Balances::locks(ALICE), vec![the_lock(30 * BASE)]); assert_eq!( @@ -1081,7 +1081,7 @@ fn locking_works_for_two_markets_with_stronger_first_unlock() { ); assert_eq!(Balances::locks(BOB), vec![the_lock(40 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); assert_eq!(>::get(BOB), vec![(market_id_2, 20 * BASE)]); assert_eq!(Balances::locks(BOB), vec![the_lock(20 * BASE)]); assert_eq!(>::get(ALICE), vec![(market_id_2, 30 * BASE)]); @@ -1090,14 +1090,14 @@ fn locking_works_for_two_markets_with_stronger_first_unlock() { assert!(GlobalDisputes::determine_voting_winner(&market_id_2).is_some()); assert_eq!(>::get(ALICE), vec![(market_id_2, 30 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![]); assert!(Balances::locks(ALICE).is_empty()); assert_eq!(>::get(BOB), vec![(market_id_2, 20 * BASE)]); assert_eq!(Balances::locks(BOB), vec![the_lock(20 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); assert_eq!(>::get(BOB), vec![]); assert!(Balances::locks(BOB).is_empty()); }); @@ -1118,26 +1118,26 @@ fn locking_works_for_two_markets_with_weaker_first_unlock() { assert!(Balances::locks(BOB).is_empty()); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id_1, OutcomeReport::Scalar(0), 50 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id_1, OutcomeReport::Scalar(20), 40 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), market_id_2, OutcomeReport::Scalar(0), 30 * BASE )); assert_ok!(GlobalDisputes::vote_on_outcome( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id_2, OutcomeReport::Scalar(20), 20 * BASE @@ -1162,7 +1162,7 @@ fn locking_works_for_two_markets_with_weaker_first_unlock() { vec![(market_id_1, 50 * BASE), (market_id_2, 30 * BASE)] ); assert_eq!(Balances::locks(ALICE), vec![the_lock(50 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![(market_id_1, 50 * BASE)]); assert_eq!(Balances::locks(ALICE), vec![the_lock(50 * BASE)]); assert_eq!( @@ -1171,7 +1171,7 @@ fn locking_works_for_two_markets_with_weaker_first_unlock() { ); assert_eq!(Balances::locks(BOB), vec![the_lock(40 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); assert_eq!(>::get(BOB), vec![(market_id_1, 40 * BASE)]); assert_eq!(Balances::locks(BOB), vec![the_lock(40 * BASE)]); assert_eq!(>::get(ALICE), vec![(market_id_1, 50 * BASE)]); @@ -1181,14 +1181,14 @@ fn locking_works_for_two_markets_with_weaker_first_unlock() { assert_eq!(>::get(ALICE), vec![(market_id_1, 50 * BASE)]); assert_eq!(Balances::locks(ALICE), vec![the_lock(50 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(ALICE), ALICE)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(ALICE), ALICE)); assert_eq!(>::get(ALICE), vec![]); assert!(Balances::locks(ALICE).is_empty()); assert_eq!(>::get(BOB), vec![(market_id_1, 40 * BASE)]); assert_eq!(Balances::locks(BOB), vec![the_lock(40 * BASE)]); - assert_ok!(GlobalDisputes::unlock_vote_balance(Origin::signed(BOB), BOB)); + assert_ok!(GlobalDisputes::unlock_vote_balance(RuntimeOrigin::signed(BOB), BOB)); assert_eq!(>::get(BOB), vec![]); assert!(Balances::locks(BOB).is_empty()); }); diff --git a/zrml/global-disputes/src/weights.rs b/zrml/global-disputes/src/weights.rs index abf1738a7..0e107852d 100644 --- a/zrml/global-disputes/src/weights.rs +++ b/zrml/global-disputes/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_global_disputes //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -62,12 +62,10 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: GlobalDisputes Outcomes (r:1 w:1) // Storage: GlobalDisputes Locks (r:1 w:1) // Storage: Balances Locks (r:1 w:1) - fn vote_on_outcome(o: u32, v: u32) -> Weight { - Weight::from_ref_time(78_818_000) - // Standard Error: 21_000 - .saturating_add(Weight::from_ref_time(23_000).saturating_mul(o.into())) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(90_000).saturating_mul(v.into())) + fn vote_on_outcome(_o: u32, v: u32) -> Weight { + Weight::from_ref_time(33_191_681) + // Standard Error: 369 + .saturating_add(Weight::from_ref_time(37_828).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -76,11 +74,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: GlobalDisputes Winners (r:5 w:0) fn unlock_vote_balance_set(l: u32, o: u32) -> Weight { - Weight::from_ref_time(43_696_000) - // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(3_636_000).saturating_mul(l.into())) - // Standard Error: 61_000 - .saturating_add(Weight::from_ref_time(1_467_000).saturating_mul(o.into())) + Weight::from_ref_time(18_127_027) + // Standard Error: 839 + .saturating_add(Weight::from_ref_time(1_534_897).saturating_mul(l.into())) + // Standard Error: 4_699 + .saturating_add(Weight::from_ref_time(401_151).saturating_mul(o.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(l.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -90,11 +88,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: GlobalDisputes Winners (r:5 w:0) fn unlock_vote_balance_remove(l: u32, o: u32) -> Weight { - Weight::from_ref_time(40_327_000) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(3_508_000).saturating_mul(l.into())) - // Standard Error: 55_000 - .saturating_add(Weight::from_ref_time(1_279_000).saturating_mul(o.into())) + Weight::from_ref_time(17_109_385) + // Standard Error: 607 + .saturating_add(Weight::from_ref_time(1_486_668).saturating_mul(l.into())) + // Standard Error: 3_398 + .saturating_add(Weight::from_ref_time(314_814).saturating_mul(o.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(l.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -102,8 +100,10 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: GlobalDisputes Winners (r:1 w:1) // Storage: GlobalDisputes Outcomes (r:1 w:1) // Storage: System Account (r:1 w:1) - fn add_vote_outcome(_w: u32) -> Weight { - Weight::from_ref_time(87_507_000) + fn add_vote_outcome(w: u32) -> Weight { + Weight::from_ref_time(35_150_950) + // Standard Error: 1_710 + .saturating_add(Weight::from_ref_time(19_709).saturating_mul(w.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -111,9 +111,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: GlobalDisputes Winners (r:1 w:0) // Storage: System Account (r:2 w:2) fn reward_outcome_owner_with_funds(o: u32) -> Weight { - Weight::from_ref_time(54_189_000) - // Standard Error: 75_000 - .saturating_add(Weight::from_ref_time(29_563_000).saturating_mul(o.into())) + Weight::from_ref_time(24_395_149) + // Standard Error: 13_698 + .saturating_add(Weight::from_ref_time(11_889_863).saturating_mul(o.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(o.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -123,16 +123,14 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: GlobalDisputes Winners (r:1 w:0) // Storage: System Account (r:1 w:0) fn reward_outcome_owner_no_funds(_o: u32) -> Weight { - Weight::from_ref_time(46_706_000).saturating_add(T::DbWeight::get().reads(3)) + Weight::from_ref_time(17_745_809).saturating_add(T::DbWeight::get().reads(3)) } // Storage: GlobalDisputes Winners (r:1 w:1) // Storage: GlobalDisputes Outcomes (r:3 w:2) - fn purge_outcomes(k: u32, o: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(18_932_000).saturating_mul(k.into())) - // Standard Error: 606_000 - .saturating_add(Weight::from_ref_time(10_914_000).saturating_mul(o.into())) + fn purge_outcomes(k: u32, _o: u32) -> Weight { + Weight::from_ref_time(34_095_000) + // Standard Error: 1_848 + .saturating_add(Weight::from_ref_time(7_103_707).saturating_mul(k.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(k.into()))) .saturating_add(T::DbWeight::get().writes(2)) diff --git a/zrml/liquidity-mining/Cargo.toml b/zrml/liquidity-mining/Cargo.toml index 7559a5db9..f143dff10 100644 --- a/zrml/liquidity-mining/Cargo.toml +++ b/zrml/liquidity-mining/Cargo.toml @@ -1,18 +1,18 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { default-features = false, optional = true, version = "1.0.144" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-market-commons = { default-features = false, path = "../market-commons" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/liquidity-mining/src/lib.rs b/zrml/liquidity-mining/src/lib.rs index 186f85bf5..c3a8ac5c4 100644 --- a/zrml/liquidity-mining/src/lib.rs +++ b/zrml/liquidity-mining/src/lib.rs @@ -101,7 +101,7 @@ mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type MarketCommons: MarketCommonsPalletApi< AccountId = Self::AccountId, diff --git a/zrml/liquidity-mining/src/mock.rs b/zrml/liquidity-mining/src/mock.rs index b4b48eb69..f11b7e2db 100644 --- a/zrml/liquidity-mining/src/mock.rs +++ b/zrml/liquidity-mining/src/mock.rs @@ -57,7 +57,7 @@ construct_runtime!( ); impl crate::Config for Runtime { - type Event = (); + type RuntimeEvent = (); type MarketCommons = MarketCommons; type MarketId = MarketId; type PalletId = LiquidityMiningPalletId; @@ -72,9 +72,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -83,7 +83,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -96,7 +96,7 @@ impl pallet_balances::Config for Runtime { type Balance = Balance; type DustRemoval = (); type ReserveIdentifier = [u8; 8]; - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; diff --git a/zrml/liquidity-mining/src/tests.rs b/zrml/liquidity-mining/src/tests.rs index 818be27f0..c4c2deb76 100644 --- a/zrml/liquidity-mining/src/tests.rs +++ b/zrml/liquidity-mining/src/tests.rs @@ -19,7 +19,7 @@ #![cfg(test)] use crate::{ - mock::{Balances, ExtBuilder, LiquidityMining, Origin, Runtime, System, ALICE, BOB}, + mock::{Balances, ExtBuilder, LiquidityMining, Runtime, RuntimeOrigin, System, ALICE, BOB}, track_incentives_based_on_bought_shares::TrackIncentivesBasedOnBoughtShares, track_incentives_based_on_sold_shares::TrackIncentivesBasedOnSoldShares, BlockBoughtShares, BlockSoldShares, LiquidityMiningPalletApi as _, OwnedValues, @@ -193,7 +193,7 @@ fn only_sudo_can_change_per_block_distribution() { ExtBuilder::default().build().execute_with(|| { assert_ok!(LiquidityMining::set_per_block_distribution(RawOrigin::Root.into(), 100)); assert_err!( - LiquidityMining::set_per_block_distribution(Origin::signed(ALICE), 100), + LiquidityMining::set_per_block_distribution(RuntimeOrigin::signed(ALICE), 100), DispatchError::BadOrigin ); }); diff --git a/zrml/liquidity-mining/src/weights.rs b/zrml/liquidity-mining/src/weights.rs index 5a8c215f4..17bd8677d 100644 --- a/zrml/liquidity-mining/src/weights.rs +++ b/zrml/liquidity-mining/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_liquidity_mining //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -54,6 +54,6 @@ pub struct WeightInfo(PhantomData); impl WeightInfoZeitgeist for WeightInfo { // Storage: LiquidityMining PerBlockIncentive (r:0 w:1) fn set_per_block_distribution() -> Weight { - Weight::from_ref_time(8_150_000).saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(2_691_000).saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/zrml/market-commons/Cargo.toml b/zrml/market-commons/Cargo.toml index ad44a7d7e..ae85191f5 100644 --- a/zrml/market-commons/Cargo.toml +++ b/zrml/market-commons/Cargo.toml @@ -1,16 +1,16 @@ [dependencies] -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-arithmetic = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-arithmetic = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/market-commons/src/mock.rs b/zrml/market-commons/src/mock.rs index 3613179fc..1f929435d 100644 --- a/zrml/market-commons/src/mock.rs +++ b/zrml/market-commons/src/mock.rs @@ -61,9 +61,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -72,7 +72,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -84,7 +84,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/orderbook-v1/Cargo.toml b/zrml/orderbook-v1/Cargo.toml index f05ad24a4..e2e7dd6ce 100644 --- a/zrml/orderbook-v1/Cargo.toml +++ b/zrml/orderbook-v1/Cargo.toml @@ -1,18 +1,18 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } # Mock -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +orml-tokens = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } [dev-dependencies] zrml-orderbook-v1 = { features = ["mock"], path = "." } diff --git a/zrml/orderbook-v1/fuzz/Cargo.toml b/zrml/orderbook-v1/fuzz/Cargo.toml index b2c36842f..fcde37c37 100644 --- a/zrml/orderbook-v1/fuzz/Cargo.toml +++ b/zrml/orderbook-v1/fuzz/Cargo.toml @@ -6,7 +6,7 @@ test = false [dependencies] arbitrary = { features = ["derive"], version = "1.0" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } libfuzzer-sys = "0.4" zeitgeist-primitives = { path = "../../../primitives" } zrml-orderbook-v1 = { features = ["mock"], path = ".." } diff --git a/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs b/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs index c624197df..7f43e5f9f 100644 --- a/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs +++ b/zrml/orderbook-v1/fuzz/orderbook_v1_full_workflow.rs @@ -21,7 +21,7 @@ use frame_system::ensure_signed; use libfuzzer_sys::fuzz_target; use zeitgeist_primitives::types::{Asset, ScalarPosition, SerdeWrapper}; use zrml_orderbook_v1::{ - mock::{ExtBuilder, Orderbook, Origin}, + mock::{ExtBuilder, Orderbook, RuntimeOrigin}, OrderSide, }; @@ -34,31 +34,32 @@ fuzz_target!(|data: Data| { // Make arbitrary order and attempt to fill let order_asset = asset(data.make_fill_order_asset); let order_hash = Orderbook::order_hash( - &ensure_signed(Origin::signed(data.make_fill_order_origin.into())).unwrap(), + &ensure_signed(RuntimeOrigin::signed(data.make_fill_order_origin.into())).unwrap(), order_asset, Orderbook::nonce(), ); let _ = Orderbook::make_order( - Origin::signed(data.make_fill_order_origin.into()), + RuntimeOrigin::signed(data.make_fill_order_origin.into()), order_asset, orderside(data.make_fill_order_side), data.make_fill_order_amount, data.make_fill_order_price, ); - let _ = Orderbook::fill_order(Origin::signed(data.fill_order_origin.into()), order_hash); + let _ = + Orderbook::fill_order(RuntimeOrigin::signed(data.fill_order_origin.into()), order_hash); // Make arbitrary order and attempt to cancel let order_asset = asset(data.make_cancel_order_asset); let order_hash = Orderbook::order_hash( - &ensure_signed(Origin::signed(data.make_cancel_order_origin.into())).unwrap(), + &ensure_signed(RuntimeOrigin::signed(data.make_cancel_order_origin.into())).unwrap(), order_asset, Orderbook::nonce(), ); let _ = Orderbook::make_order( - Origin::signed(data.make_cancel_order_origin.into()), + RuntimeOrigin::signed(data.make_cancel_order_origin.into()), order_asset, orderside(data.make_cancel_order_side), data.make_cancel_order_amount, @@ -66,7 +67,7 @@ fuzz_target!(|data: Data| { ); let _ = Orderbook::cancel_order( - Origin::signed(data.make_cancel_order_origin.into()), + RuntimeOrigin::signed(data.make_cancel_order_origin.into()), order_asset, order_hash, ); diff --git a/zrml/orderbook-v1/src/lib.rs b/zrml/orderbook-v1/src/lib.rs index 61cf64ad7..c97f84cec 100644 --- a/zrml/orderbook-v1/src/lib.rs +++ b/zrml/orderbook-v1/src/lib.rs @@ -256,7 +256,7 @@ mod pallet { pub trait Config: frame_system::Config { type Currency: ReservableCurrency; - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type MarketId: MarketId; diff --git a/zrml/orderbook-v1/src/mock.rs b/zrml/orderbook-v1/src/mock.rs index 6cecf478d..d7570fc83 100644 --- a/zrml/orderbook-v1/src/mock.rs +++ b/zrml/orderbook-v1/src/mock.rs @@ -53,7 +53,7 @@ construct_runtime!( impl crate::Config for Runtime { type Currency = Balances; - type Event = (); + type RuntimeEvent = (); type MarketId = MarketId; type Shares = Tokens; type WeightInfo = orderbook_v1::weights::WeightInfo; @@ -67,9 +67,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -78,7 +78,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -91,13 +91,11 @@ impl orml_tokens::Config for Runtime { type Balance = Balance; type CurrencyId = CurrencyId; type DustRemovalWhitelist = Everything; - type Event = (); + type RuntimeEvent = (); type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); type MaxReserves = MaxReserves; - type OnDust = (); - type OnKilledTokenAccount = (); - type OnNewTokenAccount = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); } @@ -106,7 +104,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; diff --git a/zrml/orderbook-v1/src/tests.rs b/zrml/orderbook-v1/src/tests.rs index e448ba140..4bbbd31af 100644 --- a/zrml/orderbook-v1/src/tests.rs +++ b/zrml/orderbook-v1/src/tests.rs @@ -34,7 +34,7 @@ fn it_makes_orders() { // Make an order from Alice to buy shares. assert_ok!(Orderbook::make_order( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::CategoricalOutcome(0, 2), OrderSide::Bid, 25, @@ -47,7 +47,7 @@ fn it_makes_orders() { // Make an order from Bob to sell shares. assert_ok!(Orderbook::make_order( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), Asset::CategoricalOutcome(0, 1), OrderSide::Ask, 10, @@ -67,7 +67,7 @@ fn it_takes_orders() { // Make an order from Bob to sell shares. assert_ok!(Orderbook::make_order( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), Asset::CategoricalOutcome(0, 1), OrderSide::Ask, 10, @@ -75,7 +75,7 @@ fn it_takes_orders() { )); let order_hash = Orderbook::order_hash(&BOB, Asset::CategoricalOutcome(0, 1), 0); - assert_ok!(Orderbook::fill_order(Origin::signed(ALICE), order_hash)); + assert_ok!(Orderbook::fill_order(RuntimeOrigin::signed(ALICE), order_hash)); let alice_bal = >::free_balance(&ALICE); let alice_shares = Tokens::free_balance(Asset::CategoricalOutcome(0, 1), &ALICE); @@ -94,15 +94,21 @@ fn it_cancels_orders() { ExtBuilder::default().build().execute_with(|| { // Make an order from Alice to buy shares. let share_id = Asset::CategoricalOutcome(0, 2); - assert_ok!(Orderbook::make_order(Origin::signed(ALICE), share_id, OrderSide::Bid, 25, 10)); + assert_ok!(Orderbook::make_order( + RuntimeOrigin::signed(ALICE), + share_id, + OrderSide::Bid, + 25, + 10 + )); let order_hash = Orderbook::order_hash(&ALICE, share_id, 0); assert_noop!( - Orderbook::cancel_order(Origin::signed(BOB), share_id, order_hash), + Orderbook::cancel_order(RuntimeOrigin::signed(BOB), share_id, order_hash), Error::::NotOrderCreator, ); - assert_ok!(Orderbook::cancel_order(Origin::signed(ALICE), share_id, order_hash)); + assert_ok!(Orderbook::cancel_order(RuntimeOrigin::signed(ALICE), share_id, order_hash)); }); } diff --git a/zrml/prediction-markets/Cargo.toml b/zrml/prediction-markets/Cargo.toml index f12cf796f..b8a119af2 100644 --- a/zrml/prediction-markets/Cargo.toml +++ b/zrml/prediction-markets/Cargo.toml @@ -1,13 +1,13 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.144", default-features = false, optional = true } -sp-arithmetic = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-arithmetic = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-authorized = { default-features = false, path = "../authorized" } zrml-court = { default-features = false, path = "../court" } @@ -19,17 +19,17 @@ zrml-simple-disputes = { default-features = false, path = "../simple-disputes" } # Mock -orml-asset-registry = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -pallet-randomness-collective-flip = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate", optional = true } -pallet-treasury = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +orml-asset-registry = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-currencies = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-tokens = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +pallet-randomness-collective-flip = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +pallet-timestamp = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate", optional = true } +pallet-treasury = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } substrate-fixed = { optional = true, git = "https://github.com/encointer/substrate-fixed" } -xcm = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/polkadot", optional = true, default-features = false } +xcm = { branch = "release-v0.9.32", git = "https://github.com/paritytech/polkadot", optional = true, default-features = false } zrml-prediction-markets-runtime-api = { features = ["std"], optional = true, path = "./runtime-api" } zrml-rikiddo = { optional = true, path = "../rikiddo" } zrml-swaps = { optional = true, path = "../swaps" } diff --git a/zrml/prediction-markets/fuzz/Cargo.toml b/zrml/prediction-markets/fuzz/Cargo.toml index f0813cf25..e35beb6a4 100644 --- a/zrml/prediction-markets/fuzz/Cargo.toml +++ b/zrml/prediction-markets/fuzz/Cargo.toml @@ -6,7 +6,7 @@ test = false [dependencies] arbitrary = { features = ["derive"], version = "1.0" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } libfuzzer-sys = "0.4" zeitgeist-primitives = { features = ["arbitrary", "mock"], default-features = false, path = "../../../primitives" } zrml-prediction-markets = { features = ["mock"], path = ".." } diff --git a/zrml/prediction-markets/fuzz/pm_full_workflow.rs b/zrml/prediction-markets/fuzz/pm_full_workflow.rs index 920f748cb..edddb77ac 100644 --- a/zrml/prediction-markets/fuzz/pm_full_workflow.rs +++ b/zrml/prediction-markets/fuzz/pm_full_workflow.rs @@ -26,7 +26,7 @@ use zeitgeist_primitives::types::{ Asset, Deadlines, MarketCreation, MarketDisputeMechanism, MarketPeriod, MarketType, MultiHash, OutcomeReport, ScoringRule, }; -use zrml_prediction_markets::mock::{ExtBuilder, Origin, PredictionMarkets, System}; +use zrml_prediction_markets::mock::{ExtBuilder, PredictionMarkets, RuntimeOrigin, System}; fuzz_target!(|data: Data| { let mut ext = ExtBuilder::default().build(); @@ -40,7 +40,7 @@ fuzz_target!(|data: Data| { dispute_duration: 3_u32.into(), }; let _ = PredictionMarkets::create_market( - Origin::signed(data.create_scalar_market_origin.into()), + RuntimeOrigin::signed(data.create_scalar_market_origin.into()), Asset::Ztg, data.create_scalar_market_oracle.into(), MarketPeriod::Block(data.create_scalar_market_period), @@ -56,7 +56,7 @@ fuzz_target!(|data: Data| { System::set_block_number(2); let _ = PredictionMarkets::buy_complete_set( - Origin::signed(data.buy_complete_set_origin.into()), + RuntimeOrigin::signed(data.buy_complete_set_origin.into()), data.buy_complete_set_market_id.into(), data.buy_complete_set_amount, ); @@ -64,7 +64,7 @@ fuzz_target!(|data: Data| { System::set_block_number(3); let _ = PredictionMarkets::report( - Origin::signed(data.report_origin.into()), + RuntimeOrigin::signed(data.report_origin.into()), data.report_market_id.into(), outcome(data.report_outcome), ); @@ -74,7 +74,7 @@ fuzz_target!(|data: Data| { let dispute_market_id = data.dispute_market_id.into(); let _ = PredictionMarkets::dispute( - Origin::signed(data.report_origin.into()), + RuntimeOrigin::signed(data.report_origin.into()), dispute_market_id, outcome(data.report_outcome), ); @@ -83,7 +83,7 @@ fuzz_target!(|data: Data| { System::set_block_number(5); let _ = PredictionMarkets::redeem_shares( - Origin::signed(data.redeem_origin.into()), + RuntimeOrigin::signed(data.redeem_origin.into()), data.redeem_market_id.into(), ); diff --git a/zrml/prediction-markets/runtime-api/Cargo.toml b/zrml/prediction-markets/runtime-api/Cargo.toml index 194f41697..b7bb2c86b 100644 --- a/zrml/prediction-markets/runtime-api/Cargo.toml +++ b/zrml/prediction-markets/runtime-api/Cargo.toml @@ -1,6 +1,6 @@ [dependencies] parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../../primitives" } [features] diff --git a/zrml/prediction-markets/src/benchmarks.rs b/zrml/prediction-markets/src/benchmarks.rs index ad3713ad0..09659c2a3 100644 --- a/zrml/prediction-markets/src/benchmarks.rs +++ b/zrml/prediction-markets/src/benchmarks.rs @@ -49,7 +49,7 @@ use zrml_market_commons::MarketCommonsPalletApi; use frame_support::{traits::Hooks, BoundedVec}; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { frame_system::Pallet::::assert_last_event(generic_event.into()); } diff --git a/zrml/prediction-markets/src/lib.rs b/zrml/prediction-markets/src/lib.rs index 7fda9ce26..164197014 100644 --- a/zrml/prediction-markets/src/lib.rs +++ b/zrml/prediction-markets/src/lib.rs @@ -37,7 +37,7 @@ mod pallet { use alloc::{format, vec, vec::Vec}; use core::{cmp, marker::PhantomData}; use frame_support::{ - dispatch::{DispatchResultWithPostInfo, Weight}, + dispatch::{DispatchResultWithPostInfo, Pays, Weight}, ensure, log, pallet_prelude::{ConstU32, StorageMap, StorageValue, ValueQuery}, storage::{with_transaction, TransactionOutcome}, @@ -45,9 +45,7 @@ mod pallet { tokens::BalanceStatus, Currency, EnsureOrigin, Get, Hooks, Imbalance, IsType, NamedReservableCurrency, OnUnbalanced, StorageVersion, }, - transactional, - weights::Pays, - Blake2_128Concat, BoundedVec, PalletId, Twox64Concat, + transactional, Blake2_128Concat, BoundedVec, PalletId, Twox64Concat, }; use frame_system::{ensure_signed, pallet_prelude::OriginFor}; @@ -1526,7 +1524,7 @@ mod pallet { type AdvisoryBondSlashPercentage: Get; /// The origin that is allowed to approve / reject pending advised markets. - type ApproveOrigin: EnsureOrigin; + type ApproveOrigin: EnsureOrigin; /// Shares of outcome assets and native currency type AssetManager: ZeitgeistAssetManager< @@ -1550,11 +1548,11 @@ mod pallet { BlockNumber = Self::BlockNumber, MarketId = MarketIdOf, Moment = MomentOf, - Origin = Self::Origin, + Origin = Self::RuntimeOrigin, >; /// The origin that is allowed to close markets. - type CloseOrigin: EnsureOrigin; + type CloseOrigin: EnsureOrigin; /// See [`zrml_court::CourtPalletApi`]. type Court: zrml_court::CourtPalletApi< @@ -1563,11 +1561,11 @@ mod pallet { BlockNumber = Self::BlockNumber, MarketId = MarketIdOf, Moment = MomentOf, - Origin = Self::Origin, + Origin = Self::RuntimeOrigin, >; /// The origin that is allowed to destroy markets. - type DestroyOrigin: EnsureOrigin; + type DestroyOrigin: EnsureOrigin; /// The base amount of currency that must be bonded in order to create a dispute. #[pallet::constant] @@ -1579,7 +1577,7 @@ mod pallet { type DisputeFactor: Get>; /// Event - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// See [`GlobalDisputesPalletApi`]. #[cfg(feature = "with-global-disputes")] @@ -1664,7 +1662,7 @@ mod pallet { type PalletId: Get; /// The origin that is allowed to reject pending advised markets. - type RejectOrigin: EnsureOrigin; + type RejectOrigin: EnsureOrigin; /// The base amount of currency that must be bonded to ensure the oracle reports /// in a timely manner. @@ -1672,10 +1670,10 @@ mod pallet { type OracleBond: Get>; /// The origin that is allowed to request edits in pending advised markets. - type RequestEditOrigin: EnsureOrigin; + type RequestEditOrigin: EnsureOrigin; /// The origin that is allowed to resolve markets. - type ResolveOrigin: EnsureOrigin; + type ResolveOrigin: EnsureOrigin; /// See [`DisputeApi`]. type SimpleDisputes: DisputeApi< @@ -1684,7 +1682,7 @@ mod pallet { BlockNumber = Self::BlockNumber, MarketId = MarketIdOf, Moment = MomentOf, - Origin = Self::Origin, + Origin = Self::RuntimeOrigin, >; /// Handler for slashed funds. diff --git a/zrml/prediction-markets/src/migrations.rs b/zrml/prediction-markets/src/migrations.rs index 15c18bf56..e1b0c42ae 100644 --- a/zrml/prediction-markets/src/migrations.rs +++ b/zrml/prediction-markets/src/migrations.rs @@ -26,8 +26,6 @@ use alloc::format; use alloc::vec::Vec; #[cfg(feature = "try-runtime")] use frame_support::migration::storage_key_iter; -#[cfg(feature = "try-runtime")] -use frame_support::traits::OnRuntimeUpgradeHelpersExt; use frame_support::{ dispatch::Weight, log, @@ -150,7 +148,7 @@ impl OnRuntimeUpgrade for AddOutsiderBo } #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result<(), &'static str> { + fn pre_upgrade() -> Result, &'static str> { use frame_support::pallet_prelude::Blake2_128Concat; let old_markets = storage_key_iter::, OldMarketOf, Blake2_128Concat>( @@ -158,7 +156,6 @@ impl OnRuntimeUpgrade for AddOutsiderBo MARKETS, ) .collect::>(); - Self::set_temp_storage(old_markets, "old_markets"); let markets = Markets::::iter_keys().count() as u32; let decodable_markets = Markets::::iter_values().count() as u32; @@ -172,13 +169,14 @@ impl OnRuntimeUpgrade for AddOutsiderBo log::info!("Markets: {}, Decodable Markets: {}", markets, decodable_markets); } - Ok(()) + Ok(old_markets.encode()) } #[cfg(feature = "try-runtime")] - fn post_upgrade() -> Result<(), &'static str> { + fn post_upgrade(previous_state: Vec) -> Result<(), &'static str> { let old_markets: BTreeMap, OldMarketOf> = - Self::get_temp_storage("old_markets").unwrap(); + Decode::decode(&mut &previous_state[..]) + .expect("Failed to decode state: Invalid state"); let new_market_count = >::market_iter().count(); assert_eq!(old_markets.len(), new_market_count); for (market_id, new_market) in >::market_iter() { diff --git a/zrml/prediction-markets/src/mock.rs b/zrml/prediction-markets/src/mock.rs index 04b4d8c95..be8392167 100644 --- a/zrml/prediction-markets/src/mock.rs +++ b/zrml/prediction-markets/src/mock.rs @@ -104,7 +104,7 @@ construct_runtime!( SimpleDisputes: zrml_simple_disputes::{Event, Pallet, Storage}, GlobalDisputes: zrml_global_disputes::{Event, Pallet, Storage}, Swaps: zrml_swaps::{Call, Event, Pallet}, - System: frame_system::{Config, Event, Pallet, Storage}, + System: frame_system::{Call, Config, Event, Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet}, Tokens: orml_tokens::{Config, Event, Pallet, Storage}, Treasury: pallet_treasury::{Call, Event, Pallet, Storage}, @@ -130,7 +130,7 @@ construct_runtime!( RikiddoSigmoidFeeMarketEma: zrml_rikiddo::{Pallet, Storage}, SimpleDisputes: zrml_simple_disputes::{Event, Pallet, Storage}, Swaps: zrml_swaps::{Call, Event, Pallet}, - System: frame_system::{Config, Event, Pallet, Storage}, + System: frame_system::{Call, Config, Event, Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet}, Tokens: orml_tokens::{Config, Event, Pallet, Storage}, Treasury: pallet_treasury::{Call, Event, Pallet, Storage}, @@ -149,7 +149,7 @@ impl crate::Config for Runtime { type DestroyOrigin = EnsureSignedBy; type DisputeBond = DisputeBond; type DisputeFactor = DisputeFactor; - type Event = Event; + type RuntimeEvent = RuntimeEvent; #[cfg(feature = "with-global-disputes")] type GlobalDisputes = GlobalDisputes; #[cfg(feature = "with-global-disputes")] @@ -190,9 +190,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -202,7 +202,7 @@ impl frame_system::Config for Runtime { type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -221,13 +221,11 @@ impl orml_tokens::Config for Runtime { type Balance = Balance; type CurrencyId = CurrencyId; type DustRemovalWhitelist = Everything; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = (); type MaxReserves = MaxReserves; - type OnDust = (); - type OnKilledTokenAccount = (); - type OnNewTokenAccount = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); } @@ -244,7 +242,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type MaxLocks = (); type MaxReserves = MaxReserves; @@ -269,7 +267,7 @@ impl zrml_authorized::Config for Runtime { type AuthorizedDisputeResolutionOrigin = EnsureSignedBy; type CorrectionPeriod = CorrectionPeriod; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputeResolution = prediction_markets::Pallet; type MarketCommons = MarketCommons; type PalletId = AuthorizedPalletId; @@ -279,7 +277,7 @@ impl zrml_authorized::Config for Runtime { impl zrml_court::Config for Runtime { type CourtCaseDuration = CourtCaseDuration; type DisputeResolution = prediction_markets::Pallet; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type PalletId = CourtPalletId; type Random = RandomnessCollectiveFlip; @@ -289,7 +287,7 @@ impl zrml_court::Config for Runtime { } impl zrml_liquidity_mining::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type MarketId = MarketId; type PalletId = LiquidityMiningPalletId; @@ -319,7 +317,7 @@ impl zrml_rikiddo::Config for Runtime { } impl zrml_simple_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DisputeResolution = prediction_markets::Pallet; type MarketCommons = MarketCommons; type PalletId = SimpleDisputesPalletId; @@ -327,7 +325,7 @@ impl zrml_simple_disputes::Config for Runtime { #[cfg(feature = "with-global-disputes")] impl zrml_global_disputes::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type Currency = Balances; type GlobalDisputeLockId = GlobalDisputeLockId; @@ -341,7 +339,7 @@ impl zrml_global_disputes::Config for Runtime { } impl zrml_swaps::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExitFee = ExitFee; type FixedTypeU = ::FixedTypeU; type FixedTypeS = ::FixedTypeS; @@ -368,7 +366,7 @@ impl pallet_treasury::Config for Runtime { type Burn = (); type BurnDestination = (); type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxApprovals = MaxApprovals; type OnSlash = (); type PalletId = TreasuryPalletId; diff --git a/zrml/prediction-markets/src/tests.rs b/zrml/prediction-markets/src/tests.rs index 1dc1a7955..961f59c0a 100644 --- a/zrml/prediction-markets/src/tests.rs +++ b/zrml/prediction-markets/src/tests.rs @@ -96,7 +96,7 @@ fn simple_create_categorical_market( scoring_rule: ScoringRule, ) { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(period), @@ -116,7 +116,7 @@ fn simple_create_scalar_market( scoring_rule: ScoringRule, ) { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(period), @@ -143,7 +143,10 @@ fn admin_move_market_to_closed_successfully_closes_market_and_sets_end_blocknumb ); run_blocks(3); let market_id = 0; - assert_ok!(PredictionMarkets::admin_move_market_to_closed(Origin::signed(SUDO), market_id)); + assert_ok!(PredictionMarkets::admin_move_market_to_closed( + RuntimeOrigin::signed(SUDO), + market_id + )); let market = MarketCommons::market(&market_id).unwrap(); assert_eq!(market.status, MarketStatus::Closed); let new_end = now + 3; @@ -163,7 +166,7 @@ fn admin_move_market_to_closed_successfully_closes_market_and_sets_end_timestamp let end = start + 42.saturated_into::() * MILLISECS_PER_BLOCK as u64; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(start..end), @@ -184,7 +187,10 @@ fn admin_move_market_to_closed_successfully_closes_market_and_sets_end_timestamp set_timestamp_for_on_initialize(start + shift + MILLISECS_PER_BLOCK as u64); run_blocks(shift_blocks); - assert_ok!(PredictionMarkets::admin_move_market_to_closed(Origin::signed(SUDO), market_id)); + assert_ok!(PredictionMarkets::admin_move_market_to_closed( + RuntimeOrigin::signed(SUDO), + market_id + )); let market = MarketCommons::market(&market_id).unwrap(); assert_eq!(market.status, MarketStatus::Closed); let new_end = start + shift; @@ -198,7 +204,7 @@ fn admin_move_market_to_closed_successfully_closes_market_and_sets_end_timestamp fn admin_move_market_to_closed_fails_if_market_does_not_exist() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - PredictionMarkets::admin_move_market_to_closed(Origin::signed(SUDO), 0), + PredictionMarkets::admin_move_market_to_closed(RuntimeOrigin::signed(SUDO), 0), zrml_market_commons::Error::::MarketDoesNotExist ); }); @@ -225,7 +231,7 @@ fn admin_move_market_to_closed_fails_if_market_is_not_active(market_status: Mark Ok(()) })); assert_noop!( - PredictionMarkets::admin_move_market_to_closed(Origin::signed(SUDO), market_id), + PredictionMarkets::admin_move_market_to_closed(RuntimeOrigin::signed(SUDO), market_id), Error::::MarketIsNotActive, ); }); @@ -236,7 +242,7 @@ fn admin_move_market_to_closed_correctly_clears_auto_open_and_close_blocks() { ExtBuilder::default().build().execute_with(|| { let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(22..66), @@ -249,7 +255,7 @@ fn admin_move_market_to_closed_correctly_clears_auto_open_and_close_blocks() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(33..66), @@ -262,7 +268,7 @@ fn admin_move_market_to_closed_correctly_clears_auto_open_and_close_blocks() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(22..33), @@ -274,7 +280,7 @@ fn admin_move_market_to_closed_correctly_clears_auto_open_and_close_blocks() { LIQUIDITY, vec![::MinWeight::get(); category_count.into()], )); - assert_ok!(PredictionMarkets::admin_move_market_to_closed(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_move_market_to_closed(RuntimeOrigin::signed(SUDO), 0)); let auto_close = MarketIdsPerCloseBlock::::get(66); assert_eq!(auto_close.len(), 1); @@ -292,7 +298,7 @@ fn create_scalar_market_fails_on_invalid_range(range: RangeInclusive) { ExtBuilder::default().build().execute_with(|| { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -318,7 +324,7 @@ fn create_market_fails_on_min_dispute_period() { }; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -344,7 +350,7 @@ fn create_market_fails_on_min_oracle_duration() { }; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -370,7 +376,7 @@ fn create_market_fails_on_max_dispute_period() { }; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -396,7 +402,7 @@ fn create_market_fails_on_max_grace_period() { }; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -422,7 +428,7 @@ fn create_market_fails_on_max_oracle_duration() { }; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(123..456), @@ -452,7 +458,7 @@ fn create_market_with_foreign_assets() { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(420), BOB, MarketPeriod::Block(123..456), @@ -468,7 +474,7 @@ fn create_market_with_foreign_assets() { // As per Mock asset_registry genesis ForeignAsset(50) is not registered in asset_registry. assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(50), BOB, MarketPeriod::Block(123..456), @@ -483,7 +489,7 @@ fn create_market_with_foreign_assets() { ); // As per Mock asset_registry genesis ForeignAsset(100) has allow_as_base_asset set to true. assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(100), BOB, MarketPeriod::Block(123..456), @@ -516,7 +522,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_active() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -547,7 +553,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_reported() { let market = MarketCommons::market(&0).unwrap(); run_to_block(end + market.deadlines.grace_period); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -558,7 +564,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_reported() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -591,13 +597,13 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_disputed() { assert_ne!(grace_period, 0); run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); run_to_block(grace_period + 2); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); @@ -608,7 +614,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_disputed() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -641,18 +647,18 @@ fn admin_destroy_market_correctly_unreserves_dispute_bonds() { assert_ne!(grace_period, 0); run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); run_to_block(grace_period + 2); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(DAVE), + RuntimeOrigin::signed(DAVE), 0, OutcomeReport::Categorical(1) )); @@ -669,7 +675,7 @@ fn admin_destroy_market_correctly_unreserves_dispute_bonds() { let balance_free_before_charlie = Balances::free_balance(&CHARLIE); let balance_free_before_dave = Balances::free_balance(&DAVE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), market_id)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), market_id)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &CHARLIE), SENTINEL_AMOUNT, @@ -705,7 +711,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_resolved() { let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -718,7 +724,7 @@ fn admin_destroy_market_correctly_slashes_permissionless_market_resolved() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -752,7 +758,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_proposed() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -791,9 +797,9 @@ fn admin_destroy_market_correctly_slashes_advised_market_proposed_with_edit_requ let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -821,7 +827,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_active() { 0..1, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); assert_ok!(AssetManager::deposit(Asset::Ztg, &ALICE, 2 * SENTINEL_AMOUNT)); assert_ok!(Balances::reserve_named( &PredictionMarkets::reserve_id(), @@ -829,7 +835,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_active() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -857,12 +863,12 @@ fn admin_destroy_market_correctly_slashes_advised_market_reported() { 0..end, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -873,7 +879,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_reported() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -901,17 +907,17 @@ fn admin_destroy_market_correctly_slashes_advised_market_disputed() { 0..end, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); @@ -922,7 +928,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_disputed() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -950,12 +956,12 @@ fn admin_destroy_market_correctly_slashes_advised_market_resolved() { 0..end, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -968,7 +974,7 @@ fn admin_destroy_market_correctly_slashes_advised_market_resolved() { SENTINEL_AMOUNT )); let balance_free_before_alice = Balances::free_balance(&ALICE); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!( Balances::reserved_balance_named(&PredictionMarkets::reserve_id(), &ALICE), SENTINEL_AMOUNT @@ -992,7 +998,7 @@ fn admin_destroy_market_correctly_cleans_up_accounts() { AssetManager::free_balance(base_asset, &ALICE); let swap_fee = ::MaxSwapFee::get(); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, ALICE, MarketPeriod::Block(0..42), @@ -1005,12 +1011,12 @@ fn admin_destroy_market_correctly_cleans_up_accounts() { vec![::MinWeight::get(); 3], )); // Buy some outcome tokens for Alice so that we can check that they get destroyed. - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(ALICE), 0, BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(ALICE), 0, BASE)); let market_id = 0; let pool_id = 0; let pool_account = Swaps::pool_account_id(&pool_id); let market_account = MarketCommons::market_account(market_id); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_eq!(AssetManager::free_balance(Asset::CategoricalOutcome(0, 0), &pool_account), 0); assert_eq!(AssetManager::free_balance(Asset::CategoricalOutcome(0, 1), &pool_account), 0); assert_eq!(AssetManager::free_balance(Asset::CategoricalOutcome(0, 2), &pool_account), 0); @@ -1057,7 +1063,7 @@ fn admin_destroy_market_correctly_clears_auto_open_and_close_blocks() { ExtBuilder::default().build().execute_with(|| { let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(22..66), @@ -1070,7 +1076,7 @@ fn admin_destroy_market_correctly_clears_auto_open_and_close_blocks() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(33..66), @@ -1083,7 +1089,7 @@ fn admin_destroy_market_correctly_clears_auto_open_and_close_blocks() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(22..33), @@ -1095,7 +1101,7 @@ fn admin_destroy_market_correctly_clears_auto_open_and_close_blocks() { LIQUIDITY, vec![::MinWeight::get(); category_count.into()], )); - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); let auto_close = MarketIdsPerCloseBlock::::get(66); assert_eq!(auto_close.len(), 1); @@ -1138,12 +1144,12 @@ fn admin_move_market_to_resolved_resolves_reported_market() { let category = 1; let outcome_report = OutcomeReport::Categorical(category); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, outcome_report.clone() )); assert_ok!(PredictionMarkets::admin_move_market_to_resolved( - Origin::signed(SUDO), + RuntimeOrigin::signed(SUDO), market_id )); @@ -1197,7 +1203,10 @@ fn admin_move_market_to_resovled_fails_if_market_is_not_reported_or_disputed( Ok(()) })); assert_noop!( - PredictionMarkets::admin_move_market_to_resolved(Origin::signed(SUDO), market_id,), + PredictionMarkets::admin_move_market_to_resolved( + RuntimeOrigin::signed(SUDO), + market_id, + ), Error::::InvalidMarketStatus, ); }); @@ -1273,7 +1282,7 @@ fn it_does_not_create_market_with_too_few_categories() { ExtBuilder::default().build().execute_with(|| { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..100), @@ -1294,7 +1303,7 @@ fn it_does_not_create_market_with_too_many_categories() { ExtBuilder::default().build().execute_with(|| { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..100), @@ -1322,7 +1331,7 @@ fn it_allows_sudo_to_destroy_markets() { ); // destroy the market - assert_ok!(PredictionMarkets::admin_destroy_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::admin_destroy_market(RuntimeOrigin::signed(SUDO), 0)); assert_noop!( MarketCommons::market(&0), @@ -1348,12 +1357,12 @@ fn it_allows_advisory_origin_to_approve_markets() { // Make sure it fails from the random joe assert_noop!( - PredictionMarkets::approve_market(Origin::signed(BOB), 0), + PredictionMarkets::approve_market(RuntimeOrigin::signed(BOB), 0), DispatchError::BadOrigin ); // Now it should work from SUDO - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let after_market = MarketCommons::market(&0); assert_eq!(after_market.unwrap().status, MarketStatus::Active); @@ -1379,12 +1388,16 @@ fn it_allows_request_edit_origin_to_request_edits_for_markets() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; // Make sure it fails from the random joe assert_noop!( - PredictionMarkets::request_edit(Origin::signed(BOB), 0, edit_reason.clone()), + PredictionMarkets::request_edit(RuntimeOrigin::signed(BOB), 0, edit_reason.clone()), DispatchError::BadOrigin ); // Now it should work from SUDO - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason.clone())); + assert_ok!(PredictionMarkets::request_edit( + RuntimeOrigin::signed(SUDO), + 0, + edit_reason.clone() + )); System::assert_last_event( Event::MarketRequestedEdit( 0, @@ -1416,7 +1429,7 @@ fn request_edit_fails_on_bad_origin() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; // Make sure it fails from the random joe assert_noop!( - PredictionMarkets::request_edit(Origin::signed(BOB), 0, edit_reason), + PredictionMarkets::request_edit(RuntimeOrigin::signed(BOB), 0, edit_reason), DispatchError::BadOrigin ); }); @@ -1440,7 +1453,7 @@ fn edit_request_fails_if_edit_reason_is_too_long() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize + 1]; assert_noop!( - PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason), + PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason), Error::::EditReasonLengthExceedsMaxEditReasonLen ); }); @@ -1463,11 +1476,11 @@ fn market_with_edit_request_cannot_be_approved() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); assert_noop!( - PredictionMarkets::approve_market(Origin::signed(SUDO), 0), + PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0), Error::::MarketEditRequestAlreadyInProgress ); }); @@ -1493,7 +1506,7 @@ fn it_allows_the_advisory_origin_to_reject_markets() { vec![0; ::MaxRejectReasonLen::get() as usize]; // Now it should work from SUDO assert_ok!(PredictionMarkets::reject_market( - Origin::signed(SUDO), + RuntimeOrigin::signed(SUDO), 0, reject_reason.clone() )); @@ -1525,7 +1538,7 @@ fn reject_errors_if_reject_reason_is_too_long() { let reject_reason: Vec = vec![0; ::MaxRejectReasonLen::get() as usize + 1]; assert_noop!( - PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason), + PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason), Error::::RejectReasonLengthExceedsMaxRejectReasonLen ); }); @@ -1549,9 +1562,9 @@ fn it_allows_the_advisory_origin_to_reject_markets_with_edit_request() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; let reject_reason = vec![0_u8; ::MaxRejectReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); - assert_ok!(PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason)); + assert_ok!(PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason)); assert!(!MarketIdsForEdit::::contains_key(0)); assert_noop!( @@ -1588,7 +1601,7 @@ fn reject_market_unreserves_oracle_bond_and_slashes_advisory_bond() { let reject_reason: Vec = vec![0; ::MaxRejectReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason)); + assert_ok!(PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason)); // AdvisoryBond gets slashed after reject_market // OracleBond gets unreserved after reject_market @@ -1650,7 +1663,7 @@ fn reject_market_clears_auto_close_blocks() { ); let reject_reason: Vec = vec![0; ::MaxRejectReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason)); + assert_ok!(PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason)); let auto_close = MarketIdsPerCloseBlock::::get(66); assert_eq!(auto_close.len(), 1); @@ -1734,7 +1747,11 @@ fn on_market_close_auto_rejects_expired_advised_market_with_edit_request() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), market_id, edit_reason)); + assert_ok!(PredictionMarkets::request_edit( + RuntimeOrigin::signed(SUDO), + market_id, + edit_reason + )); assert!(MarketIdsForEdit::::contains_key(0)); run_blocks(end); @@ -1767,7 +1784,7 @@ fn on_market_open_successfully_auto_opens_market_pool_with_blocks() { let end = 66; let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(start..end), @@ -1798,7 +1815,7 @@ fn on_market_close_successfully_auto_closes_market_with_blocks() { let end = 33; let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(0..end), @@ -1836,7 +1853,7 @@ fn on_market_open_successfully_auto_opens_market_with_timestamps() { let end: Moment = (66 * MILLISECS_PER_BLOCK).into(); let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(start..end), @@ -1870,7 +1887,7 @@ fn on_market_close_successfully_auto_closes_market_with_timestamps() { let end: Moment = (2 * MILLISECS_PER_BLOCK).into(); let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(0..end), @@ -1916,7 +1933,7 @@ fn on_market_open_successfully_auto_opens_multiple_markets_after_stall() { let end: Moment = (666 * MILLISECS_PER_BLOCK).into(); let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(start..end), @@ -1929,7 +1946,7 @@ fn on_market_open_successfully_auto_opens_multiple_markets_after_stall() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(start..end), @@ -1961,7 +1978,7 @@ fn on_market_close_successfully_auto_closes_multiple_markets_after_stall() { let end: Moment = (5 * MILLISECS_PER_BLOCK).into(); let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(0..end), @@ -1974,7 +1991,7 @@ fn on_market_close_successfully_auto_closes_multiple_markets_after_stall() { vec![::MinWeight::get(); category_count.into()], )); assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(0..end), @@ -2013,7 +2030,7 @@ fn on_initialize_skips_the_genesis_block() { ExtBuilder::default().build().execute_with(|| { let category_count = 3; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Timestamp(0..end), @@ -2056,7 +2073,7 @@ fn it_allows_to_buy_a_complete_set() { ); // Allows someone to generate a complete set - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); @@ -2095,7 +2112,7 @@ fn it_does_not_allow_to_buy_a_complete_set_on_pending_advised_market() { ScoringRule::CPMM, ); assert_noop!( - PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT), + PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT), Error::::MarketIsNotActive, ); }); @@ -2106,7 +2123,7 @@ fn create_categorical_market_fails_if_market_begin_is_equal_to_end() { ExtBuilder::default().build().execute_with(|| { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(3..3), @@ -2136,7 +2153,7 @@ fn create_categorical_market_fails_if_market_period_is_invalid( ExtBuilder::default().build().execute_with(|| { assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, period, @@ -2159,7 +2176,7 @@ fn create_categorical_market_fails_if_end_is_not_far_enough_ahead() { run_to_block(end_block); assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..end_block), @@ -2176,7 +2193,7 @@ fn create_categorical_market_fails_if_end_is_not_far_enough_ahead() { let end_time = MILLISECS_PER_BLOCK as u64 / 2; assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..end_time), @@ -2202,7 +2219,7 @@ fn it_does_not_allow_zero_amounts_in_buy_complete_set() { ScoringRule::CPMM, ); assert_noop!( - PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 0), + PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 0), Error::::ZeroAmount ); }); @@ -2218,7 +2235,7 @@ fn it_does_not_allow_buying_complete_sets_with_insufficient_balance() { ScoringRule::CPMM, ); assert_noop!( - PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 10000 * BASE), + PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 10000 * BASE), Error::::NotEnoughBalance ); }; @@ -2241,16 +2258,16 @@ fn it_allows_to_deploy_a_pool() { ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 100 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 100 * BASE)); assert_ok!(Balances::transfer( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), ::PalletId::get().into_account_truncating(), 100 * BASE )); assert_ok!(PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, ::MaxSwapFee::get(), LIQUIDITY, @@ -2275,9 +2292,9 @@ fn deploy_swap_pool_for_market_fails_if_market_has_a_pool() { 0..1, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 200 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 200 * BASE)); assert_ok!(PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, ::MaxSwapFee::get(), LIQUIDITY, @@ -2285,7 +2302,7 @@ fn deploy_swap_pool_for_market_fails_if_market_has_a_pool() { )); assert_noop!( PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, ::MaxSwapFee::get(), LIQUIDITY, @@ -2309,7 +2326,7 @@ fn it_does_not_allow_to_deploy_a_pool_on_pending_advised_market() { assert_noop!( PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, ::MaxSwapFee::get(), LIQUIDITY, @@ -2332,9 +2349,9 @@ fn it_allows_to_sell_a_complete_set() { ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT)); - assert_ok!(PredictionMarkets::sell_complete_set(Origin::signed(BOB), 0, CENT)); + assert_ok!(PredictionMarkets::sell_complete_set(RuntimeOrigin::signed(BOB), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); @@ -2370,7 +2387,7 @@ fn it_does_not_allow_zero_amounts_in_sell_complete_set() { ScoringRule::CPMM, ); assert_noop!( - PredictionMarkets::sell_complete_set(Origin::signed(BOB), 0, 0), + PredictionMarkets::sell_complete_set(RuntimeOrigin::signed(BOB), 0, 0), Error::::ZeroAmount ); }); @@ -2385,10 +2402,10 @@ fn it_does_not_allow_to_sell_complete_sets_with_insufficient_balance() { 0..1, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 2 * CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 2 * CENT)); assert_eq!(AssetManager::slash(Asset::CategoricalOutcome(0, 1), &BOB, CENT), 0); assert_noop!( - PredictionMarkets::sell_complete_set(Origin::signed(BOB), 0, 2 * CENT), + PredictionMarkets::sell_complete_set(RuntimeOrigin::signed(BOB), 0, 2 * CENT), Error::::InsufficientShareBalance ); }; @@ -2421,7 +2438,7 @@ fn it_allows_to_report_the_outcome_of_a_market() { assert!(market.report.is_none()); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2440,7 +2457,7 @@ fn it_allows_to_report_the_outcome_of_a_market() { }); assert_ok!(PredictionMarkets::report( - Origin::signed(SUDO), + RuntimeOrigin::signed(SUDO), 0, OutcomeReport::Categorical(1) )); @@ -2465,7 +2482,7 @@ fn report_fails_before_grace_period_is_over() { assert!(market.report.is_none()); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::NotAllowedToReportYet ); }); @@ -2491,12 +2508,16 @@ fn it_allows_only_oracle_to_report_the_outcome_of_a_market_during_oracle_duratio assert!(market.report.is_none()); assert_noop!( - PredictionMarkets::report(Origin::signed(CHARLIE), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report( + RuntimeOrigin::signed(CHARLIE), + 0, + OutcomeReport::Categorical(1) + ), Error::::ReporterNotOracle ); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2513,7 +2534,7 @@ fn it_allows_only_oracle_to_report_the_outcome_of_a_market_during_oracle_duratio fn it_allows_only_oracle_to_report_the_outcome_of_a_market_during_oracle_duration_moment() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -2525,7 +2546,7 @@ fn it_allows_only_oracle_to_report_the_outcome_of_a_market_during_oracle_duratio ScoringRule::CPMM )); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT)); // set the timestamp let market = MarketCommons::market(&0).unwrap(); @@ -2537,11 +2558,11 @@ fn it_allows_only_oracle_to_report_the_outcome_of_a_market_during_oracle_duratio Timestamp::set_timestamp(100_000_000 + grace_period); assert_noop!( - PredictionMarkets::report(Origin::signed(EVE), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1)), Error::::ReporterNotOracle ); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2562,7 +2583,7 @@ fn report_fails_on_mismatched_outcome_for_categorical_market() { let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Scalar(123)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(123)), Error::::OutcomeMismatch, ); let market = MarketCommons::market(&0).unwrap(); @@ -2585,7 +2606,7 @@ fn report_fails_on_out_of_range_outcome_for_categorical_market() { let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(2)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(2)), Error::::OutcomeMismatch, ); let market = MarketCommons::market(&0).unwrap(); @@ -2608,7 +2629,7 @@ fn report_fails_on_mismatched_outcome_for_scalar_market() { let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(0)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0)), Error::::OutcomeMismatch, ); let market = MarketCommons::market(&0).unwrap(); @@ -2634,7 +2655,7 @@ fn it_allows_to_dispute_the_outcome_of_a_market() { run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2643,7 +2664,7 @@ fn it_allows_to_dispute_the_outcome_of_a_market() { run_to_block(dispute_at); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); @@ -2670,7 +2691,7 @@ fn dispute_fails_authority_reported_already() { ExtBuilder::default().build().execute_with(|| { let end = 2; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..end), @@ -2688,7 +2709,7 @@ fn dispute_fails_authority_reported_already() { run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2697,13 +2718,17 @@ fn dispute_fails_authority_reported_already() { run_to_block(dispute_at); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); assert_noop!( - PredictionMarkets::dispute(Origin::signed(CHARLIE), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::dispute( + RuntimeOrigin::signed(CHARLIE), + 0, + OutcomeReport::Categorical(1) + ), AuthorizedError::::OnlyOneDisputeAllowed ); }); @@ -2725,7 +2750,7 @@ fn it_allows_anyone_to_report_an_unreported_market() { run_to_block(end + market.deadlines.grace_period + market.deadlines.oracle_duration + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(ALICE), // alice reports her own market now + RuntimeOrigin::signed(ALICE), // alice reports her own market now 0, OutcomeReport::Categorical(1), )); @@ -2757,14 +2782,14 @@ fn it_correctly_resolves_a_market_that_was_reported_on() { ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(CHARLIE), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); let report_at = end + market.deadlines.grace_period + 1; run_to_block(report_at); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -2816,14 +2841,14 @@ fn it_resolves_a_disputed_market() { ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(CHARLIE), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); let report_at = end + market.deadlines.grace_period + 1; run_to_block(report_at); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); @@ -2832,7 +2857,7 @@ fn it_resolves_a_disputed_market() { run_to_block(dispute_at_0); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -2841,7 +2866,7 @@ fn it_resolves_a_disputed_market() { run_to_block(dispute_at_1); assert_ok!(PredictionMarkets::dispute( - Origin::signed(DAVE), + RuntimeOrigin::signed(DAVE), 0, OutcomeReport::Categorical(0) )); @@ -2850,7 +2875,7 @@ fn it_resolves_a_disputed_market() { run_to_block(dispute_at_2); assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1) )); @@ -2895,7 +2920,7 @@ fn it_resolves_a_disputed_market() { let disputes = crate::Disputes::::get(0); assert_eq!(disputes.len(), 0); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(CHARLIE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(CHARLIE), 0)); // Make sure rewards are right: // @@ -2960,7 +2985,11 @@ fn dispute_fails_unless_reported_or_disputed_market(status: MarketStatus) { })); assert_noop!( - PredictionMarkets::dispute(Origin::signed(EVE), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::dispute( + RuntimeOrigin::signed(EVE), + 0, + OutcomeReport::Categorical(1) + ), Error::::InvalidMarketStatus ); }); @@ -2971,7 +3000,7 @@ fn start_global_dispute_works() { ExtBuilder::default().build().execute_with(|| { let end = 2; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..2), @@ -2988,7 +3017,7 @@ fn start_global_dispute_works() { let grace_period = market.deadlines.grace_period; run_to_block(end + grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Categorical(0) )); @@ -2998,18 +3027,24 @@ fn start_global_dispute_works() { if i == 1 { #[cfg(feature = "with-global-disputes")] assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), market_id), + PredictionMarkets::start_global_dispute( + RuntimeOrigin::signed(CHARLIE), + market_id + ), Error::::InvalidMarketStatus ); } else { #[cfg(feature = "with-global-disputes")] assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), market_id), + PredictionMarkets::start_global_dispute( + RuntimeOrigin::signed(CHARLIE), + market_id + ), Error::::MaxDisputesNeeded ); } assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Categorical(i.saturated_into()) )); @@ -3031,7 +3066,10 @@ fn start_global_dispute_works() { use zrml_global_disputes::GlobalDisputesPalletApi; let now = >::block_number(); - assert_ok!(PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), market_id)); + assert_ok!(PredictionMarkets::start_global_dispute( + RuntimeOrigin::signed(CHARLIE), + market_id + )); // report check assert_eq!( @@ -3061,7 +3099,7 @@ fn start_global_dispute_works() { System::assert_last_event(Event::GlobalDisputeStarted(market_id).into()); assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), market_id), + PredictionMarkets::start_global_dispute(RuntimeOrigin::signed(CHARLIE), market_id), Error::::GlobalDisputeAlreadyStarted ); } @@ -3073,7 +3111,7 @@ fn start_global_dispute_fails_on_wrong_mdm() { ExtBuilder::default().build().execute_with(|| { let end = 2; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..2), @@ -3090,7 +3128,7 @@ fn start_global_dispute_fails_on_wrong_mdm() { let grace_period = market.deadlines.grace_period; run_to_block(end + grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), market_id, OutcomeReport::Categorical(0) )); @@ -3099,7 +3137,7 @@ fn start_global_dispute_fails_on_wrong_mdm() { // only one dispute allowed for authorized mdm assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), market_id, OutcomeReport::Categorical(1u32.saturated_into()) )); @@ -3109,7 +3147,7 @@ fn start_global_dispute_fails_on_wrong_mdm() { #[cfg(feature = "with-global-disputes")] assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), market_id), + PredictionMarkets::start_global_dispute(RuntimeOrigin::signed(CHARLIE), market_id), Error::::InvalidDisputeMechanism ); }); @@ -3122,13 +3160,13 @@ fn start_global_dispute_works_without_feature() { #[cfg(not(feature = "with-global-disputes"))] assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), non_market_id), + PredictionMarkets::start_global_dispute(RuntimeOrigin::signed(CHARLIE), non_market_id), Error::::GlobalDisputesDisabled ); #[cfg(feature = "with-global-disputes")] assert_noop!( - PredictionMarkets::start_global_dispute(Origin::signed(CHARLIE), non_market_id), + PredictionMarkets::start_global_dispute(RuntimeOrigin::signed(CHARLIE), non_market_id), zrml_market_commons::Error::::MarketDoesNotExist ); }); @@ -3145,13 +3183,13 @@ fn it_allows_to_redeem_shares() { ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(CHARLIE), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -3159,7 +3197,7 @@ fn it_allows_to_redeem_shares() { let market = MarketCommons::market(&0).unwrap(); assert_eq!(market.status, MarketStatus::Resolved); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(CHARLIE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(CHARLIE), 0)); let bal = Balances::free_balance(&CHARLIE); assert_eq!(bal, 1_000 * BASE); System::assert_last_event( @@ -3191,7 +3229,7 @@ fn create_market_and_deploy_assets_results_in_expected_balances_and_pool_params( let base_asset_weight = (category_count as u128) * weight; let total_weight = 2 * base_asset_weight; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, oracle, period, @@ -3265,7 +3303,7 @@ fn process_subsidy_activates_market_with_sufficient_subsidy() { ScoringRule::RikiddoSigmoidFeeMarketEma, ); let min_subsidy = ::MinSubsidy::get(); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(ALICE), 0, min_subsidy)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(ALICE), 0, min_subsidy)); run_to_block(min_sub_period); let subsidy_queue = crate::MarketsCollectingSubsidy::::get(); assert_eq!(subsidy_queue.len(), 0); @@ -3295,8 +3333,8 @@ fn process_subsidy_blocks_market_with_insufficient_subsidy() { ScoringRule::RikiddoSigmoidFeeMarketEma, ); let subsidy = ::MinSubsidy::get() / 3; - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(ALICE), 0, subsidy)); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(BOB), 0, subsidy)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(ALICE), 0, subsidy)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(BOB), 0, subsidy)); run_to_block(min_sub_period); let subsidy_queue = crate::MarketsCollectingSubsidy::::get(); assert_eq!(subsidy_queue.len(), 0); @@ -3410,14 +3448,14 @@ fn only_creator_can_edit_market() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; // Now it should work from SUDO - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); // ALICE is market creator through simple_create_categorical_market assert_noop!( PredictionMarkets::edit_market( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), Asset::Ztg, 0, CHARLIE, @@ -3452,14 +3490,14 @@ fn edit_cycle_for_proposed_markets() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; // Now it should work from SUDO - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); // BOB was the oracle before through simple_create_categorical_market // After this edit its changed to ALICE assert_ok!(PredictionMarkets::edit_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, 0, CHARLIE, @@ -3498,7 +3536,7 @@ fn edit_market_with_foreign_asset() { let edit_reason = vec![0_u8; ::MaxEditReasonLen::get() as usize]; // Now it should work from SUDO - assert_ok!(PredictionMarkets::request_edit(Origin::signed(SUDO), 0, edit_reason)); + assert_ok!(PredictionMarkets::request_edit(RuntimeOrigin::signed(SUDO), 0, edit_reason)); assert!(MarketIdsForEdit::::contains_key(0)); @@ -3506,7 +3544,7 @@ fn edit_market_with_foreign_asset() { // As per Mock asset_registry genesis ForeignAsset(50) is not registered in asset_registry. assert_noop!( PredictionMarkets::edit_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(50), 0, CHARLIE, @@ -3522,7 +3560,7 @@ fn edit_market_with_foreign_asset() { // As per Mock asset_registry genesis ForeignAsset(420) has allow_as_base_asset set to false. assert_noop!( PredictionMarkets::edit_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(420), 0, CHARLIE, @@ -3537,7 +3575,7 @@ fn edit_market_with_foreign_asset() { ); // As per Mock asset_registry genesis ForeignAsset(100) has allow_as_base_asset set to true. assert_ok!(PredictionMarkets::edit_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::ForeignAsset(100), 0, CHARLIE, @@ -3558,7 +3596,7 @@ fn the_entire_market_lifecycle_works_with_timestamps() { ExtBuilder::default().build().execute_with(|| { // Creates a permissionless market. assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -3571,7 +3609,7 @@ fn the_entire_market_lifecycle_works_with_timestamps() { )); // is ok - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); // set the timestamp @@ -3581,12 +3619,12 @@ fn the_entire_market_lifecycle_works_with_timestamps() { Timestamp::set_timestamp(100_000_000 + grace_period); assert_noop!( - PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, CENT), + PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, CENT), Error::::MarketIsNotActive, ); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -3597,7 +3635,7 @@ fn the_entire_market_lifecycle_works_with_timestamps() { fn full_scalar_market_lifecycle() { let test = |base_asset: Asset| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -3609,7 +3647,11 @@ fn full_scalar_market_lifecycle() { ScoringRule::CPMM )); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, 100 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set( + RuntimeOrigin::signed(CHARLIE), + 0, + 100 * BASE + )); // check balances let assets = PredictionMarkets::outcome_assets(0, &MarketCommons::market(&0).unwrap()); @@ -3627,7 +3669,11 @@ fn full_scalar_market_lifecycle() { Timestamp::set_timestamp(100_000_000 + grace_period); // report - assert_ok!(PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Scalar(100))); + assert_ok!(PredictionMarkets::report( + RuntimeOrigin::signed(BOB), + 0, + OutcomeReport::Scalar(100) + )); let market_after_report = MarketCommons::market(&0).unwrap(); assert!(market_after_report.report.is_some()); @@ -3637,7 +3683,11 @@ fn full_scalar_market_lifecycle() { assert_eq!(report.outcome, OutcomeReport::Scalar(100)); // dispute - assert_ok!(PredictionMarkets::dispute(Origin::signed(DAVE), 0, OutcomeReport::Scalar(25))); + assert_ok!(PredictionMarkets::dispute( + RuntimeOrigin::signed(DAVE), + 0, + OutcomeReport::Scalar(25) + )); let disputes = crate::Disputes::::get(0); assert_eq!(disputes.len(), 1); @@ -3650,7 +3700,7 @@ fn full_scalar_market_lifecycle() { // give EVE some shares assert_ok!(Tokens::transfer( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), EVE, Asset::ScalarOutcome(0, ScalarPosition::Short), 50 * BASE @@ -3661,7 +3711,7 @@ fn full_scalar_market_lifecycle() { 50 * BASE ); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(CHARLIE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(CHARLIE), 0)); for asset in assets.iter() { let bal = Tokens::free_balance(*asset, &CHARLIE); assert_eq!(bal, 0); @@ -3693,7 +3743,7 @@ fn full_scalar_market_lifecycle() { .into(), ); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(EVE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(EVE), 0)); let base_asset_bal_eve_after = AssetManager::free_balance(base_asset, &EVE); assert_eq!(base_asset_bal_eve_after, 101250 * CENT); // 12.5 (SHORT) + 1000 (balance) System::assert_last_event( @@ -3761,7 +3811,7 @@ fn reject_market_fails_on_permissionless_market() { let reject_reason: Vec = vec![0; ::MaxRejectReasonLen::get() as usize]; assert_noop!( - PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason), + PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason), Error::::InvalidMarketStatus ); }); @@ -3777,11 +3827,11 @@ fn reject_market_fails_on_approved_market() { 0..1, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let reject_reason: Vec = vec![0; ::MaxRejectReasonLen::get() as usize]; assert_noop!( - PredictionMarkets::reject_market(Origin::signed(SUDO), 0, reject_reason), + PredictionMarkets::reject_market(RuntimeOrigin::signed(SUDO), 0, reject_reason), Error::::InvalidMarketStatus ); }); @@ -3792,7 +3842,7 @@ fn market_resolve_does_not_hold_liquidity_withdraw() { ExtBuilder::default().build().execute_with(|| { let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..end), @@ -3804,22 +3854,26 @@ fn market_resolve_does_not_hold_liquidity_withdraw() { ScoringRule::CPMM )); deploy_swap_pool(MarketCommons::market(&0).unwrap(), 0).unwrap(); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(ALICE), 0, BASE)); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(BOB), 0, 2 * BASE)); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, 3 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(ALICE), 0, BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(BOB), 0, 2 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set( + RuntimeOrigin::signed(CHARLIE), + 0, + 3 * BASE + )); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(2) )); run_to_block(grace_period + market.deadlines.dispute_duration + 2); - assert_ok!(Swaps::pool_exit(Origin::signed(FRED), 0, BASE * 100, vec![0, 0])); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(BOB), 0)); + assert_ok!(Swaps::pool_exit(RuntimeOrigin::signed(FRED), 0, BASE * 100, vec![0, 0])); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(BOB), 0)); }) } @@ -3829,7 +3883,7 @@ fn authorized_correctly_resolves_disputed_market() { let test = |base_asset: Asset| { let end = 2; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -3840,13 +3894,13 @@ fn authorized_correctly_resolves_disputed_market() { MarketDisputeMechanism::Authorized, ScoringRule::CPMM, )); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, CENT)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(CHARLIE), 0, CENT)); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); @@ -3857,7 +3911,7 @@ fn authorized_correctly_resolves_disputed_market() { let dispute_at = grace_period + 1 + 1; run_to_block(dispute_at); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -3874,12 +3928,12 @@ fn authorized_correctly_resolves_disputed_market() { // Fred authorizses an outcome, but fat-fingers it on the first try. assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Categorical(0) )); assert_ok!(Authorized::authorize_market_outcome( - Origin::signed(AuthorizedDisputeResolutionUser::get()), + RuntimeOrigin::signed(AuthorizedDisputeResolutionUser::get()), 0, OutcomeReport::Categorical(1) )); @@ -3942,7 +3996,7 @@ fn authorized_correctly_resolves_disputed_market() { let disputes = crate::Disputes::::get(0); assert_eq!(disputes.len(), 0); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(CHARLIE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(CHARLIE), 0)); if base_asset == Asset::Ztg { let charlie_balance = AssetManager::free_balance(Asset::Ztg, &CHARLIE); @@ -3982,7 +4036,7 @@ fn approve_market_correctly_unreserves_advisory_bond() { let test = |base_asset: Asset| { reserve_sentinel_amounts(); assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..100), @@ -3996,7 +4050,7 @@ fn approve_market_correctly_unreserves_advisory_bond() { let market_id = 0; let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, AdvisoryBond::get() + OracleBond::get()); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), market_id)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), market_id)); check_reserve(&ALICE, OracleBond::get()); assert_eq!(Balances::free_balance(&ALICE), alice_balance_before + AdvisoryBond::get()); let market = MarketCommons::market(&market_id).unwrap(); @@ -4020,7 +4074,7 @@ fn deploy_swap_pool_correctly_sets_weight_of_base_asset() { ::MinWeight::get() + 33, ]; assert_ok!(PredictionMarkets::create_cpmm_market_and_deploy_assets( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, ALICE, MarketPeriod::Block(0..42), @@ -4046,7 +4100,7 @@ fn deploy_swap_pool_for_market_returns_error_if_weights_is_too_short() { ExtBuilder::default().build().execute_with(|| { let category_count = 5; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..100), @@ -4058,13 +4112,13 @@ fn deploy_swap_pool_for_market_returns_error_if_weights_is_too_short() { ScoringRule::CPMM )); let amount = 123 * BASE; - assert_ok!(Balances::set_balance(Origin::root(), ALICE, 2 * amount, 0)); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(ALICE), 0, amount)); + assert_ok!(Balances::set_balance(RuntimeOrigin::root(), ALICE, 2 * amount, 0)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(ALICE), 0, amount)); // Attempt to create a pool with four weights; but we need five instead (base asset not // counted). assert_noop!( PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), 0, 1, amount, @@ -4083,7 +4137,7 @@ fn deploy_swap_pool_for_market_returns_error_if_weights_is_too_long() { ExtBuilder::default().build().execute_with(|| { let category_count = 5; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(0..100), @@ -4095,13 +4149,13 @@ fn deploy_swap_pool_for_market_returns_error_if_weights_is_too_long() { ScoringRule::CPMM )); let amount = 123 * BASE; - assert_ok!(Balances::set_balance(Origin::root(), ALICE, 2 * amount, 0)); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(ALICE), 0, amount)); + assert_ok!(Balances::set_balance(RuntimeOrigin::root(), ALICE, 2 * amount, 0)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(ALICE), 0, amount)); // Attempt to create a pool with six weights; but we need five instead (base asset not // counted). assert_noop!( PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), 0, ::MaxSwapFee::get(), amount, @@ -4123,7 +4177,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4140,7 +4194,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); @@ -4168,7 +4222,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..100), @@ -4190,7 +4244,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark assert!(market.bonds.outsider.is_none()); assert_ok!(PredictionMarkets::report( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -4233,7 +4287,7 @@ fn outsider_reports_wrong_outcome() { let end = 100; let alice_balance_before = Balances::free_balance(&ALICE); assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4252,7 +4306,7 @@ fn outsider_reports_wrong_outcome() { let report_at = grace_period + market.deadlines.oracle_duration + 1; run_to_block(report_at); assert_ok!(PredictionMarkets::report( - Origin::signed(outsider), + RuntimeOrigin::signed(outsider), 0, OutcomeReport::Categorical(1) )); @@ -4263,7 +4317,7 @@ fn outsider_reports_wrong_outcome() { let dispute_at_0 = report_at + 1; run_to_block(dispute_at_0); assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(0) )); @@ -4302,7 +4356,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4313,7 +4367,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma MarketDisputeMechanism::SimpleDisputes, ScoringRule::CPMM, )); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, OracleBond::get()); let market = MarketCommons::market(&0).unwrap(); @@ -4321,7 +4375,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma let report_at = grace_period + 1; run_to_block(report_at); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1) )); @@ -4347,7 +4401,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4358,7 +4412,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma MarketDisputeMechanism::SimpleDisputes, ScoringRule::CPMM, )); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, OracleBond::get()); let market = MarketCommons::market(&0).unwrap(); @@ -4366,7 +4420,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma let report_at = grace_period + market.deadlines.oracle_duration + 1; run_to_block(report_at); assert_ok!(PredictionMarkets::report( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -4393,7 +4447,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4410,12 +4464,12 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -4442,7 +4496,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4453,19 +4507,19 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_approved_advised_ma MarketDisputeMechanism::SimpleDisputes, ScoringRule::CPMM, )); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, OracleBond::get()); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(1) )); @@ -4492,7 +4546,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4509,18 +4563,18 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); // EVE disputes with wrong outcome assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); @@ -4550,7 +4604,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4561,25 +4615,25 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma MarketDisputeMechanism::SimpleDisputes, ScoringRule::CPMM, )); - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, OracleBond::get()); let market = MarketCommons::market(&0).unwrap(); let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(0) )); // EVE disputes with wrong outcome assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, OutcomeReport::Categorical(0) )); @@ -4606,7 +4660,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4629,7 +4683,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark run_to_block(after_oracle_duration); // CHARLIE is not an Oracle assert_ok!(PredictionMarkets::report( - Origin::signed(outsider), + RuntimeOrigin::signed(outsider), 0, OutcomeReport::Categorical(0) )); @@ -4639,12 +4693,12 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_permissionless_mark // EVE disputes with wrong outcome assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(FRED), + RuntimeOrigin::signed(FRED), 0, OutcomeReport::Categorical(0) )); @@ -4677,7 +4731,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma reserve_sentinel_amounts(); let end = 100; assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), base_asset, BOB, MarketPeriod::Block(0..end), @@ -4691,7 +4745,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma let outsider = CHARLIE; - assert_ok!(PredictionMarkets::approve_market(Origin::signed(SUDO), 0)); + assert_ok!(PredictionMarkets::approve_market(RuntimeOrigin::signed(SUDO), 0)); let alice_balance_before = Balances::free_balance(&ALICE); check_reserve(&ALICE, OracleBond::get()); let market = MarketCommons::market(&0).unwrap(); @@ -4700,7 +4754,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma run_to_block(after_oracle_duration); // CHARLIE is not an Oracle assert_ok!(PredictionMarkets::report( - Origin::signed(outsider), + RuntimeOrigin::signed(outsider), 0, OutcomeReport::Categorical(0) )); @@ -4710,12 +4764,12 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma // EVE disputes with wrong outcome assert_ok!(PredictionMarkets::dispute( - Origin::signed(EVE), + RuntimeOrigin::signed(EVE), 0, OutcomeReport::Categorical(1) )); assert_ok!(PredictionMarkets::dispute( - Origin::signed(FRED), + RuntimeOrigin::signed(FRED), 0, OutcomeReport::Categorical(0) )); @@ -4743,7 +4797,7 @@ fn on_resolution_correctly_reserves_and_unreserves_bonds_for_advised_approved_ma fn report_fails_on_market_state_proposed() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4755,7 +4809,7 @@ fn report_fails_on_market_state_proposed() { ScoringRule::CPMM )); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4765,7 +4819,7 @@ fn report_fails_on_market_state_proposed() { fn report_fails_on_market_state_closed_for_advised_market() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4777,7 +4831,7 @@ fn report_fails_on_market_state_closed_for_advised_market() { ScoringRule::CPMM )); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4787,7 +4841,7 @@ fn report_fails_on_market_state_closed_for_advised_market() { fn report_fails_on_market_state_collecting_subsidy() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(100_000_000..200_000_000), @@ -4799,7 +4853,7 @@ fn report_fails_on_market_state_collecting_subsidy() { ScoringRule::RikiddoSigmoidFeeMarketEma )); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4809,7 +4863,7 @@ fn report_fails_on_market_state_collecting_subsidy() { fn report_fails_on_market_state_insufficient_subsidy() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(100_000_000..200_000_000), @@ -4825,7 +4879,7 @@ fn report_fails_on_market_state_insufficient_subsidy() { Ok(()) }); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4835,7 +4889,7 @@ fn report_fails_on_market_state_insufficient_subsidy() { fn report_fails_on_market_state_active() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4847,7 +4901,7 @@ fn report_fails_on_market_state_active() { ScoringRule::CPMM )); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4857,7 +4911,7 @@ fn report_fails_on_market_state_active() { fn report_fails_on_market_state_suspended() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4873,7 +4927,7 @@ fn report_fails_on_market_state_suspended() { Ok(()) }); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4883,7 +4937,7 @@ fn report_fails_on_market_state_suspended() { fn report_fails_on_market_state_resolved() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4899,7 +4953,7 @@ fn report_fails_on_market_state_resolved() { Ok(()) }); assert_noop!( - PredictionMarkets::report(Origin::signed(BOB), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report(RuntimeOrigin::signed(BOB), 0, OutcomeReport::Categorical(1)), Error::::MarketIsNotClosed, ); }); @@ -4909,7 +4963,7 @@ fn report_fails_on_market_state_resolved() { fn report_fails_if_reporter_is_not_the_oracle() { ExtBuilder::default().build().execute_with(|| { assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(0..100_000_000), @@ -4927,7 +4981,11 @@ fn report_fails_if_reporter_is_not_the_oracle() { let grace_period: u64 = market.deadlines.grace_period * MILLISECS_PER_BLOCK as u64; set_timestamp_for_on_initialize(100_000_000 + grace_period + MILLISECS_PER_BLOCK as u64); assert_noop!( - PredictionMarkets::report(Origin::signed(CHARLIE), 0, OutcomeReport::Categorical(1)), + PredictionMarkets::report( + RuntimeOrigin::signed(CHARLIE), + 0, + OutcomeReport::Categorical(1) + ), Error::::ReporterNotOracle, ); }); @@ -4945,7 +5003,7 @@ fn create_market_succeeds_if_market_duration_is_maximal_in_blocks() { "Test failed due to misconfiguration: `MaxMarketLifetime` is too small" ); assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(start..end), @@ -4972,7 +5030,7 @@ fn create_market_suceeds_if_market_duration_is_maximal_in_moments() { "Test failed due to misconfiguration: `MaxMarketLifetime` is too small" ); assert_ok!(PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(start..end), @@ -4999,7 +5057,7 @@ fn create_market_fails_if_market_duration_is_too_long_in_blocks() { ); assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Block(start..end), @@ -5029,7 +5087,7 @@ fn create_market_fails_if_market_duration_is_too_long_in_moments() { ); assert_noop!( PredictionMarkets::create_market( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), Asset::Ztg, BOB, MarketPeriod::Timestamp(start..end), @@ -5085,7 +5143,7 @@ fn create_market_sets_the_correct_market_parameters_and_reserves_the_correct_amo let market_type = MarketType::Categorical(7); let dispute_mechanism = MarketDisputeMechanism::Authorized; assert_ok!(PredictionMarkets::create_market( - Origin::signed(creator), + RuntimeOrigin::signed(creator), Asset::Ztg, oracle, period.clone(), @@ -5118,15 +5176,15 @@ fn deploy_swap_pool( market: Market>, market_id: u128, ) -> DispatchResultWithPostInfo { - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(FRED), 0, 100 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(FRED), 0, 100 * BASE)); assert_ok!(Balances::transfer( - Origin::signed(FRED), + RuntimeOrigin::signed(FRED), ::PalletId::get().into_account_truncating(), 100 * BASE )); let outcome_assets_len = PredictionMarkets::outcome_assets(market_id, &market).len(); PredictionMarkets::deploy_swap_pool_for_market( - Origin::signed(FRED), + RuntimeOrigin::signed(FRED), 0, ::MaxSwapFee::get(), LIQUIDITY, @@ -5143,9 +5201,9 @@ fn scalar_market_correctly_resolves_common(base_asset: Asset, reported 0..end, ScoringRule::CPMM, ); - assert_ok!(PredictionMarkets::buy_complete_set(Origin::signed(CHARLIE), 0, 100 * BASE)); + assert_ok!(PredictionMarkets::buy_complete_set(RuntimeOrigin::signed(CHARLIE), 0, 100 * BASE)); assert_ok!(Tokens::transfer( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), EVE, Asset::ScalarOutcome(0, ScalarPosition::Short), 100 * BASE @@ -5156,7 +5214,7 @@ fn scalar_market_correctly_resolves_common(base_asset: Asset, reported let grace_period = end + market.deadlines.grace_period; run_to_block(grace_period + 1); assert_ok!(PredictionMarkets::report( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), 0, OutcomeReport::Scalar(reported_value) )); @@ -5176,8 +5234,8 @@ fn scalar_market_correctly_resolves_common(base_asset: Asset, reported assert_eq!(AssetManager::free_balance(base_asset, &CHARLIE), 900 * BASE); assert_eq!(AssetManager::free_balance(base_asset, &EVE), 1000 * BASE); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(CHARLIE), 0)); - assert_ok!(PredictionMarkets::redeem_shares(Origin::signed(EVE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(CHARLIE), 0)); + assert_ok!(PredictionMarkets::redeem_shares(RuntimeOrigin::signed(EVE), 0)); let assets = PredictionMarkets::outcome_assets(0, &MarketCommons::market(&0).unwrap()); for asset in assets.iter() { assert_eq!(AssetManager::free_balance(*asset, &CHARLIE), 0); diff --git a/zrml/prediction-markets/src/weights.rs b/zrml/prediction-markets/src/weights.rs index 4480c5ea7..6d65d7fd6 100644 --- a/zrml/prediction-markets/src/weights.rs +++ b/zrml/prediction-markets/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_prediction_markets //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -92,16 +92,12 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens TotalIssuance (r:2 w:2) // Storage: PredictionMarkets Disputes (r:1 w:1) // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1) - fn admin_destroy_disputed_market(a: u32, d: u32, _o: u32, c: u32, r: u32) -> Weight { - Weight::from_ref_time(36_524_000) - // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(28_980_000).saturating_mul(a.into())) - // Standard Error: 473_000 - .saturating_add(Weight::from_ref_time(40_066_000).saturating_mul(d.into())) - // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(425_000).saturating_mul(c.into())) - // Standard Error: 41_000 - .saturating_add(Weight::from_ref_time(438_000).saturating_mul(r.into())) + fn admin_destroy_disputed_market(a: u32, d: u32, _o: u32, _c: u32, _r: u32) -> Weight { + Weight::from_ref_time(98_844_452) + // Standard Error: 1_524 + .saturating_add(Weight::from_ref_time(12_109_486).saturating_mul(a.into())) + // Standard Error: 17_423 + .saturating_add(Weight::from_ref_time(10_703_404).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(d.into()))) @@ -118,12 +114,12 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens TotalIssuance (r:2 w:2) // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1) // Storage: PredictionMarkets Disputes (r:0 w:1) - fn admin_destroy_reported_market(a: u32, _o: u32, c: u32, _r: u32) -> Weight { - Weight::from_ref_time(302_448_000) - // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(27_690_000).saturating_mul(a.into())) - // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(809_000).saturating_mul(c.into())) + fn admin_destroy_reported_market(a: u32, _o: u32, _c: u32, r: u32) -> Weight { + Weight::from_ref_time(101_907_522) + // Standard Error: 2_150 + .saturating_add(Weight::from_ref_time(11_991_328).saturating_mul(a.into())) + // Standard Error: 2_139 + .saturating_add(Weight::from_ref_time(19_182).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(8)) @@ -133,11 +129,14 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsPerOpenTimeFrame (r:1 w:1) // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1) // Storage: MarketCommons MarketPool (r:1 w:0) - fn admin_move_market_to_closed(_o: u32, c: u32) -> Weight { - Weight::from_ref_time(62_951_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(69_000).saturating_mul(c.into())) - .saturating_add(T::DbWeight::get().reads(4)) + // Storage: Timestamp Now (r:1 w:0) + fn admin_move_market_to_closed(o: u32, c: u32) -> Weight { + Weight::from_ref_time(29_677_109) + // Standard Error: 266 + .saturating_add(Weight::from_ref_time(8_751).saturating_mul(o.into())) + // Standard Error: 266 + .saturating_add(Weight::from_ref_time(20_949).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(3)) } // Storage: MarketCommons Markets (r:1 w:1) @@ -145,8 +144,10 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Balances Reserves (r:1 w:1) // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: PredictionMarkets Disputes (r:0 w:1) - fn admin_move_market_to_resolved_scalar_reported(_r: u32) -> Weight { - Weight::from_ref_time(107_834_000) + fn admin_move_market_to_resolved_scalar_reported(r: u32) -> Weight { + Weight::from_ref_time(47_236_897) + // Standard Error: 334 + .saturating_add(Weight::from_ref_time(14_850).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -157,9 +158,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Swaps Pools (r:1 w:1) // Storage: PredictionMarkets Disputes (r:0 w:1) fn admin_move_market_to_resolved_categorical_reported(r: u32) -> Weight { - Weight::from_ref_time(171_263_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(12_000).saturating_mul(r.into())) + Weight::from_ref_time(82_465_110) + // Standard Error: 390 + .saturating_add(Weight::from_ref_time(24_567).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -172,7 +173,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: MarketCommons MarketPool (r:1 w:0) fn admin_move_market_to_resolved_scalar_disputed(_r: u32) -> Weight { - Weight::from_ref_time(174_434_000) + Weight::from_ref_time(77_566_793) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(7)) } @@ -186,9 +187,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: Swaps Pools (r:1 w:1) fn admin_move_market_to_resolved_categorical_disputed(r: u32) -> Weight { - Weight::from_ref_time(226_823_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(85_000).saturating_mul(r.into())) + Weight::from_ref_time(111_553_988) + // Standard Error: 510 + .saturating_add(Weight::from_ref_time(24_763).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(10)) .saturating_add(T::DbWeight::get().writes(8)) } @@ -196,16 +197,16 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsForEdit (r:1 w:0) // Storage: Balances Reserves (r:1 w:1) fn approve_market() -> Weight { - Weight::from_ref_time(71_421_000) + Weight::from_ref_time(30_750_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } // Storage: MarketCommons Markets (r:1 w:0) // Storage: PredictionMarkets MarketIdsForEdit (r:1 w:1) fn request_edit(r: u32) -> Weight { - Weight::from_ref_time(40_894_000) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(r.into())) + Weight::from_ref_time(16_505_286) + // Standard Error: 17 + .saturating_add(Weight::from_ref_time(957).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -214,9 +215,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: Tokens TotalIssuance (r:2 w:2) fn buy_complete_set(a: u32) -> Weight { - Weight::from_ref_time(79_725_000) - // Standard Error: 25_000 - .saturating_add(Weight::from_ref_time(19_896_000).saturating_mul(a.into())) + Weight::from_ref_time(34_786_131) + // Standard Error: 1_751 + .saturating_add(Weight::from_ref_time(8_388_765).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -228,9 +229,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1) // Storage: MarketCommons Markets (r:0 w:1) fn create_market(m: u32) -> Weight { - Weight::from_ref_time(80_436_000) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(9_000).saturating_mul(m.into())) + Weight::from_ref_time(31_590_932) + // Standard Error: 536 + .saturating_add(Weight::from_ref_time(19_431).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -239,9 +240,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn edit_market(m: u32) -> Weight { - Weight::from_ref_time(68_686_000) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(150_000).saturating_mul(m.into())) + Weight::from_ref_time(27_792_538) + // Standard Error: 342 + .saturating_add(Weight::from_ref_time(27_261).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -255,11 +256,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:1) // Storage: Swaps Pools (r:0 w:1) fn deploy_swap_pool_for_market_future_pool(a: u32, o: u32) -> Weight { - Weight::from_ref_time(170_533_000) - // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(32_842_000).saturating_mul(a.into())) - // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(145_000).saturating_mul(o.into())) + Weight::from_ref_time(62_202_136) + // Standard Error: 1_823 + .saturating_add(Weight::from_ref_time(13_956_712).saturating_mul(a.into())) + // Standard Error: 1_814 + .saturating_add(Weight::from_ref_time(50_205).saturating_mul(o.into())) .saturating_add(T::DbWeight::get().reads(8)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(7)) @@ -274,9 +275,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:1) // Storage: Swaps Pools (r:0 w:1) fn deploy_swap_pool_for_market_open_pool(a: u32) -> Weight { - Weight::from_ref_time(100_840_000) - // Standard Error: 52_000 - .saturating_add(Weight::from_ref_time(35_669_000).saturating_mul(a.into())) + Weight::from_ref_time(67_257_811) + // Standard Error: 2_495 + .saturating_add(Weight::from_ref_time(13_993_256).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(6)) @@ -288,11 +289,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: GlobalDisputes Outcomes (r:7 w:7) // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:2 w:2) fn start_global_dispute(m: u32, n: u32) -> Weight { - Weight::from_ref_time(128_368_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(8_000).saturating_mul(m.into())) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(96_000).saturating_mul(n.into())) + Weight::from_ref_time(59_605_523) + // Standard Error: 335 + .saturating_add(Weight::from_ref_time(8_254).saturating_mul(m.into())) + // Standard Error: 335 + .saturating_add(Weight::from_ref_time(13_974).saturating_mul(n.into())) .saturating_add(T::DbWeight::get().reads(12)) .saturating_add(T::DbWeight::get().writes(10)) } @@ -300,7 +301,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons Markets (r:1 w:1) // Storage: Balances Reserves (r:1 w:1) fn dispute_authorized() -> Weight { - Weight::from_ref_time(73_020_000) + Weight::from_ref_time(32_360_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -308,7 +309,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Balances Reserves (r:1 w:1) // Storage: PredictionMarkets MarketIdsForEdit (r:0 w:1) fn handle_expired_advised_market() -> Weight { - Weight::from_ref_time(82_180_000) + Weight::from_ref_time(33_141_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -318,7 +319,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Swaps Pools (r:1 w:1) // Storage: PredictionMarkets Disputes (r:0 w:1) fn internal_resolve_categorical_reported() -> Weight { - Weight::from_ref_time(145_420_000) + Weight::from_ref_time(70_937_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(4)) } @@ -330,7 +331,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: Swaps Pools (r:1 w:1) fn internal_resolve_categorical_disputed() -> Weight { - Weight::from_ref_time(191_701_000) + Weight::from_ref_time(94_028_000) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -339,7 +340,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: PredictionMarkets Disputes (r:0 w:1) fn internal_resolve_scalar_reported() -> Weight { - Weight::from_ref_time(88_350_000) + Weight::from_ref_time(35_443_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -351,7 +352,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: MarketCommons MarketPool (r:1 w:0) fn internal_resolve_scalar_disputed() -> Weight { - Weight::from_ref_time(133_121_000) + Weight::from_ref_time(60_764_000) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -365,15 +366,15 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1) // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1) fn on_initialize_resolve_overhead() -> Weight { - Weight::from_ref_time(38_470_000) + Weight::from_ref_time(14_258_000) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(8)) } // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1) fn process_subsidy_collecting_markets_raw(a: u32) -> Weight { - Weight::from_ref_time(8_741_000) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(268_000).saturating_mul(a.into())) + Weight::from_ref_time(3_089_324) + // Standard Error: 547 + .saturating_add(Weight::from_ref_time(97_367).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -382,7 +383,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Tokens TotalIssuance (r:1 w:1) fn redeem_shares_categorical() -> Weight { - Weight::from_ref_time(118_191_000) + Weight::from_ref_time(57_384_000) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -391,7 +392,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Tokens TotalIssuance (r:2 w:2) fn redeem_shares_scalar() -> Weight { - Weight::from_ref_time(149_560_000) + Weight::from_ref_time(60_727_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -400,20 +401,24 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketIdsPerCloseTimeFrame (r:1 w:1) // Storage: Balances Reserves (r:1 w:1) // Storage: PredictionMarkets MarketIdsForEdit (r:0 w:1) - fn reject_market(c: u32, _o: u32, r: u32) -> Weight { - Weight::from_ref_time(126_400_000) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(1_000).saturating_mul(c.into())) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(r.into())) + fn reject_market(c: u32, o: u32, r: u32) -> Weight { + Weight::from_ref_time(51_879_457) + // Standard Error: 358 + .saturating_add(Weight::from_ref_time(22_537).saturating_mul(c.into())) + // Standard Error: 358 + .saturating_add(Weight::from_ref_time(12_584).saturating_mul(o.into())) + // Standard Error: 22 + .saturating_add(Weight::from_ref_time(475).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: MarketCommons Markets (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) // Storage: PredictionMarkets MarketIdsPerReportBlock (r:1 w:1) - fn report(_m: u32) -> Weight { - Weight::from_ref_time(58_983_000) + fn report(m: u32) -> Weight { + Weight::from_ref_time(23_497_754) + // Standard Error: 338 + .saturating_add(Weight::from_ref_time(6_734).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -422,9 +427,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:2 w:2) // Storage: Tokens TotalIssuance (r:2 w:2) fn sell_complete_set(a: u32) -> Weight { - Weight::from_ref_time(54_681_000) - // Standard Error: 40_000 - .saturating_add(Weight::from_ref_time(27_784_000).saturating_mul(a.into())) + Weight::from_ref_time(35_416_984) + // Standard Error: 1_858 + .saturating_add(Weight::from_ref_time(11_608_572).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -437,9 +442,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1) // Storage: Swaps Pools (r:0 w:1) fn start_subsidy(a: u32) -> Weight { - Weight::from_ref_time(56_316_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(110_000).saturating_mul(a.into())) + Weight::from_ref_time(23_573_263) + // Standard Error: 226 + .saturating_add(Weight::from_ref_time(42_261).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -447,11 +452,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons Markets (r:32 w:0) // Storage: PredictionMarkets MarketIdsPerOpenTimeFrame (r:1 w:1) fn market_status_manager(b: u32, f: u32) -> Weight { - Weight::from_ref_time(59_397_000) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(3_327_000).saturating_mul(b.into())) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(3_297_000).saturating_mul(f.into())) + Weight::from_ref_time(27_286_425) + // Standard Error: 1_160 + .saturating_add(Weight::from_ref_time(1_511_142).saturating_mul(b.into())) + // Standard Error: 1_160 + .saturating_add(Weight::from_ref_time(1_501_105).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into()))) @@ -461,11 +466,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons Markets (r:32 w:0) // Storage: PredictionMarkets MarketIdsPerDisputeBlock (r:1 w:1) fn market_resolution_manager(r: u32, d: u32) -> Weight { - Weight::from_ref_time(62_079_000) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(3_374_000).saturating_mul(r.into())) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(3_206_000).saturating_mul(d.into())) + Weight::from_ref_time(25_238_195) + // Standard Error: 767 + .saturating_add(Weight::from_ref_time(1_555_436).saturating_mul(r.into())) + // Standard Error: 767 + .saturating_add(Weight::from_ref_time(1_589_138).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(d.into()))) @@ -473,7 +478,7 @@ impl WeightInfoZeitgeist for WeightInfo { } // Storage: PredictionMarkets MarketsCollectingSubsidy (r:1 w:1) fn process_subsidy_collecting_markets_dummy() -> Weight { - Weight::from_ref_time(7_620_000) + Weight::from_ref_time(2_968_000) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } diff --git a/zrml/rikiddo/Cargo.toml b/zrml/rikiddo/Cargo.toml index 3946c36d8..cd0f49627 100644 --- a/zrml/rikiddo/Cargo.toml +++ b/zrml/rikiddo/Cargo.toml @@ -1,16 +1,16 @@ [dependencies] arbitrary = { version = "1.0.1", features = ["derive"], optional = true } cfg-if = { version = "1.0.0", default-features = false } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } hashbrown = { default-features = true, version = "0.11" } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-core = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-core = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } substrate-fixed = { default-features = false, features = ["serde"], git = "https://github.com/encointer/substrate-fixed" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } diff --git a/zrml/rikiddo/fuzz/Cargo.toml b/zrml/rikiddo/fuzz/Cargo.toml index a01f8a121..5c28dfedf 100644 --- a/zrml/rikiddo/fuzz/Cargo.toml +++ b/zrml/rikiddo/fuzz/Cargo.toml @@ -72,8 +72,8 @@ test = false [dependencies] arbitrary = { features = ["derive"], version = "1.0" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } libfuzzer-sys = "0.4" substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" } zrml-rikiddo = { features = ["arbitrary", "mock"], path = ".." } diff --git a/zrml/rikiddo/src/mock.rs b/zrml/rikiddo/src/mock.rs index 3b951a497..d6459020c 100644 --- a/zrml/rikiddo/src/mock.rs +++ b/zrml/rikiddo/src/mock.rs @@ -59,7 +59,7 @@ construct_runtime!( { Balances: pallet_balances::{Call, Config, Event, Pallet, Storage}, Rikiddo: crate::{Pallet, Storage}, - System: frame_system::{Config, Event, Pallet, Storage}, + System: frame_system::{Call, Config, Event, Pallet, Storage}, Timestamp: pallet_timestamp::{Call, Pallet, Storage, Inherent}, } ); @@ -87,9 +87,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -99,7 +99,7 @@ impl frame_system::Config for Runtime { type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -110,7 +110,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MaxReserves = MaxReserves; type ExistentialDeposit = ExistentialDeposit; type MaxLocks = (); diff --git a/zrml/simple-disputes/Cargo.toml b/zrml/simple-disputes/Cargo.toml index d6b6ede2b..80aa46782 100644 --- a/zrml/simple-disputes/Cargo.toml +++ b/zrml/simple-disputes/Cargo.toml @@ -1,17 +1,17 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-market-commons = { default-features = false, path = "../market-commons" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/simple-disputes/src/lib.rs b/zrml/simple-disputes/src/lib.rs index fb4308b53..1527fe58e 100644 --- a/zrml/simple-disputes/src/lib.rs +++ b/zrml/simple-disputes/src/lib.rs @@ -68,7 +68,7 @@ mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// Event - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type DisputeResolution: DisputeResolutionApi< AccountId = Self::AccountId, @@ -141,7 +141,7 @@ mod pallet { type BlockNumber = T::BlockNumber; type MarketId = MarketIdOf; type Moment = MomentOf; - type Origin = T::Origin; + type Origin = T::RuntimeOrigin; fn on_dispute( disputes: &[MarketDispute], diff --git a/zrml/simple-disputes/src/mock.rs b/zrml/simple-disputes/src/mock.rs index af96ecece..c0848647b 100644 --- a/zrml/simple-disputes/src/mock.rs +++ b/zrml/simple-disputes/src/mock.rs @@ -102,7 +102,7 @@ impl DisputeResolutionApi for NoopResolution { } impl crate::Config for Runtime { - type Event = (); + type RuntimeEvent = (); type DisputeResolution = NoopResolution; type MarketCommons = MarketCommons; type PalletId = SimpleDisputesPalletId; @@ -116,9 +116,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = (); + type RuntimeEvent = (); type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -127,7 +127,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -139,7 +139,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = (); + type RuntimeEvent = (); type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/styx/Cargo.toml b/zrml/styx/Cargo.toml index ee233d4ff..70873adf2 100644 --- a/zrml/styx/Cargo.toml +++ b/zrml/styx/Cargo.toml @@ -1,16 +1,16 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } [dev-dependencies] -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate" } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, features = ["mock"], path = "../../primitives" } [features] diff --git a/zrml/styx/src/lib.rs b/zrml/styx/src/lib.rs index d1a6164e0..e00713303 100644 --- a/zrml/styx/src/lib.rs +++ b/zrml/styx/src/lib.rs @@ -38,9 +38,9 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The origin that is allowed to set the amount burned when crossing Styx. - type SetBurnAmountOrigin: EnsureOrigin; + type SetBurnAmountOrigin: EnsureOrigin; - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: Currency; diff --git a/zrml/styx/src/mock.rs b/zrml/styx/src/mock.rs index b147fe247..80dd2a2f8 100644 --- a/zrml/styx/src/mock.rs +++ b/zrml/styx/src/mock.rs @@ -53,7 +53,7 @@ construct_runtime!( impl crate::Config for Runtime { type Currency = Balances; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SetBurnAmountOrigin = EnsureSignedBy; type WeightInfo = zrml_styx::weights::WeightInfo; } @@ -66,9 +66,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -77,7 +77,7 @@ impl frame_system::Config for Runtime { type MaxConsumers = frame_support::traits::ConstU32<16>; type OnKilledAccount = (); type OnNewAccount = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -89,7 +89,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = (); type MaxLocks = (); type MaxReserves = MaxReserves; diff --git a/zrml/styx/src/tests.rs b/zrml/styx/src/tests.rs index 32b1fb1e1..20988d223 100644 --- a/zrml/styx/src/tests.rs +++ b/zrml/styx/src/tests.rs @@ -26,7 +26,7 @@ fn cross_slashes_funds_and_stores_crossing() { frame_system::Pallet::::set_block_number(1); let burn_amount = crate::BurnAmount::::get(); let original_balance = Balances::free_balance(&ALICE); - assert_ok!(Styx::cross(Origin::signed(ALICE))); + assert_ok!(Styx::cross(RuntimeOrigin::signed(ALICE))); let balance_after_crossing = Balances::free_balance(&ALICE); let diff = original_balance - balance_after_crossing; assert!(Crossings::::contains_key(ALICE)); @@ -38,8 +38,11 @@ fn cross_slashes_funds_and_stores_crossing() { fn account_should_only_be_able_to_cross_once() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_ok!(Styx::cross(Origin::signed(ALICE))); - assert_noop!(Styx::cross(Origin::signed(ALICE)), Error::::HasAlreadyCrossed); + assert_ok!(Styx::cross(RuntimeOrigin::signed(ALICE))); + assert_noop!( + Styx::cross(RuntimeOrigin::signed(ALICE)), + Error::::HasAlreadyCrossed + ); }); } @@ -47,7 +50,7 @@ fn account_should_only_be_able_to_cross_once() { fn should_set_burn_amount() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_ok!(Styx::set_burn_amount(Origin::signed(SUDO), 144u128)); + assert_ok!(Styx::set_burn_amount(RuntimeOrigin::signed(SUDO), 144u128)); System::assert_last_event(Event::CrossingFeeChanged(144u128).into()); assert_eq!(crate::BurnAmount::::get(), 144u128); }); @@ -57,7 +60,7 @@ fn should_set_burn_amount() { fn set_burn_amount_should_fail_with_unathorized_caller() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_noop!(Styx::set_burn_amount(Origin::signed(9999), 144u128), BadOrigin); + assert_noop!(Styx::set_burn_amount(RuntimeOrigin::signed(9999), 144u128), BadOrigin); }); } @@ -65,9 +68,9 @@ fn set_burn_amount_should_fail_with_unathorized_caller() { fn account_should_not_cross_without_sufficient_funds() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_ok!(Balances::set_balance(Origin::root(), ALICE, 0, 0)); + assert_ok!(Balances::set_balance(RuntimeOrigin::root(), ALICE, 0, 0)); assert_noop!( - Styx::cross(Origin::signed(ALICE)), + Styx::cross(RuntimeOrigin::signed(ALICE)), Error::::FundDoesNotHaveEnoughFreeBalance ); }); @@ -77,7 +80,7 @@ fn account_should_not_cross_without_sufficient_funds() { fn should_emit_account_crossed_event_with_correct_value() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); - assert_ok!(Styx::cross(Origin::signed(ALICE))); + assert_ok!(Styx::cross(RuntimeOrigin::signed(ALICE))); System::assert_last_event( Event::AccountCrossed(ALICE, crate::BurnAmount::::get()).into(), ); diff --git a/zrml/styx/src/weights.rs b/zrml/styx/src/weights.rs index 76ca25625..c86b694fb 100644 --- a/zrml/styx/src/weights.rs +++ b/zrml/styx/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_styx //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -56,12 +56,12 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Styx Crossings (r:1 w:1) // Storage: Styx BurnAmount (r:1 w:0) fn cross() -> Weight { - Weight::from_ref_time(54_610_000) + Weight::from_ref_time(23_072_000) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Styx BurnAmount (r:0 w:1) fn set_burn_amount() -> Weight { - Weight::from_ref_time(22_410_000).saturating_add(T::DbWeight::get().writes(1)) + Weight::from_ref_time(9_025_000).saturating_add(T::DbWeight::get().writes(1)) } } diff --git a/zrml/swaps/Cargo.toml b/zrml/swaps/Cargo.toml index 051aca111..5ddf3aae3 100644 --- a/zrml/swaps/Cargo.toml +++ b/zrml/swaps/Cargo.toml @@ -1,11 +1,11 @@ [dependencies] -frame-benchmarking = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, optional = true, git = "https://github.com/zeitgeistpm/substrate" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -frame-system = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } +frame-benchmarking = { branch = "polkadot-v0.9.32", default-features = false, optional = true, git = "https://github.com/paritytech/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +frame-system = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed" } zeitgeist-primitives = { default-features = false, path = "../../primitives" } zrml-liquidity-mining = { default-features = false, path = "../liquidity-mining" } @@ -14,12 +14,12 @@ zrml-rikiddo = { default-features = false, path = "../rikiddo" } # Mock -orml-currencies = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -orml-tokens = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/open-runtime-module-library", optional = true } -pallet-balances = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -pallet-timestamp = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } -sp-io = { branch = "moonbeam-polkadot-v0.9.29", git = "https://github.com/zeitgeistpm/substrate", optional = true } +orml-currencies = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +orml-tokens = { branch = "polkadot-v0.9.32", git = "https://github.com/open-web3-stack/open-runtime-module-library", optional = true } +pallet-balances = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +pallet-timestamp = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-api = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } +sp-io = { branch = "polkadot-v0.9.32", git = "https://github.com/paritytech/substrate", optional = true } zrml-swaps-runtime-api = { optional = true, path = "./runtime-api" } [dev-dependencies] diff --git a/zrml/swaps/fuzz/Cargo.toml b/zrml/swaps/fuzz/Cargo.toml index 430efcd92..900ff87a3 100644 --- a/zrml/swaps/fuzz/Cargo.toml +++ b/zrml/swaps/fuzz/Cargo.toml @@ -54,11 +54,11 @@ test = false [dependencies] arbitrary = { features = ["derive"], version = "1.0" } -frame-support = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +frame-support = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } libfuzzer-sys = "0.4" -orml-traits = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" } +orml-traits = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library" } rand = "0.8.4" -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { features = ["mock"], path = "../../../primitives" } zrml-swaps = { features = ["mock"], path = ".." } diff --git a/zrml/swaps/fuzz/pool_exit.rs b/zrml/swaps/fuzz/pool_exit.rs index 20489be31..5b0c6e7be 100644 --- a/zrml/swaps/fuzz/pool_exit.rs +++ b/zrml/swaps/fuzz/pool_exit.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; mod utils; use orml_traits::currency::MultiCurrency; @@ -47,7 +47,7 @@ fuzz_target!(|data: GeneralPoolData| { data.pool_amount, ); let _ = Swaps::pool_exit( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, data.pool_amount, data.asset_bounds, diff --git a/zrml/swaps/fuzz/pool_exit_with_exact_asset_amount.rs b/zrml/swaps/fuzz/pool_exit_with_exact_asset_amount.rs index b57329429..9f983b131 100644 --- a/zrml/swaps/fuzz/pool_exit_with_exact_asset_amount.rs +++ b/zrml/swaps/fuzz/pool_exit_with_exact_asset_amount.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; mod utils; use orml_traits::currency::MultiCurrency; @@ -49,7 +49,7 @@ fuzz_target!(|data: ExactAssetAmountData| { data.pool_amount, ); let _ = Swaps::pool_exit_with_exact_asset_amount( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset), data.asset_amount, diff --git a/zrml/swaps/fuzz/pool_exit_with_exact_pool_amount.rs b/zrml/swaps/fuzz/pool_exit_with_exact_pool_amount.rs index 3de0eb4b7..a583da30e 100644 --- a/zrml/swaps/fuzz/pool_exit_with_exact_pool_amount.rs +++ b/zrml/swaps/fuzz/pool_exit_with_exact_pool_amount.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; mod utils; use orml_traits::currency::MultiCurrency; @@ -48,7 +48,7 @@ fuzz_target!(|data: ExactAmountData| { data.pool_amount, ); let _ = Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset), data.pool_amount, diff --git a/zrml/swaps/fuzz/pool_join.rs b/zrml/swaps/fuzz/pool_join.rs index 18d28234d..76a1bf87c 100644 --- a/zrml/swaps/fuzz/pool_join.rs +++ b/zrml/swaps/fuzz/pool_join.rs @@ -21,7 +21,7 @@ use libfuzzer_sys::fuzz_target; use orml_traits::currency::MultiCurrency; use utils::GeneralPoolData; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; mod utils; use utils::construct_asset; use zrml_swaps::mock::AssetManager; @@ -41,7 +41,7 @@ fuzz_target!(|data: GeneralPoolData| { let pool_id = data.pool_creation.create_pool(); // join a pool with a valid pool id let _ = Swaps::pool_join( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, data.pool_amount, data.asset_bounds, diff --git a/zrml/swaps/fuzz/pool_join_with_exact_asset_amount.rs b/zrml/swaps/fuzz/pool_join_with_exact_asset_amount.rs index 3b317472b..91f1808d6 100644 --- a/zrml/swaps/fuzz/pool_join_with_exact_asset_amount.rs +++ b/zrml/swaps/fuzz/pool_join_with_exact_asset_amount.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; use utils::ExactAssetAmountData; mod utils; @@ -41,7 +41,7 @@ fuzz_target!(|data: ExactAssetAmountData| { } let pool_id = data.pool_creation.create_pool(); let _ = Swaps::pool_join_with_exact_asset_amount( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset), data.asset_amount, diff --git a/zrml/swaps/fuzz/pool_join_with_exact_pool_amount.rs b/zrml/swaps/fuzz/pool_join_with_exact_pool_amount.rs index 6da473ee4..f480592dd 100644 --- a/zrml/swaps/fuzz/pool_join_with_exact_pool_amount.rs +++ b/zrml/swaps/fuzz/pool_join_with_exact_pool_amount.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{ExtBuilder, RuntimeOrigin, Swaps}; use utils::ExactAmountData; mod utils; @@ -41,7 +41,7 @@ fuzz_target!(|data: ExactAmountData| { } let pool_id = data.pool_creation.create_pool(); let _ = Swaps::pool_join_with_exact_pool_amount( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset), data.pool_amount, diff --git a/zrml/swaps/fuzz/swap_exact_amount_in.rs b/zrml/swaps/fuzz/swap_exact_amount_in.rs index 40d7a92c9..4aba80d2f 100644 --- a/zrml/swaps/fuzz/swap_exact_amount_in.rs +++ b/zrml/swaps/fuzz/swap_exact_amount_in.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{AssetManager, ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{AssetManager, ExtBuilder, RuntimeOrigin, Swaps}; use utils::SwapExactAmountInData; mod utils; @@ -44,7 +44,7 @@ fuzz_target!(|data: SwapExactAmountInData| { data.asset_amount_in, ); let _ = Swaps::swap_exact_amount_in( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset_in), data.asset_amount_in, diff --git a/zrml/swaps/fuzz/swap_exact_amount_out.rs b/zrml/swaps/fuzz/swap_exact_amount_out.rs index 32e9162b5..93eab4325 100644 --- a/zrml/swaps/fuzz/swap_exact_amount_out.rs +++ b/zrml/swaps/fuzz/swap_exact_amount_out.rs @@ -18,7 +18,7 @@ #![no_main] use libfuzzer_sys::fuzz_target; -use zrml_swaps::mock::{AssetManager, ExtBuilder, Origin, Swaps}; +use zrml_swaps::mock::{AssetManager, ExtBuilder, RuntimeOrigin, Swaps}; mod utils; use orml_traits::currency::MultiCurrency; @@ -43,7 +43,7 @@ fuzz_target!(|data: SwapExactAmountOutData| { } let _ = Swaps::swap_exact_amount_out( - Origin::signed(data.origin), + RuntimeOrigin::signed(data.origin), pool_id, construct_asset(data.asset_in), data.asset_amount_in, diff --git a/zrml/swaps/rpc/Cargo.toml b/zrml/swaps/rpc/Cargo.toml index 640a11a10..dcb0ce1d5 100644 --- a/zrml/swaps/rpc/Cargo.toml +++ b/zrml/swaps/rpc/Cargo.toml @@ -1,9 +1,9 @@ [dependencies] jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } parity-scale-codec = { default-features = false, version = "3.0.0" } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-blockchain = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-blockchain = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../../primitives" } zrml-swaps-runtime-api = { default-features = false, features = ["std"], path = "../runtime-api" } diff --git a/zrml/swaps/runtime-api/Cargo.toml b/zrml/swaps/runtime-api/Cargo.toml index 78023b6cf..67f337c10 100644 --- a/zrml/swaps/runtime-api/Cargo.toml +++ b/zrml/swaps/runtime-api/Cargo.toml @@ -1,7 +1,7 @@ [dependencies] parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" } -sp-api = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } -sp-runtime = { branch = "moonbeam-polkadot-v0.9.29", default-features = false, git = "https://github.com/zeitgeistpm/substrate" } +sp-api = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } +sp-runtime = { branch = "polkadot-v0.9.32", default-features = false, git = "https://github.com/paritytech/substrate" } zeitgeist-primitives = { default-features = false, path = "../../../primitives" } [features] diff --git a/zrml/swaps/src/benchmarks.rs b/zrml/swaps/src/benchmarks.rs index 22038d993..f2b194dd2 100644 --- a/zrml/swaps/src/benchmarks.rs +++ b/zrml/swaps/src/benchmarks.rs @@ -50,7 +50,7 @@ use zrml_market_commons::MarketCommonsPalletApi; const LIQUIDITY: u128 = 100 * BASE; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { frame_system::Pallet::::assert_last_event(generic_event.into()); } diff --git a/zrml/swaps/src/lib.rs b/zrml/swaps/src/lib.rs index a386c0731..274fa9d09 100644 --- a/zrml/swaps/src/lib.rs +++ b/zrml/swaps/src/lib.rs @@ -757,7 +757,7 @@ mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The fee for exiting a pool. #[pallet::constant] @@ -1094,7 +1094,7 @@ mod pallet { #[pallet::hooks] impl Hooks for Pallet { fn on_idle(_: T::BlockNumber, remaining_weight: Weight) -> Weight { - if remaining_weight < ON_IDLE_MIN_WEIGHT { + if remaining_weight.all_lt(ON_IDLE_MIN_WEIGHT) { return Weight::zero(); } Self::execute_arbitrage_all(remaining_weight / 2) diff --git a/zrml/swaps/src/mock.rs b/zrml/swaps/src/mock.rs index 8e781e972..8d77ca50e 100644 --- a/zrml/swaps/src/mock.rs +++ b/zrml/swaps/src/mock.rs @@ -85,7 +85,7 @@ construct_runtime!( pub type AssetManager = Currencies; impl crate::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExitFee = ExitFeeMock; type FixedTypeU = ::FixedTypeU; type FixedTypeS = ::FixedTypeS; @@ -115,9 +115,9 @@ impl frame_system::Config for Runtime { type BlockLength = (); type BlockNumber = BlockNumber; type BlockWeights = (); - type Call = Call; + type RuntimeCall = RuntimeCall; type DbWeight = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Hash = Hash; type Hashing = BlakeTwo256; type Header = Header; @@ -127,7 +127,7 @@ impl frame_system::Config for Runtime { type OnKilledAccount = (); type OnNewAccount = (); type OnSetCode = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type PalletInfo = PalletInfo; type SS58Prefix = (); type SystemWeightInfo = (); @@ -146,13 +146,11 @@ impl orml_tokens::Config for Runtime { type Balance = Balance; type CurrencyId = CurrencyId; type DustRemovalWhitelist = Everything; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = ExistentialDeposits; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type OnDust = (); - type OnKilledTokenAccount = (); - type OnNewTokenAccount = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); } @@ -161,7 +159,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; @@ -170,7 +168,7 @@ impl pallet_balances::Config for Runtime { } impl zrml_liquidity_mining::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type MarketCommons = MarketCommons; type MarketId = MarketId; type PalletId = LiquidityMiningPalletId; diff --git a/zrml/swaps/src/tests.rs b/zrml/swaps/src/tests.rs index 6e41b8d69..3b33b495b 100644 --- a/zrml/swaps/src/tests.rs +++ b/zrml/swaps/src/tests.rs @@ -406,7 +406,7 @@ fn destroy_pool_in_subsidy_phase_returns_subsidy_and_closes_pool() { // Reserve some funds for subsidy assert_ok!(Swaps::pool_join_subsidy(alice_signed(), pool_id, _25)); assert_ok!(Currencies::deposit(ASSET_D, &BOB, _26)); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(BOB), pool_id, _26)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(BOB), pool_id, _26)); assert_eq!(Currencies::reserved_balance(ASSET_D, &ALICE), _25); assert_eq!(Currencies::reserved_balance(ASSET_D, &BOB), _26); @@ -438,7 +438,7 @@ fn distribute_pool_share_rewards() { subsidy_providers.iter().for_each(|provider| { assert_ok!(Currencies::deposit(base_asset, provider, subsidy_per_acc)); assert_ok!(Swaps::pool_join_subsidy( - Origin::signed(*provider), + RuntimeOrigin::signed(*provider), pool_id, subsidy_per_acc )); @@ -452,7 +452,7 @@ fn distribute_pool_share_rewards() { asset_holders.iter().for_each(|asset_holder| { assert_ok!(Currencies::deposit(base_asset, asset_holder, asset_per_acc + 20)); assert_ok!(Swaps::swap_exact_amount_out( - Origin::signed(*asset_holder), + RuntimeOrigin::signed(*asset_holder), pool_id, base_asset, Some(asset_per_acc + 20), @@ -514,8 +514,8 @@ fn end_subsidy_phase_distributes_shares_and_outcome_assets() { let subsidy_bob = min_subsidy + _25; assert_ok!(Currencies::deposit(ASSET_D, &ALICE, subsidy_alice)); assert_ok!(Currencies::deposit(ASSET_D, &BOB, subsidy_bob)); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(ALICE), pool_id, min_subsidy)); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(BOB), pool_id, subsidy_bob)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(ALICE), pool_id, min_subsidy)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(BOB), pool_id, subsidy_bob)); assert!(Swaps::end_subsidy_phase(pool_id).unwrap().result); // Check that subsidy was deposited, shares were distributed in exchange, the initial @@ -621,7 +621,7 @@ fn pool_join_fails_if_pool_is_closed() { let pool_id = 0; assert_ok!(Swaps::close_pool(pool_id)); assert_noop!( - Swaps::pool_join(Origin::signed(ALICE), pool_id, _1, vec![_1, _1, _1, _1]), + Swaps::pool_join(RuntimeOrigin::signed(ALICE), pool_id, _1, vec![_1, _1, _1, _1]), crate::Error::::InvalidPoolStatus, ); }); @@ -645,7 +645,7 @@ fn most_operations_fail_if_pool_is_clean() { )); assert_noop!( - Swaps::pool_join(Origin::signed(ALICE), pool_id, _1, vec![_10]), + Swaps::pool_join(RuntimeOrigin::signed(ALICE), pool_id, _1, vec![_10]), crate::Error::::InvalidPoolStatus, ); assert_noop!( @@ -825,7 +825,7 @@ fn pool_exit_with_exact_asset_amount_satisfies_max_out_ratio_constraints() { assert_noop!( Swaps::pool_exit_with_exact_asset_amount( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, ASSET_A, _50, @@ -860,7 +860,7 @@ fn pool_exit_with_exact_pool_amount_satisfies_max_in_ratio_constraints() { assert_noop!( Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, ASSET_A, _50, @@ -1055,7 +1055,7 @@ fn pool_exit_emits_correct_events() { ExtBuilder::default().build().execute_with(|| { frame_system::Pallet::::set_block_number(1); create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, Some(0), true); - assert_ok!(Swaps::pool_exit(Origin::signed(BOB), 0, _1, vec!(1, 2, 3, 4),)); + assert_ok!(Swaps::pool_exit(RuntimeOrigin::signed(BOB), 0, _1, vec!(1, 2, 3, 4),)); let amount = _1 - BASE / 10; // Subtract 10% fees! System::assert_last_event( Event::PoolExit(PoolAssetsEvent { @@ -1076,7 +1076,7 @@ fn pool_exit_decreases_correct_pool_parameters_with_exit_fee() { frame_system::Pallet::::set_block_number(1); create_initial_pool_with_funds_for_alice(ScoringRule::CPMM, Some(0), true); - assert_ok!(Swaps::pool_exit(Origin::signed(BOB), 0, _10, vec!(_1, _1, _1, _1),)); + assert_ok!(Swaps::pool_exit(RuntimeOrigin::signed(BOB), 0, _10, vec!(_1, _1, _1, _1),)); let pool_account = Swaps::pool_account_id(&0); let pool_shares_id = Swaps::pool_shares_id(0); @@ -1115,7 +1115,11 @@ fn pool_exit_decreases_correct_pool_parameters_on_cleaned_up_pool() { assert_ok!(Swaps::pool_join(alice_signed(), 0, _1, vec!(_1, _1, _1, _1),)); assert_ok!(Swaps::close_pool(0)); - assert_ok!(Swaps::admin_clean_up_pool(Origin::root(), 0, OutcomeReport::Categorical(65),)); + assert_ok!(Swaps::admin_clean_up_pool( + RuntimeOrigin::root(), + 0, + OutcomeReport::Categorical(65), + )); assert_ok!(Swaps::pool_exit(alice_signed(), 0, _1, vec!(_1, _1),)); System::assert_last_event( @@ -2285,12 +2289,12 @@ fn join_pool_exit_pool_does_not_create_extra_tokens() { let amount = 123_456_789_123; // Strange number to force rounding errors! assert_ok!(Swaps::pool_join( - Origin::signed(CHARLIE), + RuntimeOrigin::signed(CHARLIE), 0, amount, vec![_10000, _10000, _10000, _10000] )); - assert_ok!(Swaps::pool_exit(Origin::signed(CHARLIE), 0, amount, vec![0, 0, 0, 0])); + assert_ok!(Swaps::pool_exit(RuntimeOrigin::signed(CHARLIE), 0, amount, vec![0, 0, 0, 0])); // Check that the pool retains more tokens than before, and that Charlie loses some tokens // due to fees. @@ -2684,7 +2688,7 @@ fn single_asset_join_and_exit_are_inverse() { let pool_id = 0; assert_ok!(Currencies::deposit(asset, &ALICE, amount_in)); assert_ok!(Swaps::pool_join_with_exact_asset_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, asset, amount_in, @@ -2692,7 +2696,7 @@ fn single_asset_join_and_exit_are_inverse() { )); let pool_amount = Currencies::free_balance(Swaps::pool_shares_id(pool_id), &ALICE); assert_ok!(Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, asset, pool_amount, @@ -2721,7 +2725,7 @@ fn single_asset_operations_are_equivalent_to_swaps() { let pool_id = 0; assert_ok!(Currencies::deposit(asset_in, &ALICE, amount_in)); assert_ok!(Swaps::pool_join_with_exact_asset_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, asset_in, amount_in, @@ -2729,7 +2733,7 @@ fn single_asset_operations_are_equivalent_to_swaps() { )); let pool_amount = Currencies::free_balance(Swaps::pool_shares_id(pool_id), &ALICE); assert_ok!(Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, asset_out, pool_amount, @@ -2743,7 +2747,7 @@ fn single_asset_operations_are_equivalent_to_swaps() { let pool_id = 0; assert_ok!(Currencies::deposit(asset_in, &ALICE, amount_in)); assert_ok!(Swaps::swap_exact_amount_in( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, asset_in, amount_in, @@ -2766,7 +2770,7 @@ fn pool_join_with_uneven_balances() { let pool_id = 0; let pool_account_id = Swaps::pool_account_id(&pool_id); assert_ok!(Currencies::deposit(ASSET_A, &pool_account_id, _50)); - assert_ok!(Swaps::pool_join(Origin::signed(ALICE), pool_id, _10, vec![_100; 4])); + assert_ok!(Swaps::pool_join(RuntimeOrigin::signed(ALICE), pool_id, _10, vec![_100; 4])); assert_eq!(Currencies::free_balance(ASSET_A, &pool_account_id), _165); assert_eq!(Currencies::free_balance(ASSET_B, &pool_account_id), _110); assert_eq!(Currencies::free_balance(ASSET_C, &pool_account_id), _110); @@ -2807,7 +2811,7 @@ fn pool_exit_fails_if_balances_drop_too_low() { // We withdraw 99% of it, leaving 0.01 of each asset, which is below minimum balance. assert_noop!( - Swaps::pool_exit(Origin::signed(BOB), pool_id, _10, vec![0; 4]), + Swaps::pool_exit(RuntimeOrigin::signed(BOB), pool_id, _10, vec![0; 4]), crate::Error::::PoolDrain, ); }); @@ -2832,7 +2836,7 @@ fn pool_exit_fails_if_liquidity_drops_too_low() { // We withdraw too much liquidity but leave enough of each asset. assert_noop!( Swaps::pool_exit( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, _100 - Swaps::min_balance(Swaps::pool_shares_id(pool_id)) + 1, vec![0; 4] @@ -2874,7 +2878,7 @@ fn swap_exact_amount_in_fails_if_balances_drop_too_low() { assert_noop!( Swaps::swap_exact_amount_in( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, Swaps::min_balance(ASSET_A) / 10, @@ -2919,7 +2923,7 @@ fn swap_exact_amount_out_fails_if_balances_drop_too_low() { assert_noop!( Swaps::swap_exact_amount_out( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, Some(u128::MAX), @@ -2963,7 +2967,13 @@ fn pool_exit_with_exact_pool_amount_fails_if_balances_drop_too_low() { )); assert_noop!( - Swaps::pool_exit_with_exact_pool_amount(Origin::signed(BOB), pool_id, ASSET_A, _1, 0), + Swaps::pool_exit_with_exact_pool_amount( + RuntimeOrigin::signed(BOB), + pool_id, + ASSET_A, + _1, + 0 + ), crate::Error::::PoolDrain, ); }); @@ -2990,7 +3000,7 @@ fn pool_exit_with_exact_pool_amount_fails_if_liquidity_drops_too_low() { let ten_percent_of_pool = Swaps::min_balance(pool_shares_id) / 10; assert_noop!( Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, ASSET_A, ten_percent_of_pool, @@ -3034,7 +3044,7 @@ fn pool_exit_with_exact_asset_amount_fails_if_balances_drop_too_low() { let ten_percent_of_balance = Swaps::min_balance(ASSET_A) / 10; assert_noop!( Swaps::pool_exit_with_exact_asset_amount( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, ASSET_A, ten_percent_of_balance, @@ -3059,7 +3069,7 @@ fn pool_exit_with_exact_asset_amount_fails_if_liquidity_drops_too_low() { assert_noop!( Swaps::pool_exit_with_exact_asset_amount( - Origin::signed(BOB), + RuntimeOrigin::signed(BOB), pool_id, ASSET_A, _25, @@ -3077,7 +3087,7 @@ fn trading_functions_cache_pool_ids() { let pool_id = 0; assert_ok!(Swaps::pool_join_with_exact_pool_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, _2, @@ -3087,7 +3097,7 @@ fn trading_functions_cache_pool_ids() { PoolsCachedForArbitrage::::remove(pool_id); assert_ok!(Swaps::pool_join_with_exact_asset_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, _2, @@ -3097,7 +3107,7 @@ fn trading_functions_cache_pool_ids() { PoolsCachedForArbitrage::::remove(pool_id); assert_ok!(Swaps::pool_exit_with_exact_asset_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, _1, @@ -3107,7 +3117,7 @@ fn trading_functions_cache_pool_ids() { PoolsCachedForArbitrage::::remove(pool_id); assert_ok!(Swaps::pool_exit_with_exact_pool_amount( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, _1, @@ -3117,7 +3127,7 @@ fn trading_functions_cache_pool_ids() { PoolsCachedForArbitrage::::remove(pool_id); assert_ok!(Swaps::swap_exact_amount_in( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, _1, @@ -3129,7 +3139,7 @@ fn trading_functions_cache_pool_ids() { PoolsCachedForArbitrage::::remove(pool_id); assert_ok!(Swaps::swap_exact_amount_out( - Origin::signed(ALICE), + RuntimeOrigin::signed(ALICE), pool_id, ASSET_A, Some(u128::MAX), @@ -3422,8 +3432,8 @@ fn execute_arbitrage_observes_min_balances_mint_sell() { }); } -fn alice_signed() -> Origin { - Origin::signed(ALICE) +fn alice_signed() -> RuntimeOrigin { + RuntimeOrigin::signed(ALICE) } fn create_initial_pool( @@ -3496,7 +3506,7 @@ fn subsidize_and_start_rikiddo_pool( ) { let min_subsidy = ::MinSubsidy::get(); assert_ok!(Currencies::deposit(ASSET_D, who, min_subsidy + extra)); - assert_ok!(Swaps::pool_join_subsidy(Origin::signed(*who), pool_id, min_subsidy)); + assert_ok!(Swaps::pool_join_subsidy(RuntimeOrigin::signed(*who), pool_id, min_subsidy)); assert!(Swaps::end_subsidy_phase(pool_id).unwrap().result); } diff --git a/zrml/swaps/src/weights.rs b/zrml/swaps/src/weights.rs index f74979c4f..6ff787bdc 100644 --- a/zrml/swaps/src/weights.rs +++ b/zrml/swaps/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for zrml_swaps //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-20, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-08, STEPS: `10`, REPEAT: 1000, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: @@ -81,9 +81,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: Swaps Pools (r:1 w:1) fn admin_clean_up_pool_cpmm_categorical(a: u32) -> Weight { - Weight::from_ref_time(58_086_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(583_000).saturating_mul(a.into())) + Weight::from_ref_time(25_692_254) + // Standard Error: 614 + .saturating_add(Weight::from_ref_time(284_413).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -91,7 +91,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: MarketCommons MarketPool (r:1 w:0) // Storage: Swaps Pools (r:1 w:1) fn admin_clean_up_pool_cpmm_scalar() -> Weight { - Weight::from_ref_time(58_390_000) + Weight::from_ref_time(22_556_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -101,9 +101,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:7 w:0) // Storage: Tokens TotalIssuance (r:64 w:64) fn apply_to_cached_pools_execute_arbitrage(a: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 803_000 - .saturating_add(Weight::from_ref_time(2_356_167_000).saturating_mul(a.into())) + Weight::from_ref_time(313_000) + // Standard Error: 71_767 + .saturating_add(Weight::from_ref_time(912_062_521).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(43)) .saturating_add(T::DbWeight::get().reads((70_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(42)) @@ -111,9 +111,9 @@ impl WeightInfoZeitgeist for WeightInfo { } // Storage: Swaps PoolsCachedForArbitrage (r:8 w:7) fn apply_to_cached_pools_noop(a: u32) -> Weight { - Weight::from_ref_time(6_148_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(8_898_000).saturating_mul(a.into())) + Weight::from_ref_time(313_000) + // Standard Error: 999 + .saturating_add(Weight::from_ref_time(3_519_461).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into()))) @@ -123,9 +123,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) fn destroy_pool_in_subsidy_phase(a: u32) -> Weight { - Weight::from_ref_time(47_422_000) - // Standard Error: 40_000 - .saturating_add(Weight::from_ref_time(21_468_000).saturating_mul(a.into())) + Weight::from_ref_time(20_746_815) + // Standard Error: 6_870 + .saturating_add(Weight::from_ref_time(9_588_841).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -135,11 +135,11 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:46 w:21) // Storage: System Account (r:11 w:10) fn distribute_pool_share_rewards(a: u32, b: u32) -> Weight { - Weight::from_ref_time(55_071_000) - // Standard Error: 180_000 - .saturating_add(Weight::from_ref_time(28_979_000).saturating_mul(a.into())) - // Standard Error: 180_000 - .saturating_add(Weight::from_ref_time(40_233_000).saturating_mul(b.into())) + Weight::from_ref_time(22_860_268) + // Standard Error: 18_875 + .saturating_add(Weight::from_ref_time(10_760_963).saturating_mul(a.into())) + // Standard Error: 18_875 + .saturating_add(Weight::from_ref_time(19_119_205).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) @@ -153,26 +153,28 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens TotalIssuance (r:2 w:2) // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:0) fn end_subsidy_phase(a: u32, b: u32) -> Weight { - Weight::from_ref_time(0) - // Standard Error: 168_000 - .saturating_add(Weight::from_ref_time(26_503_000).saturating_mul(a.into())) - // Standard Error: 1_034_000 - .saturating_add(Weight::from_ref_time(126_477_000).saturating_mul(b.into())) + Weight::from_ref_time(13_533_000) + // Standard Error: 35_634 + .saturating_add(Weight::from_ref_time(8_213_437).saturating_mul(a.into())) + // Standard Error: 236_657 + .saturating_add(Weight::from_ref_time(36_459_831).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) - .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(b.into()))) + .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) - .saturating_add(T::DbWeight::get().writes((9_u64).saturating_mul(b.into()))) + .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(b.into()))) } // Storage: Swaps Pools (r:1 w:0) // Storage: Tokens Accounts (r:3 w:3) // Storage: System Account (r:1 w:0) // Storage: Tokens TotalIssuance (r:1 w:1) fn execute_arbitrage_buy_burn(a: u32) -> Weight { - Weight::from_ref_time(61_994_000) - // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(36_370_000).saturating_mul(a.into())) + Weight::from_ref_time(33_878_547) + // Standard Error: 9_283 + .saturating_add(Weight::from_ref_time(15_010_607).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) + .saturating_add(T::DbWeight::get().writes(4)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) } // Storage: Swaps Pools (r:1 w:0) @@ -180,9 +182,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:2 w:1) // Storage: Tokens TotalIssuance (r:1 w:1) fn execute_arbitrage_mint_sell(a: u32) -> Weight { - Weight::from_ref_time(80_675_000) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(33_433_000).saturating_mul(a.into())) + Weight::from_ref_time(38_285_437) + // Standard Error: 9_089 + .saturating_add(Weight::from_ref_time(13_998_473).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1)) @@ -191,9 +193,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Swaps Pools (r:1 w:0) // Storage: Tokens Accounts (r:2 w:0) fn execute_arbitrage_skipped(a: u32) -> Weight { - Weight::from_ref_time(29_826_000) - // Standard Error: 13_000 - .saturating_add(Weight::from_ref_time(5_199_000).saturating_mul(a.into())) + Weight::from_ref_time(14_828_448) + // Standard Error: 1_025 + .saturating_add(Weight::from_ref_time(2_204_192).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) } @@ -202,9 +204,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:5 w:5) // Storage: System Account (r:1 w:0) fn pool_exit(a: u32) -> Weight { - Weight::from_ref_time(64_421_000) - // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(27_430_000).saturating_mul(a.into())) + Weight::from_ref_time(37_507_291) + // Standard Error: 2_130 + .saturating_add(Weight::from_ref_time(11_575_025).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -214,7 +216,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Swaps SubsidyProviders (r:1 w:1) // Storage: Tokens Accounts (r:1 w:1) fn pool_exit_subsidy() -> Weight { - Weight::from_ref_time(77_761_000) + Weight::from_ref_time(37_934_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -224,7 +226,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn pool_exit_with_exact_asset_amount() -> Weight { - Weight::from_ref_time(142_560_000) + Weight::from_ref_time(69_851_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -234,7 +236,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn pool_exit_with_exact_pool_amount() -> Weight { - Weight::from_ref_time(143_190_000) + Weight::from_ref_time(69_798_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -242,9 +244,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens TotalIssuance (r:1 w:1) // Storage: Tokens Accounts (r:5 w:5) fn pool_join(a: u32) -> Weight { - Weight::from_ref_time(74_055_000) - // Standard Error: 32_000 - .saturating_add(Weight::from_ref_time(26_488_000).saturating_mul(a.into())) + Weight::from_ref_time(33_804_359) + // Standard Error: 2_236 + .saturating_add(Weight::from_ref_time(11_351_296).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(2)) @@ -254,7 +256,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:1 w:1) // Storage: Swaps SubsidyProviders (r:1 w:1) fn pool_join_subsidy() -> Weight { - Weight::from_ref_time(78_671_000) + Weight::from_ref_time(38_045_000) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -263,7 +265,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:3 w:3) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn pool_join_with_exact_asset_amount() -> Weight { - Weight::from_ref_time(128_600_000) + Weight::from_ref_time(63_348_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -272,15 +274,15 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: Tokens Accounts (r:3 w:3) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn pool_join_with_exact_pool_amount() -> Weight { - Weight::from_ref_time(132_720_000) + Weight::from_ref_time(63_817_000) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: Swaps Pools (r:1 w:1) fn clean_up_pool_categorical_without_reward_distribution(a: u32) -> Weight { - Weight::from_ref_time(16_673_000) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(325_000).saturating_mul(a.into())) + Weight::from_ref_time(5_597_769) + // Standard Error: 274 + .saturating_add(Weight::from_ref_time(163_354).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -289,7 +291,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn swap_exact_amount_in_cpmm() -> Weight { - Weight::from_ref_time(170_520_000) + Weight::from_ref_time(81_657_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -300,9 +302,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) fn swap_exact_amount_in_rikiddo(a: u32) -> Weight { - Weight::from_ref_time(159_946_000) - // Standard Error: 28_000 - .saturating_add(Weight::from_ref_time(19_270_000).saturating_mul(a.into())) + Weight::from_ref_time(72_975_675) + // Standard Error: 2_451 + .saturating_add(Weight::from_ref_time(7_367_384).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(5)) @@ -312,7 +314,7 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:0) // Storage: Swaps PoolsCachedForArbitrage (r:0 w:1) fn swap_exact_amount_out_cpmm() -> Weight { - Weight::from_ref_time(169_581_000) + Weight::from_ref_time(81_923_000) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -322,26 +324,26 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: RikiddoSigmoidFeeMarketEma RikiddoPerPool (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) fn swap_exact_amount_out_rikiddo(a: u32) -> Weight { - Weight::from_ref_time(101_410_000) - // Standard Error: 42_000 - .saturating_add(Weight::from_ref_time(35_542_000).saturating_mul(a.into())) + Weight::from_ref_time(52_010_503) + // Standard Error: 3_021 + .saturating_add(Weight::from_ref_time(12_822_294).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(5)) } // Storage: Swaps Pools (r:1 w:1) fn open_pool(a: u32) -> Weight { - Weight::from_ref_time(28_613_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(559_000).saturating_mul(a.into())) + Weight::from_ref_time(12_568_363) + // Standard Error: 435 + .saturating_add(Weight::from_ref_time(244_095).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } // Storage: Swaps Pools (r:1 w:1) fn close_pool(a: u32) -> Weight { - Weight::from_ref_time(31_634_000) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(366_000).saturating_mul(a.into())) + Weight::from_ref_time(11_445_465) + // Standard Error: 326 + .saturating_add(Weight::from_ref_time(192_402).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -350,9 +352,9 @@ impl WeightInfoZeitgeist for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Tokens TotalIssuance (r:2 w:2) fn destroy_pool(a: u32) -> Weight { - Weight::from_ref_time(38_770_000) - // Standard Error: 30_000 - .saturating_add(Weight::from_ref_time(26_154_000).saturating_mul(a.into())) + Weight::from_ref_time(22_588_099) + // Standard Error: 1_893 + .saturating_add(Weight::from_ref_time(10_954_266).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(2))