diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7497509bc4..6a8de9b77e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -561,15 +561,6 @@ jobs: with: name: moonbeam path: target/release - - name: Retrieve polkadot binary from - run: | - POLKADOT_VERSION=${{ needs.set-tags.outputs.polkadot_ver }} - DOCKER_TAG="parity/polkadot:v${POLKADOT_VERSION}" - - docker rm -f dummy 2> /dev/null | true - docker create -ti --name dummy $DOCKER_TAG bash - docker cp dummy:/usr/bin/polkadot test/tmp/polkadot - docker rm -f dummy - name: Retrieve moonbeam binary from docker (for plainSpec generation) run: | MOONBEAM_COMMIT=${{ needs.set-tags.outputs.latest_rt_sha8 }} @@ -592,7 +583,6 @@ jobs: ## Start zombie network and run tests chmod uog+x ../target/release/moonbeam - chmod uog+x tmp/polkadot pnpm moonwall test zombie_${{ matrix.chain }} - name: Zip and Upload Node Logs on Failure if: failure() diff --git a/Cargo.lock b/Cargo.lock index 537d4d92a6..19e9614dc3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead 0.5.2", "aes 0.8.3", @@ -201,9 +201,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] @@ -246,9 +246,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -260,15 +260,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -307,6 +307,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -314,10 +328,189 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "array-bytes" -version = "4.2.0" +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-scale" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] [[package]] name = "array-bytes" @@ -365,7 +558,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -381,7 +574,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -426,9 +619,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", - "bstr 1.6.0", + "bstr 1.6.2", "doc-comment", - "predicates 3.0.3", + "predicates 3.0.4", "predicates-core", "predicates-tree", "wait-timeout", @@ -447,10 +640,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] +[[package]] +name = "async-executor" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + [[package]] name = "async-io" version = "1.13.0" @@ -465,7 +684,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.24", "slab", "socket2 0.4.9", "waker-fn", @@ -477,20 +696,72 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-net" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.18", + "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1079d27511f6c038736279421774ef4ad4bdd2e300825f4a48c4cc463a57cedf" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.18", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] +[[package]] +name = "async-task" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" + [[package]] name = "async-trait" version = "0.1.73" @@ -499,7 +770,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -524,11 +795,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic-take" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -570,10 +847,32 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.32.0", + "object 0.32.1", "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale 0.0.11", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "base-x" version = "0.2.11" @@ -600,9 +899,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -631,7 +930,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "hash-db 0.16.0", "log", @@ -658,13 +957,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.12", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -679,11 +978,26 @@ dependencies = [ "pbkdf2 0.12.2", "rand_core 0.6.4", "ripemd", - "sha2 0.10.7", + "sha2 0.10.8", "subtle", "zeroize", ] +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitflags" version = "1.3.2" @@ -729,38 +1043,37 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.2.6", + "constant_time_eq 0.3.0", ] [[package]] name = "blake2s_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" +checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq 0.2.6", + "constant_time_eq 0.3.0", ] [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", "constant_time_eq 0.3.0", - "digest 0.10.7", ] [[package]] @@ -818,6 +1131,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + [[package]] name = "bounded-collections" version = "0.1.8" @@ -851,7 +1180,8 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", + "tinyvec", ] [[package]] @@ -867,12 +1197,12 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.9", "serde", ] @@ -887,9 +1217,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-slice-cast" @@ -905,21 +1235,21 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2-sys" @@ -943,9 +1273,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -958,7 +1288,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.19", "serde", "serde_json", "thiserror", @@ -1002,9 +1332,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", ] @@ -1033,6 +1363,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "chacha20poly1305" version = "0.9.1" @@ -1040,36 +1381,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20", + "chacha20 0.8.2", "cipher 0.3.0", - "poly1305", + "poly1305 0.7.2", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash 0.16.3", + "multihash", "serde", "unsigned-varint", ] @@ -1124,20 +1464,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.1" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1147,14 +1486,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1165,9 +1504,9 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "coarsetime" -version = "0.1.23" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" +checksum = "a73ef0d00d14301df35d0f13f5ea32344de6b00837485c358458f1e7f2d27db4" dependencies = [ "libc", "once_cell", @@ -1193,20 +1532,40 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" dependencies = [ "strum", "strum_macros", "unicode-width", ] +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1231,16 +1590,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "const-random" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] [[package]] name = "constant_time_eq" -version = "0.2.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" @@ -1404,7 +1779,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1435,16 +1810,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.3" @@ -1508,9 +1873,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", @@ -1526,7 +1891,7 @@ checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.17.0", ] [[package]] @@ -1570,12 +1935,13 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "clap", "parity-scale-codec", "sc-chain-spec", "sc-cli", + "sc-client-api", "sc-service", "sp-core", "sp-runtime", @@ -1585,7 +1951,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1608,7 +1974,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1621,11 +1987,14 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sc-consensus", + "sc-consensus-babe", "schnellru", "sp-blockchain", "sp-consensus", + "sp-consensus-slots", "sp-core", "sp-runtime", + "sp-timestamp", "sp-trie", "substrate-prometheus-endpoint", "tracing", @@ -1634,7 +2003,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1657,7 +2026,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1666,7 +2035,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-client-api", "sp-blockchain", @@ -1680,7 +2049,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1704,7 +2073,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1739,7 +2108,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1750,13 +2119,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1768,7 +2137,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "sp-core", "sp-externalities", @@ -1779,24 +2148,25 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm", + "staging-xcm", + "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1806,13 +2176,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1826,31 +2196,31 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", "sp-api", "sp-runtime", "sp-std", "sp-trie", - "xcm", + "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1873,7 +2243,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "futures 0.3.28", @@ -1886,7 +2256,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1896,15 +2266,15 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1912,7 +2282,6 @@ dependencies = [ "futures 0.3.28", "futures-timer", "polkadot-cli", - "polkadot-client", "polkadot-service", "sc-cli", "sc-client-api", @@ -1929,7 +2298,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1947,15 +2316,14 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures 0.3.28", - "lru 0.9.0", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", @@ -1967,47 +2335,53 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", - "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", + "schnellru", "sp-api", - "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", - "tokio", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "either", "futures 0.3.28", "futures-timer", "jsonrpsee", - "lru 0.9.0", "parity-scale-codec", + "pin-project", "polkadot-overseer", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", + "schnellru", "serde", "serde_json", + "smoldot", + "smoldot-light", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", + "sp-runtime", "sp-state-machine", "sp-storage", + "thiserror", "tokio", + "tokio-util", "tracing", "url", ] @@ -2015,7 +2389,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2023,6 +2397,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-trie", ] [[package]] @@ -2053,16 +2428,16 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.1.2", + "platforms", "rustc_version", "subtle", "zeroize", @@ -2076,14 +2451,27 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", ] [[package]] name = "cxx" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" +checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" dependencies = [ "cc", "cxxbridge-flags", @@ -2093,9 +2481,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285" +checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3" dependencies = [ "cc", "codespan-reporting", @@ -2103,24 +2491,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "cxxbridge-flags" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" +checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" [[package]] name = "cxxbridge-macro" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" +checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2396,7 +2784,24 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", +] + +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale 0.0.10", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", ] [[package]] @@ -2405,6 +2810,33 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "docify" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee528c501ddd15d5181997e9518e59024844eac44fd1e40cb20ddb2a8562fa" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca01728ab2679c464242eca99f94e2ce0514b52ac9ad950e2ed03fca991231c" +dependencies = [ + "common-path", + "derive-syn-parse", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn 2.0.38", + "termcolor", + "toml 0.7.8", + "walkdir", +] + [[package]] name = "dotenvy" version = "0.15.7" @@ -2452,9 +2884,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "ecdsa" @@ -2476,7 +2908,7 @@ checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -2520,11 +2952,11 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.1", "ed25519 2.2.2", "rand_core 0.6.4", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "zeroize", ] @@ -2542,6 +2974,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519 2.2.2", + "hashbrown 0.14.1", + "hex", + "rand_core 0.6.4", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -2575,12 +3022,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.2", + "crypto-bigint 0.5.3", "digest 0.10.7", "ff 0.13.0", "generic-array 0.14.7", @@ -2612,33 +3059,33 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "enumn" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2668,25 +3115,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "ethbloom" version = "0.13.0" @@ -2742,6 +3178,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.13", +] + [[package]] name = "evm" version = "0.39.1" @@ -2843,19 +3290,6 @@ dependencies = [ "quote", ] -[[package]] -name = "expander" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "expander" version = "2.0.0" @@ -2866,7 +3300,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2898,9 +3332,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fatality" @@ -2930,7 +3364,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "async-trait", "fp-consensus", @@ -2946,7 +3380,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "async-trait", "ethereum", @@ -2976,7 +3410,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fc-db", "fc-storage", @@ -2999,7 +3433,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "ethereum-types", @@ -3017,13 +3451,13 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", "rand 0.8.5", "rlp", "sc-client-api", + "sc-consensus-aura", "sc-network", "sc-network-common", "sc-network-sync", @@ -3032,24 +3466,29 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", "sp-storage", + "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "ethereum-types", @@ -3062,7 +3501,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "ethereum-types", @@ -3106,11 +3545,24 @@ dependencies = [ "subtle", ] +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "file-per-thread-logger" @@ -3201,6 +3653,17 @@ dependencies = [ "spin 0.9.8", ] +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -3225,7 +3688,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", ] @@ -3242,7 +3705,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "hex", "impl-serde 0.4.0", @@ -3261,7 +3724,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "parity-scale-codec", @@ -3273,7 +3736,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "ethereum-types", @@ -3287,7 +3750,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "evm", "frame-support", @@ -3302,7 +3765,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "ethereum", "ethereum-types", @@ -3319,7 +3782,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "frame-support", "parity-scale-codec", @@ -3331,7 +3794,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "parity-scale-codec", "serde", @@ -3346,7 +3809,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-support-procedural", @@ -3371,10 +3834,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "Inflector", - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "comfy-table", @@ -3383,7 +3846,7 @@ dependencies = [ "frame-system", "gethostname", "handlebars", - "itertools", + "itertools 0.10.5", "lazy_static", "linked-hash-map", "log", @@ -3405,12 +3868,13 @@ dependencies = [ "sp-database", "sp-externalities", "sp-inherents", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -3418,18 +3882,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3446,11 +3910,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -3462,9 +3927,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", @@ -3475,7 +3940,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-recursion", "futures 0.3.28", @@ -3487,6 +3952,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "spinners", "substrate-rpc-client", "tokio", @@ -3496,79 +3962,87 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "aquamarine", "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "expander 2.0.0", "frame-support-procedural-tools", - "itertools", + "itertools 0.10.5", + "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cfg-if", "frame-support", @@ -3587,7 +4061,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -3602,7 +4076,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "sp-api", @@ -3611,7 +4085,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "parity-scale-codec", @@ -3642,7 +4116,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] @@ -3741,7 +4215,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3752,7 +4226,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.9", - "webpki 0.22.0", + "webpki 0.22.4", ] [[package]] @@ -3807,7 +4281,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ - "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.17.0", ] [[package]] @@ -3816,7 +4290,7 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.17.0", "version_check", "zeroize", ] @@ -3907,7 +4381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.6.0", + "bstr 1.6.2", "fnv", "log", "regex", @@ -3956,9 +4430,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.7" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" +checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" dependencies = [ "log", "pest", @@ -4009,12 +4483,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash 0.8.3", "allocator-api2", + "serde", ] [[package]] @@ -4023,7 +4498,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -4046,9 +4521,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -4120,6 +4595,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -4201,21 +4685,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - [[package]] name = "hyper-rustls" version = "0.24.1" @@ -4229,7 +4698,7 @@ dependencies = [ "rustls 0.21.7", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots 0.23.1", ] @@ -4359,6 +4828,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -4372,19 +4860,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -4451,7 +4945,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -4468,7 +4962,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.4", "widestring", "windows-sys 0.48.0", "winreg", @@ -4486,11 +4980,20 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.10", + "hermit-abi 0.3.3", + "rustix 0.38.18", "windows-sys 0.48.0", ] +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + [[package]] name = "itertools" version = "0.10.5" @@ -4500,6 +5003,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -4554,7 +5066,7 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots 0.25.2", @@ -4596,7 +5108,7 @@ checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -4676,9 +5188,9 @@ checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", "ecdsa 0.16.8", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", "once_cell", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4691,108 +5203,9 @@ dependencies = [ ] [[package]] -name = "kusama-runtime" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" -dependencies = [ - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "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-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-runtime-api", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] -name = "kusama-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +name = "kusama-runtime-constants" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "polkadot-primitives", @@ -4836,6 +5249,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "landlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -4853,9 +5277,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -4869,9 +5293,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libp2p" @@ -4945,7 +5369,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -5005,10 +5429,10 @@ dependencies = [ "ed25519-dalek 2.0.0", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "zeroize", ] @@ -5033,7 +5457,7 @@ dependencies = [ "log", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "thiserror", "uint", @@ -5091,7 +5515,7 @@ dependencies = [ "once_cell", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "snow", "static_assertions", "thiserror", @@ -5213,10 +5637,10 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.20.9", "thiserror", - "webpki 0.22.0", + "webpki 0.22.4", "x509-parser 0.14.0", "yasna", ] @@ -5252,7 +5676,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash 0.17.0", + "multihash", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -5329,7 +5753,7 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.9.9", - "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.17.0", ] [[package]] @@ -5409,9 +5833,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45" +checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2" dependencies = [ "nalgebra", ] @@ -5430,9 +5854,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -5452,30 +5876,18 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lru" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] name = "lru" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" [[package]] name = "lru-cache" @@ -5515,6 +5927,54 @@ dependencies = [ "libc", ] +[[package]] +name = "macro_magic" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +dependencies = [ + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "macro_magic_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.38", +] + [[package]] name = "macrotest" version = "1.0.9" @@ -5535,13 +5995,13 @@ name = "manual-xcm-rpc" version = "0.1.0" dependencies = [ "cumulus-primitives-core", - "flume", + "flume 0.10.14", "futures 0.3.28", "hex-literal 0.3.4", "jsonrpsee", "parity-scale-codec", + "staging-xcm", "tokio", - "xcm", "xcm-primitives 0.1.1", ] @@ -5574,9 +6034,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -5584,26 +6044,27 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.6.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.18", ] [[package]] @@ -5651,12 +6112,6 @@ dependencies = [ "hash-db 0.16.0", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -5669,6 +6124,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -5709,7 +6176,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "log", @@ -5728,7 +6195,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "anyhow", "jsonrpsee", @@ -5789,6 +6256,7 @@ dependencies = [ "fp-self-contained", "frame-benchmarking", "frame-executive", + "frame-metadata", "frame-support", "frame-system", "frame-system-benchmarking", @@ -5880,7 +6348,7 @@ dependencies = [ "parachain-info", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "precompile-utils", "rlp", @@ -5901,12 +6369,13 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "strum", "strum_macros", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", "xcm-primitives 0.1.0", "xcm-primitives 0.1.1", "xcm-simulator", @@ -5925,9 +6394,9 @@ dependencies = [ "pallet-xcm", "serde", "serde_json", + "staging-xcm-builder", "tempfile", "tracing-core", - "xcm-builder", ] [[package]] @@ -5945,10 +6414,12 @@ dependencies = [ "nimbus-primitives", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", + "sc-chain-spec", "sc-cli", + "sc-client-api", "sc-consensus-grandpa", "sc-service", "sc-sysinfo", @@ -6056,7 +6527,6 @@ dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", - "kusama-runtime", "pallet-evm-precompile-relay-encoder", "pallet-proxy", "pallet-staking", @@ -6067,8 +6537,9 @@ dependencies = [ "rococo-runtime", "sp-runtime", "sp-std", + "staging-kusama-runtime", + "staging-xcm", "westend-runtime", - "xcm", "xcm-primitives 0.1.1", ] @@ -6257,6 +6728,7 @@ dependencies = [ "fp-self-contained", "frame-benchmarking", "frame-executive", + "frame-metadata", "frame-support", "frame-system", "frame-system-benchmarking", @@ -6346,7 +6818,8 @@ dependencies = [ "parachain-info", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", + "polkadot-runtime", "polkadot-runtime-parachains", "precompile-utils", "rlp", @@ -6366,12 +6839,13 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "strum", "strum_macros", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", "xcm-primitives 0.1.0", "xcm-primitives 0.1.1", "xcm-simulator", @@ -6391,6 +6865,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "moonbeam-xcm-benchmarks", + "nimbus-primitives", "pallet-asset-manager", "pallet-assets", "pallet-author-inherent", @@ -6423,11 +6898,13 @@ dependencies = [ "pallet-xcm", "pallet-xcm-transactor", "precompile-utils", + "sp-api", "sp-core", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -6459,7 +6936,7 @@ dependencies = [ "fc-mapping-sync", "fc-rpc", "fc-rpc-core", - "flume", + "flume 0.10.14", "fp-consensus", "fp-rpc", "fp-storage", @@ -6484,6 +6961,7 @@ dependencies = [ "moonbeam-rpc-trace", "moonbeam-rpc-txpool", "moonbeam-runtime", + "moonbeam-runtime-common", "moonbeam-vrf", "moonriver-runtime", "nimbus-consensus", @@ -6499,7 +6977,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-service", @@ -6519,6 +6997,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-offchain", "sc-rpc", "sc-rpc-api", "sc-service", @@ -6546,6 +7025,7 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "sp-trie", + "staging-xcm", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -6556,7 +7036,6 @@ dependencies = [ "tiny-bip39 0.8.2", "tokio", "trie-root 0.15.2", - "xcm", ] [[package]] @@ -6566,7 +7045,7 @@ dependencies = [ "nimbus-primitives", "parity-scale-codec", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "session-keys-primitives", "sp-api", "sp-application-crypto", @@ -6593,9 +7072,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -6628,6 +7107,7 @@ dependencies = [ "fp-self-contained", "frame-benchmarking", "frame-executive", + "frame-metadata", "frame-support", "frame-system", "frame-system-benchmarking", @@ -6717,7 +7197,7 @@ dependencies = [ "parachain-info", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "precompile-utils", "rlp", @@ -6738,12 +7218,13 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "strum", "strum_macros", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", "xcm-primitives 0.1.0", "xcm-primitives 0.1.1", "xcm-simulator", @@ -6760,7 +7241,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -6781,9 +7262,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -6791,24 +7272,11 @@ dependencies = [ "core2", "digest 0.10.7", "multihash-derive", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "digest 0.10.7", - "multihash-derive", - "sha2 0.10.7", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.0" @@ -6856,7 +7324,7 @@ dependencies = [ "num-rational", "num-traits", "simba", - "typenum 1.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.17.0", ] [[package]] @@ -6975,7 +7443,7 @@ dependencies = [ [[package]] name = "nimbus-consensus" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -7005,7 +7473,7 @@ dependencies = [ [[package]] name = "nimbus-primitives" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "async-trait", "frame-benchmarking", @@ -7045,6 +7513,12 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "nodrop" version = "0.1.14" @@ -7152,9 +7626,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -7165,7 +7639,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -7207,7 +7681,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -7230,9 +7704,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -7296,7 +7770,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -7307,9 +7781,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -7341,7 +7815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", - "itertools", + "itertools 0.10.5", "petgraph", "proc-macro-crate", "proc-macro2", @@ -7361,31 +7835,33 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.43#7fcd5143351315c459ee61cf805361a4c7223a47" +source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v1.1.0#0044e8dba2799cf0ddef3465ba901fa03ee1135f" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", + "paste", "scale-info", "serde", "sp-core", "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.43#7fcd5143351315c459ee61cf805361a4c7223a47" +source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v1.1.0#0044e8dba2799cf0ddef3465ba901fa03ee1135f" dependencies = [ "frame-support", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -7394,25 +7870,26 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.43#7fcd5143351315c459ee61cf805361a4c7223a47" +source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v1.1.0#0044e8dba2799cf0ddef3465ba901fa03ee1135f" dependencies = [ "frame-support", "orml-traits", "parity-scale-codec", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v0.9.43#7fcd5143351315c459ee61cf805361a4c7223a47" +source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-v1.1.0#0044e8dba2799cf0ddef3465ba901fa03ee1135f" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", + "log", "orml-traits", "orml-xcm-support", "pallet-xcm", @@ -7422,8 +7899,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -7434,7 +7911,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -7445,7 +7922,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -7464,18 +7941,19 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", "xcm-primitives 0.1.1", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -7486,7 +7964,7 @@ dependencies = [ [[package]] name = "pallet-author-inherent" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7505,7 +7983,7 @@ dependencies = [ [[package]] name = "pallet-author-mapping" version = "2.0.5" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7523,7 +8001,7 @@ dependencies = [ [[package]] name = "pallet-author-slot-filter" version = "0.9.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7541,7 +8019,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -7557,7 +8035,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -7571,7 +8049,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7595,8 +8073,10 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7615,7 +8095,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7630,7 +8110,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "frame-support", @@ -7644,10 +8124,11 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -7663,9 +8144,9 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "binary-merkle-tree", "frame-support", "frame-system", @@ -7681,13 +8162,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7705,7 +8187,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7724,7 +8206,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7741,7 +8223,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7758,7 +8240,7 @@ dependencies = [ [[package]] name = "pallet-crowdloan-rewards" version = "0.6.0" -source = "git+https://github.com/moonbeam-foundation/crowdloan-rewards?branch=moonbeam-polkadot-v0.9.43#7def581ccb38bc7707f6918cde8901d6da3c8212" +source = "git+https://github.com/moonbeam-foundation/crowdloan-rewards?branch=moonbeam-polkadot-v1.1.0#9539975524bb2792b77120788350875eb034d997" dependencies = [ "ed25519-dalek 1.0.1", "frame-benchmarking", @@ -7780,7 +8262,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7798,7 +8280,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7821,7 +8303,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7829,12 +8311,13 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", + "sp-std", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7846,6 +8329,7 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", + "sp-staking", "sp-std", ] @@ -7868,14 +8352,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "environmental", "ethereum", @@ -7931,7 +8415,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "environmental", "evm", @@ -7956,12 +8440,13 @@ dependencies = [ [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-runtime", ] [[package]] @@ -8050,7 +8535,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", ] @@ -8058,7 +8543,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "sp-core", @@ -8214,11 +8699,13 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "frame-support", "pallet-evm", + "parity-scale-codec", + "sp-runtime", ] [[package]] @@ -8252,9 +8739,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -8288,7 +8775,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "num", @@ -8484,14 +8971,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "staging-xcm", "xcm-primitives 0.1.1", ] [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "tiny-keccak", @@ -8500,7 +8987,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#73109697485a23907c8478d0a1141c622c6d23fb" dependencies = [ "fp-evm", "ripemd", @@ -8535,9 +9022,10 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -8557,7 +9045,7 @@ dependencies = [ "pallet-timestamp", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "precompile-utils", "scale-info", "serde", @@ -8566,9 +9054,10 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -8599,9 +9088,10 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] @@ -8636,8 +9126,9 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -8654,7 +9145,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8677,7 +9168,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8693,7 +9184,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8713,7 +9204,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8730,7 +9221,7 @@ dependencies = [ [[package]] name = "pallet-maintenance-mode" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8746,7 +9237,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8763,7 +9254,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8782,7 +9273,7 @@ dependencies = [ [[package]] name = "pallet-migrations" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8801,11 +9292,12 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -8836,7 +9328,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8852,7 +9344,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8868,11 +9360,12 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -8880,12 +9373,13 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8905,7 +9399,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8916,7 +9410,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -8933,7 +9427,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8978,7 +9472,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -8995,7 +9489,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9028,7 +9522,7 @@ dependencies = [ [[package]] name = "pallet-randomness" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "frame-benchmarking", "frame-support", @@ -9038,7 +9532,7 @@ dependencies = [ "nimbus-primitives", "parity-scale-codec", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "session-keys-primitives", "sp-consensus-babe", @@ -9051,7 +9545,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9069,7 +9563,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9084,7 +9578,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "assert_matches", "frame-benchmarking", @@ -9103,7 +9597,7 @@ dependencies = [ [[package]] name = "pallet-root-testing" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -9118,8 +9612,9 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -9135,7 +9630,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -9149,6 +9644,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -9156,13 +9652,14 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", "pallet-staking", + "parity-scale-codec", "rand 0.8.5", "sp-runtime", "sp-session", @@ -9172,13 +9669,17 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", + "sp-arithmetic", + "sp-io", "sp-runtime", "sp-std", ] @@ -9186,7 +9687,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9209,18 +9710,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "log", "sp-arithmetic", @@ -9229,7 +9730,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "sp-api", @@ -9238,7 +9739,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9255,7 +9756,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9270,7 +9771,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9282,13 +9783,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9307,7 +9809,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "frame-system", @@ -9323,7 +9825,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -9339,7 +9841,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -9351,7 +9853,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9368,7 +9870,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9384,7 +9886,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9399,7 +9901,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9413,8 +9915,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -9428,14 +9930,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-benchmarking", "frame-support", @@ -9446,9 +9948,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -9471,29 +9973,31 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-primitives 0.1.1", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/cumulus?branch=moonbeam-polkadot-v0.9.43#e3c7110a29df950e8ef1bc0a5c616332987f0725" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-runtime", + "sp-std", ] [[package]] name = "parity-db" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" +checksum = "ab512a34b3c2c5e465731cc7668edf79208bbe520be03484eeb05e63ed221735" dependencies = [ "blake2", "crc32fast", @@ -9511,9 +10015,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" +checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -9526,9 +10030,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" +checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9550,9 +10054,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -9683,19 +10187,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" dependencies = [ "pest", "pest_generator", @@ -9703,26 +10208,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" dependencies = [ "once_cell", "pest", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -9732,7 +10237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -9752,7 +10257,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -9773,6 +10278,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -9799,12 +10315,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" - [[package]] name = "platforms" version = "3.1.2" @@ -9813,15 +10323,17 @@ checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "polkadot-approval-distribution" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", + "futures-timer", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", "tracing-gum", @@ -9829,10 +10341,12 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "always-assert", "futures 0.3.28", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9843,13 +10357,12 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "derive_more", "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9858,6 +10371,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", + "schnellru", "sp-core", "sp-keystore", "thiserror", @@ -9866,12 +10380,11 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9881,21 +10394,20 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "sc-network", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.1.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "clap", "frame-benchmarking-cli", "futures 0.3.28", "log", - "polkadot-client", - "polkadot-node-core-pvf-worker", "polkadot-node-metrics", "polkadot-service", "sc-cli", @@ -9914,58 +10426,12 @@ dependencies = [ ] [[package]] -name = "polkadot-client" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +name = "polkadot-collator-protocol" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "async-trait", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures 0.3.28", - "kusama-runtime", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "rococo-runtime", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", - "westend-runtime", -] - -[[package]] -name = "polkadot-collator-protocol" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" -dependencies = [ - "always-assert", - "bitvec", - "fatality", + "bitvec", + "fatality", "futures 0.3.28", "futures-timer", "polkadot-node-network-protocol", @@ -9977,13 +10443,14 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", + "tokio-util", "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -9994,15 +10461,14 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "derive_more", "fatality", "futures 0.3.28", "futures-timer", "indexmap 1.9.3", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -10011,6 +10477,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", + "schnellru", "sp-application-crypto", "sp-keystore", "thiserror", @@ -10019,8 +10486,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -10033,8 +10500,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "futures-timer", @@ -10045,6 +10512,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", + "sc-network-common", "sp-application-crypto", "sp-core", "sp-keystore", @@ -10053,8 +10521,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "always-assert", "async-trait", @@ -10076,8 +10544,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "parity-scale-codec", @@ -10094,16 +10562,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "derive_more", "futures 0.3.28", "futures-timer", "kvdb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -10112,7 +10579,8 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-keystore", - "schnorrkel", + "schnellru", + "schnorrkel 0.9.1", "sp-application-crypto", "sp-consensus", "sp-consensus-slots", @@ -10123,8 +10591,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "futures 0.3.28", @@ -10132,6 +10600,7 @@ dependencies = [ "kvdb", "parity-scale-codec", "polkadot-erasure-coding", + "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -10144,8 +10613,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "fatality", @@ -10163,8 +10632,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "polkadot-node-subsystem", @@ -10178,8 +10647,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -10190,7 +10659,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", @@ -10198,8 +10668,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "polkadot-node-metrics", @@ -10213,8 +10683,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "futures-timer", @@ -10230,27 +10700,27 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "fatality", "futures 0.3.28", "kvdb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -10264,10 +10734,27 @@ dependencies = [ "tracing-gum", ] +[[package]] +name = "polkadot-node-core-prospective-parachains" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" +dependencies = [ + "bitvec", + "fatality", + "futures 0.3.28", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "thiserror", + "tracing-gum", +] + [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "fatality", @@ -10277,15 +10764,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "always-assert", "futures 0.3.28", @@ -10294,25 +10780,26 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf-common", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", + "tempfile", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "polkadot-node-primitives", @@ -10326,53 +10813,47 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-pvf-worker" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +name = "polkadot-node-core-pvf-common" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "assert_matches", "cpu-time", "futures 0.3.28", + "landlock", "libc", "parity-scale-codec", - "polkadot-node-core-pvf", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "sp-core", "sp-externalities", "sp-io", - "sp-maybe-compressed-blob", "sp-tracing", - "substrate-build-script-utils", - "tempfile", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-primitives", + "schnellru", "sp-consensus-babe", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "lazy_static", "log", @@ -10389,10 +10870,10 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.0", "futures 0.3.28", "futures-timer", "log", @@ -10408,11 +10889,12 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-channel", "async-trait", + "bitvec", "derive_more", "fatality", "futures 0.3.28", @@ -10431,15 +10913,15 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bounded-vec", "futures 0.3.28", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -10448,13 +10930,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "polkadot-node-subsystem" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -10463,8 +10945,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "derive_more", @@ -10476,6 +10958,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", @@ -10486,17 +10969,16 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "derive_more", "fatality", "futures 0.3.28", "futures-channel", - "itertools", + "itertools 0.10.5", "kvdb", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -10510,6 +10992,7 @@ dependencies = [ "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", + "schnellru", "sp-application-crypto", "sp-core", "sp-keystore", @@ -10519,13 +11002,12 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -10534,6 +11016,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", + "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -10541,9 +11024,9 @@ dependencies = [ ] [[package]] -name = "polkadot-parachain" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +name = "polkadot-parachain-primitives" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bounded-collections", "derive_more", @@ -10559,14 +11042,14 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "hex-literal 0.4.1", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", "sp-api", @@ -10585,8 +11068,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10617,8 +11100,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "frame-benchmarking", @@ -10675,6 +11158,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -10701,19 +11185,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "polkadot-runtime-common" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitvec", "frame-benchmarking", @@ -10752,14 +11237,14 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] name = "polkadot-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "polkadot-primitives", @@ -10772,10 +11257,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.0", + "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", "sp-std", @@ -10784,8 +11270,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bitflags 1.3.2", "bitvec", @@ -10793,6 +11279,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10804,7 +11291,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10822,40 +11309,43 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", + "staging-xcm-executor", "static_assertions", - "xcm", - "xcm-executor", ] [[package]] name = "polkadot-service" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", + "frame-benchmarking", "frame-benchmarking-cli", "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", "hex-literal 0.4.1", - "kusama-runtime", + "is_executable", "kusama-runtime-constants", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", "pallet-staking", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", + "parity-scale-codec", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", - "polkadot-client", "polkadot-collator-protocol", + "polkadot-core-primitives", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -10869,7 +11359,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -10878,11 +11370,11 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", - "polkadot-runtime-constants", + "polkadot-runtime-common", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", @@ -10909,6 +11401,8 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", "sp-api", @@ -10922,6 +11416,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-offchain", @@ -10931,7 +11426,9 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie", + "sp-version", + "sp-weights", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10941,17 +11438,20 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", + "bitvec", "fatality", "futures 0.3.28", + "futures-timer", "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", @@ -10962,8 +11462,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -10997,6 +11497,17 @@ dependencies = [ "universal-hash 0.4.1", ] +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", +] + [[package]] name = "polyval" version = "0.5.3" @@ -11061,7 +11572,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", + "sp-weights", + "staging-xcm", ] [[package]] @@ -11116,7 +11628,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -11124,13 +11636,13 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.11.0", "predicates-core", ] @@ -11162,12 +11674,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -11234,22 +11746,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro-warning" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -11288,7 +11806,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -11309,7 +11827,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -11330,7 +11848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -11395,20 +11913,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls 0.20.9", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", + "webpki 0.22.4", ] [[package]] @@ -11514,9 +12032,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -11524,14 +12042,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -11541,8 +12057,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", - "time 0.3.28", + "ring 0.16.20", + "time", "x509-parser 0.13.2", "yasna", ] @@ -11554,8 +12070,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.28", + "ring 0.16.20", + "time", "yasna", ] @@ -11590,14 +12106,14 @@ dependencies = [ [[package]] name = "reed-solomon-novelpoly" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" +checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582" dependencies = [ "derive_more", "fs-err", - "itertools", - "static_init 0.5.2", + "itertools 0.11.0", + "static_init", "thiserror", ] @@ -11618,7 +12134,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -11635,13 +12151,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.9", "regex-syntax 0.7.5", ] @@ -11656,9 +12172,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -11708,6 +12224,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -11718,11 +12249,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -11766,8 +12311,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11819,7 +12364,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -11842,19 +12387,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "rococo-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "polkadot-primitives", @@ -11950,7 +12496,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.19", ] [[package]] @@ -11978,9 +12524,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", @@ -11992,14 +12538,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.10" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -12011,7 +12557,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -12023,9 +12569,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", - "webpki 0.22.0", + "webpki 0.22.4", ] [[package]] @@ -12035,8 +12581,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki 0.101.6", "sct 0.7.0", ] @@ -12058,27 +12604,27 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.100.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -12087,6 +12633,17 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" @@ -12125,7 +12682,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "log", "sp-core", @@ -12136,7 +12693,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -12144,14 +12701,13 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash 0.17.0", + "multihash", "parity-scale-codec", "prost", "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -12165,7 +12721,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "futures-timer", @@ -12188,7 +12744,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -12203,7 +12759,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -12222,20 +12778,20 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "fdlimit", @@ -12249,9 +12805,9 @@ dependencies = [ "rpassword", "sc-client-api", "sc-client-db", + "sc-executor", "sc-keystore", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -12264,6 +12820,8 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", + "sp-state-machine", + "sp-storage", "sp-version", "thiserror", "tiny-bip39 1.0.0", @@ -12273,7 +12831,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "fnv", "futures 0.3.28", @@ -12289,7 +12847,6 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", "sp-statement-store", @@ -12300,7 +12857,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -12326,7 +12883,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -12351,7 +12908,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -12380,7 +12937,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "fork-tree", @@ -12395,8 +12952,8 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", "sp-api", "sp-application-crypto", @@ -12416,7 +12973,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12438,9 +12995,9 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "fnv", @@ -12450,9 +13007,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", - "sc-network-common", "sc-network-gossip", "sc-network-sync", "sc-utils", @@ -12474,7 +13029,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12493,7 +13048,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12506,10 +13061,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ahash 0.8.3", - "array-bytes 4.2.0", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", @@ -12528,6 +13083,7 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", @@ -12546,7 +13102,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "finality-grandpa", "futures 0.3.28", @@ -12566,7 +13122,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "assert_matches", "async-trait", @@ -12601,7 +13157,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -12624,13 +13180,14 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "lru 0.8.1", + "log", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", + "schnellru", "sp-api", "sp-core", "sp-externalities", @@ -12646,8 +13203,9 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", @@ -12658,16 +13216,17 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", + "parity-scale-codec", "rustix 0.36.15", "sc-allocator", "sc-executor-common", + "sp-core", "sp-runtime-interface", "sp-wasm-interface", "wasmtime", @@ -12676,7 +13235,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ansi_term", "futures 0.3.28", @@ -12692,9 +13251,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -12706,9 +13265,9 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "asynchronous-codec", @@ -12721,37 +13280,33 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec", - "snow", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-channel", "cid", @@ -12762,7 +13317,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", @@ -12772,45 +13326,33 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", "async-trait", "bitflags 1.3.2", - "bytes", "futures 0.3.28", - "futures-timer", "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ahash 0.8.3", "futures 0.3.28", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", + "schnellru", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -12819,9 +13361,9 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "futures 0.3.28", "libp2p-identity", @@ -12831,8 +13373,6 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", "sp-core", "sp-runtime", @@ -12842,9 +13382,9 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "fork-tree", @@ -12852,7 +13392,6 @@ dependencies = [ "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -12861,8 +13400,8 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -12877,17 +13416,15 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures 0.3.28", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", "sp-runtime", @@ -12897,16 +13434,17 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "bytes", "fnv", "futures 0.3.28", "futures-timer", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", @@ -12915,36 +13453,22 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", - "sc-peerset", + "sc-transaction-pool-api", "sc-utils", "sp-api", "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", "sp-runtime", "threadpool", "tracing", ] -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" -dependencies = [ - "futures 0.3.28", - "libp2p-identity", - "log", - "parking_lot 0.12.1", - "partial_sort", - "sc-utils", - "serde_json", - "sp-arithmetic", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12953,7 +13477,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12984,7 +13508,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -13003,7 +13527,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "http", "jsonrpsee", @@ -13018,9 +13542,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures 0.3.28", "futures-util", "hex", @@ -13031,6 +13555,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -13038,13 +13563,14 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "directories", @@ -13071,11 +13597,9 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -13098,7 +13622,7 @@ dependencies = [ "sp-transaction-storage-proof", "sp-trie", "sp-version", - "static_init 1.0.3", + "static_init", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -13110,7 +13634,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "log", "parity-scale-codec", @@ -13121,14 +13645,12 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "clap", "fs4", - "futures 0.3.28", "log", "sc-client-db", - "sc-utils", "sp-core", "thiserror", "tokio", @@ -13137,7 +13659,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -13156,7 +13678,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "libc", @@ -13175,7 +13697,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "chrono", "futures 0.3.28", @@ -13194,7 +13716,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ansi_term", "atty", @@ -13202,12 +13724,10 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", "sp-api", @@ -13225,18 +13745,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -13262,13 +13782,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", "log", + "parity-scale-codec", "serde", "sp-blockchain", + "sp-core", "sp-runtime", "thiserror", ] @@ -13276,7 +13798,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-channel", "futures 0.3.28", @@ -13344,7 +13866,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -13352,6 +13874,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -13370,8 +13908,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -13380,8 +13918,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -13485,9 +14023,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] @@ -13515,14 +14053,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -13541,7 +14079,7 @@ dependencies = [ [[package]] name = "session-keys-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "async-trait", "frame-support", @@ -13573,9 +14111,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -13609,9 +14147,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -13630,18 +14168,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -13687,9 +14225,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" dependencies = [ "bstr 0.2.17", "unicode-segmentation", @@ -13740,8 +14278,8 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "enumn", "parity-scale-codec", @@ -13761,9 +14299,116 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock", + "atomic-take", + "base64 0.21.4", + "bip39", + "blake2-rfc", + "bs58 0.5.0", + "chacha20 0.9.1", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.3", + "either", + "event-listener 2.5.3", + "fnv", + "futures-lite", + "futures-util", + "hashbrown 0.14.1", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305 0.8.0", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.8", + "sha3", + "siphasher", + "slab", + "smallvec", + "soketto", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel", + "async-lock", + "base64 0.21.4", + "blake2-rfc", + "derive_more", + "either", + "event-listener 2.5.3", + "fnv", + "futures-channel", + "futures-lite", + "futures-util", + "hashbrown 0.14.1", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.1", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] [[package]] name = "snap" @@ -13780,11 +14425,11 @@ dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "rustc_version", - "sha2 0.10.7", + "sha2 0.10.8", "subtle", ] @@ -13800,9 +14445,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -13828,7 +14473,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "hash-db 0.16.0", "log", @@ -13836,6 +14481,7 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", @@ -13848,21 +14494,21 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "Inflector", "blake2", - "expander 1.0.0", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "23.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -13874,8 +14520,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "16.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "integer-sqrt", "num-traits", @@ -13889,7 +14535,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -13902,9 +14548,8 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -13914,13 +14559,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", + "schnellru", "sp-api", "sp-consensus", "sp-database", @@ -13932,7 +14577,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "futures 0.3.28", @@ -13947,14 +14592,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -13965,7 +14609,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "parity-scale-codec", @@ -13973,11 +14617,9 @@ dependencies = [ "serde", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -13986,7 +14628,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "lazy_static", "parity-scale-codec", @@ -14005,7 +14647,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "finality-grandpa", "log", @@ -14023,7 +14665,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -14034,16 +14676,18 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "21.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", + "arrayvec 0.7.4", + "bandersnatch_vrfs", "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58 0.4.0", + "bs58 0.5.0", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures 0.3.28", "hash-db 0.16.0", "hash256-std-hasher", @@ -14051,7 +14695,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -14059,7 +14703,7 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", @@ -14073,38 +14717,37 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39 1.0.0", + "tracing", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "9.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", - "sp-std", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "9.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -14112,18 +14755,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "8.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "0.19.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "environmental", "parity-scale-codec", @@ -14131,16 +14774,26 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", "sp-runtime", "sp-std", "thiserror", @@ -14148,13 +14801,11 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "23.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", - "futures 0.3.28", + "ed25519-dalek 2.0.0", "libsecp256k1", "log", "parity-scale-codec", @@ -14174,8 +14825,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +version = "24.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "lazy_static", "sp-core", @@ -14185,13 +14836,11 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "0.27.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "futures 0.3.28", "parity-scale-codec", "parking_lot 0.12.1", - "serde", "sp-core", "sp-externalities", "thiserror", @@ -14200,7 +14849,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "thiserror", "zstd 0.12.4", @@ -14209,7 +14858,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -14220,7 +14869,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -14238,7 +14887,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -14252,7 +14901,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "sp-api", "sp-core", @@ -14261,8 +14910,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "8.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "backtrace", "lazy_static", @@ -14272,7 +14921,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "rustc-hash", "serde", @@ -14281,8 +14930,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "24.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "either", "hash256-std-hasher", @@ -14303,8 +14952,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "17.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -14321,25 +14970,26 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "11.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -14348,8 +14998,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -14360,8 +15011,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "0.28.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "hash-db 0.16.0", "log", @@ -14376,16 +15027,22 @@ dependencies = [ "sp-trie", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "log", + "aes-gcm 0.10.3", + "curve25519-dalek 4.1.1", + "ed25519-dalek 2.0.0", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", @@ -14394,17 +15051,18 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "8.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "13.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -14417,11 +15075,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -14431,8 +15087,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "10.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "sp-std", @@ -14444,7 +15100,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "sp-api", "sp-runtime", @@ -14453,10 +15109,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -14468,8 +15123,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "22.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", @@ -14491,8 +15146,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "22.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -14508,33 +15163,32 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "8.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "14.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi", "wasmtime", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +version = "20.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "parity-scale-codec", "scale-info", @@ -14594,20 +15248,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools", + "itertools 0.11.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -14616,9 +15270,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash 0.8.3", "atoi", @@ -14628,7 +15282,7 @@ dependencies = [ "crossbeam-queue", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", "futures-intrusive", @@ -14636,7 +15290,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "native-tls", @@ -14644,7 +15298,7 @@ dependencies = [ "paste", "percent-encoding", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -14656,9 +15310,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -14669,9 +15323,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -14682,7 +15336,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-sqlite", "syn 1.0.109", @@ -14693,46 +15347,211 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +dependencies = [ + "atoi", + "flume 0.11.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + +[[package]] +name = "ss58-registry" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" +dependencies = [ + "Inflector", + "num-format", + "proc-macro2", + "quote", + "serde", + "serde_json", + "unicode-xid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "staging-kusama-runtime" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" +dependencies = [ + "binary-merkle-tree", + "bitvec", + "frame-benchmarking", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "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-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", +] + +[[package]] +name = "staging-xcm" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", "log", - "percent-encoding", + "parity-scale-codec", + "scale-info", "serde", - "sqlx-core", - "tracing", - "url", + "sp-weights", + "xcm-procedural", ] [[package]] -name = "ss58-registry" -version = "1.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" +name = "staging-xcm-builder" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "Inflector", - "num-format", - "proc-macro2", - "quote", - "serde", - "serde_json", - "unicode-xid", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +name = "staging-xcm-executor" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", +] [[package]] name = "static_assertions" @@ -14740,18 +15559,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "static_init" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" -dependencies = [ - "cfg_aliases", - "libc", - "parking_lot 0.11.2", - "static_init_macro 0.5.0", -] - [[package]] name = "static_init" version = "1.0.3" @@ -14763,23 +15570,10 @@ dependencies = [ "libc", "parking_lot 0.11.2", "parking_lot_core 0.8.6", - "static_init_macro 1.0.2", + "static_init_macro", "winapi", ] -[[package]] -name = "static_init_macro" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf" -dependencies = [ - "cfg_aliases", - "memchr", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "static_init_macro" version = "1.0.2" @@ -14832,7 +15626,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -14848,7 +15642,7 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.9", "zeroize", ] @@ -14869,10 +15663,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" [[package]] name = "substrate-fixed" @@ -14881,13 +15672,13 @@ source = "git+https://github.com/encointer/substrate-fixed#df67f97a6db9b40215f10 dependencies = [ "parity-scale-codec", "scale-info", - "typenum 1.16.0 (git+https://github.com/encointer/typenum?tag=polkadot-v1.0.0)", + "typenum 1.16.0", ] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", @@ -14906,7 +15697,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "hyper", "log", @@ -14918,7 +15709,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "jsonrpsee", @@ -14931,14 +15722,12 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "jsonrpsee", - "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", - "scale-info", "serde", "sp-core", "sp-runtime", @@ -14950,9 +15739,9 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-trait", "futures 0.3.28", "parity-scale-codec", @@ -14976,41 +15765,36 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", "log", - "memory-db", "pallet-babe", "pallet-balances", - "pallet-beefy-mmr", - "pallet-root-testing", - "pallet-sudo", "pallet-timestamp", "parity-scale-codec", "sc-service", "scale-info", "serde", + "serde_json", "sp-api", "sp-application-crypto", "sp-block-builder", "sp-consensus-aura", "sp-consensus-babe", - "sp-consensus-beefy", "sp-consensus-grandpa", "sp-core", - "sp-debug-derive", "sp-externalities", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keyring", "sp-offchain", "sp-runtime", - "sp-runtime-interface", "sp-session", "sp-state-machine", "sp-std", @@ -15024,12 +15808,10 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "futures 0.3.28", - "parity-scale-codec", "sc-block-builder", - "sc-chain-spec", "sc-client-api", "sc-consensus", "sp-api", @@ -15044,16 +15826,17 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", "strum", "tempfile", - "toml 0.7.6", + "toml 0.7.8", "walkdir", "wasm-opt", ] @@ -15073,6 +15856,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "summarize-precompile-checks" version = "0.0.0" @@ -15098,9 +15887,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -15159,17 +15948,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.10", + "rustix 0.38.18", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -15182,22 +15971,42 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -15261,20 +16070,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa", @@ -15285,15 +16083,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -15329,7 +16127,7 @@ dependencies = [ "pbkdf2 0.11.0", "rand 0.8.5", "rustc-hash", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -15372,9 +16170,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -15384,7 +16182,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite 0.2.13", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "windows-sys 0.48.0", ] @@ -15397,7 +16195,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -15411,17 +16209,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki 0.22.0", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -15446,9 +16233,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -15470,9 +16257,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -15491,11 +16278,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -15515,9 +16302,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.4.0", "bytes", @@ -15564,7 +16351,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -15589,9 +16376,10 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -15600,14 +16388,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -15750,7 +16538,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "async-trait", "clap", @@ -15761,7 +16549,6 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-executor", - "sc-service", "serde", "serde_json", "sp-api", @@ -15786,9 +16573,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "glob", @@ -15817,7 +16604,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -15836,12 +16623,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - [[package]] name = "typenum" version = "1.16.0" @@ -15851,6 +16632,12 @@ dependencies = [ "scale-info", ] +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + [[package]] name = "ucd-trie" version = "0.1.6" @@ -15877,9 +16664,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -15898,9 +16685,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -15936,9 +16723,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec", "bytes", @@ -15952,6 +16739,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" @@ -16022,15 +16815,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -16051,12 +16844,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -16084,7 +16871,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -16118,7 +16905,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -16140,9 +16927,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" dependencies = [ "anyhow", "libc", @@ -16156,9 +16943,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" dependencies = [ "anyhow", "cxx", @@ -16168,9 +16955,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" dependencies = [ "anyhow", "cc", @@ -16195,35 +16982,33 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.13.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" dependencies = [ - "parity-wasm", - "wasmi-validation", + "smallvec", + "spin 0.9.8", + "wasmi_arena", "wasmi_core", + "wasmparser-nostd", ] [[package]] -name = "wasmi-validation" -version = "0.5.0" +name = "wasmi_arena" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" [[package]] name = "wasmi_core" -version = "0.2.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" dependencies = [ "downcast-rs", "libm", - "memory_units", - "num-rational", "num-traits", + "paste", ] [[package]] @@ -16236,6 +17021,15 @@ dependencies = [ "url", ] +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "wasmtime" version = "8.0.1" @@ -16280,14 +17074,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.3", + "base64 0.21.4", "bincode", "directories-next", "file-per-thread-logger", "log", "rustix 0.36.15", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "toml 0.5.11", "windows-sys 0.45.0", "zstd 0.11.2+zstd.1.5.2", @@ -16447,18 +17241,18 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.2", + "untrusted 0.9.0", ] [[package]] @@ -16467,7 +17261,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.0", + "webpki 0.22.4", ] [[package]] @@ -16476,7 +17270,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki 0.100.2", + "rustls-webpki 0.100.3", ] [[package]] @@ -16501,17 +17295,17 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", "sdp", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "stun", "thiserror", - "time 0.3.28", + "time", "tokio", "turn", "url", @@ -16548,7 +17342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", - "aes-gcm 0.10.2", + "aes-gcm 0.10.3", "async-trait", "bincode", "block-modes", @@ -16565,12 +17359,12 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "subtle", "thiserror", @@ -16695,9 +17489,10 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ + "binary-merkle-tree", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -16714,6 +17509,8 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -16726,6 +17523,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -16753,7 +17551,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -16763,6 +17561,7 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -16777,19 +17576,20 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "westend-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "polkadot-primitives", @@ -16802,20 +17602,21 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.18", ] [[package]] name = "wide" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", "safe_arch", @@ -16845,9 +17646,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -17044,9 +17845,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -17087,7 +17888,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 4.0.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", "serde", "zeroize", @@ -17106,10 +17907,10 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -17127,71 +17928,13 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.28", -] - -[[package]] -name = "xcm" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" -dependencies = [ - "bounded-collections", - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-weights", - "xcm-procedural", -] - -[[package]] -name = "xcm-builder" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - -[[package]] -name = "xcm-executor" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", + "time", ] [[package]] name = "xcm-primitives" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v0.9.43#30d6f1bfee22094eb7f4467c5226cc0d212e5b85" +source = "git+https://github.com/Moonsong-Labs/moonkit?branch=moonbeam-polkadot-v1.1.0#b00476a2852256cc336d9480da292e352d62b89d" dependencies = [ "sp-runtime", ] @@ -17217,38 +17960,38 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "xcm-procedural" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "xcm-simulator" -version = "0.9.43" -source = "git+https://github.com/moonbeam-foundation/polkadot?branch=moonbeam-polkadot-v0.9.43#d83bb6cc7d7c93ead2fd3cafce0e268fd3f6b9bc" +version = "1.0.0" +source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#a7be8f5c1133c85202825b94cf683c7248c5514b" dependencies = [ "frame-support", "parity-scale-codec", "paste", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -17271,7 +18014,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.28", + "time", ] [[package]] @@ -17291,7 +18034,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d39698a565..4f9b7455f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ pallet-xcm-transactor = { path = "pallets/xcm-transactor", default-features = fa precompile-utils = { path = "precompiles/utils", default-features = false } xcm-primitives = { path = "primitives/xcm", default-features = false } -pallet-crowdloan-rewards = { git = "https://github.com/moonbeam-foundation/crowdloan-rewards", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +pallet-crowdloan-rewards = { git = "https://github.com/moonbeam-foundation/crowdloan-rewards", branch = "moonbeam-polkadot-v1.1.0", default-features = false } # Moonbeam (client) moonbeam-cli = { path = "node/cli", default-features = false } @@ -118,100 +118,102 @@ moonbeam-runtime = { path = "runtime/moonbeam" } moonriver-runtime = { path = "runtime/moonriver" } # Substrate (wasm) -frame-benchmarking = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-executive = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-support = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-system = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-system-benchmarking = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -frame-try-runtime = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-assets = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-balances = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-collective = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-conviction-voting = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-democracy = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-identity = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-message-queue = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -pallet-multisig = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-preimage = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-proxy = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-referenda = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-root-testing = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-scheduler = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-society = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-staking = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-sudo = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-timestamp = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-transaction-payment = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-treasury = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-utility = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-whitelist = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +frame-benchmarking = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-executive = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-system-benchmarking = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +frame-try-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-assets = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-balances = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-conviction-voting = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-democracy = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-identity = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-message-queue = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +pallet-multisig = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-referenda = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-root-testing = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-society = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-staking = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-sudo = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-utility = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-whitelist = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } parity-scale-codec = { version = "3.2.2", default-features = false, features = [ "derive", ] } scale-info = { version = "2.0", default-features = false, features = [ "derive", ] } -sp-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-application-crypto = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-block-builder = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-consensus-babe = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-core = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-debug-derive = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-externalities = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-inherents = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-io = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-keystore = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-offchain = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-runtime = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-runtime-interface = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-session = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-std = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-transaction-pool = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -sp-version = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +sp-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-application-crypto = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-block-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-consensus-babe = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-core = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-debug-derive = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-externalities = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-keystore = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-offchain = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-runtime-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +sp-weights = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false } # Substrate (client) -frame-benchmarking-cli = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -pallet-transaction-payment-rpc = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-basic-authorship = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-block-builder = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-chain-spec = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-cli = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-client-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-client-db = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-consensus = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-consensus-grandpa = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-consensus-manual-seal = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-executor = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-informant = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-network = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-network-common = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-network-sync = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-rpc = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-rpc-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-service = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-sysinfo = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-telemetry = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-tracing = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-transaction-pool = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-transaction-pool-api = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sc-utils = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-blockchain = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-consensus = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-storage = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-timestamp = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-trie = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -sp-wasm-interface = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-build-script-utils = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-frame-rpc-system = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-prometheus-endpoint = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-test-client = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-test-runtime = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-test-runtime-client = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -substrate-wasm-builder = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } -try-runtime-cli = { git = "https://github.com/moonbeam-foundation/substrate", branch = "moonbeam-polkadot-v0.9.43" } +frame-benchmarking-cli = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-basic-authorship = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-block-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-chain-spec = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-cli = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-client-db = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-consensus = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-consensus-grandpa = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-consensus-manual-seal = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-executor = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-informant = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-network = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-network-common = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-network-sync = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-offchain = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-rpc-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-sysinfo = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-telemetry = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-tracing = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sc-utils = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-blockchain = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-consensus = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-storage = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-timestamp = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +sp-wasm-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-build-script-utils = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-frame-rpc-system = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-prometheus-endpoint = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-test-client = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-test-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-test-runtime-client = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +substrate-wasm-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +try-runtime-cli = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } # Frontier (wasm) ethereum = { version = "0.14.0", default-features = false, features = [ @@ -221,98 +223,98 @@ ethereum-types = { version = "0.14", default-features = false } evm = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false } evm-gasometer = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false } evm-runtime = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false } -fp-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-base-fee = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false, features = [ +fp-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-base-fee = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false, features = [ "forbid-evm-reentrancy", ] } -pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false, features = [ +pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false, features = [ "forbid-evm-reentrancy", ] } -pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", default-features = false } # Frontier (client) -fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fc-db = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fc-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", features = [ +fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fc-db = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fc-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0", features = [ "rpc-binary-search-estimate", ] } -fc-rpc-core = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fc-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } -fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43" } +fc-rpc-core = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fc-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } +fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.1.0" } # Cumulus (wasm) -cumulus-pallet-dmp-queue = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-primitives-core = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-primitives-parachain-inherent = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -parachain-info = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } # Cumulus (client) -cumulus-client-cli = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-client-collator = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-client-consensus-common = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-client-network = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-client-service = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-relay-chain-interface = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/moonbeam-foundation/cumulus", branch = "moonbeam-polkadot-v0.9.43" } +cumulus-client-cli = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-client-collator = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-client-network = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-client-service = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } # Polkadot / XCM (wasm) -orml-traits = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -orml-xcm-support = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -orml-xtokens = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-xcm = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-xcm-benchmarks = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -polkadot-core-primitives = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -polkadot-parachain = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -xcm = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -xcm-builder = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -xcm-executor = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +orml-traits = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +orml-xcm-support = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +orml-xtokens = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-xcm-benchmarks = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +polkadot-core-primitives = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0", default-features = false } # Polkadot / XCM (client) -kusama-runtime = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-cli = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-primitives = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-runtime = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-runtime-common = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-runtime-parachains = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -polkadot-service = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -rococo-runtime = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -westend-runtime = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } -xcm-simulator = { git = "https://github.com/moonbeam-foundation/polkadot", branch = "moonbeam-polkadot-v0.9.43" } +kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-cli = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-primitives = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-runtime-common = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-runtime-parachains = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +rococo-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +westend-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } +xcm-simulator = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-v1.1.0" } # Moonkit (wasm) -moonkit-xcm-primitives = { package = "xcm-primitives", git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -nimbus-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-author-inherent = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-author-mapping = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-author-slot-filter = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-maintenance-mode = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-migrations = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -pallet-randomness = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } -session-keys-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43", default-features = false } +moonkit-xcm-primitives = { package = "xcm-primitives", git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +nimbus-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-author-inherent = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-author-mapping = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-author-slot-filter = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-maintenance-mode = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-migrations = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +pallet-randomness = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } +session-keys-primitives = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0", default-features = false } # Moonkit (client) -nimbus-consensus = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v0.9.43" } +nimbus-consensus = { git = "https://github.com/Moonsong-Labs/moonkit", branch = "moonbeam-polkadot-v1.1.0" } # Other (wasm) affix = "0.1.2" @@ -320,6 +322,7 @@ async-trait = { version = "0.1.42" } blake2-rfc = { version = "0.2.18", default-features = false } derive_more = "0.99" environmental = { version = "1.1.2", default-features = false } +frame-metadata = { version = "16.0.0", default-features = false, features = ["current"] } hex = { version = "0.4.3", default-features = false } hex-literal = { version = "0.3.4" } impl-serde = { version = "0.3.1", default-features = false } diff --git a/archived_tests/archived_specs/test-fees/test-fee-multiplier.ts b/archived_tests/archived_specs/test-fees/test-fee-multiplier.ts index 935a1a3b85..cc00c142fe 100644 --- a/archived_tests/archived_specs/test-fees/test-fee-multiplier.ts +++ b/archived_tests/archived_specs/test-fees/test-fee-multiplier.ts @@ -318,7 +318,7 @@ describeDevMoonbeam("Fee Multiplier - XCM Executions", (context) => { .as_v2(); await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -411,7 +411,7 @@ describeDevMoonbeam("Fee Multiplier - XCM Executions", (context) => { .as_v2(); await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/archived_specs/test-pov/test-xcm-to-evm-pov.ts b/archived_tests/archived_specs/test-pov/test-xcm-to-evm-pov.ts index 0604056707..b004d8af48 100644 --- a/archived_tests/archived_specs/test-pov/test-xcm-to-evm-pov.ts +++ b/archived_tests/archived_specs/test-pov/test-xcm-to-evm-pov.ts @@ -123,7 +123,7 @@ describeDevMoonbeam("XCM to EVM - PoV tests", (context) => { // Send an XCM and create block to execute it await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); const { result, block } = await context.createBlock(); @@ -215,7 +215,7 @@ describeDevMoonbeam("XCM to EVM - PoV tests", (context) => { // Send an XCM and create block to execute it await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); const { result, block } = await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-asset-transfer.ts b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-asset-transfer.ts index be158bd7c1..f439a270b6 100644 --- a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-asset-transfer.ts +++ b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-asset-transfer.ts @@ -138,7 +138,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -205,7 +205,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -279,7 +279,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer of DEV", (context) = // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -358,7 +358,7 @@ describeDevMoonbeam( const chargedWeight = await weightMessage( context, - context.polkadotApi.createType("XcmVersionedXcm", xcmMessage) as any + context.polkadotApi.createType("StagingXcmVersionedXcm", xcmMessage) as any ); // We are charging chargedWeight // chargedWeight * 50000 = chargedFee @@ -366,7 +366,7 @@ describeDevMoonbeam( // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -493,7 +493,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -577,7 +577,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -700,7 +700,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -752,7 +752,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transfer", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-queue.ts b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-queue.ts index 126ea4e207..1ca315502f 100644 --- a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-queue.ts +++ b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-queue.ts @@ -223,7 +223,7 @@ describeDevMoonbeam("Mock XCMP - test XCMP execution", (context) => { // one per para for (let i = 0; i < numParaMsgs; i++) { await injectHrmpMessage(context, i + 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); } @@ -375,7 +375,7 @@ describeDevMoonbeam("Mock XCMP - test XCMP execution", (context) => { // one per para for (let i = 0; i < numParaMsgs; i++) { await injectHrmpMessage(context, i + 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); } @@ -483,12 +483,12 @@ describeDevMoonbeam("Mock XCMP - test XCMP execution", (context) => { // now we start injecting messages // two for para 1 await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageNotExecuted, } as RawXcmMessage); await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageExecuted, } as RawXcmMessage); @@ -542,7 +542,7 @@ describeDevMoonbeam("Mock XCMP - test XCMP execution", (context) => { // now we start injecting messages for (let i = 0; i < suspendThreshold + 1; i++) { await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageNotExecuted, } as RawXcmMessage); } diff --git a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact-ethereum.ts b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact-ethereum.ts index aeaa41825d..b4ed4c66a3 100644 --- a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact-ethereum.ts +++ b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact-ethereum.ts @@ -138,7 +138,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (transfer)" // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -267,7 +267,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (call)", (c // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -372,7 +372,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (asset fee) // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -453,7 +453,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (asset fee) // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -588,7 +588,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (proxy)", ( // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -728,7 +728,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (proxy)", ( // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -884,7 +884,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (proxy)", ( // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -1062,7 +1062,7 @@ describeDevMoonbeam("Mock XCM - transact ETHEREUM (proxy) disabled switch", (con // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -1212,7 +1212,7 @@ describeDevMoonbeam("Mock XCM - transact ETHEREUM (non-proxy) disabled switch", // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -1378,7 +1378,7 @@ describeDevMoonbeam("Mock XCM - transact ETHEREUM input size check succeeds", (c // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -1502,7 +1502,7 @@ describeDevMoonbeam("Mock XCM - transact ETHEREUM input size check fails", (cont // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -1626,7 +1626,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact ETHEREUM (transfer)" // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact.ts b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact.ts index a132af4a3e..1278c25162 100644 --- a/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact.ts +++ b/archived_tests/archived_specs/test-xcm/test-mock-hrmp-transact.ts @@ -86,7 +86,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -170,7 +170,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact with two Descends", // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -252,7 +252,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact without withdraw", ( // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -334,7 +334,7 @@ describeDevMoonbeam("Mock XCM - receive horizontal transact without buy executio // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-fees-and-trap.ts b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-fees-and-trap.ts index 86c6656e6b..2683731fc9 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-fees-and-trap.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-fees-and-trap.ts @@ -106,7 +106,7 @@ describeDevMoonbeam("Mock XCM - Fails trying to pay fees with ERC20", (context) // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -236,14 +236,14 @@ describeDevMoonbeam("Mock XCM - Trap ERC20", (context) => { // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); const chargedWeight = await weightMessage( context, - context.polkadotApi.createType("XcmVersionedXcm", xcmMessage) as any + context.polkadotApi.createType("StagingXcmVersionedXcm", xcmMessage) as any ); // We are charging chargedWeight // chargedWeight * 50000 = chargedFee @@ -273,7 +273,7 @@ describeDevMoonbeam("Mock XCM - Trap ERC20", (context) => { // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageToClaimAssets, } as RawXcmMessage); await context.createBlock(); @@ -287,7 +287,7 @@ describeDevMoonbeam("Mock XCM - Trap ERC20", (context) => { const chargedWeightForClaim = await weightMessage( context, - context.polkadotApi.createType("XcmVersionedXcm", xcmMessageToClaimAssets) as any + context.polkadotApi.createType("StagingXcmVersionedXcm", xcmMessageToClaimAssets) as any ); // We are charging chargedWeightForClaim // chargedWeightForClaim * 50000 = chargedFeeForClaim @@ -301,7 +301,7 @@ describeDevMoonbeam("Mock XCM - Trap ERC20", (context) => { // Mock again the reception of the initial xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -339,7 +339,7 @@ describeDevMoonbeam("Mock XCM - Trap ERC20", (context) => { .as_v2(); await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageFailedClaim, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer-two-ERC20.ts b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer-two-ERC20.ts index 8097a394a7..4e278294d3 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer-two-ERC20.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer-two-ERC20.ts @@ -268,7 +268,7 @@ describeDevMoonbeam("Mock XCM - Receive two ERC20", (context) => { // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer.ts b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer.ts index 4a0e8f13f5..91b1ea3f06 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-transfer.ts @@ -193,7 +193,7 @@ describeDevMoonbeamAllRuntimes("Mock XCM - Receive back erc20", (context) => { // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-v3.ts b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-v3.ts index a7476c78cc..7820ec5c73 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcm-erc20-v3.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcm-erc20-v3.ts @@ -124,7 +124,7 @@ describeDevMoonbeam("Mock XCM V3 - Receive erc20 via XCM", (context) => { // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-xcm-ver-conversion.ts b/archived_tests/archived_specs/test-xcm/test-xcm-ver-conversion.ts index fd7caf245e..8723c846a2 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcm-ver-conversion.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcm-ver-conversion.ts @@ -72,13 +72,13 @@ describeDevMoonbeam( const chargedWeight = await weightMessage( context, - context.polkadotApi.createType("XcmVersionedXcm", xcmMessage) as any + context.polkadotApi.createType("StagingXcmVersionedXcm", xcmMessage) as any ); const chargedFee = chargedWeight * 50000n; await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -158,13 +158,13 @@ describeDevMoonbeam( const chargedWeight = await weightMessage( context, - context.polkadotApi.createType("XcmVersionedXcm", xcmMessage) as any + context.polkadotApi.createType("StagingXcmVersionedXcm", xcmMessage) as any ); const chargedFee = chargedWeight * 50000n; await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/archived_specs/test-xcm/test-xcmv3-max-weight-instructions.ts b/archived_tests/archived_specs/test-xcm/test-xcmv3-max-weight-instructions.ts index 1bdab737e5..842654e2a3 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcmv3-max-weight-instructions.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcmv3-max-weight-instructions.ts @@ -64,7 +64,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -86,7 +86,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -108,7 +108,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -130,7 +130,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -152,7 +152,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -174,7 +174,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -196,7 +196,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/archived_specs/test-xcm/test-xcmv3-new-instructions.ts b/archived_tests/archived_specs/test-xcm/test-xcmv3-new-instructions.ts index 4592f7eb25..4f6b20d3e5 100644 --- a/archived_tests/archived_specs/test-xcm/test-xcmv3-new-instructions.ts +++ b/archived_tests/archived_specs/test-xcm/test-xcmv3-new-instructions.ts @@ -66,7 +66,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -87,7 +87,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -108,7 +108,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -129,7 +129,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -150,7 +150,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -172,7 +172,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -193,7 +193,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -215,7 +215,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -237,7 +237,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -259,7 +259,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -281,7 +281,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -303,7 +303,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -325,7 +325,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -347,7 +347,7 @@ describeDevMoonbeam( // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); diff --git a/archived_tests/moonbase-overrides/moonbase-runtime-local-substitute-tracing.wasm b/archived_tests/moonbase-overrides/moonbase-runtime-local-substitute-tracing.wasm new file mode 100644 index 0000000000..3a7be1dc69 Binary files /dev/null and b/archived_tests/moonbase-overrides/moonbase-runtime-local-substitute-tracing.wasm differ diff --git a/archived_tests/tracing-tests/test-trace-erc20-xcm.ts b/archived_tests/tracing-tests/test-trace-erc20-xcm.ts index f320e95b34..5f0438baae 100644 --- a/archived_tests/tracing-tests/test-trace-erc20-xcm.ts +++ b/archived_tests/tracing-tests/test-trace-erc20-xcm.ts @@ -126,7 +126,7 @@ describeDevMoonbeam("Trace ERC20 xcm", (context) => { // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/archived_tests/tracing-tests/test-trace-ethereum-xcm.ts b/archived_tests/tracing-tests/test-trace-ethereum-xcm.ts index c372303431..6592ec2900 100644 --- a/archived_tests/tracing-tests/test-trace-ethereum-xcm.ts +++ b/archived_tests/tracing-tests/test-trace-ethereum-xcm.ts @@ -110,7 +110,7 @@ describeDevMoonbeam("Trace ethereum xcm #1", (context) => { // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -211,7 +211,7 @@ describeDevMoonbeam("Trace ethereum xcm #2", (context) => { // Send an XCM and create block to execute it await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/client/vrf/src/lib.rs b/client/vrf/src/lib.rs index 415996a758..aefcbe2c70 100644 --- a/client/vrf/src/lib.rs +++ b/client/vrf/src/lib.rs @@ -16,7 +16,9 @@ //! VRF client primitives for client-side verification -use nimbus_primitives::NimbusId; +use std::sync::Arc; + +use nimbus_primitives::{DigestsProvider, NimbusId}; use schnorrkel::PublicKey; use session_keys_primitives::{make_vrf_transcript, PreDigest, VrfApi, VrfId}; use sp_application_crypto::{AppCrypto, ByteArray}; @@ -76,3 +78,32 @@ fn sign_vrf(last_vrf_output: H256, key: VrfId, keystore: &KeystorePtr) -> Option None } } + +pub struct VrfDigestsProvider { + client: Arc, + keystore: Arc, + _marker: std::marker::PhantomData, +} + +impl VrfDigestsProvider { + pub fn new(client: Arc, keystore: Arc) -> Self { + Self { + client, + keystore, + _marker: Default::default(), + } + } +} + +impl DigestsProvider for VrfDigestsProvider +where + B: sp_runtime::traits::Block, + C: sp_api::ProvideRuntimeApi, + C::Api: VrfApi, +{ + type Digests = Option; + + fn provide_digests(&self, nimbus_id: NimbusId, parent: H256) -> Self::Digests { + vrf_pre_digest::(&self.client, &self.keystore, nimbus_id, parent) + } +} diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 128b2fdd13..c051075ae6 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -15,7 +15,9 @@ moonbeam-service = { workspace = true } # Substrate frame-benchmarking-cli = { workspace = true } +sc-chain-spec = { workspace = true } sc-cli = { workspace = true } +sc-client-api = { workspace = true } sc-consensus-grandpa = { workspace = true } sc-service = { workspace = true } sc-sysinfo = { workspace = true } diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index d797e2a77f..33f2a1d0be 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -63,16 +63,14 @@ pub enum Subcommand { Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. - #[cfg(feature = "try-runtime")] - TryRuntime(try_runtime_cli::TryRuntimeCmd), - - /// Try some command against runtime state. Note: `try-runtime` feature must be enabled. - #[cfg(not(feature = "try-runtime"))] TryRuntime, /// Key management cli utilities #[clap(subcommand)] Key(KeyCmd), + + /// Precompile the WASM runtime into native code + PrecompileWasm(sc_cli::PrecompileWasmCmd), } #[derive(Debug, Parser)] diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index 99aeb04adb..126a79d752 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -32,17 +32,12 @@ use sc_cli::{ }; use sc_service::{ config::{BasePath, PrometheusConfig}, - DatabaseSource, + DatabaseSource, PartialComponents, }; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::{AccountIdConversion, Block as _}; use std::{io::Write, net::SocketAddr}; -#[cfg(feature = "try-runtime")] -use try_runtime_cli::block_building_info::substrate_info; -#[cfg(feature = "try-runtime")] -const SLOT_DURATION: u64 = 12; - fn load_spec( id: &str, para_id: ParaId, @@ -138,8 +133,10 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> std::result::Result, String> { load_spec(id, self.run.parachain_id.unwrap_or(1000).into(), &self.run) } +} - fn native_runtime_version(spec: &Box) -> &'static RuntimeVersion { +impl Cli { + fn runtime_version(spec: &Box) -> &'static RuntimeVersion { match spec { #[cfg(feature = "moonriver-native")] spec if spec.is_moonriver() => return &moonbeam_service::moonriver_runtime::VERSION, @@ -194,10 +191,6 @@ impl SubstrateCli for RelayChainCli { .load_spec(id), } } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - polkadot_cli::Cli::native_runtime_version(chain_spec) - } } fn validate_trace_environment(cli: &Cli) -> Result<()> { @@ -406,7 +399,7 @@ pub fn run() -> Result<()> { params.parachain_id.unwrap_or(1000).into(), &cli.run, )?; - let state_version = Cli::native_runtime_version(&chain_spec).state_version(); + let state_version = Cli::runtime_version(&chain_spec).state_version(); let output_buf = match chain_spec { #[cfg(feature = "moonriver-native")] @@ -491,7 +484,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "moonriver-native")] spec if spec.is_moonriver() => { return runner.sync_run(|config| { - cmd.run::( + cmd.run::( config, ) }) @@ -499,7 +492,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "moonbeam-native")] spec if spec.is_moonbeam() => { return runner.sync_run(|config| { - cmd.run::( + cmd.run::( config, ) }) @@ -507,7 +500,7 @@ pub fn run() -> Result<()> { #[cfg(feature = "moonbase-native")] _ => { return runner.sync_run(|config| { - cmd.run::( + cmd.run::( config, ) }) @@ -517,7 +510,7 @@ pub fn run() -> Result<()> { } } else if cfg!(feature = "moonbase-runtime-benchmarks") { return runner.sync_run(|config| { - cmd.run::( + cmd.run::( config, ) }); @@ -636,89 +629,62 @@ pub fn run() -> Result<()> { } } } - #[cfg(feature = "try-runtime")] - Some(Subcommand::TryRuntime(cmd)) => { + Some(Subcommand::TryRuntime) => Err("The `try-runtime` subcommand has been migrated to a \ + standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer \ + being maintained here and will be removed entirely some time after January 2024. \ + Please remove this subcommand from your runtime and use the standalone CLI." + .into()), + Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?), + Some(Subcommand::PrecompileWasm(cmd)) => { let runner = cli.create_runner(cmd)?; - let chain_spec = &runner.config().chain_spec; - match chain_spec { + let rpc_config = cli.run.new_rpc_config(); + runner.async_run(|mut config| match &config.chain_spec { #[cfg(feature = "moonriver-native")] - spec if spec.is_moonriver() => runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - - let info_provider = substrate_info(SLOT_DURATION); - Ok(( - cmd.run::< - moonbeam_service::moonriver_runtime::Block, - sp_wasm_interface::ExtendedHostFunctions< - sp_io::SubstrateHostFunctions, - ::ExtendHostFunctions, - >, _>(Some(info_provider)), + spec if spec.is_moonriver() => { + let PartialComponents { task_manager, - )) - }), + backend, + .. + } = moonbeam_service::new_partial::< + moonbeam_service::moonriver_runtime::RuntimeApi, + moonbeam_service::MoonriverExecutor, + >(&mut config, &rpc_config, false)?; + + Ok((cmd.run(backend, config.chain_spec), task_manager)) + } #[cfg(feature = "moonbeam-native")] - spec if spec.is_moonbeam() => runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - - let info_provider = substrate_info(SLOT_DURATION); - Ok(( - cmd.run::< - moonbeam_service::moonbeam_runtime::Block, - sp_wasm_interface::ExtendedHostFunctions< - sp_io::SubstrateHostFunctions, - ::ExtendHostFunctions, - >, _>(Some(info_provider)), + spec if spec.is_moonbeam() => { + let PartialComponents { task_manager, - )) - }), + backend, + .. + } = moonbeam_service::new_partial::< + moonbeam_service::moonbeam_runtime::RuntimeApi, + moonbeam_service::MoonbeamExecutor, + >(&mut config, &rpc_config, false)?; + + Ok((cmd.run(backend, config.chain_spec), task_manager)) + } #[cfg(feature = "moonbase-native")] _ => { - runner.async_run(|config| { - // we don't need any of the components of new_partial, just a runtime, or a task - // manager to do `async_run`. - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - - let info_provider = substrate_info(SLOT_DURATION); - Ok(( - cmd.run::< - moonbeam_service::moonbase_runtime::Block, - sp_wasm_interface::ExtendedHostFunctions< - sp_io::SubstrateHostFunctions, - ::ExtendHostFunctions, - >, _>(Some(info_provider)), - task_manager, - )) - }) + let PartialComponents { + task_manager, + backend, + .. + } = moonbeam_service::new_partial::< + moonbeam_service::moonbase_runtime::RuntimeApi, + moonbeam_service::MoonbaseExecutor, + >(&mut config, &rpc_config, false)?; + + Ok((cmd.run(backend, config.chain_spec), task_manager)) } #[cfg(not(feature = "moonbase-native"))] _ => panic!("invalid chain spec"), - } + }) } - #[cfg(not(feature = "try-runtime"))] - Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ - You can enable it at build time with `--features try-runtime`." - .into()), - Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?), None => { let runner = cli.create_runner(&(*cli.run).normalize())?; + let collator_options = cli.run.collator_options(); runner.run_node_until_exit(|config| async move { let hwbench = if !cli.run.no_hardware_benchmarks { config.database.path().map(|database_path| { @@ -789,42 +755,14 @@ pub fn run() -> Result<()> { ); let parachain_account = - AccountIdConversion::::into_account_truncating(&id); - - let state_version = - RelayChainCli::native_runtime_version(&config.chain_spec).state_version(); - - let genesis_state = match &config.chain_spec { - #[cfg(feature = "moonriver-native")] - spec if spec.is_moonriver() => { - let block: moonbeam_service::moonriver_runtime::Block = - generate_genesis_block(&**spec, state_version)?; - format!("0x{:?}", HexDisplay::from(&block.header().encode())) - } - #[cfg(feature = "moonbeam-native")] - spec if spec.is_moonbeam() => { - let block: moonbeam_service::moonbeam_runtime::Block = - generate_genesis_block(&**spec, state_version)?; - format!("0x{:?}", HexDisplay::from(&block.header().encode())) - } - #[cfg(feature = "moonbase-native")] - _ => { - let block: moonbeam_service::moonbase_runtime::Block = - generate_genesis_block(&*config.chain_spec, state_version)?; - format!("0x{:?}", HexDisplay::from(&block.header().encode())) - } - #[cfg(not(feature = "moonbase-native"))] - _ => panic!("invalid chain spec"), - }; + AccountIdConversion::::into_account_truncating(&id); let tokio_handle = config.tokio_handle.clone(); let polkadot_config = SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) .map_err(|err| format!("Relay chain argument error: {}", err))?; - info!("Parachain id: {:?}", id); info!("Parachain Account: {}", parachain_account); - info!("Parachain genesis state: {}", genesis_state); info!( "Is collating: {}", if config.role.is_authority() { @@ -847,7 +785,14 @@ pub fn run() -> Result<()> { spec if spec.is_moonriver() => moonbeam_service::start_node::< moonbeam_service::moonriver_runtime::RuntimeApi, moonbeam_service::MoonriverExecutor, - >(config, polkadot_config, id, rpc_config, hwbench) + >( + config, + polkadot_config, + collator_options, + id, + rpc_config, + hwbench, + ) .await .map(|r| r.0) .map_err(Into::into), @@ -855,7 +800,14 @@ pub fn run() -> Result<()> { spec if spec.is_moonbeam() => moonbeam_service::start_node::< moonbeam_service::moonbeam_runtime::RuntimeApi, moonbeam_service::MoonbeamExecutor, - >(config, polkadot_config, id, rpc_config, hwbench) + >( + config, + polkadot_config, + collator_options, + id, + rpc_config, + hwbench, + ) .await .map(|r| r.0) .map_err(Into::into), @@ -863,7 +815,14 @@ pub fn run() -> Result<()> { _ => moonbeam_service::start_node::< moonbeam_service::moonbase_runtime::RuntimeApi, moonbeam_service::MoonbaseExecutor, - >(config, polkadot_config, id, rpc_config, hwbench) + >( + config, + polkadot_config, + collator_options, + id, + rpc_config, + hwbench, + ) .await .map(|r| r.0) .map_err(Into::into), diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 540e7b6170..6eba54ac2a 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -39,6 +39,7 @@ moonbeam-rpc-primitives-debug = { workspace = true } moonbeam-rpc-primitives-txpool = { workspace = true } moonbeam-rpc-trace = { workspace = true } moonbeam-rpc-txpool = { workspace = true } +moonbeam-runtime-common = { workspace = true } moonbeam-vrf = { workspace = true } pallet-parachain-staking = { workspace = true } session-keys-primitives = { workspace = true } @@ -69,6 +70,7 @@ sc-informant = { workspace = true } sc-network = { workspace = true } sc-network-common = { workspace = true } sc-network-sync = { workspace = true } +sc-offchain = { workspace = true } sc-rpc = { workspace = true } sc-rpc-api = { workspace = true } sc-service = { workspace = true } @@ -99,7 +101,7 @@ substrate-prometheus-endpoint = { workspace = true } fc-consensus = { workspace = true } fc-db = { workspace = true } fc-mapping-sync = { workspace = true, features = [ "sql" ] } -fc-rpc = { workspace = true, features = [ "rpc-binary-search-estimate" ] } +fc-rpc = { workspace = true, features = [ "rpc-binary-search-estimate", "txpool" ] } fc-rpc-core = { workspace = true } fp-consensus = { workspace = true, features = [ "std" ] } fp-rpc = { workspace = true, features = [ "std" ] } diff --git a/node/service/src/chain_spec/moonbase.rs b/node/service/src/chain_spec/moonbase.rs index 612e5e791f..e4ab91c5e2 100644 --- a/node/service/src/chain_spec/moonbase.rs +++ b/node/service/src/chain_spec/moonbase.rs @@ -27,9 +27,9 @@ use hex_literal::hex; use moonbase_runtime::{ currency::UNIT, AccountId, AuthorFilterConfig, AuthorMappingConfig, Balance, BalancesConfig, CouncilCollectiveConfig, CrowdloanRewardsConfig, DemocracyConfig, EVMConfig, EligibilityValue, - EthereumChainIdConfig, EthereumConfig, GenesisAccount, GenesisConfig, InflationInfo, - MaintenanceModeConfig, OpenTechCommitteeCollectiveConfig, ParachainInfoConfig, - ParachainStakingConfig, PolkadotXcmConfig, Precompiles, Range, SudoConfig, SystemConfig, + EthereumChainIdConfig, EthereumConfig, GenesisAccount, InflationInfo, MaintenanceModeConfig, + OpenTechCommitteeCollectiveConfig, ParachainInfoConfig, ParachainStakingConfig, + PolkadotXcmConfig, Precompiles, Range, RuntimeGenesisConfig, SudoConfig, SystemConfig, TechCommitteeCollectiveConfig, TransactionPaymentConfig, TreasuryCouncilCollectiveConfig, HOURS, WASM_BINARY, }; @@ -41,7 +41,7 @@ use sp_core::ecdsa; use sp_runtime::{Perbill, Percent}; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a chain spec for use with the development service. pub fn development_chain_spec(mnemonic: Option, num_accounts: Option) -> ChainSpec { @@ -247,18 +247,19 @@ pub fn testnet_genesis( crowdloan_fund_pot: Balance, para_id: ParaId, chain_id: u64, -) -> GenesisConfig { +) -> RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - GenesisConfig { + RuntimeGenesisConfig { system: SystemConfig { code: WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), + ..Default::default() }, balances: BalancesConfig { balances: endowed_accounts @@ -275,8 +276,12 @@ pub fn testnet_genesis( }, parachain_info: ParachainInfoConfig { parachain_id: para_id, + ..Default::default() + }, + ethereum_chain_id: EthereumChainIdConfig { + chain_id, + ..Default::default() }, - ethereum_chain_id: EthereumChainIdConfig { chain_id }, evm: EVMConfig { // We need _some_ code inserted at the precompile address so that // the evm will actually call the address. @@ -293,8 +298,11 @@ pub fn testnet_genesis( ) }) .collect(), + ..Default::default() + }, + ethereum: EthereumConfig { + ..Default::default() }, - ethereum: EthereumConfig {}, democracy: DemocracyConfig::default(), parachain_staking: ParachainStakingConfig { candidates: candidates @@ -327,6 +335,7 @@ pub fn testnet_genesis( }, author_filter: AuthorFilterConfig { eligible_count: EligibilityValue::new_unchecked(50), + ..Default::default() }, author_mapping: AuthorMappingConfig { mappings: candidates @@ -340,11 +349,13 @@ pub fn testnet_genesis( migrations: Default::default(), maintenance_mode: MaintenanceModeConfig { start_in_maintenance_mode: false, + ..Default::default() }, // This should initialize it to whatever we have set in the pallet polkadot_xcm: PolkadotXcmConfig::default(), transaction_payment: TransactionPaymentConfig { multiplier: Multiplier::from(8u128), + ..Default::default() }, } } diff --git a/node/service/src/chain_spec/moonbeam.rs b/node/service/src/chain_spec/moonbeam.rs index faa8204aab..7280793a58 100644 --- a/node/service/src/chain_spec/moonbeam.rs +++ b/node/service/src/chain_spec/moonbeam.rs @@ -28,11 +28,11 @@ use moonbase_runtime::EligibilityValue; use moonbeam_runtime::{ currency::GLMR, currency::SUPPLY_FACTOR, AccountId, AuthorFilterConfig, AuthorMappingConfig, Balance, BalancesConfig, CouncilCollectiveConfig, CrowdloanRewardsConfig, DemocracyConfig, - EVMConfig, EthereumChainIdConfig, EthereumConfig, GenesisAccount, GenesisConfig, InflationInfo, + EVMConfig, EthereumChainIdConfig, EthereumConfig, GenesisAccount, InflationInfo, MaintenanceModeConfig, OpenTechCommitteeCollectiveConfig, ParachainInfoConfig, - ParachainStakingConfig, PolkadotXcmConfig, Precompiles, Range, SystemConfig, - TechCommitteeCollectiveConfig, TransactionPaymentConfig, TreasuryCouncilCollectiveConfig, - HOURS, WASM_BINARY, + ParachainStakingConfig, PolkadotXcmConfig, Precompiles, Range, RuntimeGenesisConfig, + SystemConfig, TechCommitteeCollectiveConfig, TransactionPaymentConfig, + TreasuryCouncilCollectiveConfig, HOURS, WASM_BINARY, }; use nimbus_primitives::NimbusId; use pallet_transaction_payment::Multiplier; @@ -42,7 +42,7 @@ use sp_core::ecdsa; use sp_runtime::{Perbill, Percent}; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a chain spec for use with the development service. pub fn development_chain_spec(mnemonic: Option, num_accounts: Option) -> ChainSpec { @@ -236,18 +236,19 @@ pub fn testnet_genesis( crowdloan_fund_pot: Balance, para_id: ParaId, chain_id: u64, -) -> GenesisConfig { +) -> RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - GenesisConfig { + RuntimeGenesisConfig { system: SystemConfig { code: WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), + ..Default::default() }, balances: BalancesConfig { balances: endowed_accounts @@ -261,8 +262,12 @@ pub fn testnet_genesis( }, parachain_info: ParachainInfoConfig { parachain_id: para_id, + ..Default::default() + }, + ethereum_chain_id: EthereumChainIdConfig { + chain_id, + ..Default::default() }, - ethereum_chain_id: EthereumChainIdConfig { chain_id }, evm: EVMConfig { // We need _some_ code inserted at the precompile address so that // the evm will actually call the address. @@ -279,8 +284,11 @@ pub fn testnet_genesis( ) }) .collect(), + ..Default::default() + }, + ethereum: EthereumConfig { + ..Default::default() }, - ethereum: EthereumConfig {}, democracy: DemocracyConfig::default(), parachain_staking: ParachainStakingConfig { candidates: candidates @@ -313,6 +321,7 @@ pub fn testnet_genesis( }, author_filter: AuthorFilterConfig { eligible_count: EligibilityValue::new_unchecked(50), + ..Default::default() }, author_mapping: AuthorMappingConfig { mappings: candidates @@ -326,11 +335,13 @@ pub fn testnet_genesis( migrations: Default::default(), maintenance_mode: MaintenanceModeConfig { start_in_maintenance_mode: false, + ..Default::default() }, // This should initialize it to whatever we have set in the pallet polkadot_xcm: PolkadotXcmConfig::default(), transaction_payment: TransactionPaymentConfig { multiplier: Multiplier::from(8u128), + ..Default::default() }, } } diff --git a/node/service/src/chain_spec/moonriver.rs b/node/service/src/chain_spec/moonriver.rs index 5929283ce5..1b19dbed85 100644 --- a/node/service/src/chain_spec/moonriver.rs +++ b/node/service/src/chain_spec/moonriver.rs @@ -28,9 +28,9 @@ use moonbase_runtime::EligibilityValue; use moonriver_runtime::{ currency::MOVR, AccountId, AuthorFilterConfig, AuthorMappingConfig, Balance, BalancesConfig, CouncilCollectiveConfig, CrowdloanRewardsConfig, DemocracyConfig, EVMConfig, - EthereumChainIdConfig, EthereumConfig, GenesisAccount, GenesisConfig, InflationInfo, - MaintenanceModeConfig, OpenTechCommitteeCollectiveConfig, ParachainInfoConfig, - ParachainStakingConfig, PolkadotXcmConfig, Precompiles, Range, SystemConfig, + EthereumChainIdConfig, EthereumConfig, GenesisAccount, InflationInfo, MaintenanceModeConfig, + OpenTechCommitteeCollectiveConfig, ParachainInfoConfig, ParachainStakingConfig, + PolkadotXcmConfig, Precompiles, Range, RuntimeGenesisConfig, SystemConfig, TechCommitteeCollectiveConfig, TransactionPaymentConfig, TreasuryCouncilCollectiveConfig, HOURS, WASM_BINARY, }; @@ -42,7 +42,7 @@ use sp_core::ecdsa; use sp_runtime::{Perbill, Percent}; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a chain spec for use with the development service. pub fn development_chain_spec(mnemonic: Option, num_accounts: Option) -> ChainSpec { @@ -236,18 +236,19 @@ pub fn testnet_genesis( crowdloan_fund_pot: Balance, para_id: ParaId, chain_id: u64, -) -> GenesisConfig { +) -> RuntimeGenesisConfig { // This is the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - GenesisConfig { + RuntimeGenesisConfig { system: SystemConfig { code: WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), + ..Default::default() }, balances: BalancesConfig { balances: endowed_accounts @@ -261,8 +262,12 @@ pub fn testnet_genesis( }, parachain_info: ParachainInfoConfig { parachain_id: para_id, + ..Default::default() + }, + ethereum_chain_id: EthereumChainIdConfig { + chain_id, + ..Default::default() }, - ethereum_chain_id: EthereumChainIdConfig { chain_id }, evm: EVMConfig { // We need _some_ code inserted at the precompile address so that // the evm will actually call the address. @@ -279,8 +284,11 @@ pub fn testnet_genesis( ) }) .collect(), + ..Default::default() + }, + ethereum: EthereumConfig { + ..Default::default() }, - ethereum: EthereumConfig {}, democracy: DemocracyConfig::default(), parachain_staking: ParachainStakingConfig { candidates: candidates @@ -313,6 +321,7 @@ pub fn testnet_genesis( }, author_filter: AuthorFilterConfig { eligible_count: EligibilityValue::new_unchecked(50), + ..Default::default() }, author_mapping: AuthorMappingConfig { mappings: candidates @@ -326,11 +335,13 @@ pub fn testnet_genesis( migrations: Default::default(), maintenance_mode: MaintenanceModeConfig { start_in_maintenance_mode: false, + ..Default::default() }, // This should initialize it to whatever we have set in the pallet polkadot_xcm: PolkadotXcmConfig::default(), transaction_payment: TransactionPaymentConfig { multiplier: Multiplier::from(10u128), + ..Default::default() }, } } diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 3ed49af776..b01afb8b22 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -46,13 +46,10 @@ pub trait RuntimeApiCollection: + nimbus_primitives::NimbusApi + cumulus_primitives_core::CollectCollationInfo + session_keys_primitives::VrfApi -where - >::StateBackend: sp_api::StateBackend, { } -impl RuntimeApiCollection for Api -where +impl RuntimeApiCollection for Api where Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::ApiExt + sp_block_builder::BlockBuilder @@ -67,8 +64,7 @@ where + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi + nimbus_primitives::NimbusApi + cumulus_primitives_core::CollectCollationInfo - + session_keys_primitives::VrfApi, - >::StateBackend: sp_api::StateBackend, + + session_keys_primitives::VrfApi { } @@ -87,7 +83,7 @@ where Block: BlockT, Backend: BackendT, Backend::State: sp_api::StateBackend, - Self::Api: RuntimeApiCollection, + Self::Api: RuntimeApiCollection, { } @@ -103,7 +99,7 @@ where + Send + Sync + CallApiAt, - Client::Api: RuntimeApiCollection, + Client::Api: RuntimeApiCollection, { } @@ -127,10 +123,9 @@ pub trait ExecuteWithClient { /// Execute whatever should be executed with the given client instance. fn execute_with_client(self, client: Arc) -> Self::Output where - >::StateBackend: sp_api::StateBackend, Backend: sc_client_api::Backend, Backend::State: sp_api::StateBackend, - Api: crate::RuntimeApiCollection, + Api: crate::RuntimeApiCollection, Client: AbstractClient + 'static; } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 78da1dc087..3a956bcd08 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -28,8 +28,10 @@ use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainConsensus, }; +#[allow(deprecated)] use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, + prepare_node_config, start_collator, start_full_node, CollatorSybilResistance, + StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::relay_chain::CollatorPair; use cumulus_primitives_core::ParaId; @@ -38,22 +40,24 @@ use cumulus_primitives_parachain_inherent::{ }; use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; +use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc; use fc_consensus::FrontierBlockImport as TFrontierBlockImport; use fc_db::DatabaseSource; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use futures::StreamExt; +use futures::{FutureExt, StreamExt}; use maplit::hashmap; #[cfg(feature = "moonbase-native")] pub use moonbase_runtime; use moonbeam_cli_opt::{EthApi as EthApiCmd, FrontierBackendConfig, RpcConfig}; #[cfg(feature = "moonbeam-native")] pub use moonbeam_runtime; +use moonbeam_vrf::VrfDigestsProvider; #[cfg(feature = "moonriver-native")] pub use moonriver_runtime; -use nimbus_consensus::NimbusManualSealConsensusDataProvider; -use nimbus_consensus::{BuildNimbusConsensusParams, NimbusConsensus}; -use nimbus_primitives::NimbusId; +use nimbus_consensus::{ + BuildNimbusConsensusParams, NimbusConsensus, NimbusManualSealConsensusDataProvider, +}; +use nimbus_primitives::{DigestsProvider, NimbusId}; use sc_client_api::{ backend::{AuxStore, Backend, StateBackend, StorageProvider}, ExecutorProvider, @@ -62,16 +66,19 @@ use sc_consensus::ImportQueue; use sc_executor::{ HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY, }; -use sc_network::{config::FullNetworkConfiguration, NetworkBlock, NetworkService}; +use sc_network::{config::FullNetworkConfiguration, NetworkBlock}; +use sc_network_sync::SyncingService; use sc_service::config::PrometheusConfig; use sc_service::{ error::Error as ServiceError, ChainSpec, Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager, }; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sp_api::{ConstructRuntimeApi, ProvideRuntimeApi}; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; -use sp_keystore::KeystorePtr; +use sp_core::{ByteArray, H256}; +use sp_keystore::{Keystore, KeystorePtr}; use std::sync::Arc; use std::{collections::BTreeMap, path::Path, sync::Mutex, time::Duration}; use substrate_prometheus_endpoint::Registry; @@ -96,7 +103,7 @@ type PartialComponentsResult = Result< FullClient, FullBackend, MaybeSelectChain, - sc_consensus::DefaultImportQueue>, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool>, ( BlockImportPipeline< @@ -355,8 +362,7 @@ where Ok(frontier_backend) } -use sp_runtime::{traits::BlakeTwo256, Percent}; -use sp_trie::PrefixedMemoryDB; +use sp_runtime::{traits::BlakeTwo256, DigestItem, Percent}; pub const SOFT_DEADLINE_PERCENT: Percent = Percent::from_percent(100); @@ -369,7 +375,7 @@ pub fn new_chain_ops( ( Arc, Arc, - sc_consensus::BasicQueue>, + sc_consensus::BasicQueue, TaskManager, ), ServiceError, @@ -403,7 +409,7 @@ fn new_chain_ops_inner( ( Arc, Arc, - sc_consensus::BasicQueue>, + sc_consensus::BasicQueue, TaskManager, ), ServiceError, @@ -412,8 +418,7 @@ where Client: From>>, RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, Executor: ExecutorT + 'static, { config.keystore = sc_service::config::KeystoreConfig::InMemory; @@ -466,8 +471,7 @@ pub fn new_partial( where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, Executor: ExecutorT + 'static, { set_prometheus_registry(config, rpc_config.no_prometheus_prefix)?; @@ -491,16 +495,21 @@ where .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _, }); - let wasm = WasmExecutor::builder() + let mut wasm_builder = WasmExecutor::builder() .with_execution_method(config.wasm_method) .with_onchain_heap_alloc_strategy(heap_pages) .with_offchain_heap_alloc_strategy(heap_pages) .with_ignore_onchain_heap_pages(true) .with_max_runtime_instances(config.max_runtime_instances) - .with_runtime_cache_size(config.runtime_cache_size) - .build(); + .with_runtime_cache_size(config.runtime_cache_size); + + if let Some(ref wasmtime_precompiled_path) = config.wasmtime_precompiled { + wasm_builder = wasm_builder.with_wasmtime_precompiled_path(wasmtime_precompiled_path); + } + + let wasm_executor = wasm_builder.build(); - let executor = NativeElseWasmExecutor::::new_with_wasm_executor(wasm); + let executor = NativeElseWasmExecutor::::new_with_wasm_executor(wasm_executor); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( @@ -612,13 +621,11 @@ async fn build_relay_chain_interface( Arc<(dyn RelayChainInterface + 'static)>, Option, )> { - if !collator_options.relay_chain_rpc_urls.is_empty() { - build_minimal_relay_chain_node( - polkadot_config, - task_manager, - collator_options.relay_chain_rpc_urls, - ) - .await + if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) = + collator_options.relay_chain_mode + { + build_minimal_relay_chain_node_with_rpc(polkadot_config, task_manager, rpc_target_urls) + .await } else { build_inprocess_relay_chain( polkadot_config, @@ -637,7 +644,8 @@ async fn build_relay_chain_interface( async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, - id: polkadot_primitives::v4::Id, + collator_options: CollatorOptions, + id: ParaId, rpc_config: RpcConfig, hwbench: Option, build_consensus: BIC, @@ -645,12 +653,12 @@ async fn start_node_impl( where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, Executor: ExecutorT + 'static, BIC: FnOnce( Arc>>, Arc>, + ParachainBlockImport, Option<&Registry>, Option, &TaskManager, @@ -661,20 +669,16 @@ where TFullClient>, >, >, - Arc>, + Arc>, KeystorePtr, bool, ) -> Result>, sc_service::Error>, { let mut parachain_config = prepare_node_config(parachain_config); - let collator_options = CollatorOptions { - relay_chain_rpc_urls: rpc_config.relay_chain_rpc_urls.clone(), - }; - let params = new_partial(&mut parachain_config, &rpc_config, false)?; let ( - _block_import, + block_import, filter_pool, mut telemetry, telemetry_worker_handle, @@ -714,6 +718,7 @@ where para_id: id, relay_chain_interface: relay_chain_interface.clone(), net_config, + sybil_resistance_level: CollatorSybilResistance::Resistant, }) .await?; @@ -793,6 +798,7 @@ where let block_data_cache = block_data_cache.clone(); let pubsub_notification_sinks = pubsub_notification_sinks.clone(); + let keystore = params.keystore_container.keystore(); move |deny_unsafe, subscription_task_executor| { let deps = rpc::FullDeps { backend: backend.clone(), @@ -818,6 +824,10 @@ where overrides: overrides.clone(), forced_parent_hashes: None, }; + let pending_consensus_data_provider = Box::new(PendingConsensusDataProvider::new( + client.clone(), + keystore.clone(), + )); if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { rpc::create_full( deps, @@ -827,6 +837,7 @@ where trace_filter_max_count: rpc_config.ethapi_trace_max_count, }), pubsub_notification_sinks.clone(), + pending_consensus_data_provider, ) .map_err(Into::into) } else { @@ -835,6 +846,7 @@ where subscription_task_executor, None, pubsub_notification_sinks.clone(), + pending_consensus_data_provider, ) .map_err(Into::into) } @@ -879,16 +891,21 @@ where .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + let BlockImportPipeline::Parachain(block_import) = block_import else { + return Err(sc_service::Error::Other( + "Block import pipeline is not for parachain".into(), + ))}; if collator { let parachain_consensus = build_consensus( client.clone(), - backend.clone(), + backend, + block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, relay_chain_interface.clone(), transaction_pool, - network, + sync_service.clone(), params.keystore_container.keystore(), force_authoring, )?; @@ -913,6 +930,7 @@ where sync_service, }; + #[allow(deprecated)] start_collator(params).await?; } else { let params = StartFullNodeParams { @@ -927,6 +945,7 @@ where sync_service, }; + #[allow(deprecated)] start_full_node(params)?; } @@ -941,7 +960,8 @@ where pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, - id: polkadot_primitives::v4::Id, + collator_options: CollatorOptions, + id: ParaId, rpc_config: RpcConfig, hwbench: Option, ) -> sc_service::error::Result<(TaskManager, Arc>)> @@ -949,18 +969,20 @@ where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: - RuntimeApiCollection>, + RuntimeApiCollection, Executor: ExecutorT + 'static, { start_node_impl( parachain_config, polkadot_config, + collator_options, id, rpc_config, hwbench, | client, backend, + block_import, prometheus_registry, telemetry, task_manager, @@ -968,7 +990,7 @@ where transaction_pool, _sync_oracle, keystore, - force_authoring + force_authoring, | { let mut proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), @@ -1007,22 +1029,12 @@ where Ok((time, parachain_inherent, author, randomness)) } }; - let client_clone = client.clone(); - let keystore_clone = keystore.clone(); - let maybe_provide_vrf_digest = move |nimbus_id: NimbusId, parent: Hash| - -> Option { - moonbeam_vrf::vrf_pre_digest::>( - &client_clone, - &keystore_clone, - nimbus_id, - parent, - ) - }; + let maybe_provide_vrf_digest = VrfDigestsProvider::new(client.clone(), keystore.clone()); Ok(NimbusConsensus::build(BuildNimbusConsensusParams { para_id: id, proposer_factory, - block_import: client.clone(), + block_import, backend, parachain_client: client.clone(), keystore, @@ -1047,14 +1059,12 @@ pub async fn new_dev( where RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, - RuntimeApi::RuntimeApi: - RuntimeApiCollection>, + RuntimeApi::RuntimeApi: RuntimeApiCollection, Executor: ExecutorT + 'static, { use async_io::Timer; use futures::Stream; use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; - use sp_core::H256; let sc_service::PartialComponents { client, @@ -1098,11 +1108,23 @@ where })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + is_validator: config.role.is_authority(), + enable_http_requests: true, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -1314,6 +1336,7 @@ where let block_data_cache = block_data_cache.clone(); let pubsub_notification_sinks = pubsub_notification_sinks.clone(); + let keystore = keystore_container.keystore(); move |deny_unsafe, subscription_task_executor| { let deps = rpc::FullDeps { backend: backend.clone(), @@ -1340,6 +1363,10 @@ where forced_parent_hashes: None, }; + let pending_consensus_data_provider = Box::new(PendingConsensusDataProvider::new( + client.clone(), + keystore.clone(), + )); if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { rpc::create_full( deps, @@ -1349,6 +1376,7 @@ where trace_filter_max_count: rpc_config.ethapi_trace_max_count, }), pubsub_notification_sinks.clone(), + pending_consensus_data_provider, ) .map_err(Into::into) } else { @@ -1357,6 +1385,7 @@ where subscription_task_executor, None, pubsub_notification_sinks.clone(), + pending_consensus_data_provider, ) .map_err(Into::into) } @@ -1624,7 +1653,6 @@ mod tests { chain_spec: Box::new(spec), wasm_method: Default::default(), wasm_runtime_overrides: Default::default(), - execution_strategies: Default::default(), rpc_id_provider: None, rpc_max_connections: Default::default(), rpc_cors: None, @@ -1648,7 +1676,84 @@ mod tests { announce_block: true, base_path: BasePath::new(Path::new("")), informant_output_format: Default::default(), + wasmtime_precompiled: None, runtime_cache_size: 2, } } } + +struct PendingConsensusDataProvider +where + RuntimeApi: Send + Sync, + Executor: ExecutorT + 'static, +{ + client: Arc>, + keystore: Arc, +} + +impl PendingConsensusDataProvider +where + RuntimeApi: + ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi::RuntimeApi: RuntimeApiCollection, + Executor: ExecutorT + 'static, +{ + pub fn new(client: Arc>, keystore: Arc) -> Self { + Self { client, keystore } + } +} + +impl fc_rpc::pending::ConsensusDataProvider + for PendingConsensusDataProvider +where + RuntimeApi: + ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi::RuntimeApi: RuntimeApiCollection, + Executor: ExecutorT + 'static, +{ + fn create_digest( + &self, + parent: &Header, + _data: &sp_inherents::InherentData, + ) -> Result { + let hash = parent.hash(); + // Get the digest from the best block header. + let mut digest = self + .client + .header(hash) + .map_err(|e| sp_inherents::Error::Application(Box::new(e)))? + .expect("Best block header should be present") + .digest; + // Get the nimbus id from the digest. + let nimbus_id = digest + .logs + .iter() + .find_map(|x| { + if let DigestItem::PreRuntime(nimbus_primitives::NIMBUS_ENGINE_ID, nimbus_id) = x { + Some( + NimbusId::from_slice(nimbus_id.as_slice()) + .expect("Nimbus pre-runtime digest should be valid"), + ) + } else { + None + } + }) + .expect("Nimbus pre-runtime digest should be present"); + // Remove the old VRF digest. + let pos = digest.logs.iter().position(|x| { + matches!( + x, + DigestItem::PreRuntime(session_keys_primitives::VRF_ENGINE_ID, _) + ) + }); + if let Some(pos) = pos { + digest.logs.remove(pos); + } + // Create the VRF digest. + let vrf_digest = VrfDigestsProvider::new(self.client.clone(), self.keystore.clone()) + .provide_digests(nimbus_id, hash); + // Append the VRF digest to the digest. + digest.logs.extend(vrf_digest); + Ok(digest) + } +} diff --git a/node/service/src/rpc.rs b/node/service/src/rpc.rs index 3c0888658b..2716b03ed9 100644 --- a/node/service/src/rpc.rs +++ b/node/service/src/rpc.rs @@ -24,11 +24,14 @@ use fp_rpc::EthereumRuntimeRPCApi; use sp_block_builder::BlockBuilder; use crate::client::RuntimeApiCollection; -use cumulus_primitives_core::ParaId; +use cumulus_primitives_core::{ParaId, PersistedValidationData}; +use cumulus_primitives_parachain_inherent::ParachainInherentData; +use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy}; use fc_rpc::{ - EthBlockDataCacheTask, EthTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override, - SchemaV2Override, SchemaV3Override, StorageOverride, + pending::ConsensusDataProvider, EthBlockDataCacheTask, EthTask, OverrideHandle, + RuntimeApiStorageOverride, SchemaV1Override, SchemaV2Override, SchemaV3Override, + StorageOverride, }; use fc_rpc_core::types::{CallRequest, FeeHistoryCache, FilterPool}; use fp_storage::EthereumStorageSchema; @@ -176,6 +179,7 @@ pub fn create_full( fc_mapping_sync::EthereumBlockNotification, >, >, + pending_consenus_data_provider: Box>, ) -> Result, Box> where BE: Backend + 'static, @@ -187,7 +191,7 @@ where C: CallApiAt, C: Send + Sync + 'static, A: ChainApi + 'static, - C::Api: RuntimeApiCollection, + C::Api: RuntimeApiCollection, P: TransactionPool + 'static, { use fc_rpc::{ @@ -242,6 +246,29 @@ where } let convert_transaction: Option = None; + let pending_create_inherent_data_providers = move |_, _| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + // Create a dummy parachain inherent data provider which is required to pass + // the checks by the para chain system. We use dummy values because in the 'pending context' + // neither do we have access to the real values nor do we need them. + let (relay_parent_storage_root, relay_chain_state) = + RelayStateSproofBuilder::default().into_state_root_and_proof(); + let vfp = PersistedValidationData { + // This is a hack to make `cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases` + // happy. Relay parent number can't be bigger than u32::MAX. + relay_parent_number: u32::MAX, + relay_parent_storage_root, + ..Default::default() + }; + let parachain_inherent_data = ParachainInherentData { + validation_data: vfp, + relay_chain_state: relay_chain_state, + downward_messages: Default::default(), + horizontal_messages: Default::default(), + }; + Ok((timestamp, parachain_inherent_data)) + }; + io.merge( Eth::new( Arc::clone(&client), @@ -258,6 +285,8 @@ where fee_history_limit, 10, forced_parent_hashes, + pending_create_inherent_data_providers, + Some(pending_consenus_data_provider), ) .replace_config::>() .into_rpc(), @@ -268,7 +297,7 @@ where EthFilter::new( client.clone(), frontier_backend.clone(), - fc_rpc::TxPool::new(client.clone(), graph.clone()), + graph.clone(), filter_pool, 500_usize, // max stored filters max_past_logs, diff --git a/pallets/asset-manager/src/benchmarks.rs b/pallets/asset-manager/src/benchmarks.rs index 20cc94df94..3cee04b8ca 100644 --- a/pallets/asset-manager/src/benchmarks.rs +++ b/pallets/asset-manager/src/benchmarks.rs @@ -209,10 +209,11 @@ benchmarks! { mod tests { use crate::mock::Test; use sp_io::TestExternalities; + use sp_runtime::BuildStorage; pub fn new_test_ext() -> TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); TestExternalities::new(t) } diff --git a/pallets/asset-manager/src/mock.rs b/pallets/asset-manager/src/mock.rs index 619b43feb7..30c4b099f4 100644 --- a/pallets/asset-manager/src/mock.rs +++ b/pallets/asset-manager/src/mock.rs @@ -18,33 +18,26 @@ use super::*; use crate as pallet_asset_manager; use parity_scale_codec::{Decode, Encode}; -use frame_support::{ - construct_runtime, parameter_types, traits::Everything, weights::Weight, RuntimeDebug, -}; +use frame_support::{construct_runtime, parameter_types, traits::Everything, weights::Weight}; use frame_system::EnsureRoot; use scale_info::TypeInfo; -use sp_core::H256; +use sp_core::{RuntimeDebug, H256}; use sp_runtime::traits::Hash as THash; use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; -use sp_runtime::DispatchError; +use sp_runtime::{BuildStorage, DispatchError}; use xcm::latest::prelude::*; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; pub type AccountId = u64; pub type Balance = u64; -pub type BlockNumber = u32; construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event}, + System: frame_system, + Balances: pallet_balances, + AssetManager: pallet_asset_manager, } ); @@ -57,13 +50,12 @@ impl frame_system::Config for Test { type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -92,7 +84,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -233,8 +225,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/pallets/erc20-xcm-bridge/src/lib.rs b/pallets/erc20-xcm-bridge/src/lib.rs index fe93f249d7..f43b61483a 100644 --- a/pallets/erc20-xcm-bridge/src/lib.rs +++ b/pallets/erc20-xcm-bridge/src/lib.rs @@ -50,7 +50,8 @@ pub mod pallet { AssetId, Error as XcmError, Junction, MultiAsset, MultiLocation, Result as XcmResult, XcmContext, }; - use xcm_executor::traits::{Convert, Error as MatchError, MatchesFungibles}; + use xcm_executor::traits::ConvertLocation; + use xcm_executor::traits::{Error as MatchError, MatchesFungibles}; use xcm_executor::Assets; const ERC20_TRANSFER_CALL_DATA_SIZE: usize = 4 + 32 + 32; // selector + from + amount @@ -61,7 +62,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_evm::Config { - type AccountIdConverter: Convert; + type AccountIdConverter: ConvertLocation; type Erc20MultilocationPrefix: Get; type Erc20TransferGasLimit: Get; type EvmRunner: Runner; @@ -166,8 +167,8 @@ pub mod pallet { let (contract_address, amount) = Erc20Matcher::::matches_fungibles(what)?; - let beneficiary = T::AccountIdConverter::convert_ref(who) - .map_err(|()| MatchError::AccountIdConversionFailed)?; + let beneficiary = T::AccountIdConverter::convert_location(who) + .ok_or(MatchError::AccountIdConversionFailed)?; let gas_limit = Self::gas_limit_of_erc20_transfer(&what.id); @@ -213,11 +214,11 @@ pub mod pallet { let (contract_address, amount) = Erc20Matcher::::matches_fungibles(asset)?; - let from = T::AccountIdConverter::convert_ref(from) - .map_err(|()| MatchError::AccountIdConversionFailed)?; + let from = T::AccountIdConverter::convert_location(from) + .ok_or(MatchError::AccountIdConversionFailed)?; - let to = T::AccountIdConverter::convert_ref(to) - .map_err(|()| MatchError::AccountIdConversionFailed)?; + let to = T::AccountIdConverter::convert_location(to) + .ok_or(MatchError::AccountIdConversionFailed)?; let gas_limit = Self::gas_limit_of_erc20_transfer(&asset.id); @@ -244,8 +245,8 @@ pub mod pallet { ) -> Result { let (contract_address, amount) = Erc20Matcher::::matches_fungibles(what)?; - let who = T::AccountIdConverter::convert_ref(who) - .map_err(|()| MatchError::AccountIdConversionFailed)?; + let who = T::AccountIdConverter::convert_location(who) + .ok_or(MatchError::AccountIdConversionFailed)?; XcmHoldingErc20sOrigins::with(|erc20s_origins| { erc20s_origins.insert(contract_address, who, amount) diff --git a/pallets/erc20-xcm-bridge/src/mock.rs b/pallets/erc20-xcm-bridge/src/mock.rs index 500a50009b..446efe7c96 100644 --- a/pallets/erc20-xcm-bridge/src/mock.rs +++ b/pallets/erc20-xcm-bridge/src/mock.rs @@ -25,22 +25,17 @@ use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; use sp_runtime::AccountId32; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage}, - EVM: pallet_evm::{Pallet, Call, Storage, Config, Event}, - Erc20XcmBridge: erc20_xcm_bridge::{Pallet}, + System: frame_system, + Balances: pallet_balances, + Timestamp: pallet_timestamp, + EVM: pallet_evm, + Erc20XcmBridge: erc20_xcm_bridge, } ); @@ -52,14 +47,13 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId32; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -88,7 +82,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); diff --git a/pallets/erc20-xcm-bridge/src/xcm_holding_ext.rs b/pallets/erc20-xcm-bridge/src/xcm_holding_ext.rs index 68e064f204..4611e3db8c 100644 --- a/pallets/erc20-xcm-bridge/src/xcm_holding_ext.rs +++ b/pallets/erc20-xcm-bridge/src/xcm_holding_ext.rs @@ -114,7 +114,7 @@ where fn execute( origin: impl Into, pre: Self::Prepared, - hash: xcm::latest::XcmHash, + hash: &mut xcm::latest::XcmHash, weight_credit: xcm::latest::Weight, ) -> xcm::latest::Outcome { let mut erc20s_origins = Default::default(); diff --git a/pallets/ethereum-xcm/src/lib.rs b/pallets/ethereum-xcm/src/lib.rs index 283f0efe46..c3ecacc18c 100644 --- a/pallets/ethereum-xcm/src/lib.rs +++ b/pallets/ethereum-xcm/src/lib.rs @@ -31,14 +31,14 @@ use ethereum_types::{H160, U256}; use fp_ethereum::{TransactionData, ValidatedTransaction}; use fp_evm::{CheckEvmTransaction, CheckEvmTransactionConfig, InvalidEvmTransactionError}; use frame_support::{ - codec::{Decode, Encode, MaxEncodedLen}, dispatch::{DispatchResultWithPostInfo, Pays, PostDispatchInfo}, - scale_info::TypeInfo, traits::{EnsureOrigin, Get}, weights::Weight, }; use frame_system::pallet_prelude::OriginFor; use pallet_evm::{AddressMapping, GasWeightMapping}; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; +use scale_info::TypeInfo; use sp_runtime::{traits::UniqueSaturatedInto, DispatchErrorWithPostInfo, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; diff --git a/pallets/ethereum-xcm/src/mock.rs b/pallets/ethereum-xcm/src/mock.rs index 13c7d94490..d62726e972 100644 --- a/pallets/ethereum-xcm/src/mock.rs +++ b/pallets/ethereum-xcm/src/mock.rs @@ -23,13 +23,13 @@ use frame_support::{ weights::Weight, ConsensusEngineId, PalletId, }; -use frame_system::EnsureRoot; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureRoot}; use pallet_evm::{AddressMapping, EnsureAddressTruncated, FeeCalculator}; use rlp::RlpStream; use sp_core::{hashing::keccak_256, H160, H256, U256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - AccountId32, + AccountId32, BuildStorage, }; use super::*; @@ -39,25 +39,20 @@ use sp_runtime::{ transaction_validity::{TransactionValidity, TransactionValidityError}, }; -pub type SignedExtra = (frame_system::CheckSpecVersion,); -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime! { - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage}, - EVM: pallet_evm::{Pallet, Call, Storage, Config, Event}, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin}, - EthereumXcm: crate::{Pallet, Call, Origin}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, + System: frame_system, + Balances: pallet_balances, + Timestamp: pallet_timestamp, + EVM: pallet_evm, + Ethereum: pallet_ethereum, + EthereumXcm: crate, + Proxy: pallet_proxy, } } @@ -73,14 +68,13 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = AccountId32; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -111,7 +105,7 @@ impl pallet_balances::Config for Test { type WeightInfo = (); type MaxReserves = (); type ReserveIdentifier = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -370,8 +364,8 @@ fn address_build(seed: u8) -> AccountInfo { // our desired mockup. pub fn new_test_ext(accounts_len: usize) -> (Vec, sp_io::TestExternalities) { // sc_cli::init_logger(""); - let mut ext = frame_system::GenesisConfig::default() - .build_storage::() + let mut ext = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let pairs = (0..accounts_len) diff --git a/pallets/moonbeam-orbiters/Cargo.toml b/pallets/moonbeam-orbiters/Cargo.toml index f1c8c3ce31..d79ad0476a 100644 --- a/pallets/moonbeam-orbiters/Cargo.toml +++ b/pallets/moonbeam-orbiters/Cargo.toml @@ -24,6 +24,7 @@ nimbus-primitives = { workspace = true } pallet-balances = { workspace = true, features = [ "insecure_zero_ed", "std" ] } sp-core = { workspace = true, features = [ "std" ] } sp-io = { workspace = true, features = [ "std" ] } +sp-runtime = { workspace = true } [features] default = [ "std" ] diff --git a/pallets/moonbeam-orbiters/src/benchmarks.rs b/pallets/moonbeam-orbiters/src/benchmarks.rs index 326652405f..fdc0ba45c9 100644 --- a/pallets/moonbeam-orbiters/src/benchmarks.rs +++ b/pallets/moonbeam-orbiters/src/benchmarks.rs @@ -25,8 +25,7 @@ use crate::{ use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; use frame_support::traits::{Currency, Get, OnInitialize, ReservableCurrency}; use frame_system::RawOrigin; -use sp_runtime::traits::Saturating; -use sp_runtime::traits::StaticLookup; +use sp_runtime::traits::{Saturating, StaticLookup}; const MIN_ORBITER_DEPOSIT: u32 = 10_000; const USER_SEED: u32 = 999666; @@ -288,9 +287,11 @@ mod tests { use frame_support::assert_ok; use parity_scale_codec::Encode; use sp_io::TestExternalities; + use sp_runtime::BuildStorage; + pub fn new_test_ext() -> TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let min_orbiter_deposit_prefix = frame_support::storage::storage_prefix(b"MoonbeamOrbiters", b"MinOrbiterDeposit"); diff --git a/pallets/moonbeam-orbiters/src/lib.rs b/pallets/moonbeam-orbiters/src/lib.rs index 2a3229d57c..e878778725 100644 --- a/pallets/moonbeam-orbiters/src/lib.rs +++ b/pallets/moonbeam-orbiters/src/lib.rs @@ -172,7 +172,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { assert!( self.min_orbiter_deposit > Zero::zero(), @@ -184,7 +184,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_initialize(_: T::BlockNumber) -> Weight { + fn on_initialize(_: BlockNumberFor) -> Weight { // Prune old OrbiterPerRound entries if let Some(round_to_prune) = CurrentRound::::get().checked_sub(&T::MaxRoundArchive::get()) diff --git a/pallets/moonbeam-orbiters/src/mock.rs b/pallets/moonbeam-orbiters/src/mock.rs index 977727640d..f1daf2ab51 100644 --- a/pallets/moonbeam-orbiters/src/mock.rs +++ b/pallets/moonbeam-orbiters/src/mock.rs @@ -20,31 +20,27 @@ use crate as pallet_moonbeam_orbiters; use frame_support::{ construct_runtime, pallet_prelude::*, parameter_types, traits::Everything, weights::Weight, }; -use frame_system::EnsureRoot; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureRoot}; use nimbus_primitives::{AccountLookup, NimbusId}; use sp_core::H256; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - MoonbeamOrbiters: pallet_moonbeam_orbiters::{Pallet, Call, Storage, Config, Event}, + System: frame_system, + Balances: pallet_balances, + MoonbeamOrbiters: pallet_moonbeam_orbiters, } ); @@ -62,14 +58,13 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -101,7 +96,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -168,8 +163,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/pallets/moonbeam-xcm-benchmarks/src/generic/benchmarking.rs b/pallets/moonbeam-xcm-benchmarks/src/generic/benchmarking.rs index 8db564d044..486dfd18a3 100644 --- a/pallets/moonbeam-xcm-benchmarks/src/generic/benchmarking.rs +++ b/pallets/moonbeam-xcm-benchmarks/src/generic/benchmarking.rs @@ -16,7 +16,7 @@ use super::*; use frame_benchmarking::{benchmarks, BenchmarkError, BenchmarkResult}; -use frame_support::dispatch::Weight; +use frame_support::{traits::TrackedStorageKey, weights::Weight}; use pallet_xcm_benchmarks::{new_executor, XcmCallOf}; use sp_std::vec; use sp_std::vec::Vec; @@ -98,7 +98,7 @@ impl frame_benchmarking::Benchmarking for XcmGenericBenchmarks { fn run_benchmark( extrinsic: &[u8], c: &[(frame_benchmarking::BenchmarkParameter, u32)], - whitelist: &[frame_benchmarking::TrackedStorageKey], + whitelist: &[TrackedStorageKey], verify: bool, internal_repeats: u32, ) -> Result, frame_benchmarking::BenchmarkError> { diff --git a/pallets/moonbeam-xcm-benchmarks/src/generic/mock.rs b/pallets/moonbeam-xcm-benchmarks/src/generic/mock.rs index c33be12f17..3b67e261f1 100644 --- a/pallets/moonbeam-xcm-benchmarks/src/generic/mock.rs +++ b/pallets/moonbeam-xcm-benchmarks/src/generic/mock.rs @@ -23,7 +23,6 @@ use frame_support::{ use parity_scale_codec::Decode; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup, TrailingZeroInput}, BuildStorage, }; @@ -37,18 +36,14 @@ use xcm_builder::{ }; use xcm_executor::traits::ConvertOrigin; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - PolkadotXcmBenchmarks: pallet_xcm_benchmarks::generic::{Pallet}, - XcmGenericBenchmarks: generic::{Pallet}, + System: frame_system, + PolkadotXcmBenchmarks: pallet_xcm_benchmarks::generic, + XcmGenericBenchmarks: generic, } ); @@ -63,14 +58,13 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -131,6 +125,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = TestUniversalAliases; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = (); } impl pallet_xcm_benchmarks::Config for Test { @@ -194,13 +189,17 @@ impl pallet_xcm_benchmarks::generic::Config for Test { fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> { Err(BenchmarkError::Skip) } + + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + Ok((Default::default(), Default::default())) + } } impl generic::Config for Test {} impl Config for Test {} pub fn new_test_ext() -> sp_io::TestExternalities { - let t = GenesisConfig { + let t = RuntimeGenesisConfig { ..Default::default() } .build_storage() diff --git a/pallets/moonbeam-xcm-benchmarks/src/mock.rs b/pallets/moonbeam-xcm-benchmarks/src/mock.rs index d4274d1657..f1e3e2aa4c 100644 --- a/pallets/moonbeam-xcm-benchmarks/src/mock.rs +++ b/pallets/moonbeam-xcm-benchmarks/src/mock.rs @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Moonbeam. If not, see . -use frame_support::{dispatch::Weight, parameter_types, traits::ContainsPair}; +use frame_support::{parameter_types, traits::ContainsPair, weights::Weight}; use xcm::latest::prelude::*; +use xcm_executor::traits::ConvertLocation; // An xcm sender/receiver akin to > /dev/null pub struct DevNull; @@ -51,20 +52,16 @@ impl xcm_executor::traits::OnResponse for DevNull { } pub struct AccountIdConverter; -impl xcm_executor::traits::Convert for AccountIdConverter { - fn convert(ml: MultiLocation) -> Result { +impl ConvertLocation for AccountIdConverter { + fn convert_location(ml: &MultiLocation) -> Option { match ml { MultiLocation { parents: 0, interior: X1(Junction::AccountId32 { id, .. }), - } => Ok(::decode(&mut &*id.to_vec()).unwrap()), - _ => Err(ml), + } => Some(::decode(&mut &*id.to_vec()).unwrap()), + _ => None, } } - - fn reverse(acc: u64) -> Result { - Err(acc) - } } parameter_types! { diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml index 00ec0cf995..5c2e8b22bb 100644 --- a/pallets/parachain-staking/Cargo.toml +++ b/pallets/parachain-staking/Cargo.toml @@ -7,7 +7,7 @@ version = "3.0.0" [dependencies] log = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true } # Substrate frame-benchmarking = { workspace = true, optional = true } @@ -27,6 +27,7 @@ pallet-balances = { workspace = true, features = [ "insecure_zero_ed", "std" ] } similar-asserts = { workspace = true } sp-core = { workspace = true, features = [ "std" ] } sp-io = { workspace = true, features = [ "std" ] } +sp-runtime = { workspace = true } [features] default = [ "std" ] @@ -37,7 +38,6 @@ std = [ "nimbus-primitives/std", "parity-scale-codec/std", "scale-info/std", - "serde", "sp-runtime/std", "sp-std/std", ] diff --git a/pallets/parachain-staking/src/auto_compound.rs b/pallets/parachain-staking/src/auto_compound.rs index a59982be39..0effe1cb4a 100644 --- a/pallets/parachain-staking/src/auto_compound.rs +++ b/pallets/parachain-staking/src/auto_compound.rs @@ -21,14 +21,13 @@ use crate::pallet::{ CandidateInfo, Config, DelegatorState, Error, Event, Pallet, Total, }; use crate::types::{Bond, BondAdjust, Delegator}; +use frame_support::dispatch::DispatchResultWithPostInfo; use frame_support::ensure; use frame_support::traits::Get; -use frame_support::{dispatch::DispatchResultWithPostInfo, RuntimeDebug}; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; use sp_runtime::traits::Saturating; -use sp_runtime::BoundedVec; -use sp_runtime::Percent; +use sp_runtime::{BoundedVec, Percent, RuntimeDebug}; use sp_std::prelude::*; /// Represents the auto-compounding amount for a delegation. diff --git a/pallets/parachain-staking/src/benchmarks.rs b/pallets/parachain-staking/src/benchmarks.rs index d3d966e784..c33a9a932c 100644 --- a/pallets/parachain-staking/src/benchmarks.rs +++ b/pallets/parachain-staking/src/benchmarks.rs @@ -24,7 +24,7 @@ use crate::{ }; use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; use frame_support::traits::{Currency, Get, OnFinalize, OnInitialize}; -use frame_system::RawOrigin; +use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin}; use sp_runtime::{Perbill, Percent}; use sp_std::vec::Vec; @@ -203,7 +203,7 @@ fn parachain_staking_on_finalize(author: T::AccountId) { /// Run to end block and author fn roll_to_and_author(round_delay: u32, author: T::AccountId) { let total_rounds = round_delay + 1u32; - let round_length: T::BlockNumber = Pallet::::round().length.into(); + let round_length: BlockNumberFor = Pallet::::round().length.into(); let mut now = >::block_number() + 1u32.into(); let end = Pallet::::round().first + (round_length * total_rounds.into()); while now < end { @@ -2265,10 +2265,11 @@ mod tests { use crate::mock::Test; use frame_support::assert_ok; use sp_io::TestExternalities; + use sp_runtime::BuildStorage; pub fn new_test_ext() -> TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); TestExternalities::new(t) } diff --git a/pallets/parachain-staking/src/delegation_requests.rs b/pallets/parachain-staking/src/delegation_requests.rs index 5a392ef230..fc26ea046d 100644 --- a/pallets/parachain-staking/src/delegation_requests.rs +++ b/pallets/parachain-staking/src/delegation_requests.rs @@ -22,16 +22,13 @@ use crate::pallet::{ }; use crate::weights::WeightInfo; use crate::{auto_compound::AutoCompoundDelegations, AddGet, Delegator}; +use frame_support::dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo}; use frame_support::ensure; use frame_support::traits::Get; use frame_support::BoundedVec; -use frame_support::{ - dispatch::{DispatchErrorWithPostInfo, DispatchResultWithPostInfo}, - RuntimeDebug, -}; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; -use sp_runtime::traits::Saturating; +use sp_runtime::{traits::Saturating, RuntimeDebug}; /// An action that can be performed upon a delegation #[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo, PartialOrd, Ord)] diff --git a/pallets/parachain-staking/src/inflation.rs b/pallets/parachain-staking/src/inflation.rs index edc2465753..6469686d05 100644 --- a/pallets/parachain-staking/src/inflation.rs +++ b/pallets/parachain-staking/src/inflation.rs @@ -19,7 +19,6 @@ use crate::pallet::{BalanceOf, Config, Pallet}; use frame_support::traits::Currency; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sp_runtime::PerThing; use sp_runtime::{Perbill, RuntimeDebug}; @@ -35,9 +34,19 @@ fn rounds_per_year() -> u32 { BLOCKS_PER_YEAR / blocks_per_round } -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[derive( - Eq, PartialEq, Clone, Copy, Encode, Decode, Default, RuntimeDebug, MaxEncodedLen, TypeInfo, + Eq, + PartialEq, + Clone, + Copy, + Encode, + Decode, + Default, + Deserialize, + RuntimeDebug, + MaxEncodedLen, + Serialize, + TypeInfo, )] pub struct Range { pub min: T, @@ -99,8 +108,9 @@ pub fn round_issuance_range(round: Range) -> Range { /// Staking expectations pub expect: Range, diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs index dc3804ba9c..f521b2b73d 100644 --- a/pallets/parachain-staking/src/lib.rs +++ b/pallets/parachain-staking/src/lib.rs @@ -252,7 +252,7 @@ pub mod pallet { pub enum Event { /// Started new round. NewRound { - starting_block: T::BlockNumber, + starting_block: BlockNumberFor, round: RoundIndex, selected_collators_number: u32, total_balance: BalanceOf, @@ -424,7 +424,7 @@ pub mod pallet { /// Set blocks per round BlocksPerRoundSet { current_round: RoundIndex, - first_block: T::BlockNumber, + first_block: BlockNumberFor, old: u32, new: u32, new_per_round_inflation_min: Perbill, @@ -447,7 +447,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_initialize(n: T::BlockNumber) -> Weight { + fn on_initialize(n: BlockNumberFor) -> Weight { let mut weight = T::WeightInfo::base_on_initialize(); let mut round = >::get(); @@ -484,7 +484,7 @@ pub mod pallet { weight = weight.saturating_add(T::DbWeight::get().reads_writes(3, 2)); weight } - fn on_finalize(_n: T::BlockNumber) { + fn on_finalize(_n: BlockNumberFor) { Self::award_points_to_block_author(); } } @@ -508,7 +508,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn round)] /// Current round index and next round scheduled transition - pub(crate) type Round = StorageValue<_, RoundInfo, ValueQuery>; + pub(crate) type Round = StorageValue<_, RoundInfo>, ValueQuery>; #[pallet::storage] #[pallet::getter(fn delegator_state)] @@ -681,7 +681,6 @@ pub mod pallet { pub num_selected_candidates: u32, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { @@ -697,7 +696,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { assert!(self.blocks_per_round > 0, "Blocks per round must be > 0"); >::put(self.inflation_config.clone()); @@ -796,13 +795,13 @@ pub mod pallet { // Choose top TotalSelected collator candidates let (_, v_count, _, total_staked) = >::select_top_candidates(1u32); // Start Round 1 at Block 0 - let round: RoundInfo = + let round: RoundInfo> = RoundInfo::new(1u32, 0u32.into(), self.blocks_per_round); >::put(round); // Snapshot total stake >::insert(1u32, >::get()); >::deposit_event(Event::NewRound { - starting_block: T::BlockNumber::zero(), + starting_block: BlockNumberFor::::zero(), round: 1u32, selected_collators_number: v_count, total_balance: total_staked, diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs index faab521715..61e8f78dcd 100644 --- a/pallets/parachain-staking/src/mock.rs +++ b/pallets/parachain-staking/src/mock.rs @@ -23,11 +23,13 @@ use crate::{ use block_author::BlockAuthor as BlockAuthorMap; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, GenesisBuild, LockIdentifier, OnFinalize, OnInitialize}, + traits::{Everything, LockIdentifier, OnFinalize, OnInitialize}, weights::{constants::RocksDbWeight, Weight}, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_io; +use sp_runtime::BuildStorage; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, Perbill, Percent, @@ -35,22 +37,18 @@ use sp_runtime::{ pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Config, Event}, - BlockAuthor: block_author::{Pallet, Storage}, + System: frame_system, + Balances: pallet_balances, + ParachainStaking: pallet_parachain_staking, + BlockAuthor: block_author, } ); @@ -65,14 +63,13 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type DbWeight = RocksDbWeight; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -100,13 +97,13 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); } impl block_author::Config for Test {} -const GENESIS_BLOCKS_PER_ROUND: u32 = 5; +const GENESIS_BLOCKS_PER_ROUND: BlockNumber = 5; const GENESIS_COLLATOR_COMMISSION: Perbill = Perbill::from_percent(20); const GENESIS_PARACHAIN_BOND_RESERVE_PERCENT: Percent = Percent::from_percent(30); const GENESIS_NUM_SELECTED_CANDIDATES: u32 = 5; @@ -231,8 +228,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { @@ -271,7 +268,7 @@ fn roll_one_block() -> BlockNumber { } /// Rolls to the desired block. Returns the number of blocks played. -pub(crate) fn roll_to(n: BlockNumber) -> u32 { +pub(crate) fn roll_to(n: BlockNumber) -> BlockNumber { let mut num_blocks = 0; let mut block = System::block_number(); while block < n { diff --git a/pallets/proxy-genesis-companion/src/lib.rs b/pallets/proxy-genesis-companion/src/lib.rs index 8c8bc78aa2..0a3c474dd6 100644 --- a/pallets/proxy-genesis-companion/src/lib.rs +++ b/pallets/proxy-genesis-companion/src/lib.rs @@ -33,6 +33,7 @@ pub use pallet::*; #[pallet] pub mod pallet { use frame_support::pallet_prelude::*; + use frame_system::pallet_prelude::*; use sp_std::vec::Vec; /// Pallet for configuring proxy at genesis @@ -57,11 +58,10 @@ pub mod pallet { T::AccountId, T::AccountId, ::ProxyType, - T::BlockNumber, + BlockNumberFor, )>, } - #[cfg(feature = "std")] impl Default for GenesisConfig { fn default() -> Self { Self { @@ -71,7 +71,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { for (delegator, delegatee, proxy_type, delay) in &self.proxies { pallet_proxy::Pallet::::add_proxy_delegate( diff --git a/pallets/proxy-genesis-companion/src/mock.rs b/pallets/proxy-genesis-companion/src/mock.rs index 0436d437cb..47c2504fc8 100644 --- a/pallets/proxy-genesis-companion/src/mock.rs +++ b/pallets/proxy-genesis-companion/src/mock.rs @@ -19,35 +19,30 @@ use super::*; use crate as proxy_companion; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, GenesisBuild, InstanceFilter}, + traits::{Everything, InstanceFilter}, weights::Weight, }; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_core::H256; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; //TODO use TestAccount once it is in a common place (currently it lives with democracy precompiles) pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, - ProxyGenesisCompanion: proxy_companion::{Pallet, Config}, + System: frame_system, + Balances: pallet_balances, + Proxy: pallet_proxy, + ProxyGenesisCompanion: proxy_companion, } ); @@ -62,14 +57,13 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -98,7 +92,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -190,8 +184,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { @@ -200,19 +194,18 @@ impl ExtBuilder { .assimilate_storage(&mut t) .expect("Pallet balances storage can be assimilated"); - GenesisBuild::::assimilate_storage( - &proxy_companion::GenesisConfig { - // Here we add the trivial proxy type and default duration. - // This saves the test writer from having to always specify this. - proxies: self - .proxies - .into_iter() - .map(|(a, b)| (a, b, (), 100)) - .collect(), - }, - &mut t, - ) - .expect("Pallet proxy genesis companion storage can be assimilated"); + let genesis_config = proxy_companion::GenesisConfig:: { + // Here we add the trivial proxy type and default duration. + // This saves the test writer from having to always specify this. + proxies: self + .proxies + .into_iter() + .map(|(a, b)| (a, b, (), 100)) + .collect(), + }; + genesis_config + .assimilate_storage(&mut t) + .expect("Pallet proxy genesis companion storage can be assimilated"); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| System::set_block_number(1)); diff --git a/pallets/xcm-transactor/Cargo.toml b/pallets/xcm-transactor/Cargo.toml index 48afa72362..d97ec803f8 100644 --- a/pallets/xcm-transactor/Cargo.toml +++ b/pallets/xcm-transactor/Cargo.toml @@ -38,6 +38,7 @@ pallet-timestamp = { workspace = true, features = [ "std" ] } pallet-xcm = { workspace = true, features = [ "std" ] } parity-scale-codec = { workspace = true, features = [ "std" ] } sp-core = { workspace = true, features = [ "std" ] } +sp-runtime = { workspace = true } [features] default = [ "std" ] diff --git a/pallets/xcm-transactor/src/benchmarks.rs b/pallets/xcm-transactor/src/benchmarks.rs index 2958113191..eaa5f2c01b 100644 --- a/pallets/xcm-transactor/src/benchmarks.rs +++ b/pallets/xcm-transactor/src/benchmarks.rs @@ -18,7 +18,7 @@ use crate::{Call, Config, Currency, CurrencyPayment, HrmpOperation, Pallet, TransactWeights}; use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; -use frame_support::dispatch::Weight; +use frame_support::weights::Weight; use frame_system::RawOrigin; use sp_std::boxed::Box; use sp_std::vec; @@ -285,10 +285,11 @@ benchmarks! { mod tests { use crate::mock::Test; use sp_io::TestExternalities; + use sp_runtime::BuildStorage; pub fn new_test_ext() -> TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); TestExternalities::new(t) } diff --git a/pallets/xcm-transactor/src/mock.rs b/pallets/xcm-transactor/src/mock.rs index 40b3198159..ad72a49cdb 100644 --- a/pallets/xcm-transactor/src/mock.rs +++ b/pallets/xcm-transactor/src/mock.rs @@ -27,6 +27,7 @@ use parity_scale_codec::{Decode, Encode}; use sp_core::{H160, H256}; use sp_io; use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::BuildStorage; use xcm::latest::{ opaque, Error as XcmError, Instruction, InteriorMultiLocation, Junction::{AccountKey20, GlobalConsensus, PalletInstance, Parachain}, @@ -43,25 +44,20 @@ use xcm_executor::{ traits::{TransactAsset, WeightBounds, WeightTrader}, Assets, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Event}, + System: frame_system, + Balances: pallet_balances, + Timestamp: pallet_timestamp, + XcmTransactor: pallet_xcm_transactor, } ); pub type Balance = u128; -pub type BlockNumber = u32; pub type AccountId = u64; parameter_types! { @@ -78,14 +74,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -112,7 +107,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -187,7 +182,12 @@ impl WeightTrader for DummyWeightTrader { DummyWeightTrader } - fn buy_weight(&mut self, _weight: Weight, _payment: Assets) -> Result { + fn buy_weight( + &mut self, + _weight: Weight, + _payment: Assets, + _context: &XcmContext, + ) -> Result { Ok(Assets::default()) } } @@ -437,8 +437,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/pallets/xcm-transactor/src/tests.rs b/pallets/xcm-transactor/src/tests.rs index 185bea3556..84f36b2faf 100644 --- a/pallets/xcm-transactor/src/tests.rs +++ b/pallets/xcm-transactor/src/tests.rs @@ -17,9 +17,10 @@ use crate::mock::*; use crate::*; use cumulus_primitives_core::relay_chain::HrmpChannelId; -use frame_support::dispatch::{DispatchError, Weight}; +use frame_support::weights::Weight; use frame_support::{assert_noop, assert_ok, weights::constants::WEIGHT_REF_TIME_PER_SECOND}; use sp_runtime::traits::Convert; +use sp_runtime::DispatchError; use sp_std::boxed::Box; use xcm::latest::prelude::*; use xcm_primitives::{UtilityAvailableCalls, UtilityEncodeCall}; diff --git a/precompiles/assets-erc20/src/lib.rs b/precompiles/assets-erc20/src/lib.rs index 8d8c2336d6..3e9a4d6c8d 100644 --- a/precompiles/assets-erc20/src/lib.rs +++ b/precompiles/assets-erc20/src/lib.rs @@ -25,12 +25,12 @@ use frame_support::traits::fungibles::{ }; use frame_support::traits::{ConstBool, Get, OriginTrait}; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, sp_runtime::traits::StaticLookup, }; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; -use sp_runtime::traits::Bounded; +use sp_runtime::traits::{Bounded, Dispatchable}; use sp_std::vec::Vec; use sp_core::{MaxEncodedLen, H160, H256, U256}; diff --git a/precompiles/assets-erc20/src/mock.rs b/precompiles/assets-erc20/src/mock.rs index ab712a0071..2f33d25546 100644 --- a/precompiles/assets-erc20/src/mock.rs +++ b/precompiles/assets-erc20/src/mock.rs @@ -32,14 +32,15 @@ use precompile_utils::{ testing::{AddressInPrefixedSet, MockAccount}, }; use sp_core::H256; -use sp_runtime::traits::{BlakeTwo256, ConstU32, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, ConstU32, IdentityLookup}, + BuildStorage, +}; pub type AccountId = MockAccount; pub type AssetId = u128; pub type Balance = u128; -pub type BlockNumber = u32; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -pub type Block = frame_system::mocking::MockBlock; +pub type Block = frame_system::mocking::MockBlockU32; /// The foreign asset precompile address prefix. Addresses that match against this prefix will /// be routed to Erc20AssetsPrecompileSet being marked as foreign @@ -108,14 +109,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -156,7 +156,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -298,17 +298,14 @@ impl pallet_assets::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ForeignAssets: pallet_assets::::{Pallet, Call, Storage, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - LocalAssets: pallet_assets::::{Pallet, Call, Storage, Event} + System: frame_system, + Balances: pallet_balances, + ForeignAssets: pallet_assets::, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + LocalAssets: pallet_assets::, } ); @@ -330,8 +327,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/assets-erc20/src/tests.rs b/precompiles/assets-erc20/src/tests.rs index dbb35ee8c2..5988770dbc 100644 --- a/precompiles/assets-erc20/src/tests.rs +++ b/precompiles/assets-erc20/src/tests.rs @@ -267,7 +267,7 @@ fn approve() { value: 500.into(), }, ) - .expect_cost(36430756) + .expect_cost(34534756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -308,7 +308,7 @@ fn approve_saturating() { value: U256::MAX, }, ) - .expect_cost(36430756) + .expect_cost(34534756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -437,7 +437,7 @@ fn transfer() { value: 400.into(), }, ) - .expect_cost(49346756) // 1 weight => 1 gas in mock + .expect_cost(48477756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -564,7 +564,7 @@ fn transfer_from() { value: 400.into(), }, ) - .expect_cost(69846756) // 1 weight => 1 gas in mock + .expect_cost(69947756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -642,7 +642,7 @@ fn transfer_from_non_incremental_approval() { value: 500.into(), }, ) - .expect_cost(36430756) + .expect_cost(34534756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -665,7 +665,7 @@ fn transfer_from_non_incremental_approval() { value: 300.into(), }, ) - .expect_cost(74880756) + .expect_cost(72171756) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -773,7 +773,7 @@ fn transfer_from_self() { value: 400.into(), }, ) - .expect_cost(49346756) // 1 weight => 1 gas in mock + .expect_cost(48477756) // 1 weight => 1 gas in mock .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -932,7 +932,7 @@ fn mint_local_assets() { value: 400.into(), }, ) - .expect_cost(28770756) // 1 weight => 1 gas in mock + .expect_cost(27261756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -993,7 +993,7 @@ fn burn_local_assets() { value: 400.into(), }, ) - .expect_cost(34903756) // 1 weight => 1 gas in mock + .expect_cost(34475756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -1053,7 +1053,7 @@ fn freeze_local_assets() { account: Address(Bob.into()), }, ) - .expect_cost(19945000) // 1 weight => 1 gas in mock + .expect_cost(18384000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1111,7 +1111,7 @@ fn thaw_local_assets() { account: Address(Bob.into()), }, ) - .expect_cost(19945000) // 1 weight => 1 gas in mock + .expect_cost(18384000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1123,7 +1123,7 @@ fn thaw_local_assets() { account: Address(Bob.into()), }, ) - .expect_cost(19747000) // 1 weight => 1 gas in mock + .expect_cost(18282000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1136,7 +1136,7 @@ fn thaw_local_assets() { value: 400.into(), }, ) - .expect_cost(49346756) // 1 weight => 1 gas in mock + .expect_cost(48477756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -1182,7 +1182,7 @@ fn freeze_asset_local_asset() { LocalAssetId(0u128), LocalPCall::freeze_asset {}, ) - .expect_cost(15833000) // 1 weight => 1 gas in mock + .expect_cost(14193000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1238,13 +1238,13 @@ fn thaw_asset_local_assets() { LocalAssetId(0u128), LocalPCall::freeze_asset {}, ) - .expect_cost(15833000) // 1 weight => 1 gas in mock + .expect_cost(14193000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); precompiles() .prepare_test(CryptoAlith, LocalAssetId(0u128), LocalPCall::thaw_asset {}) - .expect_cost(15704000) // 1 weight => 1 gas in mock + .expect_cost(14263000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1257,7 +1257,7 @@ fn thaw_asset_local_assets() { value: 400.into(), }, ) - .expect_cost(49346756) // 1 weight => 1 gas in mock + .expect_cost(48477756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -1299,7 +1299,7 @@ fn transfer_ownership_local_assets() { owner: Address(Bob.into()), }, ) - .expect_cost(17546000) // 1 weight => 1 gas in mock + .expect_cost(16042000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1327,7 +1327,7 @@ fn transfer_ownership_local_assets() { owner: Address(CryptoAlith.into()), }, ) - .expect_cost(17546000) // 1 weight => 1 gas in mock + .expect_cost(16042000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); }); @@ -1365,7 +1365,7 @@ fn set_team_local_assets() { freezer: Address(Bob.into()), }, ) - .expect_cost(16317000) // 1 weight => 1 gas in mock + .expect_cost(14641000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1395,7 +1395,7 @@ fn set_team_local_assets() { value: 400.into(), }, ) - .expect_cost(28770756) // 1 weight => 1 gas in mock + .expect_cost(27261756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -1451,7 +1451,7 @@ fn set_metadata() { decimals: 12, }, ) - .expect_cost(32454748) // 1 weight => 1 gas in mock + .expect_cost(31456892) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1507,7 +1507,7 @@ fn clear_metadata() { decimals: 12, }, ) - .expect_cost(32454748) // 1 weight => 1 gas in mock + .expect_cost(31456892) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1517,7 +1517,7 @@ fn clear_metadata() { LocalAssetId(0u128), LocalPCall::clear_metadata {}, ) - .expect_cost(32160000) // 1 weight => 1 gas in mock + .expect_cost(31930000) // 1 weight => 1 gas in mock .expect_no_logs() .execute_returns(true); @@ -1606,7 +1606,7 @@ fn permit_valid() { s: H256::from(rs.s.b32()), }, ) - .expect_cost(36429000) + .expect_cost(34533000) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -1715,7 +1715,7 @@ fn permit_valid_named_asset() { s: H256::from(rs.s.b32()), }, ) - .expect_cost(36429000) + .expect_cost(34533000) .expect_log(log3( ForeignAssetId(0u128), SELECTOR_LOG_APPROVAL, @@ -2193,7 +2193,7 @@ fn permit_valid_with_metamask_signed_data() { s: H256::from(s_real), }, ) - .expect_cost(36429000) + .expect_cost(34533000) .expect_log(log3( ForeignAssetId(1u128), SELECTOR_LOG_APPROVAL, diff --git a/precompiles/author-mapping/Cargo.toml b/precompiles/author-mapping/Cargo.toml index fd32485250..586bcda470 100644 --- a/precompiles/author-mapping/Cargo.toml +++ b/precompiles/author-mapping/Cargo.toml @@ -20,6 +20,7 @@ parity-scale-codec = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } sp-std = { workspace = true } +sp-runtime = { workspace = true } # Frontier fp-evm = { workspace = true } diff --git a/precompiles/author-mapping/src/lib.rs b/precompiles/author-mapping/src/lib.rs index ebf2afc65b..f5d9c9a42e 100644 --- a/precompiles/author-mapping/src/lib.rs +++ b/precompiles/author-mapping/src/lib.rs @@ -20,7 +20,7 @@ use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::Get, }; use nimbus_primitives::NimbusId; @@ -30,6 +30,7 @@ use parity_scale_codec::Encode; use precompile_utils::prelude::*; use sp_core::crypto::UncheckedFrom; use sp_core::{H160, H256}; +use sp_runtime::traits::Dispatchable; use sp_std::marker::PhantomData; #[cfg(test)] diff --git a/precompiles/author-mapping/src/mock.rs b/precompiles/author-mapping/src/mock.rs index b3eaf4c07c..fac53315f3 100644 --- a/precompiles/author-mapping/src/mock.rs +++ b/precompiles/author-mapping/src/mock.rs @@ -26,28 +26,25 @@ use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, SubstrateBlockHashMappin use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; use sp_io; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Config, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - AuthorMapping: pallet_author_mapping::{Pallet, Storage, Config, Event, Call}, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + AuthorMapping: pallet_author_mapping, + Scheduler: pallet_scheduler, } ); @@ -59,14 +56,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -94,7 +90,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -202,8 +198,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/author-mapping/src/tests.rs b/precompiles/author-mapping/src/tests.rs index 6c1e663ef0..11dcaea4f9 100644 --- a/precompiles/author-mapping/src/tests.rs +++ b/precompiles/author-mapping/src/tests.rs @@ -18,7 +18,7 @@ use crate::mock::{ events, AuthorMappingAccount, ExtBuilder, PCall, Precompiles, PrecompilesValue, Runtime, RuntimeCall, RuntimeOrigin, }; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use nimbus_primitives::NimbusId; use pallet_author_mapping::{keys_wrapper, Call as AuthorMappingCall, Event as AuthorMappingEvent}; use pallet_balances::Event as BalancesEvent; @@ -26,6 +26,7 @@ use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use precompile_utils::{prelude::*, testing::*}; use sp_core::crypto::UncheckedFrom; use sp_core::{H160, H256, U256}; +use sp_runtime::traits::Dispatchable; fn precompiles() -> Precompiles { PrecompilesValue::get() diff --git a/precompiles/balances-erc20/src/lib.rs b/precompiles/balances-erc20/src/lib.rs index ade86c042c..f6303bad44 100644 --- a/precompiles/balances-erc20/src/lib.rs +++ b/precompiles/balances-erc20/src/lib.rs @@ -20,8 +20,8 @@ use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, - sp_runtime::traits::{Bounded, CheckedSub, StaticLookup}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, + sp_runtime::traits::{Bounded, CheckedSub, Dispatchable, StaticLookup}, storage::types::{StorageDoubleMap, StorageMap, ValueQuery}, traits::StorageInstance, Blake2_128Concat, diff --git a/precompiles/balances-erc20/src/mock.rs b/precompiles/balances-erc20/src/mock.rs index 2626da9b7a..dfd4f5a2eb 100644 --- a/precompiles/balances-erc20/src/mock.rs +++ b/precompiles/balances-erc20/src/mock.rs @@ -22,13 +22,14 @@ use frame_support::{construct_runtime, parameter_types, traits::Everything, weig use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -pub type Block = frame_system::mocking::MockBlock; +pub type Block = frame_system::mocking::MockBlockU32; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -39,14 +40,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -87,7 +87,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -144,15 +144,11 @@ impl pallet_evm::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, } ); @@ -200,8 +196,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/balances-erc20/src/tests.rs b/precompiles/balances-erc20/src/tests.rs index 24d6108439..47a1fb2099 100644 --- a/precompiles/balances-erc20/src/tests.rs +++ b/precompiles/balances-erc20/src/tests.rs @@ -280,7 +280,7 @@ fn transfer() { value: 400.into(), }, ) - .expect_cost(185308756) // 1 weight => 1 gas in mock + .expect_cost(184118756) // 1 weight => 1 gas in mock .expect_log(log3( Precompile1, SELECTOR_LOG_TRANSFER, @@ -370,7 +370,7 @@ fn transfer_from() { value: 400.into(), }, ) - .expect_cost(185308756) // 1 weight => 1 gas in mock + .expect_cost(184118756) // 1 weight => 1 gas in mock .expect_log(log3( Precompile1, SELECTOR_LOG_TRANSFER, @@ -466,7 +466,7 @@ fn transfer_from_self() { value: 400.into(), }, ) - .expect_cost(185308756) // 1 weight => 1 gas in mock + .expect_cost(184118756) // 1 weight => 1 gas in mock .expect_log(log3( Precompile1, SELECTOR_LOG_TRANSFER, diff --git a/precompiles/batch/src/mock.rs b/precompiles/batch/src/mock.rs index 3ffc9c2619..4a36f57c97 100644 --- a/precompiles/batch/src/mock.rs +++ b/precompiles/batch/src/mock.rs @@ -22,6 +22,7 @@ use frame_support::{construct_runtime, parameter_types, weights::Weight}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; use sp_core::H256; +use sp_runtime::BuildStorage; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, Perbill, @@ -29,21 +30,15 @@ use sp_runtime::{ pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, } ); @@ -59,14 +54,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -94,7 +88,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -191,8 +185,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/batch/src/tests.rs b/precompiles/batch/src/tests.rs index 6617f13154..96090ea702 100644 --- a/precompiles/batch/src/tests.rs +++ b/precompiles/batch/src/tests.rs @@ -22,15 +22,13 @@ use crate::{ log_subcall_failed, log_subcall_succeeded, Mode, LOG_SUBCALL_FAILED, LOG_SUBCALL_SUCCEEDED, }; use fp_evm::ExitError; -use frame_support::{ - assert_ok, - dispatch::{DispatchError, Dispatchable}, -}; +use frame_support::assert_ok; use pallet_evm::Call as EvmCall; use precompile_utils::solidity::revert::revert_as_bytes; use precompile_utils::{evm::costs::call_cost, prelude::*, testing::*}; use sp_core::{H160, H256, U256}; -use sp_runtime::{DispatchErrorWithPostInfo, ModuleError}; +use sp_runtime::DispatchError; +use sp_runtime::{traits::Dispatchable, DispatchErrorWithPostInfo, ModuleError}; fn precompiles() -> Precompiles { PrecompilesValue::get() diff --git a/precompiles/call-permit/src/mock.rs b/precompiles/call-permit/src/mock.rs index a74d32ad9c..2db801b61c 100644 --- a/precompiles/call-permit/src/mock.rs +++ b/precompiles/call-permit/src/mock.rs @@ -22,6 +22,7 @@ use frame_support::{construct_runtime, pallet_prelude::*, parameter_types}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; use sp_core::H256; +use sp_runtime::BuildStorage; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, Perbill, @@ -29,21 +30,15 @@ use sp_runtime::{ pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, } ); @@ -59,14 +54,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -94,7 +88,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -170,8 +164,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/collective/Cargo.toml b/precompiles/collective/Cargo.toml index 3a11879239..d886becedc 100644 --- a/precompiles/collective/Cargo.toml +++ b/precompiles/collective/Cargo.toml @@ -22,6 +22,7 @@ pallet-collective = { workspace = true } parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] } sp-core = { workspace = true } sp-io = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } # Frontier diff --git a/precompiles/collective/src/lib.rs b/precompiles/collective/src/lib.rs index 85ad390ef4..ee945e0b0c 100644 --- a/precompiles/collective/src/lib.rs +++ b/precompiles/collective/src/lib.rs @@ -21,7 +21,6 @@ use core::marker::PhantomData; use fp_evm::Log; use frame_support::{ - dispatch::Dispatchable, dispatch::{GetDispatchInfo, Pays, PostDispatchInfo}, sp_runtime::traits::Hash, traits::ConstU32, @@ -31,6 +30,7 @@ use pallet_evm::AddressMapping; use parity_scale_codec::DecodeLimit as _; use precompile_utils::prelude::*; use sp_core::{Decode, Get, H160, H256}; +use sp_runtime::traits::Dispatchable; use sp_std::{boxed::Box, vec::Vec}; #[cfg(test)] diff --git a/precompiles/collective/src/mock.rs b/precompiles/collective/src/mock.rs index 2aa3b10ad3..411cb12522 100644 --- a/precompiles/collective/src/mock.rs +++ b/precompiles/collective/src/mock.rs @@ -18,9 +18,10 @@ use super::*; use frame_support::{ construct_runtime, parameter_types, - traits::{ConstU128, Everything, GenesisBuild, MapSuccess, OnFinalize, OnInitialize}, + traits::{ConstU128, Everything, MapSuccess, OnFinalize, OnInitialize}, PalletId, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, SubstrateBlockHashMapping}; use precompile_utils::{ precompile_set::*, @@ -30,30 +31,25 @@ use sp_core::{H256, U256}; use sp_io; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup, Replace}, - Permill, + BuildStorage, Permill, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Config, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Treasury: pallet_treasury, CouncilCollective: - pallet_collective::::{Pallet, Call, Storage, Event, Origin, Config}, + pallet_collective::, } ); @@ -65,14 +61,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -102,7 +97,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -265,8 +260,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests #[allow(unused)] pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/collective/src/tests.rs b/precompiles/collective/src/tests.rs index 7b869a137d..a9a3dee93e 100644 --- a/precompiles/collective/src/tests.rs +++ b/precompiles/collective/src/tests.rs @@ -18,7 +18,8 @@ use crate::{ assert_event_emitted, hash, log_closed, log_executed, log_proposed, log_voted, mock::{ExtBuilder, PCall, Precompiles, PrecompilesValue, Runtime, RuntimeOrigin}, }; -use frame_support::{assert_ok, dispatch::Encode, instances::Instance1}; +use frame_support::{assert_ok, instances::Instance1}; +use parity_scale_codec::Encode; use precompile_utils::{solidity::codec::Address, testing::*}; use sp_core::{H160, H256}; use sp_runtime::DispatchError; diff --git a/precompiles/conviction-voting/src/lib.rs b/precompiles/conviction-voting/src/lib.rs index fe50b0110d..345ae0c09e 100644 --- a/precompiles/conviction-voting/src/lib.rs +++ b/precompiles/conviction-voting/src/lib.rs @@ -17,8 +17,9 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::traits::{Currency, Polling}; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_conviction_voting::Call as ConvictionVotingCall; use pallet_conviction_voting::{ AccountVote, Casting, ClassLocksFor, Conviction, Delegating, Tally, TallyOf, Vote, Voting, @@ -27,7 +28,7 @@ use pallet_conviction_voting::{ use pallet_evm::{AddressMapping, Log}; use precompile_utils::prelude::*; use sp_core::{Get, MaxEncodedLen, H160, H256, U256}; -use sp_runtime::traits::StaticLookup; +use sp_runtime::traits::{Dispatchable, StaticLookup}; use sp_std::marker::PhantomData; use sp_std::vec::Vec; @@ -58,7 +59,7 @@ type ClassOf = <::Polls as type VotingOf = Voting< BalanceOf, ::AccountId, - ::BlockNumber, + BlockNumberFor, <::Polls as Polling>>::Index, ::MaxVotes, >; diff --git a/precompiles/conviction-voting/src/mock.rs b/precompiles/conviction-voting/src/mock.rs index 468152d93a..759abe3698 100644 --- a/precompiles/conviction-voting/src/mock.rs +++ b/precompiles/conviction-voting/src/mock.rs @@ -27,7 +27,7 @@ use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; use sp_runtime::{ traits::{BlakeTwo256, ConstU32, ConstU64, IdentityLookup}, - DispatchError, Perbill, + BuildStorage, DispatchError, Perbill, }; use sp_std::collections::btree_map::BTreeMap; @@ -36,21 +36,15 @@ use frame_support::traits::VoteTally; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u64; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, ConvictionVoting: pallet_conviction_voting, } ); @@ -67,14 +61,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -102,7 +95,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -290,8 +283,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/conviction-voting/src/tests.rs b/precompiles/conviction-voting/src/tests.rs index 24e4ff55fe..2f11f5a446 100644 --- a/precompiles/conviction-voting/src/tests.rs +++ b/precompiles/conviction-voting/src/tests.rs @@ -20,10 +20,13 @@ use crate::{ }; use precompile_utils::{prelude::*, testing::*}; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use sp_core::{H160, H256, U256}; -use sp_runtime::{traits::PostDispatchInfoOf, DispatchResultWithInfo}; +use sp_runtime::{ + traits::{Dispatchable, PostDispatchInfoOf}, + DispatchResultWithInfo, +}; const ONGOING_POLL_INDEX: u32 = 3; diff --git a/precompiles/crowdloan-rewards/Cargo.toml b/precompiles/crowdloan-rewards/Cargo.toml index 1f3de6ddf0..0dbc39a4bb 100644 --- a/precompiles/crowdloan-rewards/Cargo.toml +++ b/precompiles/crowdloan-rewards/Cargo.toml @@ -19,6 +19,7 @@ frame-support = { workspace = true } frame-system = { workspace = true } sp-core = { workspace = true } sp-std = { workspace = true } +sp-runtime = { workspace = true } # Frontier fp-evm = { workspace = true } diff --git a/precompiles/crowdloan-rewards/src/lib.rs b/precompiles/crowdloan-rewards/src/lib.rs index 4158a67724..d9806219a3 100644 --- a/precompiles/crowdloan-rewards/src/lib.rs +++ b/precompiles/crowdloan-rewards/src/lib.rs @@ -20,13 +20,14 @@ use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::Currency, }; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{ convert::{TryFrom, TryInto}, fmt::Debug, diff --git a/precompiles/crowdloan-rewards/src/mock.rs b/precompiles/crowdloan-rewards/src/mock.rs index 76fa6006b2..665cc2bf59 100644 --- a/precompiles/crowdloan-rewards/src/mock.rs +++ b/precompiles/crowdloan-rewards/src/mock.rs @@ -23,42 +23,36 @@ use cumulus_primitives_parachain_inherent::ParachainInherentData; use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; use frame_support::{ construct_runtime, - dispatch::UnfilteredDispatchable, inherent::{InherentData, ProvideInherent}, parameter_types, - traits::{Everything, GenesisBuild, OnFinalize, OnInitialize}, + traits::{Everything, OnFinalize, OnInitialize, UnfilteredDispatchable}, weights::Weight, }; -use frame_system::{EnsureSigned, RawOrigin}; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureSigned, RawOrigin}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; use sp_io; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; +pub type BlockNumber = BlockNumberFor; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event}, - Crowdloan: pallet_crowdloan_rewards::{Pallet, Call, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + ParachainSystem: cumulus_pallet_parachain_system, + Crowdloan: pallet_crowdloan_rewards, } ); @@ -86,14 +80,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -121,7 +114,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -235,8 +228,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/crowdloan-rewards/src/tests.rs b/precompiles/crowdloan-rewards/src/tests.rs index f8453d4e1c..ce8a3f256a 100644 --- a/precompiles/crowdloan-rewards/src/tests.rs +++ b/precompiles/crowdloan-rewards/src/tests.rs @@ -18,12 +18,13 @@ use crate::mock::{ events, roll_to, AccountId, Crowdloan, ExtBuilder, PCall, Precompiles, PrecompilesValue, Runtime, RuntimeCall, RuntimeOrigin, }; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_crowdloan_rewards::{Call as CrowdloanCall, Event as CrowdloanEvent}; use pallet_evm::Call as EvmCall; use precompile_utils::{prelude::*, testing::*}; use sha3::{Digest, Keccak256}; use sp_core::U256; +use sp_runtime::traits::Dispatchable; fn precompiles() -> Precompiles { PrecompilesValue::get() diff --git a/precompiles/gmp/Cargo.toml b/precompiles/gmp/Cargo.toml index 407ff9fd3b..05ef10529a 100644 --- a/precompiles/gmp/Cargo.toml +++ b/precompiles/gmp/Cargo.toml @@ -20,6 +20,7 @@ frame-system = { workspace = true } parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] } sp-core = { workspace = true } sp-io = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } # Frontier diff --git a/precompiles/gmp/src/lib.rs b/precompiles/gmp/src/lib.rs index f7f62e5f09..4937751339 100644 --- a/precompiles/gmp/src/lib.rs +++ b/precompiles/gmp/src/lib.rs @@ -21,15 +21,15 @@ use evm::ExitReason; use fp_evm::{Context, ExitRevert, PrecompileFailure, PrecompileHandle}; use frame_support::{ - codec::Decode, - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, sp_runtime::{traits::Zero, Saturating}, traits::ConstU32, }; use pallet_evm::AddressMapping; -use parity_scale_codec::DecodeLimit; +use parity_scale_codec::{Decode, DecodeLimit}; use precompile_utils::{prelude::*, solidity::revert::revert_as_bytes}; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::boxed::Box; use sp_std::{marker::PhantomData, vec::Vec}; use types::*; diff --git a/precompiles/gmp/src/mock.rs b/precompiles/gmp/src/mock.rs index 8fb97bc321..b82544aca7 100644 --- a/precompiles/gmp/src/mock.rs +++ b/precompiles/gmp/src/mock.rs @@ -26,6 +26,7 @@ use parity_scale_codec::{Decode, Encode}; use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; use scale_info::TypeInfo; use sp_core::H256; +use sp_runtime::BuildStorage; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, Perbill, @@ -40,24 +41,18 @@ use xcm_primitives::XcmV2Weight; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; pub type AssetId = u128; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Xtokens: orml_xtokens::{Pallet, Call, Storage, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Config, Event, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Xtokens: orml_xtokens, + PolkadotXcm: pallet_xcm, } ); @@ -80,14 +75,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -115,7 +109,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -199,6 +193,7 @@ impl xcm_executor::Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub type Precompiles = PrecompileSetBuilder< @@ -232,7 +227,12 @@ impl WeightTrader for DummyWeightTrader { DummyWeightTrader } - fn buy_weight(&mut self, _weight: Weight, _payment: Assets) -> Result { + fn buy_weight( + &mut self, + _weight: Weight, + _payment: Assets, + _context: &XcmContext, + ) -> Result { Ok(Assets::default()) } } @@ -429,8 +429,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/identity/src/lib.rs b/precompiles/identity/src/lib.rs index fa20af2651..9bf6a8a256 100644 --- a/precompiles/identity/src/lib.rs +++ b/precompiles/identity/src/lib.rs @@ -22,13 +22,14 @@ extern crate alloc; use enumflags2::BitFlags; use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::sp_runtime::traits::StaticLookup; use frame_support::traits::Currency; use pallet_evm::AddressMapping; use parity_scale_codec::MaxEncodedLen; use precompile_utils::prelude::*; use sp_core::{ConstU32, Get, H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::boxed::Box; use sp_std::marker::PhantomData; use sp_std::vec::Vec; diff --git a/precompiles/identity/src/mock.rs b/precompiles/identity/src/mock.rs index 6ec6ef9ed9..9218241b81 100644 --- a/precompiles/identity/src/mock.rs +++ b/precompiles/identity/src/mock.rs @@ -28,26 +28,20 @@ use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u64; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, Identity: pallet_identity, } ); @@ -64,14 +58,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -99,7 +92,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -222,8 +215,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/identity/src/tests.rs b/precompiles/identity/src/tests.rs index a54c0f7620..c6b670f58e 100644 --- a/precompiles/identity/src/tests.rs +++ b/precompiles/identity/src/tests.rs @@ -23,7 +23,7 @@ use crate::{ use crate::{ Data, IdentityFields, IdentityInfo, Judgement, Registrar, Registration, SubsOf, SuperOf, }; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use pallet_identity::{ Event as IdentityEvent, IdentityField, Pallet as IdentityPallet, RegistrarInfo, @@ -31,7 +31,7 @@ use pallet_identity::{ use precompile_utils::prelude::*; use precompile_utils::testing::*; use sp_core::{H160, U256}; -use sp_runtime::traits::Hash; +use sp_runtime::traits::{Dispatchable, Hash}; fn precompiles() -> Precompiles { PrecompilesValue::get() diff --git a/precompiles/pallet-democracy/src/lib.rs b/precompiles/pallet-democracy/src/lib.rs index ce8ea967e7..dd322e1ddb 100644 --- a/precompiles/pallet-democracy/src/lib.rs +++ b/precompiles/pallet-democracy/src/lib.rs @@ -19,8 +19,9 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::traits::{Bounded, ConstU32, Currency, QueryPreimage}; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_democracy::{ AccountVote, Call as DemocracyCall, Conviction, ReferendumInfo, Vote, VoteThreshold, }; @@ -28,7 +29,7 @@ use pallet_evm::AddressMapping; use pallet_preimage::Call as PreimageCall; use precompile_utils::prelude::*; use sp_core::{Get, H160, H256, U256}; -use sp_runtime::traits::{Hash, StaticLookup}; +use sp_runtime::traits::{Dispatchable, Hash, StaticLookup}; use sp_std::{ convert::{TryFrom, TryInto}, fmt::Debug, @@ -88,7 +89,7 @@ where Runtime::RuntimeCall: From>, Runtime::RuntimeCall: From>, Runtime::Hash: From + Into, - Runtime::BlockNumber: Into, + BlockNumberFor: Into, { // The accessors are first. They directly return their result. #[precompile::public("publicPropCount()")] diff --git a/precompiles/pallet-democracy/src/mock.rs b/precompiles/pallet-democracy/src/mock.rs index 4ff5e97fb8..c2ab4f8680 100644 --- a/precompiles/pallet-democracy/src/mock.rs +++ b/precompiles/pallet-democracy/src/mock.rs @@ -26,29 +26,27 @@ use pallet_democracy::{BoundedCallOf, VoteThreshold}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, SubstrateBlockHashMapping}; use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Config, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Democracy: pallet_democracy::{Pallet, Storage, Config, Event, Call}, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, - Preimage: pallet_preimage::{Pallet, Event, Call}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Democracy: pallet_democracy, + Scheduler: pallet_scheduler, + Preimage: pallet_preimage, } ); @@ -60,14 +58,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -95,7 +92,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -265,8 +262,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/pallet-democracy/src/tests.rs b/precompiles/pallet-democracy/src/tests.rs index cacb164e30..8144944b97 100644 --- a/precompiles/pallet-democracy/src/tests.rs +++ b/precompiles/pallet-democracy/src/tests.rs @@ -24,7 +24,6 @@ use crate::{ }; use frame_support::{ assert_ok, - dispatch::Dispatchable, traits::{Currency, PreimageProvider, QueryPreimage, StorePreimage}, }; use pallet_balances::Event as BalancesEvent; @@ -37,6 +36,7 @@ use pallet_democracy::{ use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use precompile_utils::{prelude::*, testing::*}; use sp_core::{H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use std::{convert::TryInto, str::from_utf8}; fn precompiles() -> Precompiles { diff --git a/precompiles/parachain-staking/Cargo.toml b/precompiles/parachain-staking/Cargo.toml index b74bef04e0..7f96925cba 100644 --- a/precompiles/parachain-staking/Cargo.toml +++ b/precompiles/parachain-staking/Cargo.toml @@ -21,6 +21,7 @@ parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] } sp-core = { workspace = true } sp-io = { workspace = true } sp-std = { workspace = true } +sp-runtime = { workspace = true } # Frontier fp-evm = { workspace = true } diff --git a/precompiles/parachain-staking/src/lib.rs b/precompiles/parachain-staking/src/lib.rs index bb2f05db6c..d3f290678e 100644 --- a/precompiles/parachain-staking/src/lib.rs +++ b/precompiles/parachain-staking/src/lib.rs @@ -24,12 +24,13 @@ mod mock; mod tests; use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::sp_runtime::Percent; use frame_support::traits::{Currency, Get}; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{convert::TryInto, marker::PhantomData, vec::Vec}; type BalanceOf = <::Currency as Currency< diff --git a/precompiles/parachain-staking/src/mock.rs b/precompiles/parachain-staking/src/mock.rs index cf06887203..325ca423a2 100644 --- a/precompiles/parachain-staking/src/mock.rs +++ b/precompiles/parachain-staking/src/mock.rs @@ -18,9 +18,10 @@ use super::*; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, GenesisBuild, OnFinalize, OnInitialize}, + traits::{Everything, OnFinalize, OnInitialize}, weights::Weight, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use pallet_parachain_staking::{AwardedPts, InflationInfo, Points, Range}; use precompile_utils::{ @@ -31,27 +32,22 @@ use sp_core::{H256, U256}; use sp_io; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, Percent, + BuildStorage, Perbill, Percent, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Config, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + ParachainStaking: pallet_parachain_staking, } ); @@ -67,14 +63,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -102,7 +97,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -293,8 +288,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/parachain-staking/src/tests.rs b/precompiles/parachain-staking/src/tests.rs index 2f7b8db90d..b4a2ab2dc3 100644 --- a/precompiles/parachain-staking/src/tests.rs +++ b/precompiles/parachain-staking/src/tests.rs @@ -19,12 +19,13 @@ use crate::mock::{ Precompiles, PrecompilesValue, Runtime, RuntimeCall, RuntimeOrigin, }; use core::str::from_utf8; +use frame_support::assert_ok; use frame_support::sp_runtime::Percent; -use frame_support::{assert_ok, dispatch::Dispatchable}; use pallet_evm::Call as EvmCall; use pallet_parachain_staking::Event as StakingEvent; use precompile_utils::{prelude::*, testing::*}; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; fn precompiles() -> Precompiles { PrecompilesValue::get() diff --git a/precompiles/precompile-registry/src/mock.rs b/precompiles/precompile-registry/src/mock.rs index f11d9ef830..dfa64383c2 100644 --- a/precompiles/precompile-registry/src/mock.rs +++ b/precompiles/precompile-registry/src/mock.rs @@ -22,6 +22,7 @@ use frame_support::{construct_runtime, pallet_prelude::*, parameter_types}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; use sp_core::H256; +use sp_runtime::BuildStorage; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, Perbill, @@ -29,21 +30,15 @@ use sp_runtime::{ pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, } ); @@ -59,14 +54,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -94,7 +88,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -171,8 +165,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/preimage/src/lib.rs b/precompiles/preimage/src/lib.rs index 36a7035f9c..d8ec491fed 100644 --- a/precompiles/preimage/src/lib.rs +++ b/precompiles/preimage/src/lib.rs @@ -17,12 +17,13 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::traits::ConstU32; use pallet_evm::AddressMapping; use pallet_preimage::Call as PreimageCall; use precompile_utils::prelude::*; use sp_core::{Hasher, H256}; +use sp_runtime::traits::Dispatchable; use sp_std::{marker::PhantomData, vec::Vec}; #[cfg(test)] diff --git a/precompiles/preimage/src/mock.rs b/precompiles/preimage/src/mock.rs index 86d8c7390a..701a6733a5 100644 --- a/precompiles/preimage/src/mock.rs +++ b/precompiles/preimage/src/mock.rs @@ -23,26 +23,20 @@ use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::{H256, U256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, Preimage: pallet_preimage, } ); @@ -59,14 +53,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -94,7 +87,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -184,8 +177,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/preimage/src/tests.rs b/precompiles/preimage/src/tests.rs index 4bd8c7fda6..cb7c3dd8f5 100644 --- a/precompiles/preimage/src/tests.rs +++ b/precompiles/preimage/src/tests.rs @@ -17,10 +17,11 @@ use crate::mock::*; use crate::*; use precompile_utils::testing::*; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use sp_core::{Hasher, U256}; +use sp_runtime::traits::Dispatchable; fn evm_call(input: Vec) -> EvmCall { EvmCall::call { diff --git a/precompiles/proxy/src/lib.rs b/precompiles/proxy/src/lib.rs index 3d5468f38e..e5a4df5c2d 100644 --- a/precompiles/proxy/src/lib.rs +++ b/precompiles/proxy/src/lib.rs @@ -18,7 +18,7 @@ use evm::ExitReason; use fp_evm::{Context, PrecompileFailure, PrecompileHandle, Transfer}; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use pallet_balances::Call as BalancesCall; use pallet_evm::AddressMapping; use pallet_proxy::Call as ProxyCall; @@ -28,7 +28,7 @@ use precompile_utils::prelude::*; use sp_core::{Get, H160, U256}; use sp_runtime::{ codec::Decode, - traits::{ConstU32, StaticLookup, Zero}, + traits::{ConstU32, Dispatchable, StaticLookup, Zero}, }; use sp_std::marker::PhantomData; diff --git a/precompiles/proxy/src/mock.rs b/precompiles/proxy/src/mock.rs index 6524998552..2f0e7b852d 100644 --- a/precompiles/proxy/src/mock.rs +++ b/precompiles/proxy/src/mock.rs @@ -32,27 +32,24 @@ use precompile_utils::{ use scale_info::TypeInfo; use sp_core::{H160, H256, U256}; use sp_io; -use sp_runtime::codec::{Decode, Encode, MaxEncodedLen}; use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::{ + codec::{Decode, Encode, MaxEncodedLen}, + BuildStorage, +}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Config, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Proxy: pallet_proxy::{Pallet, Storage, Event, Call}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Proxy: pallet_proxy, } ); @@ -64,14 +61,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -99,7 +95,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -277,8 +273,8 @@ impl ExtBuilder { /// Build the test externalities for use in tests pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/proxy/src/tests.rs b/precompiles/proxy/src/tests.rs index 8d08ddd9d9..dc0cf6829a 100644 --- a/precompiles/proxy/src/tests.rs +++ b/precompiles/proxy/src/tests.rs @@ -18,7 +18,7 @@ use crate::mock::{ AccountId, ExtBuilder, PCall, PrecompilesValue, ProxyType, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, }; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_evm::Call as EvmCall; use pallet_proxy::{ Call as ProxyCall, Event as ProxyEvent, Pallet as ProxyPallet, ProxyDefinition, @@ -26,6 +26,7 @@ use pallet_proxy::{ use precompile_utils::precompile_set::AddressU64; use precompile_utils::{assert_event_emitted, assert_event_not_emitted, prelude::*, testing::*}; use sp_core::{Get, H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use std::cell::Cell; use std::rc::Rc; use std::str::from_utf8; diff --git a/precompiles/randomness/Cargo.toml b/precompiles/randomness/Cargo.toml index 27d5b60a96..8224060f5f 100644 --- a/precompiles/randomness/Cargo.toml +++ b/precompiles/randomness/Cargo.toml @@ -21,6 +21,7 @@ parity-scale-codec = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } sp-std = { workspace = true } +sp-runtime = { workspace = true } # Frontier pallet-base-fee = { workspace = true } diff --git a/precompiles/randomness/src/lib.rs b/precompiles/randomness/src/lib.rs index 37c9647b35..bca9024960 100644 --- a/precompiles/randomness/src/lib.rs +++ b/precompiles/randomness/src/lib.rs @@ -22,9 +22,10 @@ extern crate alloc; use fp_evm::{Context, ExitReason, FeeCalculator, Log, PrecompileHandle}; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::Get, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_evm::GasWeightMapping; use pallet_randomness::{ weights::{SubstrateWeight, WeightInfo}, @@ -32,6 +33,7 @@ use pallet_randomness::{ }; use precompile_utils::{evm::costs::call_cost, prelude::*}; use sp_core::{H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{marker::PhantomData, vec, vec::Vec}; #[cfg(test)] @@ -172,7 +174,7 @@ where Runtime: pallet_randomness::Config + pallet_evm::Config, Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, Runtime::RuntimeCall: From>, - ::BlockNumber: TryInto + TryFrom, + BlockNumberFor: TryInto + TryFrom, BalanceOf: TryFrom + Into, { #[precompile::public("relayEpochIndex()")] diff --git a/precompiles/randomness/src/mock.rs b/precompiles/randomness/src/mock.rs index ec7f49dd19..ddb8a21560 100644 --- a/precompiles/randomness/src/mock.rs +++ b/precompiles/randomness/src/mock.rs @@ -16,11 +16,7 @@ //! A minimal precompile runtime including the pallet-randomness pallet use super::*; -use frame_support::{ - construct_runtime, parameter_types, - traits::{Everything, GenesisBuild}, - weights::Weight, -}; +use frame_support::{construct_runtime, parameter_types, traits::Everything, weights::Weight}; use nimbus_primitives::NimbusId; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use precompile_utils::{precompile_set::*, testing::MockAccount}; @@ -28,30 +24,24 @@ use session_keys_primitives::VrfId; use sp_core::H256; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; use sp_std::convert::{TryFrom, TryInto}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - AuthorMapping: pallet_author_mapping::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Randomness: pallet_randomness::{Pallet, Call, Storage, Event, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + AuthorMapping: pallet_author_mapping, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Randomness: pallet_randomness, } ); @@ -66,14 +56,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -102,7 +91,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -235,8 +224,8 @@ impl ExtBuilder { #[allow(dead_code)] pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/referenda/src/lib.rs b/precompiles/referenda/src/lib.rs index 788f846668..15d4938425 100644 --- a/precompiles/referenda/src/lib.rs +++ b/precompiles/referenda/src/lib.rs @@ -17,10 +17,11 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use frame_support::traits::{ schedule::DispatchTime, Bounded, Currency, Get, OriginTrait, VoteTally, }; +use frame_system::pallet_prelude::BlockNumberFor; use pallet_evm::AddressMapping; use pallet_referenda::{ Call as ReferendaCall, DecidingCount, Deposit, Pallet as Referenda, ReferendumCount, @@ -29,6 +30,7 @@ use pallet_referenda::{ use parity_scale_codec::{Encode, MaxEncodedLen}; use precompile_utils::prelude::*; use sp_core::{H160, H256, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{boxed::Box, marker::PhantomData, str::FromStr, vec::Vec}; #[cfg(test)] @@ -43,7 +45,7 @@ type BalanceOf = <::Currency as Cu >>::Balance; type TrackIdOf = <::Tracks as TracksInfo< BalanceOf, - ::BlockNumber, + BlockNumberFor, >>::Id; type BoundedCallOf = Bounded<::RuntimeCall>; @@ -141,7 +143,7 @@ where From>, ::RuntimeCall: From>, ::Hash: Into, - Runtime::BlockNumber: Into, + BlockNumberFor: Into, Runtime::AccountId: Into, TrackIdOf: TryFrom + TryInto, BalanceOf: Into, @@ -259,7 +261,7 @@ where handle: &mut impl PrecompileHandle, track_id: u16, proposal: BoundedCallOf, - enactment_moment: DispatchTime, + enactment_moment: DispatchTime>, ) -> EvmResult { log::trace!( target: "referendum-precompile", @@ -402,7 +404,7 @@ where let get_closed_ref_info = |status, - moment: Runtime::BlockNumber, + moment: BlockNumberFor, submission_deposit: Option>>, decision_deposit: Option>>| -> ClosedReferendumInfo { diff --git a/precompiles/referenda/src/mock.rs b/precompiles/referenda/src/mock.rs index 2486b38785..9f363f696f 100644 --- a/precompiles/referenda/src/mock.rs +++ b/precompiles/referenda/src/mock.rs @@ -30,28 +30,23 @@ use scale_info::TypeInfo; use sp_core::H256; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; use sp_std::convert::{TryFrom, TryInto}; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, Preimage: pallet_preimage, Scheduler: pallet_scheduler, Referenda: pallet_referenda, @@ -69,14 +64,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -105,7 +99,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -386,8 +380,8 @@ impl ExtBuilder { #[allow(dead_code)] pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/referenda/src/tests.rs b/precompiles/referenda/src/tests.rs index 6e732680e3..8039bfbf67 100644 --- a/precompiles/referenda/src/tests.rs +++ b/precompiles/referenda/src/tests.rs @@ -20,11 +20,12 @@ use crate::{ }; use precompile_utils::{prelude::*, testing::*}; -use frame_support::{assert_ok, dispatch::Dispatchable}; +use frame_support::assert_ok; use pallet_evm::{Call as EvmCall, Event as EvmEvent}; use pallet_referenda::Call as ReferendaCall; use sp_core::{Hasher, H256, U256}; +use sp_runtime::traits::Dispatchable; fn precompiles() -> TestPrecompiles { PrecompilesValue::get() diff --git a/precompiles/relay-encoder/src/lib.rs b/precompiles/relay-encoder/src/lib.rs index b640af7875..436ddd62e8 100644 --- a/precompiles/relay-encoder/src/lib.rs +++ b/precompiles/relay-encoder/src/lib.rs @@ -22,15 +22,14 @@ use cumulus_primitives_core::relay_chain; use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, ensure, traits::ConstU32, }; use pallet_staking::RewardDestination; use precompile_utils::prelude::*; use sp_core::{H256, U256}; -use sp_runtime::AccountId32; -use sp_runtime::Perbill; +use sp_runtime::{traits::Dispatchable, AccountId32, Perbill}; use sp_std::vec::Vec; use sp_std::{convert::TryInto, marker::PhantomData}; use xcm_primitives::{HrmpAvailableCalls, HrmpEncodeCall}; diff --git a/precompiles/relay-encoder/src/mock.rs b/precompiles/relay-encoder/src/mock.rs index 5f5a156711..c9a5fd88de 100644 --- a/precompiles/relay-encoder/src/mock.rs +++ b/precompiles/relay-encoder/src/mock.rs @@ -23,28 +23,22 @@ use precompile_utils::{precompile_set::*, testing::MockAccount}; use sp_core::H256; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + ParachainSystem: cumulus_pallet_parachain_system, + Timestamp: pallet_timestamp, } ); @@ -56,14 +50,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -108,7 +101,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -198,8 +191,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml index 3cd798b80e..dd642669f6 100644 --- a/precompiles/utils/Cargo.toml +++ b/precompiles/utils/Cargo.toml @@ -31,6 +31,7 @@ sp-core = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # Frontier evm = { workspace = true, features = [ "with-codec" ] } diff --git a/precompiles/utils/src/solidity/codec/xcm.rs b/precompiles/utils/src/solidity/codec/xcm.rs index dff7279b38..58b2b064fc 100644 --- a/precompiles/utils/src/solidity/codec/xcm.rs +++ b/precompiles/utils/src/solidity/codec/xcm.rs @@ -22,9 +22,10 @@ use { revert::{BacktraceExt, InjectBacktrace, MayRevert, RevertReason}, }, alloc::string::String, - frame_support::{dispatch::Weight, ensure, traits::ConstU32}, + frame_support::{ensure, traits::ConstU32}, sp_core::H256, sp_std::vec::Vec, + sp_weights::Weight, xcm::latest::{Junction, Junctions, MultiLocation, NetworkId}, }; diff --git a/precompiles/utils/src/substrate.rs b/precompiles/utils/src/substrate.rs index 27595ffa1d..f5e562d5d9 100644 --- a/precompiles/utils/src/substrate.rs +++ b/precompiles/utils/src/substrate.rs @@ -18,12 +18,14 @@ //! - Substrate call dispatch. //! - Substrate DB read and write costs +use sp_runtime::traits::Dispatchable; + use { crate::{evm::handle::using_precompile_handle, solidity::revert::revert}, core::marker::PhantomData, fp_evm::{ExitError, PrecompileFailure, PrecompileHandle}, frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, pallet_prelude::*, traits::Get, }, diff --git a/precompiles/utils/tests-external/lib.rs b/precompiles/utils/tests-external/lib.rs index 8ab68d484f..ce9223e27c 100644 --- a/precompiles/utils/tests-external/lib.rs +++ b/precompiles/utils/tests-external/lib.rs @@ -34,26 +34,21 @@ mod tests { use sp_core::{H256, U256}; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; pub type AccountId = MockAccount; pub type Balance = u128; - pub type BlockNumber = u32; - type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; - type Block = frame_system::mocking::MockBlock; + type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, } ); @@ -69,14 +64,13 @@ mod tests { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -104,7 +98,7 @@ mod tests { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -285,8 +279,8 @@ mod tests { impl ExtBuilder { #[cfg(test)] fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); let mut ext = sp_io::TestExternalities::new(t); diff --git a/precompiles/xcm-transactor/Cargo.toml b/precompiles/xcm-transactor/Cargo.toml index 898177ed9f..e491eb8af5 100644 --- a/precompiles/xcm-transactor/Cargo.toml +++ b/precompiles/xcm-transactor/Cargo.toml @@ -22,6 +22,7 @@ frame-system = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # Frontier evm = { workspace = true, features = [ "with-codec" ] } diff --git a/precompiles/xcm-transactor/src/functions.rs b/precompiles/xcm-transactor/src/functions.rs index 30039689ea..2cc8367253 100644 --- a/precompiles/xcm-transactor/src/functions.rs +++ b/precompiles/xcm-transactor/src/functions.rs @@ -18,7 +18,7 @@ use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo, Weight}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::ConstU32, }; use pallet_evm::AddressMapping; @@ -27,12 +27,14 @@ use pallet_xcm_transactor::{ }; use precompile_utils::prelude::*; use sp_core::{MaxEncodedLen, H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{ boxed::Box, convert::{TryFrom, TryInto}, marker::PhantomData, vec::Vec, }; +use sp_weights::Weight; use xcm::latest::MultiLocation; use xcm_primitives::{ AccountIdToCurrencyId, UtilityAvailableCalls, UtilityEncodeCall, DEFAULT_PROOF_SIZE, diff --git a/precompiles/xcm-transactor/src/mock.rs b/precompiles/xcm-transactor/src/mock.rs index 5ef88e350d..6f1b82a905 100644 --- a/precompiles/xcm-transactor/src/mock.rs +++ b/precompiles/xcm-transactor/src/mock.rs @@ -33,6 +33,7 @@ use precompile_utils::{ use scale_info::TypeInfo; use sp_core::{H160, H256, U256}; use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::BuildStorage; use xcm::latest::{prelude::*, Error as XcmError}; use xcm_builder::FixedWeightBounds; use xcm_executor::{ @@ -43,23 +44,17 @@ use xcm_primitives::AccountIdToCurrencyId; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + XcmTransactor: pallet_xcm_transactor, } ); @@ -96,14 +91,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = MockDbWeight; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -131,7 +125,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -282,7 +276,12 @@ impl WeightTrader for DummyWeightTrader { DummyWeightTrader } - fn buy_weight(&mut self, _weight: Weight, _payment: Assets) -> Result { + fn buy_weight( + &mut self, + _weight: Weight, + _payment: Assets, + _context: &XcmContext, + ) -> Result { Ok(Assets::default()) } } @@ -444,8 +443,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/xcm-transactor/src/tests.rs b/precompiles/xcm-transactor/src/tests.rs index 32f7065f37..b96dd4a8fe 100644 --- a/precompiles/xcm-transactor/src/tests.rs +++ b/precompiles/xcm-transactor/src/tests.rs @@ -18,7 +18,7 @@ use crate::mock::{ RuntimeOrigin, TransactorV1, TransactorV2, TransactorV3, XcmTransactor, }; -use frame_support::{assert_ok, dispatch::Weight}; +use frame_support::{assert_ok, weights::Weight}; use precompile_utils::{prelude::*, testing::*}; use sp_core::H160; use sp_std::boxed::Box; diff --git a/precompiles/xcm-transactor/src/v1/mod.rs b/precompiles/xcm-transactor/src/v1/mod.rs index 370696ee26..853b834a30 100644 --- a/precompiles/xcm-transactor/src/v1/mod.rs +++ b/precompiles/xcm-transactor/src/v1/mod.rs @@ -17,11 +17,12 @@ //! Precompile to xcm transactor runtime methods via the EVM use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use crate::functions::{CurrencyIdOf, GetDataLimit, TransactorOf, XcmTransactorWrapper}; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{convert::TryFrom, marker::PhantomData}; use xcm::latest::MultiLocation; use xcm_primitives::AccountIdToCurrencyId; diff --git a/precompiles/xcm-transactor/src/v2/mod.rs b/precompiles/xcm-transactor/src/v2/mod.rs index 6f3e89cfdb..83bd5e9f8d 100644 --- a/precompiles/xcm-transactor/src/v2/mod.rs +++ b/precompiles/xcm-transactor/src/v2/mod.rs @@ -18,9 +18,10 @@ use crate::functions::{CurrencyIdOf, GetDataLimit, TransactorOf, XcmTransactorWrapper}; use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{convert::TryFrom, marker::PhantomData}; use xcm::latest::MultiLocation; use xcm_primitives::AccountIdToCurrencyId; diff --git a/precompiles/xcm-transactor/src/v3/mod.rs b/precompiles/xcm-transactor/src/v3/mod.rs index ccc9ebe4f5..90e9a50ff8 100644 --- a/precompiles/xcm-transactor/src/v3/mod.rs +++ b/precompiles/xcm-transactor/src/v3/mod.rs @@ -18,10 +18,12 @@ use crate::functions::{CurrencyIdOf, GetDataLimit, TransactorOf, XcmTransactorWrapper}; use fp_evm::PrecompileHandle; -use frame_support::dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo, Weight}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{convert::TryFrom, marker::PhantomData}; +use sp_weights::Weight; use xcm::latest::MultiLocation; use xcm_primitives::AccountIdToCurrencyId; diff --git a/precompiles/xcm-utils/Cargo.toml b/precompiles/xcm-utils/Cargo.toml index 77fa9a9e1f..06ef0ce799 100644 --- a/precompiles/xcm-utils/Cargo.toml +++ b/precompiles/xcm-utils/Cargo.toml @@ -17,7 +17,9 @@ frame-support = { workspace = true } frame-system = { workspace = true } parity-scale-codec = { workspace = true } sp-core = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # Frontier fp-evm = { workspace = true } diff --git a/precompiles/xcm-utils/src/lib.rs b/precompiles/xcm-utils/src/lib.rs index f42ac6105f..4a7b7d31c7 100644 --- a/precompiles/xcm-utils/src/lib.rs +++ b/precompiles/xcm-utils/src/lib.rs @@ -19,21 +19,22 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; -use frame_support::codec::Decode; use frame_support::traits::ConstU32; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo, Weight}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::OriginTrait, }; use pallet_evm::AddressMapping; -use parity_scale_codec::{DecodeLimit, MaxEncodedLen}; +use parity_scale_codec::{Decode, DecodeLimit, MaxEncodedLen}; use precompile_utils::precompile_set::SelectorFilter; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::boxed::Box; use sp_std::marker::PhantomData; use sp_std::vec; use sp_std::vec::Vec; +use sp_weights::Weight; use xcm::{latest::prelude::*, VersionedXcm, MAX_XCM_DECODE_DEPTH}; use xcm_executor::traits::ConvertOrigin; use xcm_executor::traits::WeightBounds; @@ -118,7 +119,7 @@ where })?; let account: H160 = origin - .as_signed() + .into_signer() .ok_or( RevertReason::custom("Failed multilocation conversion").in_field("multilocation"), )? @@ -143,11 +144,17 @@ where let mut trader = ::Trader::new(); + let ctx = XcmContext { + origin: Some(multilocation), + message_id: XcmHash::default(), + topic: None, + }; // buy_weight returns unused assets let unused = trader .buy_weight( Weight::from_parts(weight_per_second, DEFAULT_PROOF_SIZE), vec![multiasset.clone()].into(), + &ctx, ) .map_err(|_| { RevertReason::custom("Asset not supported as fee payment").in_field("multilocation") diff --git a/precompiles/xcm-utils/src/mock.rs b/precompiles/xcm-utils/src/mock.rs index 5985b822e4..5736f5917b 100644 --- a/precompiles/xcm-utils/src/mock.rs +++ b/precompiles/xcm-utils/src/mock.rs @@ -29,39 +29,33 @@ use precompile_utils::{ }; use sp_core::{H256, U256}; use sp_io; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::traits::{BlakeTwo256, IdentityLookup, TryConvert}; +use sp_runtime::BuildStorage; use sp_std::borrow::Borrow; use xcm::latest::Error as XcmError; use xcm_builder::AllowUnpaidExecutionFrom; use xcm_builder::FixedWeightBounds; use xcm_builder::IsConcrete; use xcm_builder::SovereignSignedViaLocation; -use xcm_executor::traits::Convert; use xcm_executor::{ - traits::{TransactAsset, WeightTrader}, + traits::{ConvertLocation, TransactAsset, WeightTrader}, Assets, }; use Junctions::Here; pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + PolkadotXcm: pallet_xcm, } ); @@ -77,13 +71,13 @@ use frame_system::RawOrigin as SystemRawOrigin; use xcm::latest::Junction; pub struct MockAccountToAccountKey20(PhantomData<(Origin, AccountId)>); -impl> Convert +impl> TryConvert for MockAccountToAccountKey20 where Origin::PalletsOrigin: From> + TryInto, Error = Origin::PalletsOrigin>, { - fn convert(o: Origin) -> Result { + fn try_convert(o: Origin) -> Result { o.try_with_caller(|caller| match caller.try_into() { Ok(SystemRawOrigin::Signed(who)) => { let account_h160: H160 = who.into(); @@ -100,44 +94,27 @@ where } pub struct MockParentMultilocationToAccountConverter; -impl Convert for MockParentMultilocationToAccountConverter { - fn convert_ref(location: impl Borrow) -> Result { - match location.borrow() { +impl ConvertLocation for MockParentMultilocationToAccountConverter { + fn convert_location(location: &MultiLocation) -> Option { + match location { MultiLocation { parents: 1, interior: Here, - } => Ok(ParentAccount.into()), - _ => Err(()), - } - } - - fn reverse_ref(who: impl Borrow) -> Result { - match who.borrow() { - a if a == &AccountId::from(ParentAccount) => Ok(MultiLocation::parent()), - _ => Err(()), + } => Some(ParentAccount.into()), + _ => None, } } } pub struct MockParachainMultilocationToAccountConverter; -impl Convert for MockParachainMultilocationToAccountConverter { - fn convert_ref(location: impl Borrow) -> Result { +impl ConvertLocation for MockParachainMultilocationToAccountConverter { + fn convert_location(location: &MultiLocation) -> Option { match location.borrow() { MultiLocation { parents: 1, interior: Junctions::X1(Parachain(id)), - } => Ok(SiblingParachainAccount(*id).into()), - _ => Err(()), - } - } - - fn reverse_ref(who: impl Borrow) -> Result { - match who.borrow() { - a if a.has_prefix_u32(0xffffffff) => Ok(MultiLocation { - parents: 1, - interior: Junctions::X1(Parachain(a.without_prefix() as u32)), - }), - _ => Err(()), + } => Some(SiblingParachainAccount(*id).into()), + _ => None, } } } @@ -180,14 +157,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = MockDbWeight; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -215,7 +191,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -401,7 +377,12 @@ impl WeightTrader for DummyWeightTrader { DummyWeightTrader } - fn buy_weight(&mut self, weight: Weight, payment: Assets) -> Result { + fn buy_weight( + &mut self, + weight: Weight, + payment: Assets, + _context: &XcmContext, + ) -> Result { let asset_to_charge: MultiAsset = (MultiLocation::parent(), weight.ref_time() as u128).into(); let unused = payment @@ -465,6 +446,7 @@ impl xcm_executor::Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub(crate) struct ExtBuilder { @@ -485,8 +467,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/xcm-utils/src/tests.rs b/precompiles/xcm-utils/src/tests.rs index 05252addbe..ddd50375d1 100644 --- a/precompiles/xcm-utils/src/tests.rs +++ b/precompiles/xcm-utils/src/tests.rs @@ -18,7 +18,7 @@ use crate::mock::{ sent_xcm, AccountId, Balances, ExtBuilder, PCall, ParentAccount, Precompiles, PrecompilesValue, Runtime, SiblingParachainAccount, System, }; -use frame_support::{dispatch::Weight, traits::PalletInfo}; +use frame_support::{traits::PalletInfo, weights::Weight}; use parity_scale_codec::Encode; use precompile_utils::{prelude::*, testing::*}; use sp_core::{H160, U256}; diff --git a/precompiles/xtokens/Cargo.toml b/precompiles/xtokens/Cargo.toml index 467df5bcb4..1a9912f120 100644 --- a/precompiles/xtokens/Cargo.toml +++ b/precompiles/xtokens/Cargo.toml @@ -19,6 +19,7 @@ frame-support = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-weights = { workspace = true } # Frontier fp-evm = { workspace = true } diff --git a/precompiles/xtokens/src/lib.rs b/precompiles/xtokens/src/lib.rs index dc10776863..c75540b8a3 100644 --- a/precompiles/xtokens/src/lib.rs +++ b/precompiles/xtokens/src/lib.rs @@ -20,18 +20,20 @@ use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo, Weight}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::Get, }; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; use sp_core::{H160, U256}; +use sp_runtime::traits::Dispatchable; use sp_std::{ boxed::Box, convert::{TryFrom, TryInto}, marker::PhantomData, vec::Vec, }; +use sp_weights::Weight; use xcm::{ latest::{AssetId, Fungibility, MultiAsset, MultiAssets, MultiLocation, WeightLimit}, VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation, diff --git a/precompiles/xtokens/src/mock.rs b/precompiles/xtokens/src/mock.rs index 06daf101df..dc84561e29 100644 --- a/precompiles/xtokens/src/mock.rs +++ b/precompiles/xtokens/src/mock.rs @@ -32,6 +32,7 @@ use scale_info::TypeInfo; use sp_core::H256; use sp_io; use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::BuildStorage; use xcm::latest::{prelude::*, Error as XcmError}; use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds, IsConcrete}; use xcm_executor::{ @@ -41,25 +42,19 @@ use xcm_executor::{ pub type AccountId = MockAccount; pub type Balance = u128; -pub type BlockNumber = u32; pub type AssetId = u128; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Evm: pallet_evm::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Xtokens: orml_xtokens::{Pallet, Call, Storage, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + Evm: pallet_evm, + Timestamp: pallet_timestamp, + Xtokens: orml_xtokens, + PolkadotXcm: pallet_xcm, } ); @@ -81,14 +76,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -116,7 +110,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -241,7 +235,12 @@ impl WeightTrader for DummyWeightTrader { DummyWeightTrader } - fn buy_weight(&mut self, _weight: Weight, _payment: Assets) -> Result { + fn buy_weight( + &mut self, + _weight: Weight, + _payment: Assets, + _context: &XcmContext, + ) -> Result { Ok(Assets::default()) } } @@ -308,6 +307,7 @@ impl xcm_executor::Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] @@ -428,8 +428,8 @@ impl ExtBuilder { self } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/primitives/account/Cargo.toml b/primitives/account/Cargo.toml index 5f1f30fa04..92ffb618b4 100644 --- a/primitives/account/Cargo.toml +++ b/primitives/account/Cargo.toml @@ -15,7 +15,7 @@ blake2-rfc = { workspace = true, optional = true } impl-serde = { workspace = true } libsecp256k1 = { workspace = true, features = [ "hmac" ] } log = { workspace = true } -serde = { workspace = true, optional = true, features = [ "derive" ] } +serde = { workspace = true, features = [ "derive" ] } sha3 = { workspace = true } # Substrate diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index d702b3b1db..aca6c94cf7 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -25,7 +25,6 @@ use scale_info::TypeInfo; use sha3::{Digest, Keccak256}; use sp_core::{ecdsa, H160}; -#[cfg(feature = "std")] pub use serde::{de::DeserializeOwned, Deserialize, Serialize}; //TODO Maybe this should be upstreamed into Frontier (And renamed accordingly) so that it can @@ -42,7 +41,6 @@ pub use serde::{de::DeserializeOwned, Deserialize, Serialize}; )] pub struct AccountId20(pub [u8; 20]); -#[cfg(feature = "std")] impl_serde::impl_fixed_hash_serde!(AccountId20, 20); #[cfg(feature = "std")] @@ -103,8 +101,9 @@ impl std::str::FromStr for AccountId20 { } } -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] -#[derive(Eq, PartialEq, Clone, Encode, Decode, sp_core::RuntimeDebug, TypeInfo)] +#[derive( + Eq, PartialEq, Clone, Encode, Decode, sp_core::RuntimeDebug, TypeInfo, Serialize, Deserialize, +)] pub struct EthereumSignature(ecdsa::Signature); impl From for EthereumSignature { diff --git a/primitives/xcm/src/asset_id_conversions.rs b/primitives/xcm/src/asset_id_conversions.rs index b9e14a98df..539f9aa02d 100644 --- a/primitives/xcm/src/asset_id_conversions.rs +++ b/primitives/xcm/src/asset_id_conversions.rs @@ -14,8 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moonbeam. If not, see . -use sp_std::{borrow::Borrow, marker::PhantomData}; +use sp_runtime::traits::MaybeEquivalence; +use sp_std::marker::PhantomData; use xcm::latest::MultiLocation; +use xcm_executor::traits::ConvertLocation; /// Converter struct implementing `AssetIdConversion` converting a numeric asset ID /// (must be `TryFrom/TryInto`) into a MultiLocation Value and vice versa through @@ -25,30 +27,29 @@ use xcm::latest::MultiLocation; pub struct AsAssetType( PhantomData<(AssetId, AssetType, AssetIdInfoGetter)>, ); -impl xcm_executor::traits::Convert +impl MaybeEquivalence for AsAssetType where AssetId: Clone, AssetType: From + Into> + Clone, AssetIdInfoGetter: AssetTypeGetter, { - fn convert_ref(id: impl Borrow) -> Result { - if let Some(asset_id) = AssetIdInfoGetter::get_asset_id(id.borrow().clone().into()) { - Ok(asset_id) - } else { - Err(()) - } + fn convert(id: &MultiLocation) -> Option { + AssetIdInfoGetter::get_asset_id(id.clone().into()) } - fn reverse_ref(what: impl Borrow) -> Result { - if let Some(asset_type) = AssetIdInfoGetter::get_asset_type(what.borrow().clone()) { - if let Some(location) = asset_type.into() { - Ok(location) - } else { - Err(()) - } - } else { - Err(()) - } + fn convert_back(what: &AssetId) -> Option { + AssetIdInfoGetter::get_asset_type(what.clone()).and_then(Into::into) + } +} +impl ConvertLocation + for AsAssetType +where + AssetId: Clone, + AssetType: From + Into> + Clone, + AssetIdInfoGetter: AssetTypeGetter, +{ + fn convert_location(id: &MultiLocation) -> Option { + AssetIdInfoGetter::get_asset_id(id.clone().into()) } } diff --git a/primitives/xcm/src/fee_handlers.rs b/primitives/xcm/src/fee_handlers.rs index 2ac3cd3f9f..e8aed8a5e2 100644 --- a/primitives/xcm/src/fee_handlers.rs +++ b/primitives/xcm/src/fee_handlers.rs @@ -20,6 +20,7 @@ // This takes the first fungible asset, and takes whatever UnitPerSecondGetter establishes // UnitsToWeightRatio trait, which needs to be implemented by AssetIdInfoGetter +use cumulus_primitives_core::XcmContext; use frame_support::{ pallet_prelude::Weight, traits::{tokens::fungibles::Mutate, Get}, @@ -56,6 +57,7 @@ impl< &mut self, weight: Weight, payment: xcm_executor::Assets, + _context: &XcmContext, ) -> Result { // can only call one time if self.1.is_some() { @@ -115,7 +117,7 @@ impl< } // Refund weight. We will refund in whatever asset is stored in self. - fn refund_weight(&mut self, weight: Weight) -> Option { + fn refund_weight(&mut self, weight: Weight, _context: &XcmContext) -> Option { if let Some((id, prev_amount, units_per_second)) = self.1.clone() { let weight = weight.min(self.0); self.0 -= weight; @@ -194,13 +196,15 @@ pub trait UnitsToWeightRatio { #[cfg(test)] mod test { use super::*; + use cumulus_primitives_core::XcmHash; use xcm::latest::{AssetId, Fungibility, Junction, Junctions}; use xcm_executor::Assets; - const ARBITRARY_ID: AssetId = AssetId::Concrete(MultiLocation { + const ARBITRARY_ML: MultiLocation = MultiLocation { parents: 0u8, interior: Junctions::Here, - }); + }; + const ARBITRARY_ID: AssetId = AssetId::Concrete(ARBITRARY_ML); impl UnitsToWeightRatio for () { fn payment_is_supported(_asset_type: MultiLocation) -> bool { @@ -218,17 +222,23 @@ mod test { let amount = 1000u128; let mut payment = Assets::new(); + let multilocation = MultiLocation { + parents: 0u8, + interior: Junctions::Here, + }; payment.subsume(MultiAsset { - id: AssetId::Concrete(MultiLocation { - parents: 0u8, - interior: Junctions::Here, - }), + id: AssetId::Concrete(multilocation), fun: Fungibility::Fungible(amount), }); let mut trader: FirstAssetTrader = FirstAssetTrader::new(); + let ctx = XcmContext { + origin: Some(multilocation), + message_id: XcmHash::default(), + topic: None, + }; let unused = trader - .buy_weight((amount as u64).into(), payment.clone()) + .buy_weight((amount as u64).into(), payment.clone(), &ctx) .expect("can buy weight once"); assert!(unused.is_empty()); assert_eq!(trader.0, 1000u64.into()); @@ -240,15 +250,21 @@ mod test { // should be able to buy once let mut asset_one_payment = Assets::new(); + let multilocation = MultiLocation { + parents: 0u8, + interior: Junctions::X1(Junction::Parachain(1000)), + }; asset_one_payment.subsume(MultiAsset { - id: AssetId::Concrete(MultiLocation { - parents: 0u8, - interior: Junctions::X1(Junction::Parachain(1000)), - }), + id: AssetId::Concrete(multilocation), fun: Fungibility::Fungible(100u128), }); + let ctx = XcmContext { + origin: Some(multilocation), + message_id: XcmHash::default(), + topic: None, + }; let buy_one_results = trader - .buy_weight(100u64.into(), asset_one_payment.clone()) + .buy_weight(100u64.into(), asset_one_payment.clone(), &ctx) .expect("can buy weight once"); assert_eq!(buy_one_results.fungible.len(), 0); // no unused amount assert_eq!(trader.0, 100u64.into()); @@ -266,15 +282,21 @@ mod test { // but not twice let mut asset_two_payment = xcm_executor::Assets::new(); + let multi_location = MultiLocation { + parents: 0u8, + interior: Junctions::X1(Junction::Parachain(1001)), + }; asset_two_payment.subsume(MultiAsset { - id: AssetId::Concrete(MultiLocation { - parents: 0u8, - interior: Junctions::X1(Junction::Parachain(1001)), - }), + id: AssetId::Concrete(multi_location), fun: Fungibility::Fungible(10_000u128), }); + let ctx = XcmContext { + origin: Some(multi_location), + message_id: XcmHash::default(), + topic: None, + }; assert_eq!( - trader.buy_weight(10_000u64.into(), asset_two_payment.clone()), + trader.buy_weight(10_000u64.into(), asset_two_payment.clone(), &ctx), Err(XcmError::NotWithdrawable), ); @@ -304,14 +326,19 @@ mod test { }); let mut trader: FirstAssetTrader = FirstAssetTrader::new(); + let ctx = XcmContext { + origin: Some(ARBITRARY_ML), + message_id: XcmHash::default(), + topic: None, + }; let unused = trader - .buy_weight((amount as u64).into(), payment.clone()) + .buy_weight((amount as u64).into(), payment.clone(), &ctx) .expect("can buy weight once"); assert!(unused.is_empty()); assert_eq!(trader.0, 1000u64.into()); assert_eq!( - trader.refund_weight(1000u64.into()), + trader.refund_weight(1000u64.into(), &ctx), Some(MultiAsset { fun: Fungibility::Fungible(1000), id: ARBITRARY_ID, @@ -330,14 +357,19 @@ mod test { }); let mut trader: FirstAssetTrader = FirstAssetTrader::new(); + let ctx = XcmContext { + origin: Some(ARBITRARY_ML), + message_id: XcmHash::default(), + topic: None, + }; let unused = trader - .buy_weight((amount as u64).into(), payment.clone()) + .buy_weight((amount as u64).into(), payment.clone(), &ctx) .expect("can buy weight once"); assert!(unused.is_empty()); assert_eq!(trader.0, 1000u64.into()); assert_eq!( - trader.refund_weight(100u64.into()), + trader.refund_weight(100u64.into(), &ctx), Some(MultiAsset { fun: Fungibility::Fungible(100), id: ARBITRARY_ID, @@ -350,7 +382,7 @@ mod test { // can call again assert_eq!( - trader.refund_weight(200u64.into()), + trader.refund_weight(200u64.into(), &ctx), Some(MultiAsset { fun: Fungibility::Fungible(200), id: ARBITRARY_ID, @@ -371,17 +403,21 @@ mod test { id: ARBITRARY_ID, fun: Fungibility::Fungible(amount), }); - + let ctx = XcmContext { + origin: Some(ARBITRARY_ML), + message_id: XcmHash::default(), + topic: None, + }; let mut trader: FirstAssetTrader = FirstAssetTrader::new(); let unused = trader - .buy_weight((amount as u64).into(), payment.clone()) + .buy_weight((amount as u64).into(), payment.clone(), &ctx) .expect("can buy weight once"); assert!(unused.is_empty()); assert_eq!(trader.0, 1000u64.into()); // can't call with more weight assert_eq!( - trader.refund_weight(9999u64.into()), + trader.refund_weight(9999u64.into(), &ctx), Some(MultiAsset { fun: Fungibility::Fungible(1000), id: ARBITRARY_ID, @@ -400,9 +436,14 @@ mod test { fun: Fungibility::Fungible(amount), }); + let ctx = XcmContext { + origin: Some(ARBITRARY_ML), + message_id: XcmHash::default(), + topic: None, + }; let mut trader: FirstAssetTrader = FirstAssetTrader::new(); let unused = trader - .buy_weight((amount as u64).into(), payment.clone()) + .buy_weight((amount as u64).into(), payment.clone(), &ctx) .expect("can buy weight once"); assert!(unused.is_empty()); assert_eq!(trader.0, 1000u64.into()); @@ -413,7 +454,7 @@ mod test { // can't call with more weight assert_eq!( - trader.refund_weight(1500u64.into()), + trader.refund_weight(1500u64.into(), &ctx), Some(MultiAsset { fun: Fungibility::Fungible(1000), id: ARBITRARY_ID, diff --git a/primitives/xcm/src/origin_conversion.rs b/primitives/xcm/src/origin_conversion.rs index ed04cfa1e8..39400bb62e 100644 --- a/primitives/xcm/src/origin_conversion.rs +++ b/primitives/xcm/src/origin_conversion.rs @@ -42,13 +42,13 @@ pub struct SignedToAccountId20( sp_std::marker::PhantomData<(Origin, AccountId, Network)>, ); impl, Network: Get> - xcm_executor::traits::Convert + sp_runtime::traits::TryConvert for SignedToAccountId20 where Origin::PalletsOrigin: From> + TryInto, Error = Origin::PalletsOrigin>, { - fn convert(o: Origin) -> Result { + fn try_convert(o: Origin) -> Result { o.try_with_caller(|caller| match caller.try_into() { Ok(frame_system::RawOrigin::Signed(who)) => Ok(AccountKey20 { key: who.into(), diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 3a79b1a177..005f1e13c5 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -48,6 +48,7 @@ pallet-treasury = { workspace = true } pallet-utility = { workspace = true } pallet-whitelist = { workspace = true } pallet-xcm = { workspace = true } +sp-api = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } @@ -61,11 +62,13 @@ pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] } pallet-evm-chain-id = { workspace = true } # Nimbus +nimbus-primitives = { workspace = true } pallet-author-inherent = { workspace = true } pallet-author-slot-filter = { workspace = true } # Polkadot xcm = { workspace = true } +xcm-builder = { workspace = true } xcm-executor = { workspace = true } [features] diff --git a/runtime/common/src/apis.rs b/runtime/common/src/apis.rs index 736cc13fbe..81d831fc1f 100644 --- a/runtime/common/src/apis.rs +++ b/runtime/common/src/apis.rs @@ -591,9 +591,8 @@ macro_rules! impl_runtime_apis_plus_common { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig, ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{ - add_benchmark, BenchmarkBatch, Benchmarking, TrackedStorageKey, - }; + use frame_benchmarking::{add_benchmark, BenchmarkBatch, Benchmarking}; + use frame_support::traits::TrackedStorageKey; use xcm::latest::prelude::*; use frame_benchmarking::BenchmarkError; @@ -704,6 +703,10 @@ macro_rules! impl_runtime_apis_plus_common { -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> { Err(BenchmarkError::Skip) } + + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + Err(BenchmarkError::Skip) + } } let whitelist: Vec = vec![ diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 8688e54c07..eae8e548b6 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -24,3 +24,4 @@ mod impl_self_contained_call; mod impl_xcm_evm_runner; pub mod migrations; pub mod weights; +pub mod xcm; diff --git a/runtime/common/src/migrations.rs b/runtime/common/src/migrations.rs index c0d2cf2a69..5cc14e1de5 100644 --- a/runtime/common/src/migrations.rs +++ b/runtime/common/src/migrations.rs @@ -20,7 +20,7 @@ //! the "Migration" trait declared in the pallet-migrations crate. use frame_support::{ - dispatch::GetStorageVersion, + pallet_prelude::GetStorageVersion, traits::{Hash as PreimageHash, OnRuntimeUpgrade, PalletInfoAccess}, weights::Weight, }; diff --git a/runtime/common/src/xcm.rs b/runtime/common/src/xcm.rs new file mode 100644 index 0000000000..6494c6f641 --- /dev/null +++ b/runtime/common/src/xcm.rs @@ -0,0 +1,80 @@ +// Copyright 2019-2022 PureStake Inc. +// This file is part of Moonbeam. + +// Moonbeam is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Moonbeam is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Moonbeam. If not, see . + +#![cfg_attr(not(feature = "std"), no_std)] + +use frame_support::{traits::ProcessMessageError, weights::Weight}; +use xcm::v3::{ + Instruction::{ + self, BuyExecution, ClaimAsset, ClearOrigin, ReceiveTeleportedAsset, ReserveAssetDeposited, + WithdrawAsset, + }, + MultiLocation, + WeightLimit::{Limited, Unlimited}, +}; +use xcm_builder::{CreateMatcher, MatchXcm}; +use xcm_executor::traits::ShouldExecute; + +/// Allows execution from all origins taking payment into account. +/// +/// Only allows for `TeleportAsset`, `WithdrawAsset`, `ClaimAsset` and +/// `ReserveAssetDeposit` XCMs because they are the only ones that place assets +/// in the Holding Register to pay for execution. This is almost equal to +/// [`xcm_builder::AllowTopLevelPaidExecutionFrom`] except that it allows for +/// multiple assets and is not generic to allow all origins. + +pub struct AllowTopLevelPaidExecution; +impl ShouldExecute for AllowTopLevelPaidExecution { + fn should_execute( + _origin: &MultiLocation, + instructions: &mut [Instruction], + max_weight: Weight, + _properties: &mut xcm_executor::traits::Properties, + ) -> Result<(), ProcessMessageError> { + let end = instructions.len().min(5); + instructions[..end] + .matcher() + .match_next_inst(|inst| match inst { + ReceiveTeleportedAsset(..) | ReserveAssetDeposited(..) => Ok(()), + WithdrawAsset(..) => Ok(()), + ClaimAsset { .. } => Ok(()), + _ => Err(ProcessMessageError::BadFormat), + })? + .skip_inst_while(|inst| matches!(inst, ClearOrigin))? + .match_next_inst(|inst| { + let res = match inst { + BuyExecution { + weight_limit: Limited(ref mut weight), + .. + } if weight.all_gte(max_weight) => { + *weight = max_weight; + Ok(()) + } + BuyExecution { + ref mut weight_limit, + .. + } if weight_limit == &Unlimited => { + *weight_limit = Limited(max_weight); + Ok(()) + } + _ => Err(ProcessMessageError::Overweight(max_weight)), + }; + res + })?; + + Ok(()) + } +} diff --git a/runtime/moonbase/Cargo.toml b/runtime/moonbase/Cargo.toml index 7464108dbf..05de73a7d8 100644 --- a/runtime/moonbase/Cargo.toml +++ b/runtime/moonbase/Cargo.toml @@ -13,7 +13,7 @@ hex-literal = { workspace = true, optional = true } log = { workspace = true } num_enum = { workspace = true } rlp = { workspace = true, optional = true } -serde = { workspace = true, optional = true, features = [ "derive" ] } +serde = { workspace = true, features = [ "derive" ] } sha3 = { workspace = true, optional = true } smallvec = { workspace = true } strum = { workspace = true } @@ -101,6 +101,7 @@ pallet-whitelist = { workspace = true } parity-scale-codec = { workspace = true, features = [ "derive", "max-encoded-len", + "chain-error", ] } scale-info = { workspace = true, features = [ "derive" ] } sp-api = { workspace = true } @@ -108,18 +109,19 @@ sp-block-builder = { workspace = true } sp-core = { workspace = true } sp-debug-derive = { workspace = true } sp-inherents = { workspace = true } -sp-io = { workspace = true } +sp-io = { workspace = true, features = [ "improved_panic_error_reporting" ] } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-weights = { workspace = true } # Frontier fp-evm = { workspace = true } fp-rpc = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = [ "serde" ] } pallet-base-fee = { workspace = true } pallet-ethereum = { workspace = true, features = [ "forbid-evm-reentrancy" ] } pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] } @@ -171,6 +173,7 @@ sha3 = { workspace = true, features = [ "std" ] } cumulus-primitives-parachain-inherent = { workspace = true } cumulus-test-relay-sproof-builder = { workspace = true } +frame-metadata = { workspace = true } pallet-message-queue = { workspace = true } polkadot-runtime-parachains = { workspace = true } xcm-simulator = { workspace = true } @@ -266,7 +269,6 @@ std = [ "parity-scale-codec/std", "precompile-utils/std", "scale-info/std", - "serde", "session-keys-primitives/std", "sp-api/std", "sp-block-builder/std", diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 7b552a6f2a..7f634b7772 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -109,8 +109,8 @@ pub use precompiles::{ MoonbasePrecompiles, PrecompileName, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, LOCAL_ASSET_PRECOMPILE_ADDRESS_PREFIX, }; - use smallvec::smallvec; +use sp_runtime::serde::{Deserialize, Serialize}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -245,15 +245,13 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Nonce = Index; /// The index type for blocks. - type BlockNumber = BlockNumber; + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -307,7 +305,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type FreezeIdentifier = (); type MaxFreezes = ConstU32<0>; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type MaxHolds = ConstU32<0>; type WeightInfo = moonbeam_weights::pallet_balances::WeightInfo; } @@ -831,9 +829,20 @@ impl pallet_author_mapping::Config for Runtime { } /// The type used to represent the kinds of proxying allowed. -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] #[derive( - Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, MaxEncodedLen, TypeInfo, + Copy, + Clone, + Eq, + PartialEq, + Ord, + PartialOrd, + Encode, + Decode, + Debug, + MaxEncodedLen, + TypeInfo, + Serialize, + Deserialize, )] pub enum ProxyType { /// All calls can be proxied. This is the trivial/most permissive filter. @@ -1341,23 +1350,20 @@ impl pallet_multisig::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub enum Runtime { - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Utility: pallet_utility::{Pallet, Call, Event} = 1, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 3, Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 4, // Previously 5: pallet_randomness_collective_flip ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event} = 6, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 7, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 8, - EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 9, - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 10, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 7, + ParachainInfo: parachain_info::{Pallet, Storage, Config} = 8, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 9, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 10, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 11, ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Event, Config} = 12, Scheduler: pallet_scheduler::{Pallet, Storage, Event, Call} = 13, Democracy: pallet_democracy::{Pallet, Storage, Config, Event, Call} = 14, @@ -1365,22 +1371,22 @@ construct_runtime! { pallet_collective::::{Pallet, Call, Storage, Event, Origin, Config} = 15, TechCommitteeCollective: pallet_collective::::{Pallet, Call, Storage, Event, Origin, Config} = 16, - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 17, + Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 17, AuthorInherent: pallet_author_inherent::{Pallet, Call, Storage, Inherent} = 18, - AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 19, + AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 19, CrowdloanRewards: pallet_crowdloan_rewards::{Pallet, Call, Config, Storage, Event} = 20, AuthorMapping: pallet_author_mapping::{Pallet, Call, Config, Storage, Event} = 21, Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 22, - MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 23, + MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 23, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 24, XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 25, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 26, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 27, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 28, + PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 28, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 29, XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 30, AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 31, - Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 32, + Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 32, XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event} = 33, ProxyGenesisCompanion: pallet_proxy_genesis_companion::{Pallet, Config} = 34, LocalAssets: pallet_assets::::{Pallet, Call, Storage, Event} = 36, diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs index 0d8bcddfa6..86913b9a98 100644 --- a/runtime/moonbase/src/xcm_config.rs +++ b/runtime/moonbase/src/xcm_config.rs @@ -22,33 +22,31 @@ use super::{ Erc20XcmBridge, LocalAssets, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Treasury, XcmpQueue, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, }; -use moonbeam_runtime_common::weights as moonbeam_weights; +use moonbeam_runtime_common::{weights as moonbeam_weights, xcm::AllowTopLevelPaidExecution}; use pallet_evm_precompileset_assets_erc20::AccountIdAssetIdConversion; use sp_runtime::{ - traits::{Hash as THash, PostDispatchInfoOf}, + traits::{Hash as THash, MaybeEquivalence, PostDispatchInfoOf}, DispatchErrorWithPostInfo, }; use frame_support::{ - dispatch::Weight, parameter_types, traits::{EitherOfDiverse, Everything, Nothing, PalletInfoAccess}, }; use frame_system::{EnsureRoot, RawOrigin}; use sp_core::{ConstU32, H160, H256}; - +use sp_weights::Weight; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, NoChecking, - ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, - WeightInfoBounds, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, + NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, UsingComponents, WeightInfoBounds, WithComputedOrigin, }; use xcm::latest::prelude::*; -use xcm_executor::traits::{CallDispatcher, JustTry}; +use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ @@ -116,12 +114,10 @@ pub type LocationToAccountId = ( /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`. pub struct LocationToH160; -impl xcm_executor::traits::Convert for LocationToH160 { - fn convert(location: MultiLocation) -> Result { - >::convert( - location, - ) - .map(Into::into) +impl ConvertLocation for LocationToH160 { + fn convert_location(location: &MultiLocation) -> Option { + >::convert_location(location) + .map(Into::into) } } @@ -247,7 +243,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -343,6 +339,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = SafeCallFilter; + type Aliasers = Nothing; } // Converts a Signed Local Origin into a MultiLocation @@ -503,7 +500,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -511,7 +508,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); location.push_interior(Junction::GeneralIndex(asset)).ok(); @@ -674,17 +671,17 @@ impl pallet_erc20_xcm_bridge::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] mod testing { use super::*; + use xcm_executor::traits::ConvertLocation; /// This From exists for benchmarking purposes. It has the potential side-effect of calling /// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code. impl From for CurrencyId { fn from(location: MultiLocation) -> CurrencyId { - use xcm_executor::traits::Convert as XConvert; use xcm_primitives::AssetTypeGetter; // If it does not exist, for benchmarking purposes, we create the association - let asset_id = if let Ok(asset_id) = - AsAssetType::::convert_ref(&location) + let asset_id = if let Some(asset_id) = + AsAssetType::::convert_location(&location) { asset_id } else { diff --git a/runtime/moonbase/tests/common/mod.rs b/runtime/moonbase/tests/common/mod.rs index 42f82b8395..3168dcc5c0 100644 --- a/runtime/moonbase/tests/common/mod.rs +++ b/runtime/moonbase/tests/common/mod.rs @@ -20,8 +20,7 @@ use cumulus_primitives_parachain_inherent::ParachainInherentData; use fp_evm::GenesisAccount; use frame_support::{ assert_ok, - dispatch::Dispatchable, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{OnFinalize, OnInitialize}, }; use moonbase_runtime::{asset_config::AssetRegistrarMetadata, xcm_config::AssetType}; pub use moonbase_runtime::{ @@ -33,7 +32,7 @@ pub use moonbase_runtime::{ }; use nimbus_primitives::{NimbusId, NIMBUS_ENGINE_ID}; use sp_core::{Encode, H160}; -use sp_runtime::{Digest, DigestItem, Perbill, Percent}; +use sp_runtime::{traits::Dispatchable, BuildStorage, Digest, DigestItem, Perbill, Percent}; use std::collections::BTreeMap; @@ -221,8 +220,8 @@ impl ExtBuilder { } pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -255,43 +254,34 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_evm_chain_id::GenesisConfig { - chain_id: self.chain_id, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: self.evm_accounts, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_ethereum::GenesisConfig {}, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: self.safe_xcm_version, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_transaction_payment::GenesisConfig { - multiplier: Multiplier::from(8u128), - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm_chain_id::GenesisConfig:: { + chain_id: self.chain_id, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: self.evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_ethereum::GenesisConfig:: { + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_xcm::GenesisConfig:: { + safe_xcm_version: self.safe_xcm_version, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_transaction_payment::GenesisConfig:: { + multiplier: Multiplier::from(8u128), + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs index 53b3dde261..775849d9fd 100644 --- a/runtime/moonbase/tests/integration_test.rs +++ b/runtime/moonbase/tests/integration_test.rs @@ -29,7 +29,7 @@ use precompile_utils::{ use fp_evm::{Context, IsPrecompileResult}; use frame_support::{ assert_noop, assert_ok, - dispatch::{DispatchClass, Dispatchable}, + dispatch::DispatchClass, traits::{ fungible::Inspect, Currency as CurrencyT, EnsureOrigin, PalletInfo, StorageInfo, StorageInfoTrait, @@ -50,9 +50,13 @@ use moonbase_runtime::{ }; use polkadot_parachain::primitives::Sibling; use precompile_utils::testing::MockHandle; +use sp_runtime::{ + traits::{Convert as XcmConvert, Dispatchable}, + BuildStorage, +}; use std::str::from_utf8; use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; -use xcm_executor::traits::Convert as XcmConvert; +use xcm_executor::traits::ConvertLocation; use moonbeam_xcm_benchmarks::weights::XcmWeight; use nimbus_primitives::NimbusId; @@ -65,7 +69,7 @@ use pallet_xcm_transactor::{Currency, CurrencyPayment, HrmpOperation, TransactWe use parity_scale_codec::Encode; use sha3::{Digest, Keccak256}; use sp_core::{crypto::UncheckedFrom, ByteArray, Pair, H160, H256, U256}; -use sp_runtime::{traits::Convert, DispatchError, ModuleError}; +use sp_runtime::{DispatchError, ModuleError}; use xcm::latest::prelude::*; type AuthorMappingPCall = @@ -515,7 +519,7 @@ fn verify_pallet_indices() { #[test] fn verify_reserved_indices() { - use frame_support::metadata::*; + use frame_metadata::*; let metadata = moonbase_runtime::Runtime::metadata(); let metadata = match metadata.1 { RuntimeMetadata::V14(metadata) => metadata, @@ -1720,8 +1724,8 @@ fn run_with_system_weight(w: Weight, mut assertions: F) where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2494,7 +2498,7 @@ fn test_xcm_utils_ml_tp_account() { ExtBuilder::default().build().execute_with(|| { let xcm_utils_precompile_address = H160::from_low_u64_be(2060); let expected_address_parent: H160 = - ParentIsPreset::::convert_ref(MultiLocation::parent()) + ParentIsPreset::::convert_location(&MultiLocation::parent()) .unwrap() .into(); @@ -2512,8 +2516,8 @@ fn test_xcm_utils_ml_tp_account() { let parachain_2000_multilocation = MultiLocation::new(1, X1(Parachain(2000))); let expected_address_parachain: H160 = - SiblingParachainConvertsVia::::convert_ref( - parachain_2000_multilocation.clone(), + SiblingParachainConvertsVia::::convert_location( + ¶chain_2000_multilocation, ) .unwrap() .into(); @@ -2541,8 +2545,8 @@ fn test_xcm_utils_ml_tp_account() { ), ); let expected_address_alice_in_parachain_2000: H160 = - xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - alice_in_parachain_2000_multilocation.clone(), + xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &alice_in_parachain_2000_multilocation, ) .unwrap() .into(); @@ -2877,14 +2881,14 @@ mod fee_tests { currency, BlockWeights, FastAdjustingFeeUpdate, LengthToFee, MinimumMultiplier, TargetBlockFullness, NORMAL_WEIGHT, WEIGHT_PER_GAS, }; - use sp_runtime::{FixedPointNumber, Perbill}; + use sp_runtime::{BuildStorage, FixedPointNumber, Perbill}; fn run_with_system_weight(w: Weight, mut assertions: F) where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2935,8 +2939,8 @@ mod fee_tests { )) + LengthToFeeImpl::weight_to_fee(&Weight::from_parts(extrinsic_len as u64, 1)) + tip; - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2962,8 +2966,8 @@ mod fee_tests { #[test] fn test_min_gas_price_is_deterministic() { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2980,8 +2984,8 @@ mod fee_tests { #[test] fn test_min_gas_price_has_no_precision_loss_from_saturating_mul_int() { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -3003,8 +3007,8 @@ mod fee_tests { #[test] fn test_fee_scenarios() { use sp_runtime::FixedU128; - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { diff --git a/runtime/moonbase/tests/xcm_mock/mod.rs b/runtime/moonbase/tests/xcm_mock/mod.rs index 63d3c504a3..eb60ed090b 100644 --- a/runtime/moonbase/tests/xcm_mock/mod.rs +++ b/runtime/moonbase/tests/xcm_mock/mod.rs @@ -19,7 +19,7 @@ pub mod relay_chain; pub mod statemint_like; use cumulus_primitives_core::ParaId; use sp_runtime::traits::AccountIdConversion; -use sp_runtime::AccountId32; +use sp_runtime::{AccountId32, BuildStorage}; use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; use polkadot_runtime_parachains::configuration::{ @@ -140,8 +140,8 @@ pub const INITIAL_EVM_NONCE: u32 = 1; pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { use parachain::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -164,13 +164,11 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { }, ); - frame_support::traits::GenesisBuild::::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: evm_accounts, - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { @@ -183,8 +181,8 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { pub fn statemint_ext(para_id: u32) -> sp_io::TestExternalities { use statemint_like::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -204,8 +202,8 @@ pub fn statemint_ext(para_id: u32) -> sp_io::TestExternalities { pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { use relay_chain::{Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -219,21 +217,16 @@ pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { .map(|¶_id| (para_id.into(), mock_para_genesis_info())) .collect(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ConfigurationGenesisConfig { - config: mock_relay_config(), - }, - &mut t, - ) - .unwrap(); + let genesis_config = ConfigurationGenesisConfig:: { + config: mock_relay_config(), + }; + genesis_config.assimilate_storage(&mut t).unwrap(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ParasGenesisConfig { - paras: para_genesis, - }, - &mut t, - ) - .unwrap(); + let genesis_config = ParasGenesisConfig:: { + paras: para_genesis, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs index 784c6c538e..20a72afa7f 100644 --- a/runtime/moonbase/tests/xcm_mock/parachain.rs +++ b/runtime/moonbase/tests/xcm_mock/parachain.rs @@ -17,7 +17,6 @@ //! Parachain runtime mock. use frame_support::{ - codec::MaxEncodedLen, construct_runtime, dispatch::GetDispatchInfo, ensure, parameter_types, @@ -28,11 +27,13 @@ use frame_support::{ PalletId, }; -use frame_system::{EnsureNever, EnsureRoot}; -use parity_scale_codec::{Decode, Encode}; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureNever, EnsureRoot}; +use moonbeam_runtime_common::xcm::AllowTopLevelPaidExecution; +use pallet_xcm::migration::v1::VersionUncheckedMigrateToV1; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, Hash, IdentityLookup, Zero}, + traits::{BlakeTwo256, Hash, IdentityLookup, MaybeEquivalence, Zero}, Permill, }; use sp_std::{convert::TryFrom, prelude::*}; @@ -49,12 +50,12 @@ use xcm::latest::{ Junctions, MultiLocation, NetworkId, Outcome, Xcm, }; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, - FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, + FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, + ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, WithComputedOrigin, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -67,7 +68,7 @@ use xcm_simulator::{ pub type AccountId = moonbeam_core_primitives::AccountId; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -76,13 +77,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -116,7 +116,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -315,7 +315,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -421,6 +421,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } impl cumulus_pallet_xcm::Config for Runtime { @@ -441,7 +442,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -454,7 +455,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); location.push_interior(Junction::GeneralIndex(asset)).ok(); @@ -1175,34 +1176,29 @@ impl pallet_ethereum_xcm::Config for Runtime { type ControllerOrigin = EnsureRoot; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - XcmVersioner: mock_version_changer::{Pallet, Storage, Event}, - - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event}, - AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event}, - XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event}, - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call}, - LocalAssets: pallet_assets::::{Pallet, Call, Storage, Event}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, - - Timestamp: pallet_timestamp::{Pallet, Call, Storage}, - EVM: pallet_evm::{Pallet, Call, Storage, Config, Event}, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config}, - EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + MsgQueue: mock_msg_queue, + XcmVersioner: mock_version_changer, + + PolkadotXcm: pallet_xcm, + Assets: pallet_assets, + CumulusXcm: cumulus_pallet_xcm, + XTokens: orml_xtokens, + AssetManager: pallet_asset_manager, + XcmTransactor: pallet_xcm_transactor, + Treasury: pallet_treasury, + LocalAssets: pallet_assets::, + Proxy: pallet_proxy, + + Timestamp: pallet_timestamp, + EVM: pallet_evm, + Ethereum: pallet_ethereum, + EthereumXcm: pallet_ethereum_xcm, } ); @@ -1216,7 +1212,7 @@ pub(crate) fn para_events() -> Vec { use frame_support::traits::{OnFinalize, OnInitialize, OnRuntimeUpgrade}; pub(crate) fn on_runtime_upgrade() { - PolkadotXcm::on_runtime_upgrade(); + VersionUncheckedMigrateToV1::::on_runtime_upgrade(); } pub(crate) fn para_roll_to(n: BlockNumber) { diff --git a/runtime/moonbase/tests/xcm_mock/relay_chain.rs b/runtime/moonbase/tests/xcm_mock/relay_chain.rs index 352b60ae3a..9e83f51424 100644 --- a/runtime/moonbase/tests/xcm_mock/relay_chain.rs +++ b/runtime/moonbase/tests/xcm_mock/relay_chain.rs @@ -20,9 +20,10 @@ use frame_support::{ construct_runtime, parameter_types, traits::{Everything, Nothing, ProcessMessage, ProcessMessageError}, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, IdentityLookup}, + traits::{ConstU32, IdentityLookup}, AccountId32, }; @@ -46,7 +47,7 @@ use xcm_builder::{ use xcm_executor::{Config, XcmExecutor}; pub type AccountId = AccountId32; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -55,13 +56,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -95,7 +95,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -191,6 +191,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub type LocalOriginToLocation = SignedToAccountId32; @@ -261,6 +262,7 @@ impl paras::Config for Runtime { type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; type QueueFootprinter = (); + type OnNewHead = (); } impl dmp::Config for Runtime {} @@ -270,6 +272,7 @@ impl hrmp::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type WeightInfo = TestHrmpWeightInfo; + type ChannelManager = frame_system::EnsureRoot; } impl frame_system::offchain::SendTransactionTypes for Runtime @@ -283,7 +286,7 @@ where impl origin::Config for Runtime {} type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; parameter_types! { pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000); @@ -322,24 +325,21 @@ impl pallet_message_queue::Config for Runtime { type MessageProcessor = MessageProcessor; type QueueChangeHandler = (); type WeightInfo = (); + type QueuePausedQuery = (); } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ParasOrigin: origin::{Pallet, Origin}, - MessageQueue: pallet_message_queue::{Pallet, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - Utility: pallet_utility::{Pallet, Call, Event}, - Hrmp: hrmp::{Pallet, Call, Storage, Event, Config}, - Dmp: dmp::{Pallet, Storage}, - Paras: paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned}, - Configuration: configuration::{Pallet, Call, Storage, Config}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + ParasOrigin: origin, + MessageQueue: pallet_message_queue, + XcmPallet: pallet_xcm, + Utility: pallet_utility, + Hrmp: hrmp, + Dmp: dmp, + Paras: paras, + Configuration: configuration, } ); @@ -392,7 +392,7 @@ impl hrmp::WeightInfo for TestHrmpWeightInfo { fn clean_open_channel_requests(_: u32) -> Weight { Weight::from_parts(1, 0) } - fn force_open_hrmp_channel() -> Weight { + fn force_open_hrmp_channel(_: u32) -> Weight { Weight::from_parts(1, 0) } } diff --git a/runtime/moonbase/tests/xcm_mock/statemint_like.rs b/runtime/moonbase/tests/xcm_mock/statemint_like.rs index 229cd98aa9..b7270cdfd1 100644 --- a/runtime/moonbase/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbase/tests/xcm_mock/statemint_like.rs @@ -25,7 +25,7 @@ use frame_system::{EnsureRoot, EnsureSigned}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, Hash, IdentityLookup}, + traits::{ConstU32, Hash, IdentityLookup}, AccountId32, }; @@ -52,7 +52,6 @@ use xcm_simulator::{ pub type AccountId = AccountId32; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -61,13 +60,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -101,7 +99,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -303,6 +301,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -538,21 +537,16 @@ impl mock_statemint_prefix::Config for Runtime { type RuntimeEvent = RuntimeEvent; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - Assets: pallet_assets::{Pallet, Storage, Event}, - PrefixChanger: mock_statemint_prefix::{Pallet, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + PolkadotXcm: pallet_xcm, + CumulusXcm: cumulus_pallet_xcm, + MsgQueue: mock_msg_queue, + Assets: pallet_assets, + PrefixChanger: mock_statemint_prefix, } ); diff --git a/runtime/moonbase/tests/xcm_tests.rs b/runtime/moonbase/tests/xcm_tests.rs index 6677686bc9..7619001236 100644 --- a/runtime/moonbase/tests/xcm_tests.rs +++ b/runtime/moonbase/tests/xcm_tests.rs @@ -19,9 +19,9 @@ mod xcm_mock; use frame_support::{ assert_ok, - dispatch::Weight, traits::{ConstU32, PalletInfo, PalletInfoAccess}, weights::constants::WEIGHT_REF_TIME_PER_SECOND, + weights::Weight, BoundedVec, }; use pallet_asset_manager::LocalAssetIdCreator; @@ -32,7 +32,7 @@ use sp_std::boxed::Box; use xcm::latest::prelude::*; use xcm::{VersionedMultiLocation, WrapVersion}; use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal; -use xcm_executor::traits::Convert; +use xcm_executor::traits::ConvertLocation; use xcm_mock::*; use xcm_primitives::{UtilityEncodeCall, DEFAULT_PROOF_SIZE}; use xcm_simulator::TestExt; @@ -1081,9 +1081,9 @@ fn transact_through_derivative_multilocation() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1235,9 +1235,9 @@ fn transact_through_derivative_with_custom_fee_weight() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1388,9 +1388,9 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1956,13 +1956,13 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { }); let expected_supported_version: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 1, - ) + version: 1, + } .into(); Relay::execute_with(|| { @@ -1970,17 +1970,6 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { assert!(relay_chain::relay_events().contains(&expected_supported_version)); }); - let expected_version_notified: parachain::RuntimeEvent = - pallet_xcm::Event::VersionChangeNotified( - MultiLocation { - parents: 1, - interior: Here, - }, - 2, - vec![].into(), - ) - .into(); - // ParaA changes version to 2, and calls on_runtime_upgrade. This should notify the targets // of the new version change ParaA::execute_with(|| { @@ -1991,18 +1980,24 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { // Initialize block, to call on_initialize and notify targets parachain::para_roll_to(2); // Expect the event in the parachain - assert!(parachain::para_events().contains(&expected_version_notified)); + assert!(parachain::para_events().iter().any(|e| matches!( + e, + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::VersionChangeNotified { + result: 2, + .. + }) + ))); }); // This event should have been seen in the relay let expected_supported_version_2: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 2, - ) + version: 2, + } .into(); Relay::execute_with(|| { @@ -2079,13 +2074,13 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { }); let expected_supported_version: parachain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 1, interior: X1(Parachain(2)), }, - 0, - ) + version: 0, + } .into(); ParaA::execute_with(|| { @@ -2125,17 +2120,6 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { assert_eq!(Assets::balance(source_id, &PARAALICE.into()), 100); }); - let expected_version_notified: parachain::RuntimeEvent = - pallet_xcm::Event::VersionChangeNotified( - MultiLocation { - parents: 1, - interior: X1(Parachain(1)), - }, - 2, - vec![].into(), - ) - .into(); - // ParaB changes version to 2, and calls on_runtime_upgrade. This should notify the targets // of the new version change ParaB::execute_with(|| { @@ -2146,18 +2130,24 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { // Initialize block, to call on_initialize and notify targets parachain::para_roll_to(2); // Expect the event in the parachain - assert!(parachain::para_events().contains(&expected_version_notified)); + assert!(parachain::para_events().iter().any(|e| matches!( + e, + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::VersionChangeNotified { + result: 2, + .. + }) + ))); }); // This event should have been seen in para A let expected_supported_version_2: parachain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 1, interior: X1(Parachain(2)), }, - 2, - ) + version: 2, + } .into(); // Para A should have received the version change @@ -2468,7 +2458,7 @@ fn test_statemint_like() { let sov = xcm_builder::SiblingParachainConvertsVia::< polkadot_parachain::primitives::Sibling, statemint_like::AccountId, - >::convert_ref(dest_para) + >::convert_location(&dest_para) .unwrap(); let statemint_asset_a_balances = MultiLocation::new( @@ -2847,7 +2837,7 @@ fn transact_through_signed_multilocation() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -2937,7 +2927,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -3028,7 +3018,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight_refund() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -3139,10 +3129,11 @@ fn transact_through_signed_multilocation_para_to_para() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -3237,10 +3228,11 @@ fn transact_through_signed_multilocation_para_to_para_refund() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -3349,10 +3341,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3476,10 +3469,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3599,10 +3593,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let transfer_recipient = evm_account(); let mut transfer_recipient_balance_before = 0; diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml index c022269cb2..2d20ab97ac 100644 --- a/runtime/moonbeam/Cargo.toml +++ b/runtime/moonbeam/Cargo.toml @@ -13,7 +13,7 @@ hex-literal = { workspace = true, optional = true } log = { workspace = true } num_enum = { workspace = true } rlp = { workspace = true, optional = true } -serde = { workspace = true, optional = true, features = [ "derive" ] } +serde = { workspace = true, features = [ "derive" ] } sha3 = { workspace = true, optional = true } smallvec = { workspace = true } strum = { workspace = true } @@ -99,24 +99,26 @@ pallet-whitelist = { workspace = true } parity-scale-codec = { workspace = true, features = [ "derive", "max-encoded-len", + "chain-error", ] } scale-info = { workspace = true, features = [ "derive" ] } sp-api = { workspace = true } sp-block-builder = { workspace = true } sp-core = { workspace = true } sp-inherents = { workspace = true } -sp-io = { workspace = true } +sp-io = { workspace = true, features = [ "improved_panic_error_reporting" ] } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-weights = { workspace = true } # Frontier fp-evm = { workspace = true } fp-rpc = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = [ "serde" ] } pallet-base-fee = { workspace = true } pallet-ethereum = { workspace = true, features = [ "forbid-evm-reentrancy" ] } pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] } @@ -162,6 +164,7 @@ frame-try-runtime = { workspace = true, optional = true } [dev-dependencies] ethereum = { workspace = true } +frame-metadata = { workspace = true } hex = { workspace = true, features = [ "std" ] } sha3 = { workspace = true, features = [ "std" ] } @@ -169,6 +172,7 @@ cumulus-primitives-parachain-inherent = { workspace = true } cumulus-test-relay-sproof-builder = { workspace = true } pallet-message-queue = { workspace = true } +polkadot-runtime = { workspace = true } polkadot-runtime-parachains = { workspace = true } xcm-simulator = { workspace = true } @@ -263,7 +267,6 @@ std = [ "parity-scale-codec/std", "precompile-utils/std", "scale-info/std", - "serde", "session-keys-primitives/std", "sp-api/std", "sp-block-builder/std", @@ -332,6 +335,7 @@ runtime-benchmarks = [ "pallet-xcm-benchmarks", "pallet-xcm-transactor/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", + "polkadot-runtime/runtime-benchmarks", "session-keys-primitives/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index 1bf3691276..99130c5a78 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -75,6 +75,7 @@ pub use pallet_parachain_staking::{weights::WeightInfo, InflationInfo, Range}; use pallet_transaction_payment::{CurrencyAdapter, Multiplier, TargetedFeeAdjustment}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; +use serde::{Deserialize, Serialize}; use smallvec::smallvec; use sp_api::impl_runtime_apis; use sp_core::{OpaqueMetadata, H160, H256, U256}; @@ -236,15 +237,13 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Nonce = Index; /// The index type for blocks. - type BlockNumber = BlockNumber; + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -298,7 +297,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type FreezeIdentifier = (); type MaxFreezes = ConstU32<0>; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type MaxHolds = ConstU32<0>; type WeightInfo = moonbeam_weights::pallet_balances::WeightInfo; } @@ -814,9 +813,20 @@ impl pallet_author_mapping::Config for Runtime { } /// The type used to represent the kinds of proxying allowed. -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] #[derive( - Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, MaxEncodedLen, TypeInfo, + Copy, + Clone, + Eq, + PartialEq, + Ord, + PartialOrd, + Encode, + Decode, + Debug, + MaxEncodedLen, + TypeInfo, + Serialize, + Deserialize, )] pub enum ProxyType { /// All calls can be proxied. This is the trivial/most permissive filter. @@ -1346,36 +1356,33 @@ impl pallet_multisig::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub enum Runtime { // System support stuff. - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event} = 1, // Previously 2: pallet_randomness_collective_flip Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, + ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, RootTesting: pallet_root_testing::{Pallet, Call, Storage} = 5, // Monetary stuff. Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, // Consensus support. ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Event, Config} = 20, AuthorInherent: pallet_author_inherent::{Pallet, Call, Storage, Inherent} = 21, - AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 22, + AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 22, AuthorMapping: pallet_author_mapping::{Pallet, Call, Config, Storage, Event} = 23, MoonbeamOrbiters: pallet_moonbeam_orbiters::{Pallet, Call, Storage, Event} = 24, // Handy utilities. Utility: pallet_utility::{Pallet, Call, Event} = 30, Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 31, - MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 32, + MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 32, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 33, - Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 34, + Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 34, ProxyGenesisCompanion: pallet_proxy_genesis_companion::{Pallet, Config} = 35, Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 36, @@ -1383,9 +1390,9 @@ construct_runtime! { // Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 40, // Ethereum compatibility. - EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, // Governance stuff. Scheduler: pallet_scheduler::{Pallet, Storage, Event, Call} = 60, @@ -1407,7 +1414,7 @@ construct_runtime! { pallet_collective::::{Pallet, Call, Storage, Event, Origin, Config} = 73, // Treasury stuff. - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 80, + Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 80, // Crowdloan stuff. CrowdloanRewards: pallet_crowdloan_rewards::{Pallet, Call, Config, Storage, Event} = 90, @@ -1416,7 +1423,7 @@ construct_runtime! { XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Storage, Event} = 100, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 101, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 102, - PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, + PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 104, AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 105, XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 106, diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs index 92bbf7bef5..0339b78de5 100644 --- a/runtime/moonbeam/src/xcm_config.rs +++ b/runtime/moonbeam/src/xcm_config.rs @@ -23,33 +23,31 @@ use super::{ RuntimeEvent, RuntimeOrigin, Treasury, XcmpQueue, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, }; -use moonbeam_runtime_common::weights as moonbeam_weights; +use frame_support::{ + parameter_types, + traits::{EitherOfDiverse, Everything, Nothing, PalletInfoAccess}, +}; +use moonbeam_runtime_common::{weights as moonbeam_weights, xcm::AllowTopLevelPaidExecution}; use pallet_evm_precompileset_assets_erc20::AccountIdAssetIdConversion; use sp_runtime::{ traits::{Hash as THash, PostDispatchInfoOf}, DispatchErrorWithPostInfo, }; - -use frame_support::{ - dispatch::Weight, - parameter_types, - traits::{EitherOfDiverse, Everything, Nothing, PalletInfoAccess}, -}; +use sp_weights::Weight; use frame_system::{EnsureRoot, RawOrigin}; use sp_core::{ConstU32, H160, H256}; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, NoChecking, - ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, - WeightInfoBounds, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, + NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, UsingComponents, WeightInfoBounds, WithComputedOrigin, }; use xcm::latest::prelude::*; -use xcm_executor::traits::{CallDispatcher, JustTry}; +use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ @@ -114,12 +112,10 @@ pub type LocationToAccountId = ( /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`. pub struct LocationToH160; -impl xcm_executor::traits::Convert for LocationToH160 { - fn convert(location: MultiLocation) -> Result { - >::convert( - location, - ) - .map(Into::into) +impl ConvertLocation for LocationToH160 { + fn convert_location(location: &MultiLocation) -> Option { + >::convert_location(location) + .map(Into::into) } } @@ -239,7 +235,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -335,6 +331,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = SafeCallFilter; + type Aliasers = Nothing; } type XcmExecutor = pallet_erc20_xcm_bridge::XcmExecutorWrapper< @@ -493,7 +490,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: sp_runtime::traits::MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -501,7 +498,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), // No transactor matches this yet, so even if we have this enum variant the transfer will fail CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); @@ -670,12 +667,11 @@ mod testing { /// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code. impl From for CurrencyId { fn from(location: MultiLocation) -> CurrencyId { - use xcm_executor::traits::Convert as XConvert; use xcm_primitives::AssetTypeGetter; // If it does not exist, for benchmarking purposes, we create the association - let asset_id = if let Ok(asset_id) = - AsAssetType::::convert_ref(&location) + let asset_id = if let Some(asset_id) = + AsAssetType::::convert_location(&location) { asset_id } else { diff --git a/runtime/moonbeam/tests/common/mod.rs b/runtime/moonbeam/tests/common/mod.rs index d19e3f811f..068695603e 100644 --- a/runtime/moonbeam/tests/common/mod.rs +++ b/runtime/moonbeam/tests/common/mod.rs @@ -20,8 +20,7 @@ use cumulus_primitives_parachain_inherent::ParachainInherentData; use fp_evm::GenesisAccount; use frame_support::{ assert_ok, - dispatch::Dispatchable, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{OnFinalize, OnInitialize}, }; pub use moonbeam_runtime::{ asset_config::AssetRegistrarMetadata, @@ -34,7 +33,7 @@ pub use moonbeam_runtime::{ }; use nimbus_primitives::{NimbusId, NIMBUS_ENGINE_ID}; use sp_core::{Encode, H160}; -use sp_runtime::{Digest, DigestItem, Perbill, Percent}; +use sp_runtime::{traits::Dispatchable, BuildStorage, Digest, DigestItem, Perbill, Percent}; use std::collections::BTreeMap; @@ -232,8 +231,8 @@ impl ExtBuilder { } pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -266,35 +265,28 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_evm_chain_id::GenesisConfig { - chain_id: self.chain_id, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: self.evm_accounts, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_ethereum::GenesisConfig {}, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: self.safe_xcm_version, - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm_chain_id::GenesisConfig:: { + chain_id: self.chain_id, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: self.evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_ethereum::GenesisConfig:: { + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_xcm::GenesisConfig:: { + safe_xcm_version: self.safe_xcm_version, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); let local_assets = self.local_assets.clone(); diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs index 809dde9d3c..f37da4d480 100644 --- a/runtime/moonbeam/tests/integration_test.rs +++ b/runtime/moonbeam/tests/integration_test.rs @@ -24,7 +24,7 @@ use common::*; use fp_evm::{Context, IsPrecompileResult}; use frame_support::{ assert_noop, assert_ok, - dispatch::{DispatchClass, Dispatchable}, + dispatch::DispatchClass, traits::{ fungible::Inspect, Currency as CurrencyT, EnsureOrigin, PalletInfo, StorageInfo, StorageInfoTrait, @@ -58,12 +58,15 @@ use precompile_utils::{ }; use sha3::{Digest, Keccak256}; use sp_core::{ByteArray, Pair, H160, U256}; -use sp_runtime::{traits::Convert, DispatchError, ModuleError}; +use sp_runtime::{ + traits::{Convert, Dispatchable}, + BuildStorage, DispatchError, ModuleError, +}; use std::str::from_utf8; use xcm::latest::prelude::*; use xcm::{VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation}; use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; -use xcm_executor::traits::Convert as XcmConvert; +use xcm_executor::traits::ConvertLocation; type BatchPCall = pallet_evm_precompile_batch::BatchPrecompileCall; type CrowdloanRewardsPCall = @@ -506,7 +509,7 @@ fn verify_pallet_indices() { #[test] fn verify_reserved_indices() { - use frame_support::metadata::*; + use frame_metadata::*; let metadata = moonbeam_runtime::Runtime::metadata(); let metadata = match metadata.1 { RuntimeMetadata::V14(metadata) => metadata, @@ -1328,8 +1331,8 @@ fn run_with_system_weight(w: Weight, mut assertions: F) where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2402,7 +2405,7 @@ fn test_xcm_utils_ml_tp_account() { ExtBuilder::default().build().execute_with(|| { let xcm_utils_precompile_address = H160::from_low_u64_be(2060); let expected_address_parent: H160 = - ParentIsPreset::::convert_ref(MultiLocation::parent()) + ParentIsPreset::::convert_location(&MultiLocation::parent()) .unwrap() .into(); @@ -2420,8 +2423,8 @@ fn test_xcm_utils_ml_tp_account() { let parachain_2000_multilocation = MultiLocation::new(1, X1(Parachain(2000))); let expected_address_parachain: H160 = - SiblingParachainConvertsVia::::convert_ref( - parachain_2000_multilocation.clone(), + SiblingParachainConvertsVia::::convert_location( + ¶chain_2000_multilocation, ) .unwrap() .into(); @@ -2449,8 +2452,8 @@ fn test_xcm_utils_ml_tp_account() { ), ); let expected_address_alice_in_parachain_2000: H160 = - xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - alice_in_parachain_2000_multilocation.clone(), + xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &alice_in_parachain_2000_multilocation, ) .unwrap() .into(); @@ -2742,8 +2745,8 @@ mod fee_tests { where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2793,8 +2796,8 @@ mod fee_tests { )) + LengthToFeeImpl::weight_to_fee(&Weight::from_parts(extrinsic_len as u64, 1)) + tip; - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { diff --git a/runtime/moonbeam/tests/xcm_mock/mod.rs b/runtime/moonbeam/tests/xcm_mock/mod.rs index fc93f07cdb..df8dc5609e 100644 --- a/runtime/moonbeam/tests/xcm_mock/mod.rs +++ b/runtime/moonbeam/tests/xcm_mock/mod.rs @@ -20,7 +20,7 @@ pub mod statemint_like; use cumulus_primitives_core::ParaId; use sp_runtime::traits::AccountIdConversion; -use sp_runtime::AccountId32; +use sp_runtime::{AccountId32, BuildStorage}; use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; use polkadot_runtime_parachains::configuration::{ @@ -140,8 +140,8 @@ pub const INITIAL_EVM_NONCE: u32 = 1; pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { use parachain::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -164,13 +164,11 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { }, ); - frame_support::traits::GenesisBuild::::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: evm_accounts, - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { @@ -183,8 +181,8 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { pub fn statemint_ext(para_id: u32) -> sp_io::TestExternalities { use statemint_like::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -204,8 +202,8 @@ pub fn statemint_ext(para_id: u32) -> sp_io::TestExternalities { pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { use relay_chain::{Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -219,21 +217,16 @@ pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { .map(|¶_id| (para_id.into(), mock_para_genesis_info())) .collect(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ConfigurationGenesisConfig { - config: mock_relay_config(), - }, - &mut t, - ) - .unwrap(); + let genesis_config = ConfigurationGenesisConfig:: { + config: mock_relay_config(), + }; + genesis_config.assimilate_storage(&mut t).unwrap(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ParasGenesisConfig { - paras: para_genesis, - }, - &mut t, - ) - .unwrap(); + let genesis_config = ParasGenesisConfig:: { + paras: para_genesis, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs index e2a87451d0..3d6ec8ece0 100644 --- a/runtime/moonbeam/tests/xcm_mock/parachain.rs +++ b/runtime/moonbeam/tests/xcm_mock/parachain.rs @@ -17,7 +17,6 @@ //! Parachain runtime mock. use frame_support::{ - codec::MaxEncodedLen, construct_runtime, dispatch::GetDispatchInfo, ensure, parameter_types, @@ -29,12 +28,14 @@ use frame_support::{ }; use cumulus_primitives_core::relay_chain::HrmpChannelId; -use frame_system::{EnsureNever, EnsureRoot}; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureNever, EnsureRoot}; +use moonbeam_runtime_common::xcm::AllowTopLevelPaidExecution; use orml_traits::parameter_type_with_key; -use parity_scale_codec::{Decode, Encode}; +use pallet_xcm::migration::v1::VersionUncheckedMigrateToV1; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, Hash, IdentityLookup, Zero}, + traits::{BlakeTwo256, Hash, IdentityLookup, MaybeEquivalence, Zero}, Permill, }; use sp_std::{convert::TryFrom, prelude::*}; @@ -49,12 +50,12 @@ use xcm::latest::{ Junctions, MultiLocation, NetworkId, Outcome, Xcm, }; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, - FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, + FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, + ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, WithComputedOrigin, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -67,7 +68,7 @@ use xcm_simulator::{ pub type AccountId = moonbeam_core_primitives::AccountId; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -76,13 +77,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -116,7 +116,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -311,7 +311,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -407,6 +407,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } impl cumulus_pallet_xcm::Config for Runtime { @@ -427,7 +428,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -435,7 +436,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); location.push_interior(Junction::GeneralIndex(asset)).ok(); @@ -1156,34 +1157,29 @@ impl pallet_ethereum_xcm::Config for Runtime { type ControllerOrigin = EnsureRoot; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - XcmVersioner: mock_version_changer::{Pallet, Storage, Event}, - - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event}, - AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event}, - XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event}, - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call}, - LocalAssets: pallet_assets::::{Pallet, Call, Storage, Event}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, - - Timestamp: pallet_timestamp::{Pallet, Call, Storage}, - EVM: pallet_evm::{Pallet, Call, Storage, Config, Event}, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config}, - EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + MsgQueue: mock_msg_queue, + XcmVersioner: mock_version_changer, + + PolkadotXcm: pallet_xcm, + Assets: pallet_assets, + CumulusXcm: cumulus_pallet_xcm, + XTokens: orml_xtokens, + AssetManager: pallet_asset_manager, + XcmTransactor: pallet_xcm_transactor, + Treasury: pallet_treasury, + LocalAssets: pallet_assets::, + Proxy: pallet_proxy, + + Timestamp: pallet_timestamp, + EVM: pallet_evm, + Ethereum: pallet_ethereum, + EthereumXcm: pallet_ethereum_xcm, } ); @@ -1197,7 +1193,7 @@ pub(crate) fn para_events() -> Vec { use frame_support::traits::{OnFinalize, OnInitialize, OnRuntimeUpgrade}; pub(crate) fn on_runtime_upgrade() { - PolkadotXcm::on_runtime_upgrade(); + VersionUncheckedMigrateToV1::::on_runtime_upgrade(); } pub(crate) fn para_roll_to(n: BlockNumber) { diff --git a/runtime/moonbeam/tests/xcm_mock/relay_chain.rs b/runtime/moonbeam/tests/xcm_mock/relay_chain.rs index 352b60ae3a..9e83f51424 100644 --- a/runtime/moonbeam/tests/xcm_mock/relay_chain.rs +++ b/runtime/moonbeam/tests/xcm_mock/relay_chain.rs @@ -20,9 +20,10 @@ use frame_support::{ construct_runtime, parameter_types, traits::{Everything, Nothing, ProcessMessage, ProcessMessageError}, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, IdentityLookup}, + traits::{ConstU32, IdentityLookup}, AccountId32, }; @@ -46,7 +47,7 @@ use xcm_builder::{ use xcm_executor::{Config, XcmExecutor}; pub type AccountId = AccountId32; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -55,13 +56,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -95,7 +95,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -191,6 +191,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub type LocalOriginToLocation = SignedToAccountId32; @@ -261,6 +262,7 @@ impl paras::Config for Runtime { type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; type QueueFootprinter = (); + type OnNewHead = (); } impl dmp::Config for Runtime {} @@ -270,6 +272,7 @@ impl hrmp::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type WeightInfo = TestHrmpWeightInfo; + type ChannelManager = frame_system::EnsureRoot; } impl frame_system::offchain::SendTransactionTypes for Runtime @@ -283,7 +286,7 @@ where impl origin::Config for Runtime {} type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; parameter_types! { pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000); @@ -322,24 +325,21 @@ impl pallet_message_queue::Config for Runtime { type MessageProcessor = MessageProcessor; type QueueChangeHandler = (); type WeightInfo = (); + type QueuePausedQuery = (); } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ParasOrigin: origin::{Pallet, Origin}, - MessageQueue: pallet_message_queue::{Pallet, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - Utility: pallet_utility::{Pallet, Call, Event}, - Hrmp: hrmp::{Pallet, Call, Storage, Event, Config}, - Dmp: dmp::{Pallet, Storage}, - Paras: paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned}, - Configuration: configuration::{Pallet, Call, Storage, Config}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + ParasOrigin: origin, + MessageQueue: pallet_message_queue, + XcmPallet: pallet_xcm, + Utility: pallet_utility, + Hrmp: hrmp, + Dmp: dmp, + Paras: paras, + Configuration: configuration, } ); @@ -392,7 +392,7 @@ impl hrmp::WeightInfo for TestHrmpWeightInfo { fn clean_open_channel_requests(_: u32) -> Weight { Weight::from_parts(1, 0) } - fn force_open_hrmp_channel() -> Weight { + fn force_open_hrmp_channel(_: u32) -> Weight { Weight::from_parts(1, 0) } } diff --git a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs index 38232a157b..8fb27ffb3a 100644 --- a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs @@ -25,7 +25,7 @@ use frame_system::{EnsureRoot, EnsureSigned}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, Hash, IdentityLookup}, + traits::{ConstU32, Hash, IdentityLookup}, AccountId32, }; @@ -52,7 +52,6 @@ use xcm_simulator::{ pub type AccountId = AccountId32; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -61,13 +60,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -101,7 +99,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -303,6 +301,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -537,21 +536,16 @@ impl mock_statemint_prefix::Config for Runtime { type RuntimeEvent = RuntimeEvent; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - Assets: pallet_assets::{Pallet, Storage, Event}, - PrefixChanger: mock_statemint_prefix::{Pallet, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + PolkadotXcm: pallet_xcm, + CumulusXcm: cumulus_pallet_xcm, + MsgQueue: mock_msg_queue, + Assets: pallet_assets, + PrefixChanger: mock_statemint_prefix, } ); diff --git a/runtime/moonbeam/tests/xcm_tests.rs b/runtime/moonbeam/tests/xcm_tests.rs index 78936ad0cc..fb134dc36f 100644 --- a/runtime/moonbeam/tests/xcm_tests.rs +++ b/runtime/moonbeam/tests/xcm_tests.rs @@ -33,7 +33,7 @@ use sp_core::ConstU32; use xcm::latest::prelude::*; use xcm::{VersionedMultiLocation, WrapVersion}; use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal; -use xcm_executor::traits::Convert; +use xcm_executor::traits::ConvertLocation; use xcm_mock::parachain; use xcm_mock::relay_chain; use xcm_mock::*; @@ -1117,9 +1117,9 @@ fn transact_through_derivative_with_custom_fee_weight() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1270,9 +1270,9 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1838,13 +1838,13 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { }); let expected_supported_version: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 1, - ) + version: 1, + } .into(); Relay::execute_with(|| { @@ -1852,17 +1852,6 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { assert!(relay_chain::relay_events().contains(&expected_supported_version)); }); - let expected_version_notified: parachain::RuntimeEvent = - pallet_xcm::Event::VersionChangeNotified( - MultiLocation { - parents: 1, - interior: Here, - }, - 2, - vec![].into(), - ) - .into(); - // ParaA changes version to 2, and calls on_runtime_upgrade. This should notify the targets // of the new version change ParaA::execute_with(|| { @@ -1873,18 +1862,24 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { // Initialize block, to call on_initialize and notify targets parachain::para_roll_to(2); // Expect the event in the parachain - assert!(parachain::para_events().contains(&expected_version_notified)); + assert!(parachain::para_events().iter().any(|e| matches!( + e, + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::VersionChangeNotified { + result: 2, + .. + }) + ))); }); // This event should have been seen in the relay let expected_supported_version_2: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 2, - ) + version: 2, + } .into(); Relay::execute_with(|| { @@ -2194,7 +2189,7 @@ fn test_statemint_like() { let sov = xcm_builder::SiblingParachainConvertsVia::< polkadot_parachain::primitives::Sibling, statemint_like::AccountId, - >::convert_ref(dest_para) + >::convert_location(&dest_para) .unwrap(); let statemint_asset_a_balances = MultiLocation::new( @@ -2570,7 +2565,7 @@ fn transact_through_signed_multilocation() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -2660,7 +2655,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -2751,7 +2746,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight_refund() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -2862,10 +2857,11 @@ fn transact_through_signed_multilocation_para_to_para() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -2960,10 +2956,11 @@ fn transact_through_signed_multilocation_para_to_para_refund() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -3072,10 +3069,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3199,10 +3197,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3322,10 +3321,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let transfer_recipient = evm_account(); let mut transfer_recipient_balance_before = 0; diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml index 3b0bd2d4a2..f39b51950c 100644 --- a/runtime/moonriver/Cargo.toml +++ b/runtime/moonriver/Cargo.toml @@ -13,7 +13,7 @@ hex-literal = { workspace = true, optional = true } log = { workspace = true } num_enum = { workspace = true } rlp = { workspace = true, optional = true } -serde = { workspace = true, optional = true, features = [ "derive" ] } +serde = { workspace = true, features = [ "derive" ] } sha3 = { workspace = true, optional = true } smallvec = { workspace = true } strum = { workspace = true } @@ -99,6 +99,7 @@ pallet-whitelist = { workspace = true } parity-scale-codec = { workspace = true, features = [ "derive", "max-encoded-len", + "chain-error", ] } scale-info = { workspace = true, features = [ "derive" ] } sp-api = { workspace = true } @@ -106,18 +107,19 @@ sp-block-builder = { workspace = true } sp-core = { workspace = true } sp-debug-derive = { workspace = true } sp-inherents = { workspace = true } -sp-io = { workspace = true } +sp-io = { workspace = true, features = [ "improved_panic_error_reporting" ] } sp-offchain = { workspace = true } sp-runtime = { workspace = true } sp-session = { workspace = true } sp-std = { workspace = true } sp-transaction-pool = { workspace = true } sp-version = { workspace = true } +sp-weights = { workspace = true } # Frontier fp-evm = { workspace = true } fp-rpc = { workspace = true } -fp-self-contained = { workspace = true } +fp-self-contained = { workspace = true, features = [ "serde" ] } pallet-base-fee = { workspace = true } pallet-ethereum = { workspace = true, features = [ "forbid-evm-reentrancy" ] } pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] } @@ -163,6 +165,7 @@ frame-try-runtime = { workspace = true, optional = true } [dev-dependencies] ethereum = { workspace = true } +frame-metadata = { workspace = true } hex = { workspace = true, features = [ "std" ] } sha3 = { workspace = true, features = [ "std" ] } @@ -262,7 +265,6 @@ std = [ "parity-scale-codec/std", "precompile-utils/std", "scale-info/std", - "serde", "session-keys-primitives/std", "sp-api/std", "sp-block-builder/std", diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 79ce4bb832..82c2fd0307 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -80,6 +80,7 @@ use sp_core::{OpaqueMetadata, H160, H256, U256}; use sp_runtime::TryRuntimeError; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, + serde::{Deserialize, Serialize}, traits::{ BlakeTwo256, Block as BlockT, DispatchInfoOf, Dispatchable, IdentityLookup, PostDispatchInfoOf, UniqueSaturatedInto, Zero, @@ -237,15 +238,13 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Nonce = Index; /// The index type for blocks. - type BlockNumber = BlockNumber; - /// The type for hashing blocks and tries. - type Hash = Hash; + type Block = Block; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The output of the `Hashing` function. + type Hash = H256; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -299,7 +298,7 @@ impl pallet_balances::Config for Runtime { type AccountStore = System; type FreezeIdentifier = (); type MaxFreezes = ConstU32<0>; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type MaxHolds = ConstU32<0>; type WeightInfo = moonbeam_weights::pallet_balances::WeightInfo; } @@ -818,9 +817,20 @@ impl pallet_author_mapping::Config for Runtime { } /// The type used to represent the kinds of proxying allowed. -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] #[derive( - Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, MaxEncodedLen, TypeInfo, + Copy, + Clone, + Eq, + PartialEq, + Ord, + PartialOrd, + Encode, + Decode, + Debug, + MaxEncodedLen, + TypeInfo, + Serialize, + Deserialize, )] pub enum ProxyType { /// All calls can be proxied. This is the trivial/most permissive filter. @@ -1357,45 +1367,42 @@ impl pallet_multisig::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub enum Runtime { // System support stuff. - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event} = 1, // Previously 2: pallet_randomness_collective_flip Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, + ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, RootTesting: pallet_root_testing::{Pallet, Call, Storage} = 5, // Monetary stuff. Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 11, // Consensus support. ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Event, Config} = 20, AuthorInherent: pallet_author_inherent::{Pallet, Call, Storage, Inherent} = 21, - AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 22, + AuthorFilter: pallet_author_slot_filter::{Pallet, Call, Storage, Event, Config} = 22, AuthorMapping: pallet_author_mapping::{Pallet, Call, Config, Storage, Event} = 23, MoonbeamOrbiters: pallet_moonbeam_orbiters::{Pallet, Call, Storage, Event} = 24, // Handy utilities. Utility: pallet_utility::{Pallet, Call, Event} = 30, Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 31, - MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 32, + MaintenanceMode: pallet_maintenance_mode::{Pallet, Call, Config, Storage, Event} = 32, Identity: pallet_identity::{Pallet, Call, Storage, Event} = 33, - Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 34, + Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 34, ProxyGenesisCompanion: pallet_proxy_genesis_companion::{Pallet, Config} = 35, Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 36, // Sudo was previously index 40 // Ethereum compatibility - EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, - EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, // Governance stuff. Scheduler: pallet_scheduler::{Pallet, Storage, Event, Call} = 60, @@ -1417,7 +1424,7 @@ construct_runtime! { pallet_collective::::{Pallet, Call, Storage, Event, Origin, Config} = 73, // Treasury stuff. - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 80, + Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call} = 80, // Crowdloan stuff. CrowdloanRewards: pallet_crowdloan_rewards::{Pallet, Call, Config, Storage, Event} = 90, @@ -1426,7 +1433,7 @@ construct_runtime! { XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Storage, Event} = 100, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 101, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 102, - PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, + PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 104, AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 105, XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 106, diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs index c5b3774085..6c1c67cc7d 100644 --- a/runtime/moonriver/src/xcm_config.rs +++ b/runtime/moonriver/src/xcm_config.rs @@ -23,33 +23,31 @@ use super::{ RuntimeEvent, RuntimeOrigin, Treasury, XcmpQueue, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, }; -use moonbeam_runtime_common::weights as moonbeam_weights; -use pallet_evm_precompileset_assets_erc20::AccountIdAssetIdConversion; -use sp_runtime::{ - traits::{Hash as THash, PostDispatchInfoOf}, - DispatchErrorWithPostInfo, -}; - use frame_support::{ - dispatch::Weight, parameter_types, traits::{EitherOfDiverse, Everything, Nothing, PalletInfoAccess}, }; +use moonbeam_runtime_common::{weights as moonbeam_weights, xcm::AllowTopLevelPaidExecution}; +use pallet_evm_precompileset_assets_erc20::AccountIdAssetIdConversion; +use sp_runtime::{ + traits::{Hash as THash, MaybeEquivalence, PostDispatchInfoOf}, + DispatchErrorWithPostInfo, +}; +use sp_weights::Weight; use frame_system::{EnsureRoot, RawOrigin}; use sp_core::{ConstU32, H160, H256}; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, NoChecking, - ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, - WeightInfoBounds, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FungiblesAdapter, + NoChecking, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, UsingComponents, WeightInfoBounds, WithComputedOrigin, }; use xcm::latest::prelude::*; -use xcm_executor::traits::{CallDispatcher, JustTry}; +use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ @@ -116,12 +114,10 @@ pub type LocationToAccountId = ( /// Wrapper type around `LocationToAccountId` to convert an `AccountId` to type `H160`. pub struct LocationToH160; -impl xcm_executor::traits::Convert for LocationToH160 { - fn convert(location: MultiLocation) -> Result { - >::convert( - location, - ) - .map(Into::into) +impl ConvertLocation for LocationToH160 { + fn convert_location(location: &MultiLocation) -> Option { + >::convert_location(location) + .map(Into::into) } } @@ -247,7 +243,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -343,6 +339,7 @@ impl xcm_executor::Config for XcmExecutorConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = SafeCallFilter; + type Aliasers = Nothing; } type XcmExecutor = pallet_erc20_xcm_bridge::XcmExecutorWrapper< @@ -502,7 +499,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -515,7 +512,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); location.push_interior(Junction::GeneralIndex(asset)).ok(); @@ -682,12 +679,11 @@ mod testing { /// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code. impl From for CurrencyId { fn from(location: MultiLocation) -> CurrencyId { - use xcm_executor::traits::Convert as XConvert; use xcm_primitives::AssetTypeGetter; // If it does not exist, for benchmarking purposes, we create the association - let asset_id = if let Ok(asset_id) = - AsAssetType::::convert_ref(&location) + let asset_id = if let Some(asset_id) = + AsAssetType::::convert_location(&location) { asset_id } else { diff --git a/runtime/moonriver/tests/common/mod.rs b/runtime/moonriver/tests/common/mod.rs index 2634cb500a..8c20a49b11 100644 --- a/runtime/moonriver/tests/common/mod.rs +++ b/runtime/moonriver/tests/common/mod.rs @@ -20,8 +20,7 @@ use cumulus_primitives_parachain_inherent::ParachainInherentData; use fp_evm::GenesisAccount; use frame_support::{ assert_ok, - dispatch::Dispatchable, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{OnFinalize, OnInitialize}, }; pub use moonriver_runtime::{ asset_config::AssetRegistrarMetadata, @@ -34,7 +33,7 @@ pub use moonriver_runtime::{ }; use nimbus_primitives::{NimbusId, NIMBUS_ENGINE_ID}; use sp_core::{Encode, H160}; -use sp_runtime::{Digest, DigestItem, Perbill, Percent}; +use sp_runtime::{traits::Dispatchable, BuildStorage, Digest, DigestItem, Perbill, Percent}; use std::collections::BTreeMap; @@ -233,8 +232,8 @@ impl ExtBuilder { } pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -267,43 +266,34 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_evm_chain_id::GenesisConfig { - chain_id: self.chain_id, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: self.evm_accounts, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_ethereum::GenesisConfig {}, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: self.safe_xcm_version, - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_transaction_payment::GenesisConfig { - multiplier: Multiplier::from(10u128), - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm_chain_id::GenesisConfig:: { + chain_id: self.chain_id, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: self.evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_ethereum::GenesisConfig:: { + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_xcm::GenesisConfig:: { + safe_xcm_version: self.safe_xcm_version, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); + + let genesis_config = pallet_transaction_payment::GenesisConfig:: { + multiplier: Multiplier::from(10u128), + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); let local_assets = self.local_assets.clone(); diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs index 0a8c96e037..feb2b0417d 100644 --- a/runtime/moonriver/tests/integration_test.rs +++ b/runtime/moonriver/tests/integration_test.rs @@ -24,7 +24,7 @@ use common::*; use fp_evm::{Context, IsPrecompileResult}; use frame_support::{ assert_noop, assert_ok, - dispatch::{DispatchClass, Dispatchable}, + dispatch::DispatchClass, traits::{ fungible::Inspect, Currency as CurrencyT, EnsureOrigin, PalletInfo, StorageInfo, StorageInfoTrait, @@ -56,12 +56,15 @@ use precompile_utils::{ }; use sha3::{Digest, Keccak256}; use sp_core::{ByteArray, Pair, H160, U256}; -use sp_runtime::{traits::Convert, DispatchError, ModuleError}; +use sp_runtime::{ + traits::{Convert, Dispatchable}, + BuildStorage, DispatchError, ModuleError, +}; use std::str::from_utf8; use xcm::latest::prelude::*; use xcm::{VersionedMultiAssets, VersionedMultiLocation}; use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; -use xcm_executor::traits::Convert as XcmConvert; +use xcm_executor::traits::ConvertLocation; type BatchPCall = pallet_evm_precompile_batch::BatchPrecompileCall; type CrowdloanRewardsPCall = @@ -504,7 +507,7 @@ fn verify_pallet_indices() { #[test] fn verify_reserved_indices() { - use frame_support::metadata::*; + use frame_metadata::*; let metadata = moonriver_runtime::Runtime::metadata(); let metadata = match metadata.1 { RuntimeMetadata::V14(metadata) => metadata, @@ -1304,8 +1307,8 @@ fn run_with_system_weight(w: Weight, mut assertions: F) where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2308,7 +2311,7 @@ fn test_xcm_utils_ml_tp_account() { ExtBuilder::default().build().execute_with(|| { let xcm_utils_precompile_address = H160::from_low_u64_be(2060); let expected_address_parent: H160 = - ParentIsPreset::::convert_ref(MultiLocation::parent()) + ParentIsPreset::::convert_location(&MultiLocation::parent()) .unwrap() .into(); @@ -2326,8 +2329,8 @@ fn test_xcm_utils_ml_tp_account() { let parachain_2000_multilocation = MultiLocation::new(1, X1(Parachain(2000))); let expected_address_parachain: H160 = - SiblingParachainConvertsVia::::convert_ref( - parachain_2000_multilocation.clone(), + SiblingParachainConvertsVia::::convert_location( + ¶chain_2000_multilocation, ) .unwrap() .into(); @@ -2355,8 +2358,8 @@ fn test_xcm_utils_ml_tp_account() { ), ); let expected_address_alice_in_parachain_2000: H160 = - xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - alice_in_parachain_2000_multilocation.clone(), + xcm_builder::HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &alice_in_parachain_2000_multilocation, ) .unwrap() .into(); @@ -2647,8 +2650,8 @@ mod fee_tests { where F: FnMut() -> (), { - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { @@ -2696,8 +2699,8 @@ mod fee_tests { + LengthToFeeImpl::weight_to_fee(&(Weight::from_parts(extrinsic_len as u64, 1))) + tip; - let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default() - .build_storage::() + let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::::default() + .build_storage() .unwrap() .into(); t.execute_with(|| { diff --git a/runtime/moonriver/tests/xcm_mock/mod.rs b/runtime/moonriver/tests/xcm_mock/mod.rs index ec73a70562..da2dd942d9 100644 --- a/runtime/moonriver/tests/xcm_mock/mod.rs +++ b/runtime/moonriver/tests/xcm_mock/mod.rs @@ -20,7 +20,7 @@ pub mod statemine_like; use cumulus_primitives_core::ParaId; use sp_runtime::traits::AccountIdConversion; -use sp_runtime::AccountId32; +use sp_runtime::{AccountId32, BuildStorage}; use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; use polkadot_runtime_parachains::configuration::{ @@ -140,8 +140,8 @@ pub const INITIAL_EVM_NONCE: u32 = 1; pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { use parachain::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -164,13 +164,11 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { }, ); - frame_support::traits::GenesisBuild::::assimilate_storage( - &pallet_evm::GenesisConfig { - accounts: evm_accounts, - }, - &mut t, - ) - .unwrap(); + let genesis_config = pallet_evm::GenesisConfig:: { + accounts: evm_accounts, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { @@ -183,8 +181,8 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { pub fn statemine_ext(para_id: u32) -> sp_io::TestExternalities { use statemine_like::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -204,8 +202,8 @@ pub fn statemine_ext(para_id: u32) -> sp_io::TestExternalities { pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { use relay_chain::{Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -219,21 +217,16 @@ pub fn relay_ext(paras: Vec) -> sp_io::TestExternalities { .map(|¶_id| (para_id.into(), mock_para_genesis_info())) .collect(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ConfigurationGenesisConfig { - config: mock_relay_config(), - }, - &mut t, - ) - .unwrap(); + let genesis_config = ConfigurationGenesisConfig:: { + config: mock_relay_config(), + }; + genesis_config.assimilate_storage(&mut t).unwrap(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &ParasGenesisConfig { - paras: para_genesis, - }, - &mut t, - ) - .unwrap(); + let genesis_config = ParasGenesisConfig:: { + paras: para_genesis, + ..Default::default() + }; + genesis_config.assimilate_storage(&mut t).unwrap(); let mut ext = sp_io::TestExternalities::new(t); ext.execute_with(|| { diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs index c3ac50063a..d4cdddb21e 100644 --- a/runtime/moonriver/tests/xcm_mock/parachain.rs +++ b/runtime/moonriver/tests/xcm_mock/parachain.rs @@ -17,7 +17,6 @@ //! Parachain runtime mock. use frame_support::{ - codec::MaxEncodedLen, construct_runtime, dispatch::GetDispatchInfo, ensure, parameter_types, @@ -27,11 +26,13 @@ use frame_support::{ weights::Weight, PalletId, }; -use frame_system::{EnsureNever, EnsureRoot}; -use parity_scale_codec::{Decode, Encode}; +use frame_system::{pallet_prelude::BlockNumberFor, EnsureNever, EnsureRoot}; +use moonbeam_runtime_common::xcm::AllowTopLevelPaidExecution; +use pallet_xcm::migration::v1::VersionUncheckedMigrateToV1; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, Hash, IdentityLookup, Zero}, + traits::{BlakeTwo256, Hash, IdentityLookup, MaybeEquivalence, Zero}, Permill, }; use sp_std::{convert::TryFrom, prelude::*}; @@ -48,12 +49,12 @@ use xcm::latest::{ Junctions, MultiLocation, NetworkId, Outcome, Xcm, }; use xcm_builder::{ - AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, - FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountKey20AsNative, SovereignSignedViaLocation, TakeWeightCredit, WithComputedOrigin, + AccountKey20Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AsPrefixedGeneralIndex, + ConvertedConcreteId, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, + FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, + ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + SiblingParachainConvertsVia, SignedAccountKey20AsNative, SovereignSignedViaLocation, + TakeWeightCredit, WithComputedOrigin, }; use xcm_executor::{traits::JustTry, Config, XcmExecutor}; @@ -66,7 +67,7 @@ use xcm_simulator::{ pub type AccountId = moonbeam_core_primitives::AccountId; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -75,13 +76,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -115,7 +115,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -311,7 +311,7 @@ pub type XcmBarrier = ( WithComputedOrigin< ( // If the message is one that immediately attemps to pay for execution, then allow it. - AllowTopLevelPaidExecutionFrom, + AllowTopLevelPaidExecution, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, ), @@ -415,6 +415,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } impl cumulus_pallet_xcm::Config for Runtime { @@ -435,7 +436,7 @@ pub struct CurrencyIdtoMultiLocation(sp_std::marker::PhantomDat impl sp_runtime::traits::Convert> for CurrencyIdtoMultiLocation where - AssetXConverter: xcm_executor::traits::Convert, + AssetXConverter: MaybeEquivalence, { fn convert(currency: CurrencyId) -> Option { match currency { @@ -448,7 +449,7 @@ where let multi: MultiLocation = SelfReserve::get(); Some(multi) } - CurrencyId::ForeignAsset(asset) => AssetXConverter::reverse_ref(asset).ok(), + CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset), CurrencyId::LocalAssetReserve(asset) => { let mut location = LocalAssetsPalletLocation::get(); location.push_interior(Junction::GeneralIndex(asset)).ok(); @@ -1166,34 +1167,29 @@ impl pallet_ethereum_xcm::Config for Runtime { type ControllerOrigin = EnsureRoot; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - XcmVersioner: mock_version_changer::{Pallet, Storage, Event}, - - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event}, - AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event}, - XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event}, - Treasury: pallet_treasury::{Pallet, Storage, Config, Event, Call}, - LocalAssets: pallet_assets::::{Pallet, Call, Storage, Event}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, - - Timestamp: pallet_timestamp::{Pallet, Call, Storage}, - EVM: pallet_evm::{Pallet, Call, Storage, Config, Event}, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config}, - EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Origin}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + MsgQueue: mock_msg_queue, + XcmVersioner: mock_version_changer, + + PolkadotXcm: pallet_xcm, + Assets: pallet_assets, + CumulusXcm: cumulus_pallet_xcm, + XTokens: orml_xtokens, + AssetManager: pallet_asset_manager, + XcmTransactor: pallet_xcm_transactor, + Treasury: pallet_treasury, + LocalAssets: pallet_assets::, + Proxy: pallet_proxy, + + Timestamp: pallet_timestamp, + EVM: pallet_evm, + Ethereum: pallet_ethereum, + EthereumXcm: pallet_ethereum_xcm, } ); @@ -1207,7 +1203,7 @@ pub(crate) fn para_events() -> Vec { use frame_support::traits::{OnFinalize, OnInitialize, OnRuntimeUpgrade}; pub(crate) fn on_runtime_upgrade() { - PolkadotXcm::on_runtime_upgrade(); + VersionUncheckedMigrateToV1::::on_runtime_upgrade(); } pub(crate) fn para_roll_to(n: BlockNumber) { diff --git a/runtime/moonriver/tests/xcm_mock/relay_chain.rs b/runtime/moonriver/tests/xcm_mock/relay_chain.rs index 352b60ae3a..9e83f51424 100644 --- a/runtime/moonriver/tests/xcm_mock/relay_chain.rs +++ b/runtime/moonriver/tests/xcm_mock/relay_chain.rs @@ -20,9 +20,10 @@ use frame_support::{ construct_runtime, parameter_types, traits::{Everything, Nothing, ProcessMessage, ProcessMessageError}, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, IdentityLookup}, + traits::{ConstU32, IdentityLookup}, AccountId32, }; @@ -46,7 +47,7 @@ use xcm_builder::{ use xcm_executor::{Config, XcmExecutor}; pub type AccountId = AccountId32; pub type Balance = u128; -pub type BlockNumber = u32; +pub type BlockNumber = BlockNumberFor; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -55,13 +56,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -95,7 +95,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -191,6 +191,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub type LocalOriginToLocation = SignedToAccountId32; @@ -261,6 +262,7 @@ impl paras::Config for Runtime { type UnsignedPriority = ParasUnsignedPriority; type NextSessionRotation = TestNextSessionRotation; type QueueFootprinter = (); + type OnNewHead = (); } impl dmp::Config for Runtime {} @@ -270,6 +272,7 @@ impl hrmp::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type WeightInfo = TestHrmpWeightInfo; + type ChannelManager = frame_system::EnsureRoot; } impl frame_system::offchain::SendTransactionTypes for Runtime @@ -283,7 +286,7 @@ where impl origin::Config for Runtime {} type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; parameter_types! { pub MessageQueueServiceWeight: Weight = Weight::from_parts(1_000_000_000, 1_000_000); @@ -322,24 +325,21 @@ impl pallet_message_queue::Config for Runtime { type MessageProcessor = MessageProcessor; type QueueChangeHandler = (); type WeightInfo = (); + type QueuePausedQuery = (); } construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ParasOrigin: origin::{Pallet, Origin}, - MessageQueue: pallet_message_queue::{Pallet, Event}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - Utility: pallet_utility::{Pallet, Call, Event}, - Hrmp: hrmp::{Pallet, Call, Storage, Event, Config}, - Dmp: dmp::{Pallet, Storage}, - Paras: paras::{Pallet, Call, Storage, Event, Config, ValidateUnsigned}, - Configuration: configuration::{Pallet, Call, Storage, Config}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + ParasOrigin: origin, + MessageQueue: pallet_message_queue, + XcmPallet: pallet_xcm, + Utility: pallet_utility, + Hrmp: hrmp, + Dmp: dmp, + Paras: paras, + Configuration: configuration, } ); @@ -392,7 +392,7 @@ impl hrmp::WeightInfo for TestHrmpWeightInfo { fn clean_open_channel_requests(_: u32) -> Weight { Weight::from_parts(1, 0) } - fn force_open_hrmp_channel() -> Weight { + fn force_open_hrmp_channel(_: u32) -> Weight { Weight::from_parts(1, 0) } } diff --git a/runtime/moonriver/tests/xcm_mock/statemine_like.rs b/runtime/moonriver/tests/xcm_mock/statemine_like.rs index b6197daa55..b0223afe79 100644 --- a/runtime/moonriver/tests/xcm_mock/statemine_like.rs +++ b/runtime/moonriver/tests/xcm_mock/statemine_like.rs @@ -25,7 +25,7 @@ use frame_system::{EnsureRoot, EnsureSigned}; use sp_core::H256; use sp_runtime::{ - traits::{BlakeTwo256, ConstU32, Hash, IdentityLookup}, + traits::{ConstU32, Hash, IdentityLookup}, AccountId32, }; @@ -52,7 +52,6 @@ use xcm_simulator::{ pub type AccountId = AccountId32; pub type Balance = u128; pub type AssetId = u128; -pub type BlockNumber = u32; parameter_types! { pub const BlockHashCount: u32 = 250; @@ -61,13 +60,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = sp_runtime::generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -101,7 +99,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -303,6 +301,7 @@ impl Config for XcmConfig { type MessageExporter = (); type UniversalAliases = Nothing; type SafeCallFilter = Everything; + type Aliasers = Nothing; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -538,21 +537,16 @@ impl mock_statemine_prefix::Config for Runtime { type RuntimeEvent = RuntimeEvent; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - Assets: pallet_assets::{Pallet, Storage, Event}, - PrefixChanger: mock_statemine_prefix::{Pallet, Storage, Event}, + pub enum Runtime { + System: frame_system, + Balances: pallet_balances, + PolkadotXcm: pallet_xcm, + CumulusXcm: cumulus_pallet_xcm, + MsgQueue: mock_msg_queue, + Assets: pallet_assets, + PrefixChanger: mock_statemine_prefix, } ); diff --git a/runtime/moonriver/tests/xcm_tests.rs b/runtime/moonriver/tests/xcm_tests.rs index 20a8f08b3d..72712ffb80 100644 --- a/runtime/moonriver/tests/xcm_tests.rs +++ b/runtime/moonriver/tests/xcm_tests.rs @@ -28,7 +28,7 @@ use sp_core::ConstU32; use xcm::latest::prelude::*; use xcm::{VersionedMultiLocation, WrapVersion}; use xcm_builder::HashedDescriptionDescribeFamilyAllTerminal; -use xcm_executor::traits::Convert; +use xcm_executor::traits::ConvertLocation; use xcm_mock::parachain; use xcm_mock::relay_chain; use xcm_mock::*; @@ -1269,9 +1269,9 @@ fn transact_through_derivative_with_custom_fee_weight() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1422,9 +1422,9 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { let event_found: Option = parachain::para_events() .iter() .find_map(|event| match event.clone() { - parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) => { - Some(event.clone()) - } + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped { + .. + }) => Some(event.clone()), _ => None, }); // Assert that the events do not contain the assets being trapped @@ -1990,13 +1990,13 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { }); let expected_supported_version: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 1, - ) + version: 1, + } .into(); Relay::execute_with(|| { @@ -2004,17 +2004,6 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { assert!(relay_chain::relay_events().contains(&expected_supported_version)); }); - let expected_version_notified: parachain::RuntimeEvent = - pallet_xcm::Event::VersionChangeNotified( - MultiLocation { - parents: 1, - interior: Here, - }, - 2, - vec![].into(), - ) - .into(); - // ParaA changes version to 2, and calls on_runtime_upgrade. This should notify the targets // of the new version change ParaA::execute_with(|| { @@ -2025,18 +2014,24 @@ fn test_automatic_versioning_on_runtime_upgrade_with_relay() { // Initialize block, to call on_initialize and notify targets parachain::para_roll_to(2); // Expect the event in the parachain - assert!(parachain::para_events().contains(&expected_version_notified)); + assert!(parachain::para_events().iter().any(|e| matches!( + e, + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::VersionChangeNotified { + result: 2, + .. + }) + ))); }); // This event should have been seen in the relay let expected_supported_version_2: relay_chain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 0, interior: X1(Parachain(1)), }, - 2, - ) + version: 2, + } .into(); Relay::execute_with(|| { @@ -2113,13 +2108,13 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { }); let expected_supported_version: parachain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 1, interior: X1(Parachain(2)), }, - 0, - ) + version: 0, + } .into(); ParaA::execute_with(|| { @@ -2159,17 +2154,6 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { assert_eq!(Assets::balance(source_id, &PARAALICE.into()), 100); }); - let expected_version_notified: parachain::RuntimeEvent = - pallet_xcm::Event::VersionChangeNotified( - MultiLocation { - parents: 1, - interior: X1(Parachain(1)), - }, - 2, - vec![].into(), - ) - .into(); - // ParaB changes version to 2, and calls on_runtime_upgrade. This should notify the targets // of the new version change ParaB::execute_with(|| { @@ -2180,18 +2164,24 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { // Initialize block, to call on_initialize and notify targets parachain::para_roll_to(2); // Expect the event in the parachain - assert!(parachain::para_events().contains(&expected_version_notified)); + assert!(parachain::para_events().iter().any(|e| matches!( + e, + parachain::RuntimeEvent::PolkadotXcm(pallet_xcm::Event::VersionChangeNotified { + result: 2, + .. + }) + ))); }); // This event should have been seen in para A let expected_supported_version_2: parachain::RuntimeEvent = - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { + pallet_xcm::Event::SupportedVersionChanged { + location: MultiLocation { parents: 1, interior: X1(Parachain(2)), }, - 2, - ) + version: 2, + } .into(); // Para A should have received the version change @@ -2502,7 +2492,7 @@ fn test_statemine_like() { let sov = xcm_builder::SiblingParachainConvertsVia::< polkadot_parachain::primitives::Sibling, statemine_like::AccountId, - >::convert_ref(dest_para) + >::convert_location(&dest_para) .unwrap(); let statemine_asset_a_balances = MultiLocation::new( @@ -2881,7 +2871,7 @@ fn transact_through_signed_multilocation() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -2972,7 +2962,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -3063,7 +3053,7 @@ fn transact_through_signed_multilocation_custom_fee_and_weight_refund() { let derived = xcm_builder::Account32Hash::< relay_chain::KusamaNetwork, relay_chain::AccountId, - >::convert_ref(descend_origin_multilocation) + >::convert_location(&descend_origin_multilocation) .unwrap(); Relay::execute_with(|| { @@ -3174,10 +3164,11 @@ fn transact_through_signed_multilocation_para_to_para() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -3272,10 +3263,11 @@ fn transact_through_signed_multilocation_para_to_para_refund() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); ParaB::execute_with(|| { // free execution, full amount received @@ -3384,10 +3376,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum() { .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3511,10 +3504,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_no_proxy_fails() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let mut parachain_b_alice_balances_before = 0; ParaB::execute_with(|| { @@ -3634,10 +3628,11 @@ fn transact_through_signed_multilocation_para_to_para_ethereum_proxy_succeeds() .reanchor(¶_b_location, ancestry.interior) .unwrap(); - let derived = HashedDescriptionDescribeFamilyAllTerminal::::convert_ref( - descend_origin_multilocation, - ) - .unwrap(); + let derived = + HashedDescriptionDescribeFamilyAllTerminal::::convert_location( + &descend_origin_multilocation, + ) + .unwrap(); let transfer_recipient = evm_account(); let mut transfer_recipient_balance_before = 0; diff --git a/test/.gitignore b/test/.gitignore index 3e972c1b39..3ca2272e46 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -9,4 +9,5 @@ polkadot html contracts/cache -contracts/out \ No newline at end of file +contracts/out +wasm/precompiled* \ No newline at end of file diff --git a/test/helpers/referenda.ts b/test/helpers/referenda.ts new file mode 100644 index 0000000000..72e2e2bc0d --- /dev/null +++ b/test/helpers/referenda.ts @@ -0,0 +1,188 @@ +import "@moonbeam-network/api-augment"; +import { DevModeContext } from "@moonwall/cli"; +import Debugger from "debug"; +import chalk from "chalk"; +import { FrameSupportPreimagesBounded } from "@polkadot/types/lookup"; +const log = Debugger("test:referenda"); + +export interface ForceReducedReferendaExecutionOptions { + forceTally?: boolean; // Will force tally to match total issuance +} + +/** + * @description Force a referendum to be executed in the next blocks by + * changing the referenda and scheduler storage data + * This function will create few blocks to ensure the referendum is executed. + */ +export const forceReducedReferendaExecution = async ( + context: DevModeContext, + proposalIndex: number, + options: ForceReducedReferendaExecutionOptions = {} +) => { + const forceTally = options?.forceTally || false; + const api = context.polkadotJs(); + + log( + `[#${chalk.green((await api.rpc.chain.getHeader()).number.toNumber())}]: Referedum ${chalk.red( + proposalIndex + )}` + ); + + const referendumData = await api.query.referenda.referendumInfoFor(proposalIndex); + const referendumKey = api.query.referenda.referendumInfoFor.key(proposalIndex); + if (!referendumData.isSome) { + throw new Error(`Referendum ${proposalIndex} not found`); + } + const referendumInfo = referendumData.unwrap(); + if (!referendumInfo.isOngoing) { + throw new Error(`Referendum ${proposalIndex} is not ongoing`); + } + + const ongoingData = referendumInfo.asOngoing; + const ongoingJson = ongoingData.toJSON(); + const callHash = ongoingData.proposal.asLookup.toHex(); + const proposalBlockTarget = (await api.rpc.chain.getHeader()).number.toNumber(); + const fastProposalData: any = { + ongoing: { + ...ongoingJson, + enactment: { after: 0 }, + deciding: { + since: proposalBlockTarget - 1, + confirming: proposalBlockTarget - 1, + }, + alarm: [proposalBlockTarget + 1, [proposalBlockTarget + 1, 0]], + }, + }; + if (forceTally) { + const totalIssuance = (await api.query.balances.totalIssuance()).toBigInt(); + fastProposalData["tally"] = { + ayes: totalIssuance - 1n, + nays: 0, + support: totalIssuance - 1n, + }; + } + + let fastProposal; + try { + fastProposal = api.registry.createType( + `Option`, + fastProposalData + ); + } catch { + fastProposal = api.registry.createType( + `Option`, + fastProposalData + ); + } + + log( + `${chalk.blue("SetStorage")} Fast Proposal: ${chalk.red( + proposalIndex.toString() + )} referendumKey ${referendumKey}` + ); + + await context.createBlock( + api.tx.sudo.sudo(api.tx.system.setStorage([[referendumKey, fastProposal.toHex()]])), + { allowFailures: false } + ); + + // Fast forward the nudge referendum to the next block to get the refendum to be scheduled + log( + `${chalk.yellow("Rescheduling")} ${chalk.red("scheduler.nudgeReferendum")} to #${chalk.green( + (await api.rpc.chain.getHeader()).number.toNumber() + 2 + )}` + ); + + await moveScheduledCallTo(context, 2, (call) => { + if (!call.isInline) { + return false; + } + const callData = api.createType("Call", call.asInline.toHex()); + return ( + callData.method == "nudgeReferendum" && (callData.args[0] as any).toNumber() == proposalIndex + ); + }); + + log( + `${chalk.yellow("Fast forward")} ${chalk.green(1)} to #${chalk.green( + (await api.rpc.chain.getHeader()).number.toNumber() + 1 + )}` + ); + await context.createBlock(); + + // Fast forward the scheduled proposal + log( + `${chalk.yellow("Rescheduling")} proposal ${chalk.red(proposalIndex)} to #${chalk.green( + (await api.rpc.chain.getHeader()).number.toNumber() + 2 + )}` + ); + await moveScheduledCallTo( + context, + 2, + (call) => call.isLookup && call.asLookup.toHex() == callHash + ); + + log( + `${chalk.yellow("Fast forward")} ${chalk.green(1)} to #${chalk.green( + (await api.rpc.chain.getHeader()).number.toNumber() + 1 + )}` + ); + await context.createBlock(); +}; + +async function moveScheduledCallTo( + context: DevModeContext, + blockCounts: number, + verifier: (call: FrameSupportPreimagesBounded) => boolean +) { + const api = context.polkadotJs(); + const blockNumber = (await api.rpc.chain.getHeader()).number.toNumber(); + // Fast forward the nudge referendum to the next block to get the refendum to be scheduled + const agenda = await api.query.scheduler.agenda.entries(); + let storages: [string, string][] = []; + let deleteStorages: string[] = []; + for (const agendaEntry of agenda) { + for (const scheduledEntry of agendaEntry[1]) { + if (scheduledEntry.isSome && verifier(scheduledEntry.unwrap().call)) { + log(`${chalk.blue("SetStorage")} scheduler.agenda`); + deleteStorages.push(agendaEntry[0].toHex()); + storages.push([ + await api.query.scheduler.agenda.key(blockNumber + blockCounts), + agendaEntry[1].toHex(), + ]); + if (scheduledEntry.unwrap().maybeId.isSome) { + const id = scheduledEntry.unwrap().maybeId.unwrap().toHex(); + const lookup = await api.query.scheduler.lookup(id); + log( + `Checking lookup ${scheduledEntry.unwrap().maybeId.unwrap().toHex()}: ${lookup.isSome}` + ); + if (lookup.isSome) { + const lookupKey = await api.query.scheduler.lookup.key(id); + const lookupJson = lookup.unwrap().toJSON(); + const fastLookup = api.registry.createType("Option<(u32,u32)>", [ + blockNumber + blockCounts, + 0, + ]); + const result = storages.push([lookupKey, fastLookup.toHex()]); + log(`Updated lookup to ${fastLookup.toJSON()}`); + } + } + } + } + } + + if (storages.length == 0) { + throw new Error("No scheduled call found"); + } + await context.createBlock( + api.tx.sudo.sudo( + api.tx.utility.batchAll([ + api.tx.system.setStorage(storages), + api.tx.system.killStorage(deleteStorages), + ]) + ), + { + allowFailures: false, + } + ); +} diff --git a/test/helpers/xcm.ts b/test/helpers/xcm.ts index 222d4cfbdb..347a3809c4 100644 --- a/test/helpers/xcm.ts +++ b/test/helpers/xcm.ts @@ -806,7 +806,7 @@ export class XcmFragment { async override_weight(context: DevModeContext): Promise { const message: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", this.as_v2()) as any; + .createType("StagingXcmVersionedXcm", this.as_v2()) as any; const instructions = message.asV2; for (var i = 0; i < instructions.length; i++) { diff --git a/test/moonwall.config.json b/test/moonwall.config.json index dcd07ff794..b86bd54edc 100644 --- a/test/moonwall.config.json +++ b/test/moonwall.config.json @@ -3,11 +3,33 @@ "label": "MasterConfig 🌔", "defaultTestTimeout": 120000, "scriptsDir": "scripts/", + "additionalRepos": [ + { + "name": "polkadot-sdk", + "ghAuthor": "paritytech", + "ghRepo": "polkadot-sdk", + "binaries": [ + { + "name": "polkadot", + "defaultArgs": [] + }, + { + "name": "polkadot-execute-worker", + "defaultArgs": [] + }, + { + "name": "polkadot-prepare-worker", + "defaultArgs": [] + } + ] + } + ], "environments": [ { "name": "zombie_moonbeam", "testFileDir": ["suites/para"], "include": ["**/*moonbeam*"], + "runScripts": ["download-polkadot.sh"], "foundation": { "rtUpgradePath": "../target/release/wbuild/moonbeam-runtime/moonbeam_runtime.compact.compressed.wasm", "type": "zombie", @@ -20,6 +42,7 @@ "name": "zombie_moonbase", "testFileDir": ["suites/para"], "include": ["**/*moonbase*", "**/*common*"], + "runScripts": ["download-polkadot.sh"], "foundation": { "rtUpgradePath": "../target/release/wbuild/moonbase-runtime/moonbase_runtime.compact.compressed.wasm", "type": "zombie", @@ -32,6 +55,7 @@ "name": "zombie_common", "testFileDir": ["suites/para"], "include": ["**/*common*"], + "runScripts": ["download-polkadot.sh"], "foundation": { "type": "zombie", "zombieSpec": { @@ -277,8 +301,11 @@ "testFileDir": ["suites/dev/"], "include": ["**/*test*"], "contracts": "contracts/", - "runScripts": ["compile-contracts.ts compile"], - "multiThreads": true, + "runScripts": [ + "compile-contracts.ts compile", + "compile-wasm.ts compile -b ../target/release/moonbeam -o wasm -c moonbase-dev" + ], + "multiThreads": false, "envVars": ["DEBUG_COLORS=1"], "reporters": ["html", "basic"], "foundation": { @@ -289,11 +316,10 @@ "binPath": "../target/release/moonbeam", "newRpcBehaviour": true, "options": [ - "--execution=Native", - "--wasm-execution=interpreted-i-know-what-i-do", "--ethapi=txpool", "--no-hardware-benchmarks", "--no-telemetry", + "--wasmtime-precompiled=wasm", "--reserved-only", "--no-grandpa", "--no-prometheus", @@ -402,6 +428,7 @@ { "name": "mb", "type": "parachain", + "allowUnresolvedImports": true, "configPath": "./configs/moonbeam.yml" } ] @@ -424,6 +451,7 @@ { "name": "mb", "type": "parachain", + "allowUnresolvedImports": true, "configPath": "./configs/moonriver.yml" } ] @@ -446,6 +474,7 @@ { "name": "mb", "type": "parachain", + "allowUnresolvedImports": true, "configPath": "./configs/alphanet.yml" } ] diff --git a/test/package-lock.json b/test/package-lock.json index cc493fb184..c6d8782080 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -13,9 +13,9 @@ "@openzeppelin/contracts": "^4.9.3", "@polkadot/api-derive": "^10.9.1", "@polkadot/apps-config": "^0.132.1", - "@polkadot/keyring": "^12.3.2", + "@polkadot/keyring": "^12.4.2", "@polkadot/rpc-provider": "^10.9.1", - "@polkadot/util-crypto": "^12.3.2", + "@polkadot/util-crypto": "^12.4.2", "@substrate/txwrapper-core": "^6.0.1", "@substrate/txwrapper-substrate": "^6.0.1", "@types/yargs": "^17.0.24", @@ -27,29 +27,29 @@ "json-stable-stringify": "^1.0.2", "merkle-patricia-tree": "^4.2.4", "node-fetch": "^3.3.2", - "randomness": "^1.5.32", + "randomness": "^1.6.1", "rlp": "^3.0.0", "semver": "^7.5.4", "solc": "0.8.19", - "viem": "^1.5.3", + "viem": "^1.7.0", "vitest": "^0.31.4" }, "devDependencies": { "@moonbeam-network/api-augment": "^0.2400.0", - "@moonwall/cli": "^4.0.10", - "@moonwall/util": "^4.0.10", + "@moonwall/cli": "^4.0.19", + "@moonwall/util": "^4.0.18", "@polkadot/api": "^10.9.1", "@polkadot/api-augment": "^10.9.1", "@polkadot/types": "^10.9.1", "@polkadot/types-codec": "^10.9.1", - "@polkadot/util": "^12.3.2", + "@polkadot/util": "^12.4.2", "@types/debug": "^4.1.8", - "@types/node": "^20.4.8", + "@types/node": "^20.5.4", "@types/semver": "^7.5.0", "bottleneck": "^2.19.5", "bun-types": "^0.7.3", "debug": "^4.3.4", - "ethers": "^6.7.0", + "ethers": "^6.7.1", "prettier": "^2.8.8", "tsx": "^3.12.7", "typescript": "^5.1.6", @@ -248,9 +248,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz", - "integrity": "sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==", + "version": "7.23.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz", + "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2230,9 +2230,9 @@ "license": "Apache-2.0" }, "node_modules/@jest/schemas": { - "version": "29.6.0", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", - "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { "@sinclair/typebox": "^0.27.8" @@ -2301,6 +2301,15 @@ "version": "0.8.2-11", "license": "Apache-2.0" }, + "node_modules/@ljharb/through": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.9.tgz", + "integrity": "sha512-yN599ZBuMPPK4tdoToLlvgJB4CLK8fGl7ntfy0Wn7U6ttNvHYurd81bfUiK/6sMkiIwm65R6ck4L6+Y3DfVbNQ==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/@logion/node-api": { "version": "0.16.0", "license": "Apache-2.0", @@ -2352,19 +2361,6 @@ } } }, - "node_modules/@mapbox/node-pre-gyp/node_modules/rimraf": { - "version": "3.0.2", - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@mapbox/node-pre-gyp/node_modules/webidl-conversions": { "version": "3.0.1", "license": "BSD-2-Clause" @@ -2393,18 +2389,25 @@ } }, "node_modules/@moonwall/cli": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/@moonwall/cli/-/cli-4.0.13.tgz", - "integrity": "sha512-OQTKYhrgBdkAF3AD2KXJMQQXoiuaZ5PCmo0aEyerHcLeTnxibM28eawGC4QgL3sHld/8PhabSjpwK8uu5NrmQQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@moonwall/cli/-/cli-4.1.1.tgz", + "integrity": "sha512-OfFZJX1bZtD0KTvB7FYPdh9jUuirL+/uveVlfK/lr1+bqUuXmu7ypklOTc6Rue0kAOsig9u+83Rhp8dRYNgTBQ==", "dev": true, "dependencies": { - "@moonwall/types": "4.0.11", - "@polkadot/util-crypto": "^12.3.2", - "@types/cli-progress": "^3.11.0", - "@types/debug": "^4.1.8", - "@types/node": "^20.4.8", - "@types/yargs": "^17.0.24", - "@zombienet/orchestrator": "^0.0.50", + "@acala-network/chopsticks": "^0.7.3", + "@moonbeam-network/api-augment": "^0.2400.0", + "@moonwall/types": "4.1.1", + "@moonwall/util": "4.1.1", + "@polkadot/api": "^10.9.1", + "@polkadot/api-augment": "^10.9.1", + "@polkadot/api-derive": "^10.9.1", + "@polkadot/keyring": "^12.4.2", + "@polkadot/types": "^10.9.1", + "@polkadot/types-codec": "^10.9.1", + "@polkadot/util": "^12.4.2", + "@polkadot/util-crypto": "^12.4.2", + "@zombienet/orchestrator": "^0.0.54", + "@zombienet/utils": "^0.0.22", "bottleneck": "^2.19.5", "chalk": "^5.3.0", "clear": "^0.1.0", @@ -2412,16 +2415,18 @@ "colors": "^1.4.0", "debug": "^4.3.4", "dotenv": "^16.3.1", - "inquirer": "^8.2.6", + "ethers": "^6.7.1", + "inquirer": "^9.2.11", "inquirer-press-to-continue": "^1.2.0", + "minimatch": "^9.0.3", "node-fetch": "^3.3.2", - "prettier": "^2.8.8", "semver": "^7.5.4", - "tsup": "^7.2.0", - "tsx": "^3.12.7", - "vitest": "^0.34.1", - "ws": "^8.13.0", - "yaml": "^2.3.1", + "viem": "^1.10.7", + "vitest": "^0.34.3", + "web3": "4.0.3", + "web3-providers-ws": "4.0.3", + "ws": "^8.14.0", + "yaml": "^2.3.2", "yargs": "^17.7.2" }, "bin": { @@ -2430,46 +2435,29 @@ "engines": { "node": ">=14.16.0", "pnpm": ">=7" - }, - "peerDependencies": { - "@acala-network/chopsticks": "^0.7.3", - "@moonbeam-network/api-augment": "^0.2400.0", - "@moonwall/util": "4.0.11", - "@polkadot/api": "^10.9.1", - "@polkadot/api-augment": "^10.9.1", - "@polkadot/api-derive": "^10.9.1", - "@polkadot/keyring": "^12.3.2", - "@polkadot/types": "^10.9.1", - "@polkadot/types-codec": "^10.9.1", - "@polkadot/util": "^12.3.2", - "ethers": "^6.6.7", - "tsx": "^3.12.7", - "viem": "^1.5.3", - "web3": "4.0.3", - "web3-providers-ws": "4.0.3" } }, "node_modules/@moonwall/cli/node_modules/@vitest/expect": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.1.tgz", - "integrity": "sha512-q2CD8+XIsQ+tHwypnoCk8Mnv5e6afLFvinVGCq3/BOT4kQdVQmY6rRfyKkwcg635lbliLPqbunXZr+L1ssUWiQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", + "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==", "dev": true, "dependencies": { - "@vitest/spy": "0.34.1", - "@vitest/utils": "0.34.1", - "chai": "^4.3.7" + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", + "chai": "^4.3.10" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@moonwall/cli/node_modules/@vitest/runner": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.1.tgz", - "integrity": "sha512-YfQMpYzDsYB7yqgmlxZ06NI4LurHWfrH7Wy3Pvf/z/vwUSgq1zLAb1lWcItCzQG+NVox+VvzlKQrYEXb47645g==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz", + "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==", "dev": true, "dependencies": { - "@vitest/utils": "0.34.1", + "@vitest/utils": "0.34.6", "p-limit": "^4.0.0", "pathe": "^1.1.1" }, @@ -2478,9 +2466,9 @@ } }, "node_modules/@moonwall/cli/node_modules/@vitest/snapshot": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.1.tgz", - "integrity": "sha512-0O9LfLU0114OqdF8lENlrLsnn024Tb1CsS9UwG0YMWY2oGTQfPtkW+B/7ieyv0X9R2Oijhi3caB1xgGgEgclSQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz", + "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==", "dev": true, "dependencies": { "magic-string": "^0.30.1", @@ -2492,9 +2480,9 @@ } }, "node_modules/@moonwall/cli/node_modules/@vitest/spy": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.1.tgz", - "integrity": "sha512-UT4WcI3EAPUNO8n6y9QoEqynGGEPmmRxC+cLzneFFXpmacivjHZsNbiKD88KUScv5DCHVDgdBsLD7O7s1enFcQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz", + "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==", "dev": true, "dependencies": { "tinyspy": "^2.1.1" @@ -2504,9 +2492,9 @@ } }, "node_modules/@moonwall/cli/node_modules/@vitest/utils": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.1.tgz", - "integrity": "sha512-/ql9dsFi4iuEbiNcjNHQWXBum7aL8pyhxvfnD9gNtbjR9fUKAjxhj4AA3yfLXg6gJpMGGecvtF8Au2G9y3q47Q==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz", + "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==", "dev": true, "dependencies": { "diff-sequences": "^29.4.3", @@ -2517,6 +2505,23 @@ "url": "https://opencollective.com/vitest" } }, + "node_modules/@moonwall/cli/node_modules/@zombienet/utils": { + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@zombienet/utils/-/utils-0.0.22.tgz", + "integrity": "sha512-jr2RAP0jYxzHPFSIWJP3W0ctili7XpwH/cs3BGFUmCU/Nj3dqkZpMqEBoxMECGUNQ4MS3jdgDoqR86UcsALXWw==", + "dev": true, + "dependencies": { + "cli-table3": "^0.6.3", + "debug": "^4.3.4", + "mocha": "^10.2.0", + "nunjucks": "^3.2.4", + "toml": "^3.0.0", + "ts-node": "^10.9.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@moonwall/cli/node_modules/ansi-styles": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", @@ -2529,6 +2534,21 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/@moonwall/cli/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@moonwall/cli/node_modules/p-limit": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", @@ -2545,12 +2565,12 @@ } }, "node_modules/@moonwall/cli/node_modules/pretty-format": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", - "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, @@ -2574,9 +2594,9 @@ } }, "node_modules/@moonwall/cli/node_modules/vite-node": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.1.tgz", - "integrity": "sha512-odAZAL9xFMuAg8aWd7nSPT+hU8u2r9gU3LRm9QKjxBEF2rRdWpMuqkrkjvyVQEdNFiBctqr2Gg4uJYizm5Le6w==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz", + "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -2584,7 +2604,7 @@ "mlly": "^1.4.0", "pathe": "^1.1.1", "picocolors": "^1.0.0", - "vite": "^3.0.0 || ^4.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0" }, "bin": { "vite-node": "vite-node.mjs" @@ -2597,23 +2617,23 @@ } }, "node_modules/@moonwall/cli/node_modules/vitest": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.1.tgz", - "integrity": "sha512-G1PzuBEq9A75XSU88yO5G4vPT20UovbC/2osB2KEuV/FisSIIsw7m5y2xMdB7RsAGHAfg2lPmp2qKr3KWliVlQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz", + "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==", "dev": true, "dependencies": { "@types/chai": "^4.3.5", "@types/chai-subset": "^1.3.3", "@types/node": "*", - "@vitest/expect": "0.34.1", - "@vitest/runner": "0.34.1", - "@vitest/snapshot": "0.34.1", - "@vitest/spy": "0.34.1", - "@vitest/utils": "0.34.1", + "@vitest/expect": "0.34.6", + "@vitest/runner": "0.34.6", + "@vitest/snapshot": "0.34.6", + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", "acorn": "^8.9.0", "acorn-walk": "^8.2.0", "cac": "^6.7.14", - "chai": "^4.3.7", + "chai": "^4.3.10", "debug": "^4.3.4", "local-pkg": "^0.4.3", "magic-string": "^0.30.1", @@ -2623,8 +2643,8 @@ "strip-literal": "^1.0.1", "tinybench": "^2.5.0", "tinypool": "^0.7.0", - "vite": "^3.0.0 || ^4.0.0", - "vite-node": "0.34.1", + "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0", + "vite-node": "0.34.6", "why-is-node-running": "^2.2.2" }, "bin": { @@ -2673,6 +2693,27 @@ } } }, + "node_modules/@moonwall/cli/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/@moonwall/cli/node_modules/yocto-queue": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", @@ -2686,20 +2727,22 @@ } }, "node_modules/@moonwall/types": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/@moonwall/types/-/types-4.0.11.tgz", - "integrity": "sha512-H2gSbZOdBERQS9QH6TW0yteNlFA5gc+svhXjQeYxSQmAvPZ0n6Ks1tbaZ9L8KtNxvJRev4SXreqfMZVn7/qPsg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@moonwall/types/-/types-4.1.1.tgz", + "integrity": "sha512-J0Ty8Ppb9P3GPeLibfK2p5siEphtDE/4wFFDmTPY+0OmlLXJNAr68x7KdUadjOytLhrm2IyygM4laWc3hGzpiw==", "dev": true, "dependencies": { "@polkadot/api": "^10.9.1", "@polkadot/api-base": "^10.9.1", - "@polkadot/keyring": "^12.3.2", + "@polkadot/keyring": "^12.4.2", "@polkadot/types": "^10.9.1", - "@polkadot/util": "^12.3.2", - "@polkadot/util-crypto": "^12.3.2", + "@polkadot/util": "^12.4.2", + "@polkadot/util-crypto": "^12.4.2", + "@zombienet/utils": "^0.0.22", + "bottleneck": "^2.19.5", "debug": "^4.3.4", - "ethers": "^6.7.0", - "viem": "^1.5.3", + "ethers": "^6.7.1", + "viem": "^1.10.7", "web3": "4.0.3" }, "engines": { @@ -2707,17 +2750,40 @@ "pnpm": ">=7" } }, + "node_modules/@moonwall/types/node_modules/@zombienet/utils": { + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@zombienet/utils/-/utils-0.0.22.tgz", + "integrity": "sha512-jr2RAP0jYxzHPFSIWJP3W0ctili7XpwH/cs3BGFUmCU/Nj3dqkZpMqEBoxMECGUNQ4MS3jdgDoqR86UcsALXWw==", + "dev": true, + "dependencies": { + "cli-table3": "^0.6.3", + "debug": "^4.3.4", + "mocha": "^10.2.0", + "nunjucks": "^3.2.4", + "toml": "^3.0.0", + "ts-node": "^10.9.1" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/@moonwall/util": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/@moonwall/util/-/util-4.0.11.tgz", - "integrity": "sha512-cWfikbWfnrVJK/COZO2lA8J4R6eMHa8KhphBhrM4cT9h9LCgnkHlBVXtGb7x6RlfNUYTL/3uRZFDpkWtorSVhA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@moonwall/util/-/util-4.1.1.tgz", + "integrity": "sha512-NnOkEKM8tPKhzXB3297wDI+turUuWq1S0cIjkBvkU/7kpXGK4jd7SBRTFHlIXM1Fc0xIQgzpc7hBh/OOt3wcdg==", "dev": true, "dependencies": { - "@moonwall/types": "4.0.11", - "@polkadot/util-crypto": "^12.3.2", - "@types/debug": "^4.1.8", - "@types/node": "^20.4.8", - "@types/yargs": "^17.0.24", + "@moonbeam-network/api-augment": "^0.2400.0", + "@moonwall/types": "4.1.1", + "@polkadot/api": "^10.9.1", + "@polkadot/api-augment": "^10.9.1", + "@polkadot/api-derive": "^10.9.1", + "@polkadot/keyring": "^12.4.2", + "@polkadot/rpc-provider": "^10.9.1", + "@polkadot/types": "^10.9.1", + "@polkadot/types-codec": "^10.9.1", + "@polkadot/util": "^12.4.2", + "@polkadot/util-crypto": "^12.4.2", "bottleneck": "^2.19.5", "chalk": "^5.3.0", "clear": "^0.1.0", @@ -2725,58 +2791,45 @@ "colors": "^1.4.0", "debug": "^4.3.4", "dotenv": "^16.3.1", - "inquirer": "^8.2.6", + "ethers": "^6.7.1", + "inquirer": "^9.2.11", "inquirer-press-to-continue": "^1.2.0", "node-fetch": "^3.3.2", - "prettier": "^2.8.8", "rlp": "^3.0.0", "semver": "^7.5.4", - "viem": "^1.5.3", - "vite": "^4.4.8", - "vitest": "^0.34.1", + "viem": "^1.10.7", + "vitest": "^0.34.3", "web3": "4.0.3", - "ws": "^8.13.0", - "yaml": "^2.3.1", + "ws": "^8.14.0", + "yaml": "^2.3.2", "yargs": "^17.7.2" }, "engines": { "node": ">=14.16.0", "pnpm": ">=7" - }, - "peerDependencies": { - "@moonbeam-network/api-augment": "^0.2400.0", - "@polkadot/api": "^10.9.1", - "@polkadot/api-augment": "^10.9.1", - "@polkadot/api-derive": "^10.9.1", - "@polkadot/keyring": "^12.3.2", - "@polkadot/rpc-provider": "^10.9.1", - "@polkadot/types": "^10.9.1", - "@polkadot/types-codec": "^10.9.1", - "@polkadot/util": "^12.3.2", - "ethers": "^6.6.7" } }, "node_modules/@moonwall/util/node_modules/@vitest/expect": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.1.tgz", - "integrity": "sha512-q2CD8+XIsQ+tHwypnoCk8Mnv5e6afLFvinVGCq3/BOT4kQdVQmY6rRfyKkwcg635lbliLPqbunXZr+L1ssUWiQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.6.tgz", + "integrity": "sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==", "dev": true, "dependencies": { - "@vitest/spy": "0.34.1", - "@vitest/utils": "0.34.1", - "chai": "^4.3.7" + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", + "chai": "^4.3.10" }, "funding": { "url": "https://opencollective.com/vitest" } }, "node_modules/@moonwall/util/node_modules/@vitest/runner": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.1.tgz", - "integrity": "sha512-YfQMpYzDsYB7yqgmlxZ06NI4LurHWfrH7Wy3Pvf/z/vwUSgq1zLAb1lWcItCzQG+NVox+VvzlKQrYEXb47645g==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.6.tgz", + "integrity": "sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==", "dev": true, "dependencies": { - "@vitest/utils": "0.34.1", + "@vitest/utils": "0.34.6", "p-limit": "^4.0.0", "pathe": "^1.1.1" }, @@ -2785,9 +2838,9 @@ } }, "node_modules/@moonwall/util/node_modules/@vitest/snapshot": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.1.tgz", - "integrity": "sha512-0O9LfLU0114OqdF8lENlrLsnn024Tb1CsS9UwG0YMWY2oGTQfPtkW+B/7ieyv0X9R2Oijhi3caB1xgGgEgclSQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.6.tgz", + "integrity": "sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==", "dev": true, "dependencies": { "magic-string": "^0.30.1", @@ -2799,9 +2852,9 @@ } }, "node_modules/@moonwall/util/node_modules/@vitest/spy": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.1.tgz", - "integrity": "sha512-UT4WcI3EAPUNO8n6y9QoEqynGGEPmmRxC+cLzneFFXpmacivjHZsNbiKD88KUScv5DCHVDgdBsLD7O7s1enFcQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.6.tgz", + "integrity": "sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==", "dev": true, "dependencies": { "tinyspy": "^2.1.1" @@ -2811,9 +2864,9 @@ } }, "node_modules/@moonwall/util/node_modules/@vitest/utils": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.1.tgz", - "integrity": "sha512-/ql9dsFi4iuEbiNcjNHQWXBum7aL8pyhxvfnD9gNtbjR9fUKAjxhj4AA3yfLXg6gJpMGGecvtF8Au2G9y3q47Q==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.6.tgz", + "integrity": "sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==", "dev": true, "dependencies": { "diff-sequences": "^29.4.3", @@ -2852,12 +2905,12 @@ } }, "node_modules/@moonwall/util/node_modules/pretty-format": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", - "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, @@ -2881,9 +2934,9 @@ } }, "node_modules/@moonwall/util/node_modules/vite-node": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.1.tgz", - "integrity": "sha512-odAZAL9xFMuAg8aWd7nSPT+hU8u2r9gU3LRm9QKjxBEF2rRdWpMuqkrkjvyVQEdNFiBctqr2Gg4uJYizm5Le6w==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.6.tgz", + "integrity": "sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -2891,7 +2944,7 @@ "mlly": "^1.4.0", "pathe": "^1.1.1", "picocolors": "^1.0.0", - "vite": "^3.0.0 || ^4.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0" }, "bin": { "vite-node": "vite-node.mjs" @@ -2904,23 +2957,23 @@ } }, "node_modules/@moonwall/util/node_modules/vitest": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.1.tgz", - "integrity": "sha512-G1PzuBEq9A75XSU88yO5G4vPT20UovbC/2osB2KEuV/FisSIIsw7m5y2xMdB7RsAGHAfg2lPmp2qKr3KWliVlQ==", + "version": "0.34.6", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.6.tgz", + "integrity": "sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==", "dev": true, "dependencies": { "@types/chai": "^4.3.5", "@types/chai-subset": "^1.3.3", "@types/node": "*", - "@vitest/expect": "0.34.1", - "@vitest/runner": "0.34.1", - "@vitest/snapshot": "0.34.1", - "@vitest/spy": "0.34.1", - "@vitest/utils": "0.34.1", + "@vitest/expect": "0.34.6", + "@vitest/runner": "0.34.6", + "@vitest/snapshot": "0.34.6", + "@vitest/spy": "0.34.6", + "@vitest/utils": "0.34.6", "acorn": "^8.9.0", "acorn-walk": "^8.2.0", "cac": "^6.7.14", - "chai": "^4.3.7", + "chai": "^4.3.10", "debug": "^4.3.4", "local-pkg": "^0.4.3", "magic-string": "^0.30.1", @@ -2930,8 +2983,8 @@ "strip-literal": "^1.0.1", "tinybench": "^2.5.0", "tinypool": "^0.7.0", - "vite": "^3.0.0 || ^4.0.0", - "vite-node": "0.34.1", + "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0", + "vite-node": "0.34.6", "why-is-node-running": "^2.2.2" }, "bin": { @@ -2980,6 +3033,27 @@ } } }, + "node_modules/@moonwall/util/node_modules/ws": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/@moonwall/util/node_modules/yocto-queue": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", @@ -3084,20 +3158,6 @@ "node": ">=10" } }, - "node_modules/@npmcli/move-file/node_modules/rimraf": { - "version": "3.0.2", - "license": "ISC", - "optional": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@open-web3/orml-type-definitions": { "version": "0.9.4-38", "license": "Apache-2.0", @@ -3301,21 +3361,27 @@ } }, "node_modules/@polkadot/keyring": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-12.5.1.tgz", + "integrity": "sha512-u6b+Q7wI6WY/vwmJS9uUHy/5hKZ226nTlVNmxjkj9GvrRsQvUSwS94163yHPJwiZJiIv5xK5m0rwCMyoYu+wjA==", "dependencies": { - "@polkadot/util": "12.3.2", - "@polkadot/util-crypto": "12.3.2", - "tslib": "^2.5.3" + "@polkadot/util": "12.5.1", + "@polkadot/util-crypto": "12.5.1", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" }, "peerDependencies": { - "@polkadot/util": "12.3.2", - "@polkadot/util-crypto": "12.3.2" + "@polkadot/util": "12.5.1", + "@polkadot/util-crypto": "12.5.1" } }, + "node_modules/@polkadot/keyring/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/metadata": { "version": "4.17.1", "license": "Apache-2.0", @@ -3508,17 +3574,23 @@ "license": "MIT" }, "node_modules/@polkadot/networks": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-12.5.1.tgz", + "integrity": "sha512-PP6UUdzz6iHHZH4q96cUEhTcydHj16+61sqeaYEJSF6Q9iY+5WVWQ26+rdjmre/EBdrMQkSS/CKy73mO5z/JkQ==", "dependencies": { - "@polkadot/util": "12.3.2", - "@substrate/ss58-registry": "^1.40.0", - "tslib": "^2.5.3" + "@polkadot/util": "12.5.1", + "@substrate/ss58-registry": "^1.43.0", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" } }, + "node_modules/@polkadot/networks/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/react-identicon": { "version": "3.5.1", "license": "Apache-2.0", @@ -3713,49 +3785,103 @@ } }, "node_modules/@polkadot/util": { - "version": "12.3.2", - "license": "Apache-2.0", - "dependencies": { - "@polkadot/x-bigint": "12.3.2", - "@polkadot/x-global": "12.3.2", - "@polkadot/x-textdecoder": "12.3.2", - "@polkadot/x-textencoder": "12.3.2", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-12.5.1.tgz", + "integrity": "sha512-fDBZL7D4/baMG09Qowseo884m3QBzErGkRWNBId1UjWR99kyex+cIY9fOSzmuQxo6nLdJlLHw1Nz2caN3+Bq0A==", + "dependencies": { + "@polkadot/x-bigint": "12.5.1", + "@polkadot/x-global": "12.5.1", + "@polkadot/x-textdecoder": "12.5.1", + "@polkadot/x-textencoder": "12.5.1", "@types/bn.js": "^5.1.1", "bn.js": "^5.2.1", - "tslib": "^2.5.3" + "tslib": "^2.6.2" }, "engines": { "node": ">=16" } }, "node_modules/@polkadot/util-crypto": { - "version": "12.3.2", - "license": "Apache-2.0", - "dependencies": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@polkadot/networks": "12.3.2", - "@polkadot/util": "12.3.2", - "@polkadot/wasm-crypto": "^7.2.1", - "@polkadot/wasm-util": "^7.2.1", - "@polkadot/x-bigint": "12.3.2", - "@polkadot/x-randomvalues": "12.3.2", - "@scure/base": "1.1.1", - "tslib": "^2.5.3" + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-12.5.1.tgz", + "integrity": "sha512-Y8ORbMcsM/VOqSG3DgqutRGQ8XXK+X9M3C8oOEI2Tji65ZsXbh9Yh+ryPLM0oBp/9vqOXjkLgZJbbVuQceOw0A==", + "dependencies": { + "@noble/curves": "^1.2.0", + "@noble/hashes": "^1.3.2", + "@polkadot/networks": "12.5.1", + "@polkadot/util": "12.5.1", + "@polkadot/wasm-crypto": "^7.2.2", + "@polkadot/wasm-util": "^7.2.2", + "@polkadot/x-bigint": "12.5.1", + "@polkadot/x-randomvalues": "12.5.1", + "@scure/base": "^1.1.3", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" }, "peerDependencies": { - "@polkadot/util": "12.3.2" + "@polkadot/util": "12.5.1" + } + }, + "node_modules/@polkadot/util-crypto/node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, + "node_modules/@polkadot/util-crypto/node_modules/@noble/hashes": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@polkadot/util-crypto/node_modules/@scure/base": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.3.tgz", + "integrity": "sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@polkadot/util-crypto/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@polkadot/util/node_modules/@polkadot/x-global": { + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.5.1.tgz", + "integrity": "sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@polkadot/util/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/wasm-bridge": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-bridge/-/wasm-bridge-7.2.2.tgz", + "integrity": "sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==", "dependencies": { - "@polkadot/wasm-util": "7.2.1", - "tslib": "^2.5.0" + "@polkadot/wasm-util": "7.2.2", + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3765,16 +3891,22 @@ "@polkadot/x-randomvalues": "*" } }, + "node_modules/@polkadot/wasm-bridge/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/wasm-crypto": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto/-/wasm-crypto-7.2.2.tgz", + "integrity": "sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==", "dependencies": { - "@polkadot/wasm-bridge": "7.2.1", - "@polkadot/wasm-crypto-asmjs": "7.2.1", - "@polkadot/wasm-crypto-init": "7.2.1", - "@polkadot/wasm-crypto-wasm": "7.2.1", - "@polkadot/wasm-util": "7.2.1", - "tslib": "^2.5.0" + "@polkadot/wasm-bridge": "7.2.2", + "@polkadot/wasm-crypto-asmjs": "7.2.2", + "@polkadot/wasm-crypto-init": "7.2.2", + "@polkadot/wasm-crypto-wasm": "7.2.2", + "@polkadot/wasm-util": "7.2.2", + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3785,10 +3917,11 @@ } }, "node_modules/@polkadot/wasm-crypto-asmjs": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-asmjs/-/wasm-crypto-asmjs-7.2.2.tgz", + "integrity": "sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3797,15 +3930,21 @@ "@polkadot/util": "*" } }, + "node_modules/@polkadot/wasm-crypto-asmjs/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/wasm-crypto-init": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-init/-/wasm-crypto-init-7.2.2.tgz", + "integrity": "sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==", "dependencies": { - "@polkadot/wasm-bridge": "7.2.1", - "@polkadot/wasm-crypto-asmjs": "7.2.1", - "@polkadot/wasm-crypto-wasm": "7.2.1", - "@polkadot/wasm-util": "7.2.1", - "tslib": "^2.5.0" + "@polkadot/wasm-bridge": "7.2.2", + "@polkadot/wasm-crypto-asmjs": "7.2.2", + "@polkadot/wasm-crypto-wasm": "7.2.2", + "@polkadot/wasm-util": "7.2.2", + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3815,12 +3954,18 @@ "@polkadot/x-randomvalues": "*" } }, + "node_modules/@polkadot/wasm-crypto-init/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/wasm-crypto-wasm": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-crypto-wasm/-/wasm-crypto-wasm-7.2.2.tgz", + "integrity": "sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==", "dependencies": { - "@polkadot/wasm-util": "7.2.1", - "tslib": "^2.5.0" + "@polkadot/wasm-util": "7.2.2", + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3829,11 +3974,22 @@ "@polkadot/util": "*" } }, + "node_modules/@polkadot/wasm-crypto-wasm/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@polkadot/wasm-crypto/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/wasm-util": { - "version": "7.2.1", - "license": "Apache-2.0", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@polkadot/wasm-util/-/wasm-util-7.2.2.tgz", + "integrity": "sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.1" }, "engines": { "node": ">=16" @@ -3842,17 +3998,39 @@ "@polkadot/util": "*" } }, + "node_modules/@polkadot/wasm-util/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/x-bigint": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-12.5.1.tgz", + "integrity": "sha512-Fw39eoN9v0sqxSzfSC5awaDVdzojIiE7d1hRSQgVSrES+8whWvtbYMR0qwbVhTuW7DvogHmye41P9xKMlXZysg==", "dependencies": { - "@polkadot/x-global": "12.3.2", - "tslib": "^2.5.3" + "@polkadot/x-global": "12.5.1", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" } }, + "node_modules/@polkadot/x-bigint/node_modules/@polkadot/x-global": { + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.5.1.tgz", + "integrity": "sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@polkadot/x-bigint/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/x-fetch": { "version": "12.3.2", "license": "Apache-2.0", @@ -3876,20 +4054,37 @@ } }, "node_modules/@polkadot/x-randomvalues": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-12.5.1.tgz", + "integrity": "sha512-UsMb1d+77EPNjW78BpHjZLIm4TaIpfqq89OhZP/6gDIoS2V9iE/AK3jOWKm1G7Y2F8XIoX1qzQpuMakjfagFoQ==", "dependencies": { - "@polkadot/x-global": "12.3.2", - "tslib": "^2.5.3" + "@polkadot/x-global": "12.5.1", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" }, "peerDependencies": { - "@polkadot/util": "12.3.2", + "@polkadot/util": "12.5.1", "@polkadot/wasm-util": "*" } }, + "node_modules/@polkadot/x-randomvalues/node_modules/@polkadot/x-global": { + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.5.1.tgz", + "integrity": "sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@polkadot/x-randomvalues/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/x-rxjs": { "version": "6.11.1", "license": "Apache-2.0", @@ -3916,27 +4111,61 @@ "license": "0BSD" }, "node_modules/@polkadot/x-textdecoder": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-12.5.1.tgz", + "integrity": "sha512-j2YZGWfwhMC8nHW3BXq10fAPY02ObLL/qoTjCMJ1Cmc/OGq18Ep7k9cXXbjFAq3wf3tUUewt/u/hStKCk3IvfQ==", "dependencies": { - "@polkadot/x-global": "12.3.2", - "tslib": "^2.5.3" + "@polkadot/x-global": "12.5.1", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@polkadot/x-textdecoder/node_modules/@polkadot/x-global": { + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.5.1.tgz", + "integrity": "sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==", + "dependencies": { + "tslib": "^2.6.2" }, "engines": { "node": ">=16" } }, + "node_modules/@polkadot/x-textdecoder/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/x-textencoder": { - "version": "12.3.2", - "license": "Apache-2.0", + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-12.5.1.tgz", + "integrity": "sha512-1JNNpOGb4wD+c7zFuOqjibl49LPnHNr4rj4s3WflLUIZvOMY6euoDuN3ISjQSHCLlVSoH0sOCWA3qXZU4bCTDQ==", "dependencies": { - "@polkadot/x-global": "12.3.2", - "tslib": "^2.5.3" + "@polkadot/x-global": "12.5.1", + "tslib": "^2.6.2" }, "engines": { "node": ">=16" } }, + "node_modules/@polkadot/x-textencoder/node_modules/@polkadot/x-global": { + "version": "12.5.1", + "resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-12.5.1.tgz", + "integrity": "sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@polkadot/x-textencoder/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, "node_modules/@polkadot/x-ws": { "version": "12.3.2", "license": "Apache-2.0", @@ -4028,67 +4257,60 @@ "license": "MIT" }, "node_modules/@scure/bip32": { - "version": "1.3.0", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.2.tgz", + "integrity": "sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==", "dependencies": { - "@noble/curves": "~1.0.0", - "@noble/hashes": "~1.3.0", - "@scure/base": "~1.1.0" + "@noble/curves": "~1.2.0", + "@noble/hashes": "~1.3.2", + "@scure/base": "~1.1.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/@scure/bip32/node_modules/@noble/curves": { - "version": "1.0.0", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", "dependencies": { - "@noble/hashes": "1.3.0" + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/@scure/bip32/node_modules/@noble/hashes": { - "version": "1.3.0", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT" + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32/node_modules/@scure/base": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.3.tgz", + "integrity": "sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==", + "funding": { + "url": "https://paulmillr.com/funding/" + } }, "node_modules/@scure/bip39": { - "version": "1.2.0", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz", + "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==", "dependencies": { "@noble/hashes": "~1.3.0", "@scure/base": "~1.1.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "node_modules/@scure/bip39/node_modules/@noble/hashes": { - "version": "1.3.0", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT" - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -4283,22 +4505,6 @@ "node": ">=14.0.0" } }, - "node_modules/@snowfork/snowbridge-types/node_modules/@polkadot/rpc-provider/node_modules/@polkadot/keyring": { - "version": "8.7.1", - "license": "Apache-2.0", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" - } - }, "node_modules/@snowfork/snowbridge-types/node_modules/@polkadot/types": { "version": "7.15.1", "license": "Apache-2.0", @@ -4378,22 +4584,6 @@ "node": ">=14.0.0" } }, - "node_modules/@snowfork/snowbridge-types/node_modules/@polkadot/types/node_modules/@polkadot/keyring": { - "version": "8.7.1", - "license": "Apache-2.0", - "dependencies": { - "@babel/runtime": "^7.17.8", - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@polkadot/util": "8.7.1", - "@polkadot/util-crypto": "8.7.1" - } - }, "node_modules/@snowfork/snowbridge-types/node_modules/@polkadot/util": { "version": "8.7.1", "resolved": "https://registry.npmjs.org/@polkadot/util/-/util-8.7.1.tgz", @@ -4678,8 +4868,9 @@ } }, "node_modules/@substrate/ss58-registry": { - "version": "1.40.0", - "license": "Apache-2.0" + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz", + "integrity": "sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==" }, "node_modules/@substrate/txwrapper-core": { "version": "6.0.1", @@ -4830,14 +5021,6 @@ "@types/chai": "*" } }, - "node_modules/@types/cli-progress": { - "version": "3.11.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/debug": { "version": "4.1.8", "dev": true, @@ -4886,9 +5069,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz", - "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==" + "version": "20.8.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz", + "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==" }, "node_modules/@types/node-fetch": { "version": "2.6.4", @@ -5103,29 +5286,6 @@ "url": "https://opencollective.com/vitest" } }, - "node_modules/@wagmi/chains": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@wagmi/chains/-/chains-1.6.0.tgz", - "integrity": "sha512-5FRlVxse5P4ZaHG3GTvxwVANSmYJas1eQrTBHhjxVtqXoorm0aLmCHbhmN8Xo1yu09PaWKlleEvfE98yH4AgIw==", - "funding": [ - { - "type": "gitcoin", - "url": "https://wagmi.sh/gitcoin" - }, - { - "type": "github", - "url": "https://github.com/sponsors/wagmi-dev" - } - ], - "peerDependencies": { - "typescript": ">=5.0.4" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/@zeitgeistpm/type-defs": { "version": "1.0.0", "license": "GPL-3.0" @@ -5135,16 +5295,16 @@ "license": "BSD-4-Clause" }, "node_modules/@zombienet/orchestrator": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/@zombienet/orchestrator/-/orchestrator-0.0.50.tgz", - "integrity": "sha512-phpyoUmC2Kv+IJ8naqvaJ/CIT0DT+WNpACa22LTdx4ZukJWXbVfTkWm1imejApUyk7NmLK92OlwCdUOGdyOATg==", + "version": "0.0.54", + "resolved": "https://registry.npmjs.org/@zombienet/orchestrator/-/orchestrator-0.0.54.tgz", + "integrity": "sha512-PmHlSqJyLaz0+xSDmE4SkXDg8xfvKCObdVtrckpFqRihqf8S938IoCDECD1ji01fW+sCIdOD4UzMrpBMlCoivg==", "dev": true, "dependencies": { "@polkadot/api": "^10.9.1", - "@polkadot/keyring": "^12.3.2", - "@polkadot/util-crypto": "^12.3.2", - "@zombienet/utils": "^0.0.21", - "chai": "^4.3.7", + "@polkadot/keyring": "^12.4.2", + "@polkadot/util-crypto": "^12.4.2", + "@zombienet/utils": "^0.0.22", + "chai": "^4.3.8", "debug": "^4.3.4", "execa": "^5.1.1", "fs-extra": "^11.1.1", @@ -5157,25 +5317,28 @@ "napi-maybe-compressed-blob": "^0.0.11", "peer-id": "^0.16.0", "tmp-promise": "^3.0.3", - "typescript": "^5.1.6", - "yaml": "^2.3.1" + "typescript": "^5.2.2", + "yaml": "^2.3.2" }, "engines": { "node": ">=18" } }, "node_modules/@zombienet/orchestrator/node_modules/@zombienet/utils": { - "version": "0.0.21", - "resolved": "https://registry.npmjs.org/@zombienet/utils/-/utils-0.0.21.tgz", - "integrity": "sha512-31fMNlITzmj1gPha2CcihDE6nON94r8ixZTZbWa2g0nacS0nnoTKUNFukw9vg+aGF5QkwSevy+eobOQEb/jhjg==", + "version": "0.0.22", + "resolved": "https://registry.npmjs.org/@zombienet/utils/-/utils-0.0.22.tgz", + "integrity": "sha512-jr2RAP0jYxzHPFSIWJP3W0ctili7XpwH/cs3BGFUmCU/Nj3dqkZpMqEBoxMECGUNQ4MS3jdgDoqR86UcsALXWw==", "dev": true, "dependencies": { - "cli-table3": "^0.6.2", + "cli-table3": "^0.6.3", "debug": "^4.3.4", "mocha": "^10.2.0", "nunjucks": "^3.2.4", "toml": "^3.0.0", "ts-node": "^10.9.1" + }, + "engines": { + "node": ">=18" } }, "node_modules/@zombienet/orchestrator/node_modules/minimatch": { @@ -5219,9 +5382,9 @@ "license": "ISC" }, "node_modules/abitype": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.9.3.tgz", - "integrity": "sha512-dz4qCQLurx97FQhnb/EIYTk/ldQ+oafEDUqC0VVIeQS1Q48/YWt/9YNfMmp9SLFqN41ktxny3c8aYxHjmFIB/w==", + "version": "0.9.8", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-0.9.8.tgz", + "integrity": "sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ==", "funding": [ { "type": "github", @@ -5510,15 +5673,6 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/asap": { "version": "2.0.6", "license": "MIT" @@ -5892,21 +6046,6 @@ "integrity": "sha512-kssLD5mDLoawmLZFgQRRq0Wy+dca/os6TZ0MHWyFVoVAEwSrpAxmNCZ1K1GUelfhlDaL2FikRxeF9GkATdzXZg==", "dev": true }, - "node_modules/bundle-require": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-4.0.1.tgz", - "integrity": "sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==", - "dev": true, - "dependencies": { - "load-tsconfig": "^0.2.3" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "peerDependencies": { - "esbuild": ">=0.17" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -5950,20 +6089,6 @@ "node": ">= 10" } }, - "node_modules/cacache/node_modules/rimraf": { - "version": "3.0.2", - "license": "ISC", - "optional": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/cacheable-lookup": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.1.0.tgz", @@ -6049,16 +6174,17 @@ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, "node_modules/chai": { - "version": "4.3.7", - "license": "MIT", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", "dependencies": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" @@ -6082,8 +6208,12 @@ "dev": true }, "node_modules/check-error": { - "version": "1.0.2", - "license": "MIT", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { "node": "*" } @@ -6284,9 +6414,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz", - "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz", + "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==", "dev": true, "engines": { "node": ">=6" @@ -6309,12 +6439,12 @@ } }, "node_modules/cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz", + "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==", "dev": true, "engines": { - "node": ">= 10" + "node": ">= 12" } }, "node_modules/cliui": { @@ -6590,8 +6720,9 @@ }, "node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6873,6 +7004,20 @@ "ieee754": "^1.1.13" } }, + "node_modules/define-data-property": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", + "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { "version": "1.2.0", "license": "MIT", @@ -6937,26 +7082,14 @@ "license": "Apache-2.0" }, "node_modules/diff-sequences": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", - "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/dom-walk": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", @@ -7576,18 +7709,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/ethereum-cryptography/node_modules/@scure/bip39": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz", - "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==", - "dependencies": { - "@noble/hashes": "~1.3.0", - "@scure/base": "~1.1.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/ethereumjs-util": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz", @@ -7637,9 +7758,9 @@ } }, "node_modules/ethers": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.7.0.tgz", - "integrity": "sha512-pxt5hK82RNwcTX2gOZP81t6qVPVspnkpeivwEgQuK9XUvbNtghBnT8GNIb/gPh+WnVSfi8cXC9XlfT8sqc6D6w==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.7.1.tgz", + "integrity": "sha512-qX5kxIFMfg1i+epfgb0xF4WM7IqapIIu50pOJ17aebkxxa4BacW5jFrQRmCJpDEg2ZK2oNtR5QjrQ1WDBF29dA==", "dev": true, "funding": [ { @@ -8040,27 +8161,43 @@ } }, "node_modules/figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz", + "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==", "dev": true, "dependencies": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "^5.0.0", + "is-unicode-supported": "^1.2.0" }, "engines": { - "node": ">=8" + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/figures/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", "dev": true, "engines": { - "node": ">=0.8.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/figures/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/fill-range": { @@ -8197,15 +8334,15 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.4.tgz", + "integrity": "sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==", "engines": { "node": "*" }, "funding": { "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://github.com/sponsors/rawify" } }, "node_modules/fresh": { @@ -8317,8 +8454,9 @@ } }, "node_modules/get-func-name": { - "version": "2.0.0", - "license": "MIT", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "engines": { "node": "*" } @@ -8439,26 +8577,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/gopd": { "version": "1.0.1", "license": "MIT", @@ -8838,15 +8956,6 @@ ], "license": "BSD-3-Clause" }, - "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/immediate": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", @@ -8890,29 +8999,29 @@ "license": "ISC" }, "node_modules/inquirer": { - "version": "8.2.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", - "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "version": "9.2.11", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.11.tgz", + "integrity": "sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g==", "dev": true, "dependencies": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.1", + "@ljharb/through": "^2.3.9", + "ansi-escapes": "^4.3.2", + "chalk": "^5.3.0", "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", + "cli-width": "^4.1.0", + "external-editor": "^3.1.0", + "figures": "^5.0.0", "lodash": "^4.17.21", - "mute-stream": "0.0.8", + "mute-stream": "1.0.0", "ora": "^5.4.1", - "run-async": "^2.4.0", - "rxjs": "^7.5.5", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6", - "wrap-ansi": "^6.0.1" + "run-async": "^3.0.0", + "rxjs": "^7.8.1", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^6.2.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.18.0" } }, "node_modules/inquirer-press-to-continue": { @@ -9037,44 +9146,16 @@ "node_modules/inquirer-press-to-continue/node_modules/strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "dependencies": { - "has-flag": "^4.0.0" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/inquirer/node_modules/wrap-ansi": { @@ -9986,30 +10067,6 @@ "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==", "dev": true }, - "node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "node_modules/load-tsconfig": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz", - "integrity": "sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/local-pkg": { "version": "0.4.3", "license": "MIT", @@ -10045,12 +10102,6 @@ "version": "4.6.2", "license": "MIT" }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", - "dev": true - }, "node_modules/log-symbols": { "version": "4.1.0", "license": "MIT", @@ -10217,19 +10268,19 @@ } }, "node_modules/mathjs": { - "version": "11.9.1", - "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-11.9.1.tgz", - "integrity": "sha512-VdB9ELZ6Dwda13j5d1eCBETmPO8m9qIJETUdfZmTA9cPnXUiIk7UuoAmvxFqtfAe32XYuRugAec2Ndv0/RfRhg==", + "version": "11.11.1", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-11.11.1.tgz", + "integrity": "sha512-uWrwMrhU31TCqHKmm1yFz0C352njGUVr/I1UnpMOxI/VBTTbCktx/mREUXx5Vyg11xrFdg/F3wnMM7Ql/csVsQ==", "dependencies": { - "@babel/runtime": "^7.22.6", + "@babel/runtime": "^7.22.15", "complex.js": "^2.1.1", "decimal.js": "^10.4.3", "escape-latex": "^1.2.0", - "fraction.js": "^4.2.0", + "fraction.js": "4.3.4", "javascript-natural-sort": "^0.7.1", "seedrandom": "^3.0.5", "tiny-emitter": "^2.1.0", - "typed-function": "^4.1.0" + "typed-function": "^4.1.1" }, "bin": { "mathjs": "bin/cli.js" @@ -11345,10 +11396,13 @@ } }, "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/mz": { "version": "2.7.0", @@ -11600,20 +11654,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/node-gyp/node_modules/rimraf": { - "version": "3.0.2", - "license": "ISC", - "optional": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/nopt": { "version": "5.0.0", "license": "ISC", @@ -11976,8 +12016,9 @@ }, "node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -11987,15 +12028,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/pathe": { "version": "1.1.1", "license": "MIT" @@ -12138,15 +12170,6 @@ "version": "6.2.1", "license": "MIT" }, - "node_modules/pirates": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/pkg-types": { "version": "1.0.3", "license": "MIT", @@ -12645,35 +12668,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-load-config": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", - "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", - "dev": true, - "dependencies": { - "lilconfig": "^2.0.5", - "yaml": "^2.1.1" - }, - "engines": { - "node": ">= 14" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, "node_modules/postcss-value-parser": { "version": "4.2.0", "license": "MIT" @@ -12921,12 +12915,12 @@ } }, "node_modules/randomness": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/randomness/-/randomness-1.6.0.tgz", - "integrity": "sha512-iRLTTxFFfUx5patImsPlBk6rfLf79/4SBeuNWxoTjRY484ELAah5wuDMNlJMnE3PmWMlaxQBYIFbFF2XQxpwBg==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/randomness/-/randomness-1.6.4.tgz", + "integrity": "sha512-WRIdC7TE1iD6v/s++0jP4h9UKl1419/RUiWNE4+fJN6jUmRXTaSyZ0OvP701TjduEYQh+wNJpQVkK+9/ReDkUA==", "dependencies": { "fft-js": "0.0.12", - "mathjs": "11.9.1" + "mathjs": "11.11.1" }, "engines": { "node": ">=14 <15 || >=16 <17 || >=18" @@ -13044,14 +13038,14 @@ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -13150,15 +13144,6 @@ "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" }, - "node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/resolve-pkg-maps": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", @@ -13216,6 +13201,20 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/ripemd160": { "version": "2.0.2", "license": "MIT", @@ -13267,9 +13266,9 @@ "license": "MIT" }, "node_modules/run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", + "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==", "dev": true, "engines": { "node": ">=0.12.0" @@ -13509,6 +13508,20 @@ "version": "2.0.0", "license": "ISC" }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "license": "MIT" @@ -13535,8 +13548,9 @@ }, "node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -13546,8 +13560,9 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -13625,15 +13640,6 @@ "node": ">= 10" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/smart-buffer": { "version": "4.2.0", "license": "MIT", @@ -13718,18 +13724,6 @@ "atomic-sleep": "^1.0.0" } }, - "node_modules/source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "dependencies": { - "whatwg-url": "^7.0.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/source-map-js": { "version": "1.0.2", "license": "BSD-3-Clause", @@ -13756,32 +13750,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map/node_modules/tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/source-map/node_modules/webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, - "node_modules/source-map/node_modules/whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "node_modules/split2": { "version": "4.2.0", "license": "ISC", @@ -14021,57 +13989,6 @@ "react-is": ">= 16.8.0" } }, - "node_modules/sucrase": { - "version": "3.34.0", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", - "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.2", - "commander": "^4.0.0", - "glob": "7.1.6", - "lines-and-columns": "^1.1.6", - "mz": "^2.7.0", - "pirates": "^4.0.1", - "ts-interface-checker": "^0.1.9" - }, - "bin": { - "sucrase": "bin/sucrase", - "sucrase-node": "bin/sucrase-node" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sucrase/node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/sucrase/node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/supports-color": { "version": "5.5.0", "license": "MIT", @@ -14412,21 +14329,6 @@ "tmp": "^0.2.0" } }, - "node_modules/tmp-promise/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/tmp-promise/node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -14505,21 +14407,6 @@ "version": "0.0.3", "license": "MIT" }, - "node_modules/tree-kill": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", - "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", - "dev": true, - "bin": { - "tree-kill": "cli.js" - } - }, - "node_modules/ts-interface-checker": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", - "dev": true - }, "node_modules/ts-node": { "version": "10.9.1", "license": "MIT", @@ -14572,51 +14459,6 @@ "version": "2.5.3", "license": "0BSD" }, - "node_modules/tsup": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/tsup/-/tsup-7.2.0.tgz", - "integrity": "sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==", - "dev": true, - "dependencies": { - "bundle-require": "^4.0.0", - "cac": "^6.7.12", - "chokidar": "^3.5.1", - "debug": "^4.3.1", - "esbuild": "^0.18.2", - "execa": "^5.0.0", - "globby": "^11.0.3", - "joycon": "^3.0.1", - "postcss-load-config": "^4.0.1", - "resolve-from": "^5.0.0", - "rollup": "^3.2.5", - "source-map": "0.8.0-beta.0", - "sucrase": "^3.20.3", - "tree-kill": "^1.2.2" - }, - "bin": { - "tsup": "dist/cli-default.js", - "tsup-node": "dist/cli-node.js" - }, - "engines": { - "node": ">=16.14" - }, - "peerDependencies": { - "@swc/core": "^1", - "postcss": "^8.4.12", - "typescript": ">=4.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "postcss": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, "node_modules/tsx": { "version": "3.12.7", "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.7.tgz", @@ -14683,9 +14525,9 @@ } }, "node_modules/typed-function": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.0.tgz", - "integrity": "sha512-DGwUl6cioBW5gw2L+6SMupGwH/kZOqivy17E4nsh1JI9fKF87orMmlQx3KISQPmg3sfnOUGlwVkroosvgddrlg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.1.tgz", + "integrity": "sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ==", "engines": { "node": ">= 14" } @@ -14866,9 +14708,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -15027,20 +14869,25 @@ } }, "node_modules/viem": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/viem/-/viem-1.6.0.tgz", - "integrity": "sha512-ae9Twkd0q2Qlj4yYpWjb4DzYAhKY0ibEpRH8FJaTywZXNpTjFidSdBaT0CVn1BaH7O7cnX4/O47zvDUMGJD1AA==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/viem/-/viem-1.15.1.tgz", + "integrity": "sha512-lxk8wwUK7ZivYAUZ6pH+9Y6jjrfXXjafCOoASa4lw3ULUCT2BajU4SELarlxJQimpsFd7OZD4m4iEXYLF/bt6w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/wagmi-dev" + } + ], "dependencies": { - "@adraffy/ens-normalize": "1.9.0", - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.0", - "@scure/bip32": "1.3.0", - "@scure/bip39": "1.2.0", - "@types/ws": "^8.5.4", - "@wagmi/chains": "1.6.0", - "abitype": "0.9.3", + "@adraffy/ens-normalize": "1.9.4", + "@noble/curves": "1.2.0", + "@noble/hashes": "1.3.2", + "@scure/bip32": "1.3.2", + "@scure/bip39": "1.2.1", + "@types/ws": "^8.5.5", + "abitype": "0.9.8", "isomorphic-ws": "5.0.0", - "ws": "8.12.0" + "ws": "8.13.0" }, "peerDependencies": { "typescript": ">=5.0.4" @@ -15052,39 +14899,30 @@ } }, "node_modules/viem/node_modules/@adraffy/ens-normalize": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.0.tgz", - "integrity": "sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ==" + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz", + "integrity": "sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw==" }, - "node_modules/viem/node_modules/@noble/hashes": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz", - "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ] + "node_modules/viem/node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } }, - "node_modules/viem/node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "node_modules/viem/node_modules/@noble/hashes": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" + "node": ">= 16" }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } + "funding": { + "url": "https://paulmillr.com/funding/" } }, "node_modules/vite": { @@ -16410,9 +16248,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", "dev": true, "engines": { "node": ">= 14" diff --git a/test/package.json b/test/package.json index 7fddda3501..f6a3ccc26f 100644 --- a/test/package.json +++ b/test/package.json @@ -15,8 +15,8 @@ "license": "ISC", "devDependencies": { "@moonbeam-network/api-augment": "^0.2400.0", - "@moonwall/cli": "^4.0.19", - "@moonwall/util": "^4.0.18", + "@moonwall/cli": "^4.1.6", + "@moonwall/util": "^4.1.6", "@polkadot/api": "^10.9.1", "@polkadot/api-augment": "^10.9.1", "@polkadot/types": "^10.9.1", @@ -38,7 +38,7 @@ "yargs": "^17.7.2" }, "dependencies": { - "@acala-network/chopsticks": "^0.7.3", + "@acala-network/chopsticks": "^0.8.1", "@openzeppelin/contracts": "^4.9.3", "@polkadot/api-derive": "^10.9.1", "@polkadot/apps-config": "^0.132.1", diff --git a/test/pnpm-lock.yaml b/test/pnpm-lock.yaml index 451db1e0d6..44cf49b772 100644 --- a/test/pnpm-lock.yaml +++ b/test/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@acala-network/chopsticks': - specifier: ^0.7.3 - version: 0.7.3(debug@4.3.4) + specifier: ^0.8.1 + version: 0.8.1(@polkadot/util@12.4.2)(debug@4.3.4) '@openzeppelin/contracts': specifier: ^4.9.3 version: 4.9.3 @@ -83,11 +83,11 @@ devDependencies: specifier: ^0.2400.0 version: 0.2400.0 '@moonwall/cli': - specifier: ^4.0.19 - version: 4.0.19(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6) + specifier: ^4.1.6 + version: 4.1.6(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6) '@moonwall/util': - specifier: ^4.0.18 - version: 4.0.18(@vitest/ui@0.31.4)(typescript@5.1.6) + specifier: ^4.1.6 + version: 4.1.6(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6) '@polkadot/api': specifier: ^10.9.1 version: 10.9.1 @@ -148,8 +148,58 @@ devDependencies: packages: + /@acala-network/chopsticks-core@0.8.1(@polkadot/util@12.4.2)(debug@4.3.4): + resolution: {integrity: sha512-EZQRXKun9hqAW5BONa2/XAA15DwX3JQfJyvuPMxeIQNDUhyAH8Az3VbfEfhEnfsMbIVC2RyOFowZ8gy+bsuTjg==} + dependencies: + '@acala-network/chopsticks-executor': 0.8.1(@polkadot/util@12.4.2) + '@polkadot/api': 10.9.1 + '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) + axios: 1.5.1(debug@4.3.4) + eventemitter3: 5.0.1 + localforage: 1.10.0 + lodash: 4.17.21 + pino: 8.15.0 + pino-pretty: 10.2.0 + sql.js: 1.8.0 + sqlite3: 5.1.6 + typeorm: 0.3.17(sql.js@1.8.0)(sqlite3@5.1.6) + zod: 3.22.2 + transitivePeerDependencies: + - '@google-cloud/spanner' + - '@polkadot/util' + - '@sap/hana-client' + - better-sqlite3 + - bluebird + - bufferutil + - debug + - encoding + - hdb-pool + - ioredis + - mongodb + - mssql + - mysql2 + - oracledb + - pg + - pg-native + - pg-query-stream + - redis + - supports-color + - ts-node + - typeorm-aurora-data-api-driver + - utf-8-validate + dev: false + /@acala-network/chopsticks-executor@0.7.3: resolution: {integrity: sha512-sPAQst4/i8S5i3aGPz7YXgRHfoR71HxOdk30PXnuExkUpOKQH1BYD0wuQkoVstonTeBwis3BSW5CL9Xz/4ksjQ==} + dev: true + + /@acala-network/chopsticks-executor@0.8.1(@polkadot/util@12.4.2): + resolution: {integrity: sha512-ILVjn2yc9A27DYastbEoE9jEHUe/P8sCaGWVF3aQCXQCOh2MHgi0UXcfe+2VQKRQsrr4eEjt/hospOFZMmGB3Q==} + dependencies: + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.4.2) + transitivePeerDependencies: + - '@polkadot/util' + dev: false /@acala-network/chopsticks@0.7.3(debug@4.3.4): resolution: {integrity: sha512-RYGFI1UQgNwc+rUwjoZEucLYesiG62IJXT9ABfs/KKEkvMx6JiJWwO37tObdGkUm4S8zezdRumEnOPOl+B65FQ==} @@ -158,7 +208,7 @@ packages: '@acala-network/chopsticks-executor': 0.7.3 '@pnpm/npm-conf': 2.2.2 '@polkadot/api': 10.9.1 - axios: 1.4.0(debug@4.3.4) + axios: 1.5.1(debug@4.3.4) global-agent: 3.0.0 js-yaml: 4.1.0 jsondiffpatch: 0.4.1 @@ -167,10 +217,10 @@ packages: pino-pretty: 10.2.0 reflect-metadata: 0.1.13 sqlite3: 5.1.6 - typeorm: 0.3.17(sqlite3@5.1.6) - ws: 8.13.0 + typeorm: 0.3.17(sql.js@1.8.0)(sqlite3@5.1.6) + ws: 8.14.2 yargs: 17.7.2 - zod: 3.21.4 + zod: 3.22.2 transitivePeerDependencies: - '@google-cloud/spanner' - '@sap/hana-client' @@ -194,6 +244,48 @@ packages: - ts-node - typeorm-aurora-data-api-driver - utf-8-validate + dev: true + + /@acala-network/chopsticks@0.8.1(@polkadot/util@12.4.2)(debug@4.3.4): + resolution: {integrity: sha512-2CY07A9DPOfA+qseZi7GXzCsppInUZBmotCNYcpPV+W/iGOeAgJJfm6tHUpmsRv6nc6nMIDOdbKK57F5OUT3vA==} + hasBin: true + dependencies: + '@acala-network/chopsticks-core': 0.8.1(@polkadot/util@12.4.2)(debug@4.3.4) + '@pnpm/npm-conf': 2.2.2 + '@polkadot/api': 10.9.1 + axios: 1.5.1(debug@4.3.4) + dotenv: 16.3.1 + global-agent: 3.0.0 + js-yaml: 4.1.0 + jsondiffpatch: 0.5.0 + lodash: 4.17.21 + ws: 8.14.2 + yargs: 17.7.2 + zod: 3.22.2 + transitivePeerDependencies: + - '@google-cloud/spanner' + - '@polkadot/util' + - '@sap/hana-client' + - better-sqlite3 + - bluebird + - bufferutil + - debug + - encoding + - hdb-pool + - ioredis + - mongodb + - mssql + - mysql2 + - oracledb + - pg + - pg-native + - pg-query-stream + - redis + - supports-color + - ts-node + - typeorm-aurora-data-api-driver + - utf-8-validate + dev: false /@acala-network/type-definitions@5.1.1(@polkadot/types@10.9.1): resolution: {integrity: sha512-QNhPwWePz/gFluSACKIhq0Z7rTntS21uIZUNpp9tsvc0zlJ20QjHJnv+ZfkdaKauFrL5upFfTgWqrLhN0jV0JQ==} @@ -205,6 +297,7 @@ packages: /@adraffy/ens-normalize@1.9.0: resolution: {integrity: sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ==} + dev: false /@adraffy/ens-normalize@1.9.2: resolution: {integrity: sha512-0h+FrQDqe2Wn+IIGFkTCd4aAwTJ+7834Ek1COohCyV26AXhwQ7WQaz+4F/nLOeVl/3BtWHOHLPsq46V8YB46Eg==} @@ -258,7 +351,7 @@ packages: '@babel/traverse': 7.22.15 '@babel/types': 7.22.15 convert-source-map: 1.9.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -451,13 +544,13 @@ packages: engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 + dev: false /@babel/runtime@7.22.11: resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 - dev: false /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} @@ -507,7 +600,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.22.16 '@babel/types': 7.22.15 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -1256,6 +1349,11 @@ packages: '@open-web3/orml-type-definitions': 0.8.2-11 dev: false + /@ljharb/through@2.3.9: + resolution: {integrity: sha512-yN599ZBuMPPK4tdoToLlvgJB4CLK8fGl7ntfy0Wn7U6ttNvHYurd81bfUiK/6sMkiIwm65R6ck4L6+Y3DfVbNQ==} + engines: {node: '>= 0.4'} + dev: true + /@logion/node-api@0.16.0: resolution: {integrity: sha512-lc825osQK/psRqptw8LrmlvZWGBYLq4YADhhvUl9d3rQCpDDjUEKHqRVJ7CoG/B6sxj4qdqUCCYH678vGJRPcg==} engines: {node: '>=16'} @@ -1279,7 +1377,7 @@ packages: detect-libc: 2.0.2 https-proxy-agent: 5.0.1 make-dir: 3.1.0 - node-fetch: 2.6.12 + node-fetch: 2.7.0 nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 @@ -1300,42 +1398,44 @@ packages: engines: {node: '>=14.0.0'} dev: true - /@moonwall/cli@4.0.19(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6): - resolution: {integrity: sha512-N7Me5YQwMm3+8H+vn081QLjAHsQ3H/SCvlg9WaYJKCC7fN5XaXZsZo8wSO/pCoGKLf9JEm6h232Noix1+9k4pg==} + /@moonwall/cli@4.1.6(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6): + resolution: {integrity: sha512-Y+b3f83T4PpGNvcDqauhGRBjn121/rtMPxLflohJXomXRoThB+vriI3jL/atnAO5IKbpPjeMo1sRNcle5+WYhw==} engines: {node: '>=14.16.0', pnpm: '>=7'} hasBin: true dependencies: '@acala-network/chopsticks': 0.7.3(debug@4.3.4) '@moonbeam-network/api-augment': 0.2400.0 - '@moonwall/types': 4.0.18(typescript@5.1.6) - '@moonwall/util': 4.0.18(@vitest/ui@0.31.4)(typescript@5.1.6) + '@moonwall/types': 4.1.6(@types/node@20.5.4)(typescript@5.1.6) + '@moonwall/util': 4.1.6(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6) '@polkadot/api': 10.9.1 '@polkadot/api-augment': 10.9.1 '@polkadot/api-derive': 10.9.1 - '@polkadot/keyring': 12.4.2(@polkadot/util-crypto@12.4.2)(@polkadot/util@12.4.2) + '@polkadot/keyring': 12.5.1(@polkadot/util-crypto@12.5.1)(@polkadot/util@12.5.1) '@polkadot/types': 10.9.1 '@polkadot/types-codec': 10.9.1 - '@polkadot/util': 12.4.2 - '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) - '@zombienet/orchestrator': 0.0.50(@polkadot/util@12.4.2)(@types/node@20.5.4) + '@polkadot/util': 12.5.1 + '@polkadot/util-crypto': 12.5.1(@polkadot/util@12.5.1) + '@zombienet/orchestrator': 0.0.56(@polkadot/util@12.5.1)(@types/node@20.5.4) + '@zombienet/utils': 0.0.22(@types/node@20.5.4)(typescript@5.1.6) bottleneck: 2.19.5 chalk: 5.3.0 clear: 0.1.0 cli-progress: 3.12.0 colors: 1.4.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) dotenv: 16.3.1 ethers: 6.7.1 - inquirer: 8.2.6 - inquirer-press-to-continue: 1.2.0(inquirer@8.2.6) + inquirer: 9.2.11 + inquirer-press-to-continue: 1.2.0(inquirer@9.2.11) + minimatch: 9.0.3 node-fetch: 3.3.2 semver: 7.5.4 - viem: 1.7.0(typescript@5.1.6) - vitest: 0.34.2(@vitest/ui@0.31.4) + viem: 1.15.4(typescript@5.1.6) + vitest: 0.34.6(@vitest/ui@0.31.4) web3: 4.0.3 web3-providers-ws: 4.0.3 - ws: 8.13.0 - yaml: 2.3.1 + ws: 8.14.2 + yaml: 2.3.2 yargs: 17.7.2 transitivePeerDependencies: - '@edge-runtime/vm' @@ -1382,23 +1482,28 @@ packages: - zod dev: true - /@moonwall/types@4.0.18(typescript@5.1.6): - resolution: {integrity: sha512-1oAHXhRT59Is96XPzsWJq/4CLLj5TMMgAVEn0kSlpZfesrlPGjwMJu8cnrTkoLd2r67y4gmdwlfe/Exn/YY02A==} + /@moonwall/types@4.1.6(@types/node@20.5.4)(typescript@5.1.6): + resolution: {integrity: sha512-bPshKiorLsgl0NOsUZCP0wsF1g3wrbnYQ1UXPRzLfrH9/ZLlFkKYqlnPBD4Fo4ZT/tZp5LTdOGxgrdxi5dfN0w==} engines: {node: '>=14.16.0', pnpm: '>=7'} dependencies: '@polkadot/api': 10.9.1 '@polkadot/api-base': 10.9.1 - '@polkadot/keyring': 12.4.2(@polkadot/util-crypto@12.4.2)(@polkadot/util@12.4.2) + '@polkadot/keyring': 12.5.1(@polkadot/util-crypto@12.5.1)(@polkadot/util@12.5.1) '@polkadot/types': 10.9.1 - '@polkadot/util': 12.4.2 - '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) + '@polkadot/util': 12.5.1 + '@polkadot/util-crypto': 12.5.1(@polkadot/util@12.5.1) + '@zombienet/utils': 0.0.22(@types/node@20.5.4)(typescript@5.1.6) bottleneck: 2.19.5 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) ethers: 6.7.1 - viem: 1.7.0(typescript@5.1.6) + viem: 1.15.4(typescript@5.1.6) web3: 4.0.3 transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' - bufferutil + - chokidar - encoding - supports-color - typescript @@ -1406,45 +1511,49 @@ packages: - zod dev: true - /@moonwall/util@4.0.18(@vitest/ui@0.31.4)(typescript@5.1.6): - resolution: {integrity: sha512-iFMKiWAVsnEk12io+g5BkkpoS7dDxQS6/ZrwHneOHTMB9yo1Nbmi/hP/4fBjSGxApSTY/NpryP3mJ7orNt2DXA==} + /@moonwall/util@4.1.6(@types/node@20.5.4)(@vitest/ui@0.31.4)(typescript@5.1.6): + resolution: {integrity: sha512-eYIQbfTDIVxPHLiy7Bry4y9xcB04YIQ0JY5zYQD+Aq2oFjoPJawyKhLlTsr29cP0lrr5fbvomB5LPohWaDgcqQ==} engines: {node: '>=14.16.0', pnpm: '>=7'} dependencies: '@moonbeam-network/api-augment': 0.2400.0 - '@moonwall/types': 4.0.18(typescript@5.1.6) + '@moonwall/types': 4.1.6(@types/node@20.5.4)(typescript@5.1.6) '@polkadot/api': 10.9.1 '@polkadot/api-augment': 10.9.1 '@polkadot/api-derive': 10.9.1 - '@polkadot/keyring': 12.4.2(@polkadot/util-crypto@12.4.2)(@polkadot/util@12.4.2) + '@polkadot/keyring': 12.5.1(@polkadot/util-crypto@12.5.1)(@polkadot/util@12.5.1) '@polkadot/rpc-provider': 10.9.1 '@polkadot/types': 10.9.1 '@polkadot/types-codec': 10.9.1 - '@polkadot/util': 12.4.2 - '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) + '@polkadot/util': 12.5.1 + '@polkadot/util-crypto': 12.5.1(@polkadot/util@12.5.1) bottleneck: 2.19.5 chalk: 5.3.0 clear: 0.1.0 cli-progress: 3.12.0 colors: 1.4.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) dotenv: 16.3.1 ethers: 6.7.1 - inquirer: 8.2.6 - inquirer-press-to-continue: 1.2.0(inquirer@8.2.6) + inquirer: 9.2.11 + inquirer-press-to-continue: 1.2.0(inquirer@9.2.11) node-fetch: 3.3.2 rlp: 3.0.0 semver: 7.5.4 - viem: 1.7.0(typescript@5.1.6) - vitest: 0.34.2(@vitest/ui@0.31.4) + viem: 1.15.4(typescript@5.1.6) + vitest: 0.34.6(@vitest/ui@0.31.4) web3: 4.0.3 - ws: 8.13.0 - yaml: 2.3.1 + ws: 8.14.2 + yaml: 2.3.2 yargs: 17.7.2 transitivePeerDependencies: - '@edge-runtime/vm' + - '@swc/core' + - '@swc/wasm' + - '@types/node' - '@vitest/browser' - '@vitest/ui' - bufferutil + - chokidar - encoding - happy-dom - jsdom @@ -1467,12 +1576,19 @@ packages: resolution: {integrity: sha512-2upgEu0iLiDVDZkNLeFV2+ht0BAVgQnEmCk6JsOch9Rp8xfkMCbvbAZlA2pBHQc73dbl+vFOXfqkf4uemdn0bw==} dependencies: '@noble/hashes': 1.3.0 + dev: false /@noble/curves@1.1.0: resolution: {integrity: sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==} dependencies: '@noble/hashes': 1.3.1 + /@noble/curves@1.2.0: + resolution: {integrity: sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==} + dependencies: + '@noble/hashes': 1.3.2 + dev: true + /@noble/ed25519@1.7.3: resolution: {integrity: sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==} dev: true @@ -1491,11 +1607,17 @@ packages: /@noble/hashes@1.3.0: resolution: {integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==} + dev: false /@noble/hashes@1.3.1: resolution: {integrity: sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==} engines: {node: '>= 16'} + /@noble/hashes@1.3.2: + resolution: {integrity: sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==} + engines: {node: '>= 16'} + dev: true + /@noble/secp256k1@1.5.5: resolution: {integrity: sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==} dev: false @@ -1914,6 +2036,18 @@ packages: '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) tslib: 2.6.2 + /@polkadot/keyring@12.5.1(@polkadot/util-crypto@12.5.1)(@polkadot/util@12.5.1): + resolution: {integrity: sha512-u6b+Q7wI6WY/vwmJS9uUHy/5hKZ226nTlVNmxjkj9GvrRsQvUSwS94163yHPJwiZJiIv5xK5m0rwCMyoYu+wjA==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': 12.5.1 + '@polkadot/util-crypto': 12.5.1 + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/util-crypto': 12.5.1(@polkadot/util@12.5.1) + tslib: 2.6.2 + dev: true + /@polkadot/keyring@6.11.1(@polkadot/util-crypto@12.4.2)(@polkadot/util@12.4.2): resolution: {integrity: sha512-rW8INl7pO6Dmaffd6Df1yAYCRWa2RmWQ0LGfJeA/M6seVIkI6J3opZqAd4q2Op+h9a7z4TESQGk8yggOEL+Csg==} engines: {node: '>=14.0.0'} @@ -1998,6 +2132,15 @@ packages: '@substrate/ss58-registry': 1.43.0 tslib: 2.6.2 + /@polkadot/networks@12.5.1: + resolution: {integrity: sha512-PP6UUdzz6iHHZH4q96cUEhTcydHj16+61sqeaYEJSF6Q9iY+5WVWQ26+rdjmre/EBdrMQkSS/CKy73mO5z/JkQ==} + engines: {node: '>=16'} + dependencies: + '@polkadot/util': 12.5.1 + '@substrate/ss58-registry': 1.43.0 + tslib: 2.6.2 + dev: true + /@polkadot/networks@6.11.1: resolution: {integrity: sha512-0C6Ha2kvr42se3Gevx6UhHzv3KnPHML0N73Amjwvdr4y0HLZ1Nfw+vcm5yqpz5gpiehqz97XqFrsPRauYdcksQ==} engines: {node: '>=14.0.0'} @@ -2485,6 +2628,24 @@ packages: '@scure/base': 1.1.1 tslib: 2.6.2 + /@polkadot/util-crypto@12.5.1(@polkadot/util@12.5.1): + resolution: {integrity: sha512-Y8ORbMcsM/VOqSG3DgqutRGQ8XXK+X9M3C8oOEI2Tji65ZsXbh9Yh+ryPLM0oBp/9vqOXjkLgZJbbVuQceOw0A==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': 12.5.1 + dependencies: + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + '@polkadot/networks': 12.5.1 + '@polkadot/util': 12.5.1 + '@polkadot/wasm-crypto': 7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1) + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/x-bigint': 12.5.1 + '@polkadot/x-randomvalues': 12.5.1(@polkadot/util@12.5.1)(@polkadot/wasm-util@7.2.2) + '@scure/base': 1.1.3 + tslib: 2.6.2 + dev: true + /@polkadot/util-crypto@6.11.1(@polkadot/util@6.11.1): resolution: {integrity: sha512-fWA1Nz17FxWJslweZS4l0Uo30WXb5mYV1KEACVzM+BSZAvG5eoiOAYX6VYZjyw6/7u53XKrWQlD83iPsg3KvZw==} engines: {node: '>=14.0.0'} @@ -2565,6 +2726,19 @@ packages: bn.js: 5.2.1 tslib: 2.6.2 + /@polkadot/util@12.5.1: + resolution: {integrity: sha512-fDBZL7D4/baMG09Qowseo884m3QBzErGkRWNBId1UjWR99kyex+cIY9fOSzmuQxo6nLdJlLHw1Nz2caN3+Bq0A==} + engines: {node: '>=16'} + dependencies: + '@polkadot/x-bigint': 12.5.1 + '@polkadot/x-global': 12.5.1 + '@polkadot/x-textdecoder': 12.5.1 + '@polkadot/x-textencoder': 12.5.1 + '@types/bn.js': 5.1.1 + bn.js: 5.2.1 + tslib: 2.6.2 + dev: true + /@polkadot/util@6.11.1: resolution: {integrity: sha512-TEdCetr9rsdUfJZqQgX/vxLuV4XU8KMoKBMJdx+JuQ5EWemIdQkEtMBdL8k8udNGbgSNiYFA6rPppATeIxAScg==} engines: {node: '>=14.0.0'} @@ -2616,6 +2790,19 @@ packages: '@polkadot/x-randomvalues': 12.4.2(@polkadot/util@12.4.2)(@polkadot/wasm-util@7.2.2) tslib: 2.6.2 + /@polkadot/wasm-bridge@7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1): + resolution: {integrity: sha512-CgNENd65DVYtackOVXXRA0D1RPoCv5+77IdBCf7kNqu6LeAnR4nfTI6qjaApUdN1xRweUsQjSH7tu7VjkMOA0A==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + '@polkadot/x-randomvalues': '*' + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/x-randomvalues': 12.5.1(@polkadot/util@12.5.1)(@polkadot/wasm-util@7.2.2) + tslib: 2.6.2 + dev: true + /@polkadot/wasm-crypto-asmjs@4.6.1(@polkadot/util@6.11.1): resolution: {integrity: sha512-1oHQjz2oEO1kCIcQniOP+dZ9N2YXf2yCLHLsKaKSvfXiWaetVCaBNB8oIHIVYvuLnVc8qlMi66O6xc1UublHsw==} engines: {node: '>=14.0.0'} @@ -2655,6 +2842,16 @@ packages: '@polkadot/util': 12.4.2 tslib: 2.6.2 + /@polkadot/wasm-crypto-asmjs@7.2.2(@polkadot/util@12.5.1): + resolution: {integrity: sha512-wKg+cpsWQCTSVhjlHuNeB/184rxKqY3vaklacbLOMbUXieIfuDBav5PJdzS3yeiVE60TpYaHW4iX/5OYHS82gg==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + dependencies: + '@polkadot/util': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/wasm-crypto-init@6.4.1(@polkadot/util@10.4.2)(@polkadot/x-randomvalues@10.4.2): resolution: {integrity: sha512-1ALagSi/nfkyFaH6JDYfy/QbicVbSn99K8PV9rctDUfxc7P06R7CoqbjGQ4OMPX6w1WYVPU7B4jPHGLYBlVuMw==} engines: {node: '>=14.0.0'} @@ -2685,6 +2882,22 @@ packages: '@polkadot/x-randomvalues': 12.4.2(@polkadot/util@12.4.2)(@polkadot/wasm-util@7.2.2) tslib: 2.6.2 + /@polkadot/wasm-crypto-init@7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1): + resolution: {integrity: sha512-vD4iPIp9x+SssUIWUenxWLPw4BVIwhXHNMpsV81egK990tvpyIxL205/EF5QRb1mKn8WfWcNFm5tYwwh9NdnnA==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + '@polkadot/x-randomvalues': '*' + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-bridge': 7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1) + '@polkadot/wasm-crypto-asmjs': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/wasm-crypto-wasm': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/x-randomvalues': 12.5.1(@polkadot/util@12.5.1)(@polkadot/wasm-util@7.2.2) + tslib: 2.6.2 + dev: true + /@polkadot/wasm-crypto-wasm@4.6.1(@polkadot/util@6.11.1): resolution: {integrity: sha512-NI3JVwmLjrSYpSVuhu0yeQYSlsZrdpK41UC48sY3kyxXC71pi6OVePbtHS1K3xh3FFmDd9srSchExi3IwzKzMw==} engines: {node: '>=14.0.0'} @@ -2726,6 +2939,17 @@ packages: '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.4.2) tslib: 2.6.2 + /@polkadot/wasm-crypto-wasm@7.2.2(@polkadot/util@12.5.1): + resolution: {integrity: sha512-3efoIB6jA3Hhv6k0YIBwCtlC8gCSWCk+R296yIXRLLr3cGN415KM/PO/d1JIXYI64lbrRzWRmZRhllw3jf6Atg==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + tslib: 2.6.2 + dev: true + /@polkadot/wasm-crypto@4.6.1(@polkadot/util@6.11.1)(@polkadot/x-randomvalues@6.11.1): resolution: {integrity: sha512-2wEftBDxDG+TN8Ah6ogtvzjdZdcF0mAjU4UNNOfpmkBCxQYZOrAHB8HXhzo3noSsKkLX7PDX57NxvJ9OhoTAjw==} engines: {node: '>=14.0.0'} @@ -2787,6 +3011,23 @@ packages: '@polkadot/x-randomvalues': 12.4.2(@polkadot/util@12.4.2)(@polkadot/wasm-util@7.2.2) tslib: 2.6.2 + /@polkadot/wasm-crypto@7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1): + resolution: {integrity: sha512-1ZY1rxUTawYm0m1zylvBMFovNIHYgG2v/XoASNp/EMG5c8FQIxCbhJRaTBA983GVq4lN/IAKREKEp9ZbLLqssA==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + '@polkadot/x-randomvalues': '*' + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-bridge': 7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1) + '@polkadot/wasm-crypto-asmjs': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/wasm-crypto-init': 7.2.2(@polkadot/util@12.5.1)(@polkadot/x-randomvalues@12.5.1) + '@polkadot/wasm-crypto-wasm': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/x-randomvalues': 12.5.1(@polkadot/util@12.5.1)(@polkadot/wasm-util@7.2.2) + tslib: 2.6.2 + dev: true + /@polkadot/wasm-util@6.4.1(@polkadot/util@10.4.2): resolution: {integrity: sha512-Uwo+WpEsDmFExWC5kTNvsVhvqXMZEKf4gUHXFn4c6Xz4lmieRT5g+1bO1KJ21pl4msuIgdV3Bksfs/oiqMFqlw==} engines: {node: '>=14.0.0'} @@ -2816,6 +3057,16 @@ packages: '@polkadot/util': 12.4.2 tslib: 2.6.2 + /@polkadot/wasm-util@7.2.2(@polkadot/util@12.5.1): + resolution: {integrity: sha512-N/25960ifCc56sBlJZ2h5UBpEPvxBmMLgwYsl7CUuT+ea2LuJW9Xh8VHDN/guYXwmm92/KvuendYkEUykpm/JQ==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': '*' + dependencies: + '@polkadot/util': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/x-bigint@10.4.2: resolution: {integrity: sha512-awRiox+/XSReLzimAU94fPldowiwnnMUkQJe8AebYhNocAj6SJU00GNoj6j6tAho6yleOwrTJXZaWFBaQVJQNg==} engines: {node: '>=14.0.0'} @@ -2838,6 +3089,14 @@ packages: '@polkadot/x-global': 12.4.2 tslib: 2.6.2 + /@polkadot/x-bigint@12.5.1: + resolution: {integrity: sha512-Fw39eoN9v0sqxSzfSC5awaDVdzojIiE7d1hRSQgVSrES+8whWvtbYMR0qwbVhTuW7DvogHmye41P9xKMlXZysg==} + engines: {node: '>=16'} + dependencies: + '@polkadot/x-global': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/x-bigint@8.7.1: resolution: {integrity: sha512-ClkhgdB/KqcAKk3zA6Qw8wBL6Wz67pYTPkrAtImpvoPJmR+l4RARauv+MH34JXMUNlNb3aUwqN6lq2Z1zN+mJg==} engines: {node: '>=14.0.0'} @@ -2895,6 +3154,13 @@ packages: dependencies: tslib: 2.6.2 + /@polkadot/x-global@12.5.1: + resolution: {integrity: sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==} + engines: {node: '>=16'} + dependencies: + tslib: 2.6.2 + dev: true + /@polkadot/x-global@6.11.1: resolution: {integrity: sha512-lsBK/e4KbjfieyRmnPs7bTiGbP/6EoCZz7rqD/voNS5qsJAaXgB9LR+ilubun9gK/TDpebyxgO+J19OBiQPIRw==} engines: {node: '>=14.0.0'} @@ -2929,6 +3195,19 @@ packages: '@polkadot/x-global': 12.4.2 tslib: 2.6.2 + /@polkadot/x-randomvalues@12.5.1(@polkadot/util@12.5.1)(@polkadot/wasm-util@7.2.2): + resolution: {integrity: sha512-UsMb1d+77EPNjW78BpHjZLIm4TaIpfqq89OhZP/6gDIoS2V9iE/AK3jOWKm1G7Y2F8XIoX1qzQpuMakjfagFoQ==} + engines: {node: '>=16'} + peerDependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-util': '*' + dependencies: + '@polkadot/util': 12.5.1 + '@polkadot/wasm-util': 7.2.2(@polkadot/util@12.5.1) + '@polkadot/x-global': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/x-randomvalues@6.11.1: resolution: {integrity: sha512-2MfUfGZSOkuPt7GF5OJkPDbl4yORI64SUuKM25EGrJ22o1UyoBnPOClm9eYujLMD6BfDZRM/7bQqqoLW+NuHVw==} engines: {node: '>=14.0.0'} @@ -2975,6 +3254,14 @@ packages: '@polkadot/x-global': 12.4.2 tslib: 2.6.2 + /@polkadot/x-textdecoder@12.5.1: + resolution: {integrity: sha512-j2YZGWfwhMC8nHW3BXq10fAPY02ObLL/qoTjCMJ1Cmc/OGq18Ep7k9cXXbjFAq3wf3tUUewt/u/hStKCk3IvfQ==} + engines: {node: '>=16'} + dependencies: + '@polkadot/x-global': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/x-textdecoder@6.11.1: resolution: {integrity: sha512-DI1Ym2lyDSS/UhnTT2e9WutukevFZ0WGpzj4eotuG2BTHN3e21uYtYTt24SlyRNMrWJf5+TkZItmZeqs1nwAfQ==} engines: {node: '>=14.0.0'} @@ -3013,6 +3300,14 @@ packages: '@polkadot/x-global': 12.4.2 tslib: 2.6.2 + /@polkadot/x-textencoder@12.5.1: + resolution: {integrity: sha512-1JNNpOGb4wD+c7zFuOqjibl49LPnHNr4rj4s3WflLUIZvOMY6euoDuN3ISjQSHCLlVSoH0sOCWA3qXZU4bCTDQ==} + engines: {node: '>=16'} + dependencies: + '@polkadot/x-global': 12.5.1 + tslib: 2.6.2 + dev: true + /@polkadot/x-textencoder@6.11.1: resolution: {integrity: sha512-8ipjWdEuqFo+R4Nxsc3/WW9CSEiprX4XU91a37ZyRVC4e9R1bmvClrpXmRQLVcAQyhRvG8DKOOtWbz8xM+oXKg==} engines: {node: '>=14.0.0'} @@ -3118,12 +3413,17 @@ packages: /@scure/base@1.1.1: resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==} + /@scure/base@1.1.3: + resolution: {integrity: sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q==} + dev: true + /@scure/bip32@1.3.0: resolution: {integrity: sha512-bcKpo1oj54hGholplGLpqPHRbIsnbixFtc06nwuNM5/dwSXOq/AAYoIBRsBmnZJSdfeNW5rnff7NTAz3ZCqR9Q==} dependencies: '@noble/curves': 1.0.0 '@noble/hashes': 1.3.0 '@scure/base': 1.1.1 + dev: false /@scure/bip32@1.3.1: resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==} @@ -3132,11 +3432,20 @@ packages: '@noble/hashes': 1.3.1 '@scure/base': 1.1.1 + /@scure/bip32@1.3.2: + resolution: {integrity: sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA==} + dependencies: + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + '@scure/base': 1.1.3 + dev: true + /@scure/bip39@1.2.0: resolution: {integrity: sha512-SX/uKq52cuxm4YFXWFaVByaSHJh2w3BnokVSeUJVCv6K7WulT9u2BuNRBhuFl8vAuYnzx9bEu9WgpcNYTrYieg==} dependencies: '@noble/hashes': 1.3.0 '@scure/base': 1.1.1 + dev: false /@scure/bip39@1.2.1: resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==} @@ -3495,12 +3804,12 @@ packages: '@vitest/utils': 0.31.4 chai: 4.3.7 - /@vitest/expect@0.34.2: - resolution: {integrity: sha512-EZm2dMNlLyIfDMha17QHSQcg2KjeAZaXd65fpPzXY5bvnfx10Lcaz3N55uEe8PhF+w4pw+hmrlHLLlRn9vkBJg==} + /@vitest/expect@0.34.6: + resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==} dependencies: - '@vitest/spy': 0.34.2 - '@vitest/utils': 0.34.2 - chai: 4.3.8 + '@vitest/spy': 0.34.6 + '@vitest/utils': 0.34.6 + chai: 4.3.10 dev: true /@vitest/runner@0.31.4: @@ -3511,10 +3820,10 @@ packages: p-limit: 4.0.0 pathe: 1.1.1 - /@vitest/runner@0.34.2: - resolution: {integrity: sha512-8ydGPACVX5tK3Dl0SUwxfdg02h+togDNeQX3iXVFYgzF5odxvaou7HnquALFZkyVuYskoaHUOqOyOLpOEj5XTA==} + /@vitest/runner@0.34.6: + resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==} dependencies: - '@vitest/utils': 0.34.2 + '@vitest/utils': 0.34.6 p-limit: 4.0.0 pathe: 1.1.1 dev: true @@ -3526,8 +3835,8 @@ packages: pathe: 1.1.1 pretty-format: 27.5.1 - /@vitest/snapshot@0.34.2: - resolution: {integrity: sha512-qhQ+xy3u4mwwLxltS4Pd4SR+XHv4EajiTPNY3jkIBLUApE6/ce72neJPSUQZ7bL3EBuKI+NhvzhGj3n5baRQUQ==} + /@vitest/snapshot@0.34.6: + resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==} dependencies: magic-string: 0.30.3 pathe: 1.1.1 @@ -3539,8 +3848,8 @@ packages: dependencies: tinyspy: 2.1.1 - /@vitest/spy@0.34.2: - resolution: {integrity: sha512-yd4L9OhfH6l0Av7iK3sPb3MykhtcRN5c5K5vm1nTbuN7gYn+yvUVVsyvzpHrjqS7EWqn9WsPJb7+0c3iuY60tA==} + /@vitest/spy@0.34.6: + resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==} dependencies: tinyspy: 2.1.1 dev: true @@ -3566,8 +3875,8 @@ packages: loupe: 2.3.6 pretty-format: 27.5.1 - /@vitest/utils@0.34.2: - resolution: {integrity: sha512-Lzw+kAsTPubhoQDp1uVAOP6DhNia1GMDsI9jgB0yMn+/nDaPieYQ88lKqz/gGjSHL4zwOItvpehec9OY+rS73w==} + /@vitest/utils@0.34.6: + resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==} dependencies: diff-sequences: 29.6.3 loupe: 2.3.6 @@ -3583,6 +3892,7 @@ packages: optional: true dependencies: typescript: 5.1.6 + dev: false /@zeitgeistpm/type-defs@1.0.0: resolution: {integrity: sha512-dtjNlJSb8ELz87aTD6jqKKfO7kY4HFYzSmDk9JrzHLv+w/JKtG+aLz+WImL6MSaF1MjDE1tm28dj980Zn+nfGA==} @@ -3592,17 +3902,17 @@ packages: resolution: {integrity: sha512-OkqtOLPkR7oqWLrsgRKhzyLZVFLnNLfEF3DMXH+Rpn1fMNMDq/fOY9pXt55B+flBc62saN73CfOTy3hMSVZFTA==} dev: false - /@zombienet/orchestrator@0.0.50(@polkadot/util@12.4.2)(@types/node@20.5.4): - resolution: {integrity: sha512-phpyoUmC2Kv+IJ8naqvaJ/CIT0DT+WNpACa22LTdx4ZukJWXbVfTkWm1imejApUyk7NmLK92OlwCdUOGdyOATg==} + /@zombienet/orchestrator@0.0.56(@polkadot/util@12.5.1)(@types/node@20.5.4): + resolution: {integrity: sha512-8uLbWmzipDiuOfnNxsH8j17QZ70wZXvlLQzAWRZgis+741zpQ3ZCd8Jq0X3QiziXwAKTMMtZNLD4PLonWnDdrg==} engines: {node: '>=18'} dependencies: '@polkadot/api': 10.9.1 - '@polkadot/keyring': 12.4.2(@polkadot/util-crypto@12.4.2)(@polkadot/util@12.4.2) - '@polkadot/util-crypto': 12.4.2(@polkadot/util@12.4.2) - '@zombienet/utils': 0.0.21(@types/node@20.5.4)(typescript@5.1.6) + '@polkadot/keyring': 12.5.1(@polkadot/util-crypto@12.5.1)(@polkadot/util@12.5.1) + '@polkadot/util-crypto': 12.5.1(@polkadot/util@12.5.1) + '@zombienet/utils': 0.0.22(@types/node@20.5.4)(typescript@5.2.2) JSONStream: 1.3.5 - chai: 4.3.7 - debug: 4.3.4 + chai: 4.3.10 + debug: 4.3.4(supports-color@5.5.0) execa: 5.1.1 fs-extra: 11.1.1 jsdom: 22.1.0 @@ -3613,8 +3923,8 @@ packages: napi-maybe-compressed-blob: 0.0.11 peer-id: 0.16.0 tmp-promise: 3.0.3 - typescript: 5.1.6 - yaml: 2.3.1 + typescript: 5.2.2 + yaml: 2.3.2 transitivePeerDependencies: - '@polkadot/util' - '@swc/core' @@ -3631,7 +3941,7 @@ packages: resolution: {integrity: sha512-dTU1orWPPMyGNi86nLLFEd3cK5n+DNbavAdiOOqu2rhem2m+AuycwYEGXKf+Y4j3Ofau2gnfdUllsfFjRWrj7A==} dependencies: cli-table3: 0.6.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) mocha: 10.2.0 nunjucks: 3.2.4 toml: 3.0.0 @@ -3645,11 +3955,12 @@ packages: - typescript dev: false - /@zombienet/utils@0.0.21(@types/node@20.5.4)(typescript@5.1.6): - resolution: {integrity: sha512-31fMNlITzmj1gPha2CcihDE6nON94r8ixZTZbWa2g0nacS0nnoTKUNFukw9vg+aGF5QkwSevy+eobOQEb/jhjg==} + /@zombienet/utils@0.0.22(@types/node@20.5.4)(typescript@5.1.6): + resolution: {integrity: sha512-jr2RAP0jYxzHPFSIWJP3W0ctili7XpwH/cs3BGFUmCU/Nj3dqkZpMqEBoxMECGUNQ4MS3jdgDoqR86UcsALXWw==} + engines: {node: '>=18'} dependencies: cli-table3: 0.6.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) mocha: 10.2.0 nunjucks: 3.2.4 toml: 3.0.0 @@ -3663,6 +3974,25 @@ packages: - typescript dev: true + /@zombienet/utils@0.0.22(@types/node@20.5.4)(typescript@5.2.2): + resolution: {integrity: sha512-jr2RAP0jYxzHPFSIWJP3W0ctili7XpwH/cs3BGFUmCU/Nj3dqkZpMqEBoxMECGUNQ4MS3jdgDoqR86UcsALXWw==} + engines: {node: '>=18'} + dependencies: + cli-table3: 0.6.3 + debug: 4.3.4(supports-color@5.5.0) + mocha: 10.2.0 + nunjucks: 3.2.4 + toml: 3.0.0 + ts-node: 10.9.1(@types/node@20.5.4)(typescript@5.2.2) + transitivePeerDependencies: + - '@swc/core' + - '@swc/wasm' + - '@types/node' + - chokidar + - supports-color + - typescript + dev: true + /JSONStream@1.3.5: resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==} hasBin: true @@ -3694,6 +4024,21 @@ packages: optional: true dependencies: typescript: 5.1.6 + dev: false + + /abitype@0.9.8(typescript@5.1.6): + resolution: {integrity: sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ==} + peerDependencies: + typescript: '>=5.0.4' + zod: ^3 >=3.19.1 + peerDependenciesMeta: + typescript: + optional: true + zod: + optional: true + dependencies: + typescript: 5.1.6 + dev: true /abort-controller@3.0.0: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} @@ -3752,7 +4097,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) transitivePeerDependencies: - supports-color @@ -3908,8 +4253,8 @@ packages: resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==} dev: false - /axios@1.4.0(debug@4.3.4): - resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==} + /axios@1.5.1(debug@4.3.4): + resolution: {integrity: sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==} dependencies: follow-redirects: 1.15.2(debug@4.3.4) form-data: 4.0.0 @@ -4236,20 +4581,21 @@ packages: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} dev: false - /chai@4.3.7: - resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} + /chai@4.3.10: + resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==} engines: {node: '>=4'} dependencies: assertion-error: 1.1.0 - check-error: 1.0.2 + check-error: 1.0.3 deep-eql: 4.1.3 - get-func-name: 2.0.0 + get-func-name: 2.0.2 loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 + dev: true - /chai@4.3.8: - resolution: {integrity: sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==} + /chai@4.3.7: + resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} engines: {node: '>=4'} dependencies: assertion-error: 1.1.0 @@ -4259,7 +4605,6 @@ packages: loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 - dev: true /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -4269,6 +4614,14 @@ packages: escape-string-regexp: 1.0.5 supports-color: 5.5.0 + /chalk@3.0.0: + resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==} + engines: {node: '>=8'} + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + dev: false + /chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -4287,6 +4640,12 @@ packages: /check-error@1.0.2: resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} + /check-error@1.0.3: + resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + dependencies: + get-func-name: 2.0.2 + dev: true + /chokidar@3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} @@ -4387,9 +4746,9 @@ packages: optionalDependencies: '@colors/colors': 1.5.0 - /cli-width@3.0.0: - resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==} - engines: {node: '>= 10'} + /cli-width@4.1.0: + resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} + engines: {node: '>= 12'} dev: true /cliui@7.0.4: @@ -4666,7 +5025,7 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 /date-time@3.1.0: resolution: {integrity: sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==} @@ -4688,17 +5047,6 @@ packages: ms: 2.0.0 dev: false - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - /debug@4.3.4(supports-color@5.5.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -5082,6 +5430,11 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} + /escape-string-regexp@5.0.0: + resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} + engines: {node: '>=12'} + dev: true + /esutils@2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} @@ -5364,11 +5717,12 @@ packages: commander: 2.7.1 dev: false - /figures@3.2.0: - resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} - engines: {node: '>=8'} + /figures@5.0.0: + resolution: {integrity: sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==} + engines: {node: '>=14'} dependencies: - escape-string-regexp: 1.0.5 + escape-string-regexp: 5.0.0 + is-unicode-supported: 1.3.0 dev: true /fill-range@7.0.1: @@ -5415,7 +5769,7 @@ packages: debug: optional: true dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -5579,6 +5933,10 @@ packages: /get-func-name@2.0.0: resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} + /get-func-name@2.0.2: + resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} + dev: true + /get-intrinsic@1.2.1: resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} dependencies: @@ -5628,6 +5986,7 @@ packages: /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + requiresBuild: true dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -5853,7 +6212,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) transitivePeerDependencies: - supports-color optional: true @@ -5864,7 +6223,7 @@ packages: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) transitivePeerDependencies: - supports-color dev: true @@ -5899,7 +6258,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) transitivePeerDependencies: - supports-color @@ -5937,6 +6296,10 @@ packages: /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + /immediate@3.0.6: + resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} + dev: false + /immediate@3.2.3: resolution: {integrity: sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg==} dev: false @@ -5974,34 +6337,34 @@ packages: /ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - /inquirer-press-to-continue@1.2.0(inquirer@8.2.6): + /inquirer-press-to-continue@1.2.0(inquirer@9.2.11): resolution: {integrity: sha512-HdKOgEAydYhI3OKLy5S4LMi7a/AHJjPzF06mHqbdVxlTmHOaytQVBaVbQcSytukD70K9FYLhYicNOPuNjFiWVQ==} peerDependencies: inquirer: '>=8.0.0 <10.0.0' dependencies: deep-equal: 2.2.2 - inquirer: 8.2.6 + inquirer: 9.2.11 ora: 6.3.1 dev: true - /inquirer@8.2.6: - resolution: {integrity: sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==} - engines: {node: '>=12.0.0'} + /inquirer@9.2.11: + resolution: {integrity: sha512-B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g==} + engines: {node: '>=14.18.0'} dependencies: + '@ljharb/through': 2.3.9 ansi-escapes: 4.3.2 - chalk: 4.1.2 + chalk: 5.3.0 cli-cursor: 3.1.0 - cli-width: 3.0.0 + cli-width: 4.1.0 external-editor: 3.1.0 - figures: 3.2.0 + figures: 5.0.0 lodash: 4.17.21 - mute-stream: 0.0.8 + mute-stream: 1.0.0 ora: 5.4.1 - run-async: 2.4.1 + run-async: 3.0.0 rxjs: 7.8.1 string-width: 4.2.3 strip-ansi: 6.0.1 - through: 2.3.8 wrap-ansi: 6.2.0 dev: true @@ -6237,6 +6600,7 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + requiresBuild: true /iso-random-stream@2.0.2: resolution: {integrity: sha512-yJvs+Nnelic1L2vH2JzWvvPQFA4r7kSTnpST/+LkAQjSz0hos2oqLD+qIVi9Qk38Hoe7mNDt3j0S27R58MVjLQ==} @@ -6252,6 +6616,7 @@ packages: ws: '*' dependencies: ws: 8.12.0 + dev: false /isomorphic-ws@5.0.0(ws@8.13.0): resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} @@ -6336,7 +6701,7 @@ packages: whatwg-encoding: 2.0.0 whatwg-mimetype: 3.0.0 whatwg-url: 12.0.1 - ws: 8.13.0 + ws: 8.14.2 xml-name-validator: 4.0.0 transitivePeerDependencies: - bufferutil @@ -6392,6 +6757,17 @@ packages: dependencies: chalk: 2.4.2 diff-match-patch: 1.0.5 + dev: true + bundledDependencies: [] + + /jsondiffpatch@0.5.0: + resolution: {integrity: sha512-Quz3MvAwHxVYNXsOByL7xI5EB2WYOeFswqaHIA3qOK3isRWTxiplBEocmmru6XmxDB2L7jDNYtYA4FyimoAFEw==} + engines: {node: '>=8.17.0'} + hasBin: true + dependencies: + chalk: 3.0.0 + diff-match-patch: 1.0.5 + dev: false bundledDependencies: [] /jsonfile@4.0.0: @@ -6533,10 +6909,22 @@ packages: uint8arrays: 3.1.1 dev: true + /lie@3.1.1: + resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==} + dependencies: + immediate: 3.0.6 + dev: false + /local-pkg@0.4.3: resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} engines: {node: '>=14'} + /localforage@1.10.0: + resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==} + dependencies: + lie: 3.1.1 + dev: false + /locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} @@ -7061,8 +7449,9 @@ packages: varint: 5.0.2 dev: false - /mute-stream@0.0.8: - resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} + /mute-stream@1.0.0: + resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dev: true /mz@2.7.0: @@ -7144,7 +7533,7 @@ packages: resolution: {integrity: sha512-CwbljitiWJhF1gL83NbanhoKs1l23TDlRioNraPTZrzZIEooPemrHRj5m0FZCPkB1ecdYCSWWGcHysJgX/ngnQ==} engines: {node: '>= 10.13'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) json-stringify-safe: 5.0.1 lodash: 4.17.21 propagate: 2.0.1 @@ -7183,7 +7572,6 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 - dev: false /node-fetch@3.3.2: resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} @@ -7987,8 +8375,8 @@ packages: resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==} dev: true - /run-async@2.4.1: - resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} + /run-async@3.0.0: + resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==} engines: {node: '>=0.12.0'} dev: true @@ -8231,7 +8619,7 @@ packages: requiresBuild: true dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) socks: 2.7.1 transitivePeerDependencies: - supports-color @@ -8290,6 +8678,9 @@ packages: /sprintf-js@1.1.2: resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==} + /sql.js@1.8.0: + resolution: {integrity: sha512-3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw==} + /sqlite3@5.1.6: resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==} requiresBuild: true @@ -8667,6 +9058,37 @@ packages: v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + /ts-node@10.9.1(@types/node@20.5.4)(typescript@5.2.2): + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 20.5.4 + acorn: 8.10.0 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 5.2.2 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: true + /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: false @@ -8746,7 +9168,7 @@ packages: is-typedarray: 1.0.0 dev: false - /typeorm@0.3.17(sqlite3@5.1.6): + /typeorm@0.3.17(sql.js@1.8.0)(sqlite3@5.1.6): resolution: {integrity: sha512-UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig==} engines: {node: '>= 12.9.0'} hasBin: true @@ -8810,14 +9232,15 @@ packages: chalk: 4.1.2 cli-highlight: 2.1.11 date-fns: 2.30.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) dotenv: 16.3.1 glob: 8.1.0 mkdirp: 2.1.6 reflect-metadata: 0.1.13 sha.js: 2.4.11 + sql.js: 1.8.0 sqlite3: 5.1.6 - tslib: 2.6.1 + tslib: 2.6.2 uuid: 9.0.0 yargs: 17.7.2 transitivePeerDependencies: @@ -8834,6 +9257,12 @@ packages: engines: {node: '>=14.17'} hasBin: true + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /ufo@1.2.0: resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} @@ -8969,6 +9398,30 @@ packages: extsprintf: 1.3.0 dev: false + /viem@1.15.4(typescript@5.1.6): + resolution: {integrity: sha512-kQtJiYbZ86rzGdAXkvAxf6ovsabzyn41loNiSjQNFXwvn24cGP3IbQhQcK5OYorQY9Pz7Dm54EBV5XhFxo+15g==} + peerDependencies: + typescript: '>=5.0.4' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@adraffy/ens-normalize': 1.9.4 + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + '@scure/bip32': 1.3.2 + '@scure/bip39': 1.2.1 + '@types/ws': 8.5.5 + abitype: 0.9.8(typescript@5.1.6) + isomorphic-ws: 5.0.0(ws@8.13.0) + typescript: 5.1.6 + ws: 8.13.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + - zod + dev: true + /viem@1.7.0(typescript@5.1.6): resolution: {integrity: sha512-S4SclYe0Oca6TuPh2YPI3BzfC7a4UvN7TRDCWwpoVNnu9+4z2hqCZhW+6aF1yufgSwdezNsF14vztE/P4eMdBw==} peerDependencies: @@ -8992,6 +9445,7 @@ packages: - bufferutil - utf-8-validate - zod + dev: false /vite-node@0.31.4(@types/node@20.5.4): resolution: {integrity: sha512-uzL377GjJtTbuc5KQxVbDu2xfU/x0wVjUtXQR2ihS21q/NK6ROr4oG0rsSkBBddZUVCwzfx22in76/0ZZHXgkQ==} @@ -8999,7 +9453,7 @@ packages: hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 @@ -9014,13 +9468,13 @@ packages: - supports-color - terser - /vite-node@0.34.2(@types/node@20.5.4): - resolution: {integrity: sha512-JtW249Zm3FB+F7pQfH56uWSdlltCo1IOkZW5oHBzeQo0iX4jtC7o1t9aILMGd9kVekXBP2lfJBEQt9rBh07ebA==} + /vite-node@0.34.6(@types/node@20.5.4): + resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==} engines: {node: '>=v14.18.0'} hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 @@ -9116,7 +9570,7 @@ packages: cac: 6.7.14 chai: 4.3.7 concordance: 5.0.4 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) local-pkg: 0.4.3 magic-string: 0.30.2 pathe: 1.1.1 @@ -9137,8 +9591,8 @@ packages: - supports-color - terser - /vitest@0.34.2(@vitest/ui@0.31.4): - resolution: {integrity: sha512-WgaIvBbjsSYMq/oiMlXUI7KflELmzM43BEvkdC/8b5CAod4ryAiY2z8uR6Crbi5Pjnu5oOmhKa9sy7uk6paBxQ==} + /vitest@0.34.6(@vitest/ui@0.31.4): + resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==} engines: {node: '>=v14.18.0'} hasBin: true peerDependencies: @@ -9171,17 +9625,17 @@ packages: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 '@types/node': 20.5.4 - '@vitest/expect': 0.34.2 - '@vitest/runner': 0.34.2 - '@vitest/snapshot': 0.34.2 - '@vitest/spy': 0.34.2 + '@vitest/expect': 0.34.6 + '@vitest/runner': 0.34.6 + '@vitest/snapshot': 0.34.6 + '@vitest/spy': 0.34.6 '@vitest/ui': 0.31.4(vitest@0.31.4) - '@vitest/utils': 0.34.2 + '@vitest/utils': 0.34.6 acorn: 8.10.0 acorn-walk: 8.2.0 cac: 6.7.14 - chai: 4.3.8 - debug: 4.3.4 + chai: 4.3.10 + debug: 4.3.4(supports-color@5.5.0) local-pkg: 0.4.3 magic-string: 0.30.3 pathe: 1.1.1 @@ -9191,7 +9645,7 @@ packages: tinybench: 2.5.0 tinypool: 0.7.0 vite: 4.4.9(@types/node@20.5.4) - vite-node: 0.34.2(@types/node@20.5.4) + vite-node: 0.34.6(@types/node@20.5.4) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -9956,6 +10410,7 @@ packages: optional: true utf-8-validate: optional: true + dev: false /ws@8.13.0: resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==} @@ -9969,6 +10424,18 @@ packages: utf-8-validate: optional: true + /ws@8.14.2: + resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + /ws@8.5.0: resolution: {integrity: sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==} engines: {node: '>=10.0.0'} @@ -10044,8 +10511,8 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - /yaml@2.3.1: - resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} + /yaml@2.3.2: + resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} engines: {node: '>= 14'} dev: true @@ -10102,14 +10569,9 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - /zod@3.21.4: - resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==} - /zod@3.22.2: resolution: {integrity: sha512-wvWkphh5WQsJbVk1tbx1l1Ly4yg+XecD+Mq280uBGt9wa5BKSWf4Mhp6GmrkPixhMxmabYY7RbzlwVP32pbGCg==} requiresBuild: true - dev: true - optional: true github.com/aurora-is-near/eth-object/a84d1420fdde87a768b96c6a3b3d0ee435998f72: resolution: {tarball: https://codeload.github.com/aurora-is-near/eth-object/tar.gz/a84d1420fdde87a768b96c6a3b3d0ee435998f72} diff --git a/test/scripts/compile-wasm.ts b/test/scripts/compile-wasm.ts new file mode 100644 index 0000000000..788002df98 --- /dev/null +++ b/test/scripts/compile-wasm.ts @@ -0,0 +1,64 @@ +import fs from "fs/promises"; +import path from "path"; +import child_process from "child_process"; +import yargs from "yargs"; +import { hideBin } from "yargs/helpers"; + +yargs(hideBin(process.argv)) + .usage("Usage: $0") + .version("2.0.0") + .options({ + OutputDirectory: { + type: "string", + alias: "o", + description: "Output directory for compiled contracts", + default: "precompiled-wasm", + }, + Binary: { + type: "string", + alias: "b", + description: "Moonbeam binary path", + default: "contracts/src", + }, + Chain: { + type: "string", + alias: "c", + description: "runtime chain to use", + require: true, + }, + Verbose: { + type: "boolean", + alias: "v", + description: "Verbose mode for extra logging.", + default: false, + }, + }) + .command("compile", "Compile wasm", async (argv) => { + await main(argv as any); + }) + .parse(); + +async function main(args: any) { + const outputDirectory = path.join(process.cwd(), args.argv.OutputDirectory); + const binaryPath = args.argv.Binary; + + console.log(`🗃️ Binary: ${binaryPath}`); + console.log(`🗃️ Output directory: ${outputDirectory}`); + + child_process.execSync(`mkdir -p ${outputDirectory}`); + + await fs.mkdir("tmp", { recursive: true }); + const tmpDir = await fs.mkdtemp("tmp/base-path"); + try { + const command = + `${binaryPath} precompile-wasm --log=wasmtime-runtime --base-path=${tmpDir} ` + + `--chain ${args.argv.Chain} ${outputDirectory}`; + console.log(`🗃️ ${command}`); + + child_process.execSync(`${command}`); + } finally { + if ((await fs.stat(tmpDir)).isDirectory()) { + await fs.rm(tmpDir, { recursive: true, force: true }); + } + } +} diff --git a/test/scripts/download-polkadot.sh b/test/scripts/download-polkadot.sh new file mode 100755 index 0000000000..2eb0fe75b1 --- /dev/null +++ b/test/scripts/download-polkadot.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +# Exit on any error +set -e + +# Grab Polkadot version +branch=$(egrep -o '/polkadot.*#([^\"]*)' $(dirname $0)/../../Cargo.lock | head -1 | sed 's/.*release-//#') +polkadot_release=$(echo $branch | sed 's/#.*//' | sed 's/\/polkadot-sdk?branch=moonbeam-polkadot-v//') + +# Always run the commands from the "test" dir +cd $(dirname $0)/.. + +if [[ -f tmp/polkadot ]]; then + POLKADOT_VERSION=$(tmp/polkadot --version) + if [[ $POLKADOT_VERSION == *$polkadot_release* ]]; then + exit 0 + else + echo "Updating polkadot binary..." + + wget https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v$polkadot_release/polkadot -P tmp + chmod +x tmp/polkadot + + pnpm moonwall download polkadot-execute-worker $polkadot_release tmp + chmod +x tmp/polkadot-execute-worker + + pnpm moonwall download polkadot-prepare-worker $polkadot_release tmp + chmod +x tmp/polkadot-prepare-worker + + fi +else + echo "Polkadot binary not found, downloading..." + wget https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v$polkadot_release/polkadot -P tmp + chmod +x tmp/polkadot + + pnpm moonwall download polkadot-execute-worker $polkadot_release tmp + chmod +x tmp/polkadot-execute-worker + + pnpm moonwall download polkadot-prepare-worker $polkadot_release tmp + chmod +x tmp/polkadot-prepare-worker +fi diff --git a/test/suites/dev/test-democracy/test-democracy-proposal-seconding.ts b/test/suites/dev/test-democracy/test-democracy-proposal-seconding.ts index 865373bbb4..c88b3845fe 100644 --- a/test/suites/dev/test-democracy/test-democracy-proposal-seconding.ts +++ b/test/suites/dev/test-democracy/test-democracy-proposal-seconding.ts @@ -57,7 +57,7 @@ describeSuite({ it({ id: "T03", title: "should end-up in a valid referendum", - timeout: 1000000, + timeout: 120_000, test: async function () { // let Launchperiod elapse to turn the proposal into a referendum // launchPeriod minus the 3 blocks that already elapsed diff --git a/test/suites/dev/test-eth-call/test-eth-call-state-override.ts b/test/suites/dev/test-eth-call/test-eth-call-state-override.ts index b9ba53459b..fe77c14739 100644 --- a/test/suites/dev/test-eth-call/test-eth-call-state-override.ts +++ b/test/suites/dev/test-eth-call/test-eth-call-state-override.ts @@ -258,7 +258,6 @@ describeSuite({ test: async function () { const { abi, deployedBytecode } = fetchCompiledContract("MultiplyBy7"); - console.log(deployedBytecode); const result = await customDevRpcRequest("eth_call", [ { from: ALITH_ADDRESS, diff --git a/test/suites/dev/test-eth-fee/test-eth-fee-history.ts b/test/suites/dev/test-eth-fee/test-eth-fee-history.ts index 0e405bdead..e763967670 100644 --- a/test/suites/dev/test-eth-fee/test-eth-fee-history.ts +++ b/test/suites/dev/test-eth-fee/test-eth-fee-history.ts @@ -60,7 +60,7 @@ describeSuite({ it({ id: "T01", title: "result length should match spec", - timeout: 30000, + timeout: 40_000, test: async function () { const block_count = 2; const reward_percentiles = [20, 50, 70]; @@ -114,7 +114,7 @@ describeSuite({ it({ id: "T02", title: "should calculate percentiles", - timeout: 60000, + timeout: 40_000, test: async function () { let max_fee_per_gas = parseGwei("10").toString(); let block_count = 11; diff --git a/test/suites/dev/test-fees/test-fee-multiplier-xcm.ts b/test/suites/dev/test-fees/test-fee-multiplier-xcm.ts index af076bf960..71741f016e 100644 --- a/test/suites/dev/test-fees/test-fee-multiplier-xcm.ts +++ b/test/suites/dev/test-fees/test-fee-multiplier-xcm.ts @@ -178,7 +178,7 @@ describeSuite({ .as_v2(); await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -281,7 +281,7 @@ describeSuite({ .as_v2(); await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-pov/test-xcm-to-evm-pov.ts b/test/suites/dev/test-pov/test-xcm-to-evm-pov.ts index b26a2216af..7de1a7ff50 100644 --- a/test/suites/dev/test-pov/test-xcm-to-evm-pov.ts +++ b/test/suites/dev/test-pov/test-xcm-to-evm-pov.ts @@ -131,7 +131,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); const { result, block } = await context.createBlock(); @@ -231,7 +231,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessage(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); const { result, block } = await context.createBlock(); diff --git a/test/suites/dev/test-precompile/test-precompile-democracy3.ts b/test/suites/dev/test-precompile/test-precompile-democracy3.ts index 84712b7eb0..9338ef19fc 100644 --- a/test/suites/dev/test-precompile/test-precompile-democracy3.ts +++ b/test/suites/dev/test-precompile/test-precompile-democracy3.ts @@ -2,9 +2,12 @@ import "@moonbeam-network/api-augment"; import { beforeAll, describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; import { ALITH_ADDRESS, + ALITH_PRIVATE_KEY, BALTATHAR_ADDRESS, BALTATHAR_PRIVATE_KEY, PRECOMPILE_DEMOCRACY_ADDRESS, + VOTE_AMOUNT, + alith, PROPOSAL_AMOUNT, createViemTransaction, } from "@moonwall/util"; @@ -18,6 +21,7 @@ describeSuite({ foundationMethods: "dev", testCases: ({ context, it, log }) => { let encodedHash: `0x${string}`; + let enactmentPeriod: bigint; let launchPeriod: number; let democracyAbi: Abi; @@ -25,6 +29,7 @@ describeSuite({ const { abi } = fetchCompiledContract("Democracy"); democracyAbi = abi; launchPeriod = context.polkadotJs().consts.democracy.launchPeriod.toNumber(); + enactmentPeriod = context.polkadotJs().consts.democracy.enactmentPeriod.toBigInt(); log(`launchPeriod: ${launchPeriod}`); encodedHash = await notePreimagePrecompile( @@ -75,7 +80,7 @@ describeSuite({ it({ id: "T02", title: "check referendum is up", - timeout: 1000000, + timeout: 120_000, test: async function () { // After Launchperiod elapses, turn the proposal into a referendum // launchPeriod minus the 3 blocks that already elapsed @@ -95,5 +100,86 @@ describeSuite({ ); }, }); + + it({ + id: "T03", + title: "should allow to vote", + timeout: 120_000, + test: async function () { + await context.createBlock( + createViemTransaction(context, { + to: PRECOMPILE_DEMOCRACY_ADDRESS, + privateKey: ALITH_PRIVATE_KEY, + gas: 2_000_000n, + data: encodeFunctionData({ + abi: democracyAbi, + functionName: "standardVote", + args: [numberToHex(0), "0x01", numberToHex(VOTE_AMOUNT), numberToHex(1)], + }), + }) + ); + + const referendumInfoOf = await context.polkadotJs().query.democracy.referendumInfoOf(0); + expect(referendumInfoOf.unwrap().asOngoing.proposal.asLookup.hash_.toHex()).to.equal( + encodedHash + ); + expect(referendumInfoOf.unwrap().asOngoing.delay.toBigInt()).to.equal(enactmentPeriod); + expect(referendumInfoOf.unwrap().asOngoing.tally.ayes.toBigInt()).to.equal( + 10_000_000_000_000_000_000n + ); + expect(referendumInfoOf.unwrap().asOngoing.tally.turnout.toBigInt()).to.equal( + 10_000_000_000_000_000_000n + ); + const referendumHex = referendumInfoOf.toHex(); + + // Instead of waiting votePeriod + enactmentPeriod (which is very long) we hack + // the referendum to be shorter + const blockNumber = (await context.polkadotJs().rpc.chain.getHeader()).number.toBigInt(); + + const newEndBlock = context.polkadotJs().registry.createType("u32", blockNumber + 2n); + const delayAmount = referendumInfoOf.unwrap().asOngoing.delay.toBigInt() - enactmentPeriod; + const delay = context + .polkadotJs() + .registry.createType("u32", delayAmount < 0n ? 0n : delayAmount); + + // taking same referendum with different end & delay + const modReferendum = `0x00${newEndBlock.toHex(true).slice(2)}${referendumHex.slice( + 12, + 88 + )}${delay.toHex(true).slice(2)}${referendumHex.slice(96)}`; + + // Changing storage for the referendum using sudo + await context + .polkadotJs() + .tx.sudo.sudo( + context + .polkadotJs() + .tx.system.setStorage([ + [ + context.polkadotJs().query.democracy.referendumInfoOf.key(0).toString(), + modReferendum, + ], + ]) + ) + .signAndSend(alith); + + await context.createBlock(); + + // Waiting extra blocks for the vote to finish + for (let i = 0; i < 10; i++) { + await context.createBlock(); + } + + const parachainBondInfo = await context + .polkadotJs() + .query.parachainStaking.parachainBondInfo(); + + const referendumDone = await context.polkadotJs().query.democracy.referendumInfoOf(0); + + expect(referendumDone.unwrap().isFinished).to.be.true; + expect(referendumDone.unwrap().asFinished.approved.isTrue).to.be.true; + expect(parachainBondInfo.account.toString()).to.equal(ALITH_ADDRESS); + }, + }); }, }); diff --git a/test/suites/dev/test-precompile/test-precompile-democracy4.ts b/test/suites/dev/test-precompile/test-precompile-democracy4.ts deleted file mode 100644 index 616efd4cf6..0000000000 --- a/test/suites/dev/test-precompile/test-precompile-democracy4.ts +++ /dev/null @@ -1,153 +0,0 @@ -import "@moonbeam-network/api-augment"; -import { beforeAll, describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; -import { - ALITH_ADDRESS, - ALITH_PRIVATE_KEY, - BALTATHAR_PRIVATE_KEY, - PRECOMPILE_DEMOCRACY_ADDRESS, - PROPOSAL_AMOUNT, - VOTE_AMOUNT, - alith, - createViemTransaction, -} from "@moonwall/util"; -import { Abi, encodeFunctionData, numberToHex } from "viem"; -import { notePreimagePrecompile } from "../../../helpers/precompiles.js"; - -describeSuite({ - id: "D2533", - title: "Democracy - vote on referendum", - foundationMethods: "dev", - testCases: ({ context, it, log }) => { - let encodedHash: `0x${string}`; - let enactmentPeriod: bigint; - let democracyAbi: Abi; - let launchPeriod: number; - - beforeAll(async () => { - enactmentPeriod = context.polkadotJs().consts.democracy.enactmentPeriod.toBigInt(); - launchPeriod = context.polkadotJs().consts.democracy.launchPeriod.toNumber(); - const { abi } = fetchCompiledContract("Democracy"); - democracyAbi = abi; - - encodedHash = await notePreimagePrecompile( - context, - context.polkadotJs().tx.parachainStaking.setParachainBondAccount(ALITH_ADDRESS) - ); - - await context.createBlock( - createViemTransaction(context, { - to: PRECOMPILE_DEMOCRACY_ADDRESS, - privateKey: ALITH_PRIVATE_KEY, - gas: 2_000_000n, - data: encodeFunctionData({ - abi: democracyAbi, - functionName: "propose", - args: [encodedHash, numberToHex(PROPOSAL_AMOUNT)], - }), - }) - ); - - await context.createBlock( - createViemTransaction(context, { - to: PRECOMPILE_DEMOCRACY_ADDRESS, - privateKey: BALTATHAR_PRIVATE_KEY, - gas: 2_000_000n, - data: encodeFunctionData({ - abi: democracyAbi, - functionName: "second", - args: [numberToHex(0), numberToHex(1000)], - }), - }) - ); - }); - - it({ - id: "T01", - title: "vote", - timeout: 2000000, - test: async function () { - // After Launchperiod elapses, turn the proposal into a referendum - // launchPeriod minus the 3 blocks that already elapsed - log(`Creating ${launchPeriod - 3} blocks so that new referendum can be raised`); - for (let i = 0; i < launchPeriod - 3; i++) { - await context.createBlock(); - } - - await context.createBlock( - createViemTransaction(context, { - to: PRECOMPILE_DEMOCRACY_ADDRESS, - privateKey: ALITH_PRIVATE_KEY, - gas: 2_000_000n, - data: encodeFunctionData({ - abi: democracyAbi, - functionName: "standardVote", - args: [numberToHex(0), "0x01", numberToHex(VOTE_AMOUNT), numberToHex(1)], - }), - }) - ); - - const referendumInfoOf = await context.polkadotJs().query.democracy.referendumInfoOf(0); - expect(referendumInfoOf.unwrap().asOngoing.proposal.asLookup.hash_.toHex()).to.equal( - encodedHash - ); - expect(referendumInfoOf.unwrap().asOngoing.delay.toBigInt()).to.equal(enactmentPeriod); - expect(referendumInfoOf.unwrap().asOngoing.tally.ayes.toBigInt()).to.equal( - 10_000_000_000_000_000_000n - ); - expect(referendumInfoOf.unwrap().asOngoing.tally.turnout.toBigInt()).to.equal( - 10_000_000_000_000_000_000n - ); - - const referendumHex = referendumInfoOf.toHex(); - - // Instead of waiting votePeriod + enactmentPeriod (which is very long) we hack - // the referendum to be shorter - const blockNumber = (await context.polkadotJs().rpc.chain.getHeader()).number.toBigInt(); - - const newEndBlock = context.polkadotJs().registry.createType("u32", blockNumber + 2n); - const delayAmount = referendumInfoOf.unwrap().asOngoing.delay.toBigInt() - enactmentPeriod; - const delay = context - .polkadotJs() - .registry.createType("u32", delayAmount < 0n ? 0n : delayAmount); - - // taking same referendum with different end & delay - const modReferendum = `0x00${newEndBlock.toHex(true).slice(2)}${referendumHex.slice( - 12, - 88 - )}${delay.toHex(true).slice(2)}${referendumHex.slice(96)}`; - - // Changing storage for the referendum using sudo - await context - .polkadotJs() - .tx.sudo.sudo( - context - .polkadotJs() - .tx.system.setStorage([ - [ - context.polkadotJs().query.democracy.referendumInfoOf.key(0).toString(), - modReferendum, - ], - ]) - ) - .signAndSend(alith); - - await context.createBlock(); - - // Waiting extra blocks for the vote to finish - for (let i = 0; i < 10; i++) { - await context.createBlock(); - } - - const parachainBondInfo = await context - .polkadotJs() - .query.parachainStaking.parachainBondInfo(); - - const referendumDone = await context.polkadotJs().query.democracy.referendumInfoOf(0); - - expect(referendumDone.unwrap().isFinished).to.be.true; - expect(referendumDone.unwrap().asFinished.approved.isTrue).to.be.true; - expect(parachainBondInfo.account.toString()).to.equal(ALITH_ADDRESS); - }, - }); - }, -}); diff --git a/test/suites/dev/test-precompile/test-precompile-proxy-leader-demo3.ts b/test/suites/dev/test-precompile/test-precompile-proxy-leader-demo3.ts index 5757f443b3..1020e93f93 100644 --- a/test/suites/dev/test-precompile/test-precompile-proxy-leader-demo3.ts +++ b/test/suites/dev/test-precompile/test-precompile-proxy-leader-demo3.ts @@ -19,6 +19,7 @@ describeSuite({ beforeAll(async function () { leaderContractAddress = await setupPoolWithParticipants(context); + const rawTx = context.writeContract!({ contractName: "ProxyLeaderDemo", contractAddress: leaderContractAddress, diff --git a/test/suites/dev/test-precompile/test-precompile-referenda-demo.ts b/test/suites/dev/test-precompile/test-precompile-referenda-demo.ts index ddbe941cda..ca235b69a9 100644 --- a/test/suites/dev/test-precompile/test-precompile-referenda-demo.ts +++ b/test/suites/dev/test-precompile/test-precompile-referenda-demo.ts @@ -8,7 +8,7 @@ import { import { GLMR } from "@moonwall/util"; import { u8aToHex } from "@polkadot/util"; import { decodeEventLog, getAddress } from "viem"; -import { jumpBlocks } from "../../../helpers/block.js"; +import { forceReducedReferendaExecution } from "../../../helpers/referenda.js"; import { expectSubstrateEvent, expectSubstrateEvents } from "../../../helpers/expect.js"; describeSuite({ @@ -19,7 +19,6 @@ describeSuite({ it({ id: "T01", title: "should be accessible from a smart contract", - timeout: 500000, test: async function () { const setStorageCallIndex = u8aToHex(context.polkadotJs().tx.system.setStorage.callIndex); const trackName = "root"; @@ -36,6 +35,8 @@ describeSuite({ args: [trackName, setStorageCallIndex], }); + // We verify the contract is version 1. + // After running the proposal it will auto-upgrade to version 2. expect( await context.readContract!({ contractAddress: refUpgradeDemoV1Address, @@ -72,7 +73,6 @@ describeSuite({ rawTxOnly: true, }); - console.log("this?"); const result = (await context.createBlock(rawTxn)) as any; const { @@ -133,25 +133,34 @@ describeSuite({ "Referenda should still be in preparation" ).to.be.true; - log(`Waiting preparation time: ${trackInfo![1].preparePeriod.toNumber()}`); - await jumpBlocks(context, trackInfo![1].preparePeriod.toNumber()); - referendumInfo = await context - .polkadotJs() - .query.referenda.referendumInfoFor(referendumIndex); - expect( - referendumInfo.unwrap().asOngoing.deciding.isSome, - "Referenda should now be in deciding" - ).to.be.true; - - log(`Waiting confirmation time: ${trackInfo![1].minEnactmentPeriod.toNumber()}`); - await jumpBlocks(context, trackInfo![1].confirmPeriod.toNumber()); - referendumInfo = await context - .polkadotJs() - .query.referenda.referendumInfoFor(referendumIndex); - expect(referendumInfo.unwrap().isApproved, "Referenda should now be approved").to.be.true; - - log(`Waiting enactment time: ${trackInfo![1].minEnactmentPeriod.toNumber()}`); - await jumpBlocks(context, trackInfo![1].confirmPeriod.toNumber()); + // Keeping this for knowledge on fast tracking by producing many blocks + // This is a bit slow (30s) + + // log(`Waiting preparation time: ${trackInfo![1].preparePeriod.toNumber()}`); + // await jumpBlocks(context, trackInfo![1].preparePeriod.toNumber()); + // referendumInfo = await context + // .polkadotJs() + // .query.referenda.referendumInfoFor(referendumIndex); + // expect( + // referendumInfo.unwrap().asOngoing.deciding.isSome, + // "Referenda should now be in deciding" + // ).to.be.true; + + // log(`Waiting confirmation time: ${trackInfo![1].minEnactmentPeriod.toNumber()}`); + // await jumpBlocks(context, trackInfo![1].confirmPeriod.toNumber()); + // referendumInfo = await context + // .polkadotJs() + // .query.referenda.referendumInfoFor(referendumIndex); + //expect(referendumInfo.unwrap().isApproved, "Referenda should now be approved").to.be.true; + + // log(`Waiting enactment time: ${trackInfo![1].minEnactmentPeriod.toNumber()}`); + // await jumpBlocks(context, trackInfo![1].confirmPeriod.toNumber()); + + // Use this forced reduced referenda execution which modify the storage data of the + // referenda and the agenda + await forceReducedReferendaExecution(context, referendumIndex.toNumber(), { + forceTally: false, + }); expect( await context.readContract!({ @@ -167,7 +176,6 @@ describeSuite({ it({ id: "T02", title: "should work for valid tracks", - timeout: 180000, test: async function () { const validTracks = [ "root", @@ -199,9 +207,7 @@ describeSuite({ it({ id: "T03", title: "should be fail for invalid tracks", - timeout: 180000, test: async function () { - // this.timeout(180000); const validTracks = ["toor", "", 0, "admin", -1, "0x01", "0xFFFF", "0xFFFFFFFF"]; const failures: any[] = []; for (const trackName of validTracks) { diff --git a/test/suites/dev/test-precompile/test-precompile-wormhole.ts b/test/suites/dev/test-precompile/test-precompile-wormhole.ts index b436bda630..80cc988b32 100644 --- a/test/suites/dev/test-precompile/test-precompile-wormhole.ts +++ b/test/suites/dev/test-precompile/test-precompile-wormhole.ts @@ -306,7 +306,6 @@ describeSuite({ it({ id: "T01", title: "should support V1 user action", - timeout: 3600 * 1000, test: async function () { // create payload const destination = context @@ -342,7 +341,6 @@ describeSuite({ it({ id: "T02", title: "should support V2 user action with fee", - timeout: 3600 * 1000, test: async function () { // create payload const destination = context @@ -383,7 +381,6 @@ describeSuite({ it({ id: "T03", title: "should pay entire transfer when fee greater than transfer", - timeout: 3600 * 1000, test: async function () { // create payload const destination = context @@ -422,7 +419,6 @@ describeSuite({ it({ id: "T04", title: "should pay no fee if fee is zero", - timeout: 3600 * 1000, test: async function () { // create payload const destination = context diff --git a/test/suites/dev/test-precompile/test-precompile-xcm-utils.ts b/test/suites/dev/test-precompile/test-precompile-xcm-utils.ts index 74414fd1c2..becda4c1c9 100644 --- a/test/suites/dev/test-precompile/test-precompile-xcm-utils.ts +++ b/test/suites/dev/test-precompile/test-precompile-xcm-utils.ts @@ -182,7 +182,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage) as any; + .createType("StagingXcmVersionedXcm", xcmMessage) as any; const rawTxn = await context.writePrecompile!({ precompileName: "XcmUtils", @@ -243,7 +243,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const rawTxn = await context.writePrecompile!({ precompileName: "XcmUtils", @@ -310,7 +310,7 @@ describeSuite({ const sentMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage) as any; + .createType("StagingXcmVersionedXcm", xcmMessage) as any; // Try sending it with local view const localRawTxn = await context.writePrecompile!({ @@ -406,7 +406,7 @@ describeSuite({ const sentMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const rawTxn = await context.writePrecompile!({ precompileName: "XcmUtils", diff --git a/test/suites/dev/test-staking/test-staking-locks7.ts b/test/suites/dev/test-staking/test-staking-locks7.ts index c27a048350..3032254da4 100644 --- a/test/suites/dev/test-staking/test-staking-locks7.ts +++ b/test/suites/dev/test-staking/test-staking-locks7.ts @@ -32,7 +32,7 @@ describeSuite({ it({ id: "T01", title: "should be unlocked only after executing revoke delegation", - timeout: 120000, + timeout: 60_000, test: async function () { const lock = await context.polkadotJs().query.balances.locks(randomAccount.address); expect(lock.length).to.be.equal(1, "Lock should have been added"); diff --git a/test/suites/dev/test-txpool/test-txpool-limits2.ts b/test/suites/dev/test-txpool/test-txpool-limits2.ts index 9b6aa1378b..1d24dc05cf 100644 --- a/test/suites/dev/test-txpool/test-txpool-limits2.ts +++ b/test/suites/dev/test-txpool/test-txpool-limits2.ts @@ -18,13 +18,17 @@ describeSuite({ bytecode, }); - for (let i = 0; i < 120; i++) { - const rawTxn = await createEthersTransaction(context, { - data: deployData, - nonce: i, - gasLimit: 400000n, - }); - await sendRawTransaction(context, rawTxn); + const txs = await Promise.all( + new Array(120).fill(0).map((_, i) => + createEthersTransaction(context, { + data: deployData, + nonce: i, + gasLimit: 400000n, + }) + ) + ); + for (const tx of txs) { + await context.viem().sendRawTransaction({ serializedTransaction: tx }); } await context.createBlock(); diff --git a/test/suites/dev/test-txpool/test-txpool-limits3.ts b/test/suites/dev/test-txpool/test-txpool-limits3.ts index a87e29aa39..b98c10c5b3 100644 --- a/test/suites/dev/test-txpool/test-txpool-limits3.ts +++ b/test/suites/dev/test-txpool/test-txpool-limits3.ts @@ -1,40 +1,74 @@ import "@moonbeam-network/api-augment"; -import { describeSuite, expect } from "@moonwall/cli"; -import { - ALITH_ADDRESS, - BALTATHAR_ADDRESS, - createRawTransfer, - sendRawTransaction, -} from "@moonwall/util"; +import { beforeAll, describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; +import { ALITH_ADDRESS, createEthersTransaction, sendRawTransaction } from "@moonwall/util"; +import { encodeDeployData } from "viem"; describeSuite({ id: "D3305", title: "TxPool - Limits", foundationMethods: "dev", testCases: ({ context, it, log }) => { - // 8192 is the number of tx that can be sent to the Pool - // before it throws an error and drops all tx + let deployData: string; + beforeAll(async () => { + const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); + deployData = encodeDeployData({ + abi, + bytecode, + }); + const txs = await Promise.all( + new Array(8192).fill(0).map((_, i) => + createEthersTransaction(context, { + data: deployData, + nonce: i, + }) + ) + ); + for (const tx of txs) { + await context.viem().sendRawTransaction({ serializedTransaction: tx }); + } + }); + it({ id: "T01", - title: - "should be able to send 8192 tx to the pool " + - "and have them all published within the following blocks", + title: "should be able to have 8192 tx in the pool", + timeout: 30_000, test: async function () { - for (let i = 0; i < 8192; i++) { - // for (let i = 0; i < 8192; i++) { - const rawTxn = await createRawTransfer(context, BALTATHAR_ADDRESS, 1n, { - nonce: i, - gas: 400000n, - }); - await sendRawTransaction(context, rawTxn); - } const inspectBlob = (await context .viem() .transport.request({ method: "txpool_inspect" })) as any; - const txPoolSize = Object.keys(inspectBlob.pending[ALITH_ADDRESS.toLowerCase()]).length; - expect(txPoolSize).toBe(8192); + }, + }); + + it({ + id: "T02", + title: "should drop the 8193th tx", + timeout: 30_000, + test: async function () { + try { + await context.viem().sendRawTransaction({ + serializedTransaction: await createEthersTransaction(context, { + data: deployData, + nonce: 8192, + }), + }); + } catch (e: any) { + expect(e.message).toContain("submit transaction to pool failed: Ok(ImmediatelyDropped)"); + } + }, + }); + + it({ + id: "T03", + title: "should be able have them all published within the following blocks", + timeout: 40_000, + test: async function () { + const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); + const deployData = encodeDeployData({ + abi, + bytecode, + }); let blocks = 1; while (true) { diff --git a/test/suites/dev/test-txpool/test-txpool-limits4.ts b/test/suites/dev/test-txpool/test-txpool-limits4.ts index 912bfbaeaa..45c42aa823 100644 --- a/test/suites/dev/test-txpool/test-txpool-limits4.ts +++ b/test/suites/dev/test-txpool/test-txpool-limits4.ts @@ -1,6 +1,7 @@ import "@moonbeam-network/api-augment"; -import { describeSuite, expect } from "@moonwall/cli"; -import { BALTATHAR_ADDRESS, createRawTransfer, sendRawTransaction } from "@moonwall/util"; +import { describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; +import { ALITH_ADDRESS, createEthersTransaction, sendRawTransaction } from "@moonwall/util"; +import { encodeDeployData } from "viem"; describeSuite({ id: "D3306", @@ -9,28 +10,56 @@ describeSuite({ testCases: ({ context, it, log }) => { it({ id: "T01", - title: "shouldn't work for 8193", + title: + "should be able to send 8192 tx to the pool and have them" + + " all published within the following blocks - bigger tx", + timeout: 60_000, test: async function () { - try { - for (let i = 0; i < 8193; i++) { - const rawTxn = await createRawTransfer(context, BALTATHAR_ADDRESS, 1n, { + const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); + const deployData = encodeDeployData({ + abi, + bytecode, + }); + + const txs = await Promise.all( + new Array(8192).fill(0).map((_, i) => + createEthersTransaction(context, { + data: deployData, nonce: i, gas: 400000n, - }); - await sendRawTransaction(context, rawTxn); - } - } catch (e: any) { - expect(e.message).toContain("submit transaction to pool failed: Ok(ImmediatelyDropped)"); + }) + ) + ); + for (const tx of txs) { + await context.viem().sendRawTransaction({ serializedTransaction: tx }); } const inspectBlob = (await context .viem() .transport.request({ method: "txpool_inspect" })) as any; - expect(inspectBlob).toMatchObject({ - pending: {}, - queued: {}, - }); + const txPoolSize = Object.keys(inspectBlob.pending[ALITH_ADDRESS.toLowerCase()]).length; + + expect(txPoolSize).toBe(8192); + + let blocks = 1; + while (true) { + await context.createBlock(); + + const inspectBlob = (await context + .viem() + .transport.request({ method: "txpool_inspect" })) as any; + const txPoolSize = Object.keys( + inspectBlob.pending[ALITH_ADDRESS.toLowerCase()] || {} + ).length; + log(`Transactions left in pool: ${txPoolSize}`); + + if ((await context.viem().getBlock()).transactions.length == 0) { + break; + } + blocks++; + } + log(`Transaction pool was emptied in ${blocks} blocks.`); }, }); }, diff --git a/test/suites/dev/test-txpool/test-txpool-limits5.ts b/test/suites/dev/test-txpool/test-txpool-limits5.ts deleted file mode 100644 index 43ccdc4fc5..0000000000 --- a/test/suites/dev/test-txpool/test-txpool-limits5.ts +++ /dev/null @@ -1,60 +0,0 @@ -import "@moonbeam-network/api-augment"; -import { describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; -import { ALITH_ADDRESS, createEthersTransaction, sendRawTransaction } from "@moonwall/util"; -import { encodeDeployData } from "viem"; - -describeSuite({ - id: "D3307", - title: "TxPool - Limits", - foundationMethods: "dev", - testCases: ({ context, it, log }) => { - it({ - id: "T01", - title: - "should be able to send 8192 tx to the pool and have them" + - " all published within the following blocks - bigger tx", - timeout: 400_000, - test: async function () { - const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); - const deployData = encodeDeployData({ - abi, - bytecode, - }); - - for (let i = 0; i < 8192; i++) { - const rawTxn = await createEthersTransaction(context, { - data: deployData, - nonce: i, - }); - await sendRawTransaction(context, rawTxn); - } - const inspectBlob = (await context - .viem() - .transport.request({ method: "txpool_inspect" })) as any; - - const txPoolSize = Object.keys(inspectBlob.pending[ALITH_ADDRESS.toLowerCase()]).length; - - expect(txPoolSize).toBe(8192); - - let blocks = 1; - while (true) { - await context.createBlock(); - - const inspectBlob = (await context - .viem() - .transport.request({ method: "txpool_inspect" })) as any; - const txPoolSize = Object.keys( - inspectBlob.pending[ALITH_ADDRESS.toLowerCase()] || {} - ).length; - log(`Transactions left in pool: ${txPoolSize}`); - - if ((await context.viem().getBlock()).transactions.length == 0) { - break; - } - blocks++; - } - log(`Transaction pool was emptied in ${blocks} blocks.`); - }, - }); - }, -}); diff --git a/test/suites/dev/test-txpool/test-txpool-limits6.ts b/test/suites/dev/test-txpool/test-txpool-limits6.ts deleted file mode 100644 index 3fd2d57441..0000000000 --- a/test/suites/dev/test-txpool/test-txpool-limits6.ts +++ /dev/null @@ -1,61 +0,0 @@ -import "@moonbeam-network/api-augment"; -import { describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; -import { ALITH_ADDRESS, createEthersTransaction, sendRawTransaction } from "@moonwall/util"; -import { encodeDeployData } from "viem"; - -describeSuite({ - id: "D3308", - title: "TxPool - Limits", - foundationMethods: "dev", - testCases: ({ context, it, log }) => { - it({ - id: "T01", - title: - "should be able to send 8192 tx to the pool and have them" + - " all published within the following blocks - bigger tx", - timeout: 400_000, - test: async function () { - const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); - const deployData = encodeDeployData({ - abi, - bytecode, - }); - - for (let i = 0; i < 8192; i++) { - const rawTxn = await createEthersTransaction(context, { - data: deployData, - nonce: i, - gas: 400000n, - }); - await sendRawTransaction(context, rawTxn); - } - const inspectBlob = (await context - .viem() - .transport.request({ method: "txpool_inspect" })) as any; - - const txPoolSize = Object.keys(inspectBlob.pending[ALITH_ADDRESS.toLowerCase()]).length; - - expect(txPoolSize).toBe(8192); - - let blocks = 1; - while (true) { - await context.createBlock(); - - const inspectBlob = (await context - .viem() - .transport.request({ method: "txpool_inspect" })) as any; - const txPoolSize = Object.keys( - inspectBlob.pending[ALITH_ADDRESS.toLowerCase()] || {} - ).length; - log(`Transactions left in pool: ${txPoolSize}`); - - if ((await context.viem().getBlock()).transactions.length == 0) { - break; - } - blocks++; - } - log(`Transaction pool was emptied in ${blocks} blocks.`); - }, - }); - }, -}); diff --git a/test/suites/dev/test-txpool/test-txpool-limits7.ts b/test/suites/dev/test-txpool/test-txpool-limits7.ts deleted file mode 100644 index 1cde923ac9..0000000000 --- a/test/suites/dev/test-txpool/test-txpool-limits7.ts +++ /dev/null @@ -1,44 +0,0 @@ -import "@moonbeam-network/api-augment"; -import { describeSuite, expect, fetchCompiledContract } from "@moonwall/cli"; -import { createEthersTransaction, sendRawTransaction } from "@moonwall/util"; -import { encodeDeployData } from "viem"; - -describeSuite({ - id: "D3309", - title: "TxPool - Limits", - foundationMethods: "dev", - testCases: ({ context, it, log }) => { - it({ - id: "T01", - title: "shouldn't work for 8193 - bigger tx", - timeout: 400_000, - test: async function () { - const { abi, bytecode } = fetchCompiledContract("MultiplyBy7"); - const deployData = encodeDeployData({ - abi, - bytecode, - }); - try { - for (let i = 0; i < 8192; i++) { - const rawTxn = await createEthersTransaction(context, { - data: deployData, - nonce: i, - }); - await sendRawTransaction(context, rawTxn); - } - } catch (e: any) { - expect(e.message).toContain("submit transaction to pool failed: Ok(ImmediatelyDropped)"); - } - - const inspectBlob = (await context - .viem() - .transport.request({ method: "txpool_inspect" })) as any; - - expect(inspectBlob).toMatchObject({ - pending: {}, - queued: {}, - }); - }, - }); - }, -}); diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-1.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-1.ts index c5cc78e4ac..2f75fe25ae 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-1.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-1.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-2.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-2.ts index 40aa5f26f1..4189a872e3 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-2.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-2.ts @@ -59,7 +59,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-3.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-3.ts index 18aca28c1b..2404b290d2 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-3.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-3.ts @@ -57,7 +57,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-4.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-4.ts index 0cf22bb079..4cd8c85ffc 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-4.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-4.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-5.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-5.ts index 769695550d..95e5559252 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-5.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-5.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-6.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-6.ts index ad5beb4e1d..d7e2f7b321 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-6.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-error-and-appendix-6.ts @@ -53,7 +53,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message @@ -99,7 +99,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; diff --git a/test/suites/dev/test-xcm-v2/test-mock-dmp-queue.ts b/test/suites/dev/test-xcm-v2/test-mock-dmp-queue.ts index 21835580a9..a4114593a9 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-dmp-queue.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-dmp-queue.ts @@ -61,7 +61,7 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).withdraw_asset().as_v2()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).withdraw_asset().as_v2()) ); // How much does the buyExecution weight? @@ -69,7 +69,7 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).buy_execution().as_v2()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).buy_execution().as_v2()) ); // How much does the refundSurplus weight? @@ -79,7 +79,7 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).refund_surplus().as_v2()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).refund_surplus().as_v2()) ); const refundSurplusPerMessage = @@ -93,7 +93,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-1.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-1.ts index 4ab8292ba5..c3cc071b11 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-1.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-1.ts @@ -83,7 +83,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-2.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-2.ts index 8c94457527..d665547928 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-2.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-2.ts @@ -92,7 +92,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-3.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-3.ts index 353698fc28..34d86ed6e8 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-3.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-3.ts @@ -76,7 +76,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-4.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-4.ts index cf16776f44..c761669628 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-4.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-4.ts @@ -75,7 +75,7 @@ describeSuite({ const chargedWeight = await weightMessage( context, - context.polkadotJs().createType("XcmVersionedXcm", xcmMessage) + context.polkadotJs().createType("StagingXcmVersionedXcm", xcmMessage) ); // We are charging chargedWeight // chargedWeight * 50000 = chargedFee @@ -83,7 +83,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-5.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-5.ts index 3f123f6c74..72c6acead7 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-5.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-5.ts @@ -117,7 +117,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-6.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-6.ts index 8fffad53cb..d937912d0d 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-6.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-asset-transfer-6.ts @@ -78,7 +78,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-1.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-1.ts index e57668ba3e..4ad9c5eb3b 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-1.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-1.ts @@ -85,7 +85,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-2.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-2.ts index 5cd6531908..66f0bc03d5 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-2.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-2.ts @@ -86,7 +86,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-3.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-3.ts index 7260b17cf7..d5d1074e9a 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-3.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-3.ts @@ -84,7 +84,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-4.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-4.ts index 37f64f3893..91d598e784 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-4.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-4.ts @@ -84,7 +84,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-1.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-1.ts index 25947124b1..d622229089 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-1.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-1.ts @@ -129,7 +129,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-10.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-10.ts index c2181371d0..6122502b1b 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-10.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-10.ts @@ -138,7 +138,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-2.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-2.ts index ebef3bf036..a4f68116bd 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-2.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-2.ts @@ -130,7 +130,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-3.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-3.ts index f48ffdccdf..1963010b8d 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-3.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-3.ts @@ -92,7 +92,7 @@ describeSuite({ context .polkadotJs() .createType( - "XcmVersionedXcm", + "StagingXcmVersionedXcm", new XcmFragment(config) .reserve_asset_deposited() .clear_origin() @@ -116,7 +116,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -208,7 +208,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-4.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-4.ts index 55ff95b5f7..a5a34d3a6f 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-4.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-4.ts @@ -130,7 +130,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-5.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-5.ts index e3873a4f99..ba6644f64f 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-5.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-5.ts @@ -137,7 +137,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-6.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-6.ts index 3670c03be4..0fd197ea8e 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-6.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-6.ts @@ -152,7 +152,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-7.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-7.ts index 48f89341f7..e17069c4f0 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-7.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-7.ts @@ -160,7 +160,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-8.ts b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-8.ts index 35fb98cda7..5b339808f3 100644 --- a/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-8.ts +++ b/test/suites/dev/test-xcm-v2/test-mock-hrmp-transact-ethereum-8.ts @@ -135,7 +135,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer-two-ERC20.ts b/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer-two-ERC20.ts index a9962ece5b..0cc621fc1f 100644 --- a/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer-two-ERC20.ts +++ b/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer-two-ERC20.ts @@ -241,7 +241,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); diff --git a/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer.ts b/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer.ts index 8f0e550f05..c60df22320 100644 --- a/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer.ts +++ b/test/suites/dev/test-xcm-v2/test-xcm-erc20-transfer.ts @@ -176,7 +176,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); diff --git a/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-1.ts b/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-1.ts index 27fdd03477..b10361a45c 100644 --- a/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-1.ts +++ b/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-1.ts @@ -71,13 +71,13 @@ describeSuite({ const chargedWeight = await weightMessage( context, - context.polkadotJs().createType("XcmVersionedXcm", xcmMessage) + context.polkadotJs().createType("StagingXcmVersionedXcm", xcmMessage) ); const chargedFee = chargedWeight * 50000n; await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-2.ts b/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-2.ts index 6902698954..66e345db8e 100644 --- a/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-2.ts +++ b/test/suites/dev/test-xcm-v2/test-xcm-ver-conversion-2.ts @@ -72,13 +72,13 @@ describeSuite({ const chargedWeight = await weightMessage( context, - context.polkadotJs().createType("XcmVersionedXcm", xcmMessage) + context.polkadotJs().createType("StagingXcmVersionedXcm", xcmMessage) ); const chargedFee = chargedWeight * 50000n; await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-1.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-1.ts index 7550f8215f..a7e7338fda 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-1.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-1.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage) as any; + .createType("StagingXcmVersionedXcm", xcmMessage) as any; const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-2.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-2.ts index 251a3edc44..83e055f1d9 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-2.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-2.ts @@ -59,7 +59,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-3.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-3.ts index 1e8940627d..b81324163d 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-3.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-3.ts @@ -57,7 +57,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-4.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-4.ts index 14309a656f..88c02851a2 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-4.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-4.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-5.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-5.ts index 3b2b3292b1..b340f1fbab 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-5.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-5.ts @@ -60,7 +60,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-6.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-6.ts index 89d511a956..afbd9204dc 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-6.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-error-and-appendix-6.ts @@ -53,7 +53,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; // Send RPC call to inject XCM message @@ -99,7 +99,7 @@ describeSuite({ const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage); + .createType("StagingXcmVersionedXcm", xcmMessage); const totalMessage = [...receivedMessage.toU8a()]; diff --git a/test/suites/dev/test-xcm-v3/test-mock-dmp-queue.ts b/test/suites/dev/test-xcm-v3/test-mock-dmp-queue.ts index 23e066257f..7379240aab 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-dmp-queue.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-dmp-queue.ts @@ -61,7 +61,7 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).withdraw_asset().as_v3()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).withdraw_asset().as_v3()) ); // How much does the buyExecution weight? @@ -69,7 +69,7 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).buy_execution().as_v3()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).buy_execution().as_v3()) ); // How much does the refundSurplus weight? @@ -79,21 +79,14 @@ describeSuite({ context, context .polkadotJs() - .createType("XcmVersionedXcm", new XcmFragment(config).refund_surplus().as_v3()) + .createType("StagingXcmVersionedXcm", new XcmFragment(config).refund_surplus().as_v3()) ); - const refundSurplusPerMessage = - (weightPerMessage - withdrawWeight - buyExecutionWeight) / refundSurplusWeight; - - const xcmMessage = new XcmFragment(config) - .withdraw_asset() - .buy_execution() - .refund_surplus(refundSurplusPerMessage) - .as_v3(); + const xcmMessage = new XcmFragment(config).withdraw_asset().buy_execution().as_v3(); const receivedMessage: XcmVersionedXcm = context .polkadotJs() - .createType("XcmVersionedXcm", xcmMessage) as any; + .createType("StagingXcmVersionedXcm", xcmMessage) as any; const totalMessage = [...receivedMessage.toU8a()]; @@ -151,6 +144,79 @@ describeSuite({ const pageIndex = await apiAt.query.dmpQueue.pageIndex(); expect(pageIndex.beginUsed.toBigInt()).to.eq(0n); expect(pageIndex.endUsed.toBigInt()).to.eq(0n); + + // Repeat the test with different parameters + { + const xcmMessage = new XcmFragment(config) + .withdraw_asset() + .buy_execution(0, 5n) + .refund_surplus() + .as_v3(); + + const receivedMessage: XcmVersionedXcm = context + .polkadotJs() + .createType("StagingXcmVersionedXcm", xcmMessage) as any; + + const totalMessage = [...receivedMessage.toU8a()]; + + // We want these isntructions to fail in BuyExecution. That means + // WithdrawAsset needs to work. The only way for this to work + // is to fund each sovereign account + const sovereignAddress = u8aToHex( + new Uint8Array([...new TextEncoder().encode("Parent")]) + ).padEnd(42, "0"); + + // We first fund the parent sovereign account with 1000 + // we will only withdraw 1, so no problem on this + await context.createBlock( + context.polkadotJs().tx.balances.transfer(sovereignAddress, 1n * GLMR), + { allowFailures: false } + ); + + // now we start injecting messages + // several + for (let i = 0; i < numMsgs; i++) { + await customDevRpcRequest("xcm_injectDownwardMessage", [totalMessage]); + } + + await context.createBlock(); + + const signedBlock = await context.polkadotJs().rpc.chain.getBlock(); + const apiAt = await context.polkadotJs().at(signedBlock.block.header.hash); + console.log("signedBlock", signedBlock.block.header.hash.toHex()); + const allRecords = await apiAt.query.system.events(); + + // lets grab at which point the dmp queue was exhausted + const exhaustIndex = allRecords.findIndex(({ event }) => + context.polkadotJs().events.dmpQueue.MaxMessagesExhausted.is(event) + ); + + expect( + exhaustIndex, + "Index not found where dmpQueue is exhausted" + ).to.be.greaterThanOrEqual(0); + + // OnInitialization + const eventsExecutedOnInitialization = allRecords.filter( + ({ event }, index) => + context.polkadotJs().events.dmpQueue.ExecutedDownward.is(event) && + index < exhaustIndex + ); + + // OnIdle + const eventsExecutedOnIdle = allRecords.filter( + ({ event }, index) => + context.polkadotJs().events.dmpQueue.ExecutedDownward.is(event) && + index > exhaustIndex + ); + + // the test was designed to go half and half + expect(eventsExecutedOnInitialization.length).to.be.eq(10); + expect(eventsExecutedOnIdle.length).to.be.eq(10); + const pageIndex = await apiAt.query.dmpQueue.pageIndex(); + expect(pageIndex.beginUsed.toBigInt()).to.eq(0n); + expect(pageIndex.endUsed.toBigInt()).to.eq(0n); + } }, }); }, diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-2.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-2.ts index 45fa7dbf66..7071c1516c 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-2.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-2.ts @@ -83,7 +83,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-3.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-3.ts index 646433ae11..43f162b036 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-3.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-3.ts @@ -95,7 +95,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-4.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-4.ts index 158da66535..9a0c3446e1 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-4.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-4.ts @@ -78,7 +78,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-5.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-5.ts index f49f75a4eb..aab56b07bc 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-5.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-5.ts @@ -76,7 +76,7 @@ describeSuite({ const chargedWeight = await weightMessage( context, - context.polkadotJs().createType("XcmVersionedXcm", xcmMessage) + context.polkadotJs().createType("StagingXcmVersionedXcm", xcmMessage) ); // We are charging chargedWeight // chargedWeight * 50000 = chargedFee @@ -84,7 +84,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, foreign_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-6.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-6.ts index 8999731188..5664d72149 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-6.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-6.ts @@ -120,7 +120,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-8.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-8.ts index 765fac671c..394b27dbfb 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-8.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-asset-transfer-8.ts @@ -81,7 +81,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-1.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-1.ts index 529ad9d4e9..31bcb444ce 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-1.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-1.ts @@ -90,7 +90,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-2.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-2.ts index 0905476257..331b026ef0 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-2.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-2.ts @@ -91,7 +91,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-3.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-3.ts index a0e493a07b..268fba06c7 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-3.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-3.ts @@ -89,7 +89,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-4.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-4.ts index 8b807dee0e..5fb79ba39d 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-4.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-4.ts @@ -89,7 +89,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-1.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-1.ts index 7f06e12c63..08d290c8d4 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-1.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-1.ts @@ -135,7 +135,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-10.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-10.ts index 9ad856db81..27b6d20de7 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-10.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-10.ts @@ -146,7 +146,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-11.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-11.ts index 607d4d3df3..ea0279f4d6 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-11.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-11.ts @@ -145,7 +145,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-12.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-12.ts index c3cd6eeddc..808092631e 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-12.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-12.ts @@ -127,7 +127,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-2.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-2.ts index 4153d5aaea..371c7dceb5 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-2.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-2.ts @@ -139,7 +139,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-3.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-3.ts index 3fcf368245..e9bc1a1fb3 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-3.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-3.ts @@ -92,7 +92,7 @@ describeSuite({ context .polkadotJs() .createType( - "XcmVersionedXcm", + "StagingXcmVersionedXcm", new XcmFragment(config) .reserve_asset_deposited() .clear_origin() @@ -116,7 +116,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, statemint_para_id, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); @@ -215,7 +215,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-4.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-4.ts index cf68f02ce8..6cab0cf75a 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-4.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-4.ts @@ -136,7 +136,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-5.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-5.ts index 9cb83a2887..68a53ea452 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-5.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-5.ts @@ -143,7 +143,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-6.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-6.ts index d1c9eabdba..3ab3458ba4 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-6.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-6.ts @@ -158,7 +158,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-7.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-7.ts index ba25a2143e..d474b6111e 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-7.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-7.ts @@ -166,7 +166,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-8.ts b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-8.ts index 9a9f010a2a..3b7ded3f38 100644 --- a/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-8.ts +++ b/test/suites/dev/test-xcm-v3/test-mock-hrmp-transact-ethereum-8.ts @@ -141,7 +141,7 @@ describeSuite({ // Send an XCM and create block to execute it await injectHrmpMessageAndSeal(context, 1, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); diff --git a/test/suites/dev/test-xcm-v3/test-xcm-erc20-excess-gas.ts b/test/suites/dev/test-xcm-v3/test-xcm-erc20-excess-gas.ts index 7c0c67d65f..4a5c8d284e 100644 --- a/test/suites/dev/test-xcm-v3/test-xcm-erc20-excess-gas.ts +++ b/test/suites/dev/test-xcm-v3/test-xcm-erc20-excess-gas.ts @@ -163,7 +163,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); @@ -260,7 +260,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); diff --git a/test/suites/dev/test-xcm-v3/test-xcm-erc20-fees-and-trap.ts b/test/suites/dev/test-xcm-v3/test-xcm-erc20-fees-and-trap.ts index f4be2c47ee..55d061eabe 100644 --- a/test/suites/dev/test-xcm-v3/test-xcm-erc20-fees-and-trap.ts +++ b/test/suites/dev/test-xcm-v3/test-xcm-erc20-fees-and-trap.ts @@ -105,7 +105,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); @@ -212,13 +212,13 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); const chargedWeight = await weightMessage( context, - polkadotJs.createType("XcmVersionedXcm", xcmMessage) + polkadotJs.createType("StagingXcmVersionedXcm", xcmMessage) ); // We are charging chargedWeight // chargedWeight * 50000 = chargedFee @@ -252,7 +252,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageToClaimAssets, }); @@ -265,7 +265,7 @@ describeSuite({ const chargedWeightForClaim = await weightMessage( context, - polkadotJs.createType("XcmVersionedXcm", xcmMessageToClaimAssets) + polkadotJs.createType("StagingXcmVersionedXcm", xcmMessageToClaimAssets) ); // We are charging chargedWeightForClaim // chargedWeightForClaim * 50000 = chargedFeeForClaim @@ -280,7 +280,7 @@ describeSuite({ // Mock again the reception of the initial xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); @@ -317,7 +317,7 @@ describeSuite({ .as_v3(); await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessageFailedClaim, }); diff --git a/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3-filter.ts b/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3-filter.ts index d88e6bb188..5ddf9701f6 100644 --- a/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3-filter.ts +++ b/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3-filter.ts @@ -111,7 +111,7 @@ describeSuite({ const getTransferWeight = async function (limit: bigint) { // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: new XcmFragment(config) .withdraw_asset() .clear_origin() diff --git a/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3.ts b/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3.ts index f9e68b7488..690ec4b2fc 100644 --- a/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3.ts +++ b/test/suites/dev/test-xcm-v3/test-xcm-erc20-v3.ts @@ -115,7 +115,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessageAndSeal(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, }); diff --git a/test/suites/dev/test-xcm-v3/test-xcmv3-max-weight-instructions.ts b/test/suites/dev/test-xcm-v3/test-xcmv3-max-weight-instructions.ts index 24b85ab39f..f176770ccb 100644 --- a/test/suites/dev/test-xcm-v3/test-xcmv3-max-weight-instructions.ts +++ b/test/suites/dev/test-xcm-v3/test-xcmv3-max-weight-instructions.ts @@ -63,7 +63,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -73,7 +73,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -89,7 +89,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -99,7 +99,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -115,7 +115,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -125,7 +125,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -141,7 +141,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -151,7 +151,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -167,7 +167,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -177,7 +177,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -193,7 +193,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -203,7 +203,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); @@ -219,7 +219,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -229,7 +229,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("WeightNotComputable"); + expect(events[0].event.data[2].toString()).equals("WeightNotComputable"); }, }); }, diff --git a/test/suites/dev/test-xcm-v3/test-xcmv3-new-instructions.ts b/test/suites/dev/test-xcm-v3/test-xcmv3-new-instructions.ts index 99374b587e..acd014e7fa 100644 --- a/test/suites/dev/test-xcm-v3/test-xcmv3-new-instructions.ts +++ b/test/suites/dev/test-xcm-v3/test-xcmv3-new-instructions.ts @@ -66,7 +66,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -91,7 +91,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -116,7 +116,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -141,7 +141,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -166,7 +166,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -192,7 +192,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -217,7 +217,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -227,7 +227,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("Transport"); + expect(events[0].event.data[2].toString()).equals("Transport"); }, }); @@ -243,7 +243,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -253,7 +253,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("ExpectationFalse"); + expect(events[0].event.data[2].toString()).equals("ExpectationFalse"); }, }); @@ -269,7 +269,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -279,7 +279,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("ExpectationFalse"); + expect(events[0].event.data[2].toString()).equals("ExpectationFalse"); }, }); @@ -295,7 +295,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -305,7 +305,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("ExpectationFalse"); + expect(events[0].event.data[2].toString()).equals("ExpectationFalse"); }, }); @@ -321,7 +321,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -331,7 +331,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("Transport"); + expect(events[0].event.data[2].toString()).equals("Transport"); }, }); @@ -347,7 +347,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -357,7 +357,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("NameMismatch"); + expect(events[0].event.data[2].toString()).equals("NameMismatch"); }, }); @@ -373,7 +373,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -383,7 +383,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("Transport"); + expect(events[0].event.data[2].toString()).equals("Transport"); }, }); @@ -399,7 +399,7 @@ describeSuite({ // Mock the reception of the xcm message await injectHrmpMessage(context, paraId, { - type: "XcmVersionedXcm", + type: "StagingXcmVersionedXcm", payload: xcmMessage, } as RawXcmMessage); await context.createBlock(); @@ -409,7 +409,7 @@ describeSuite({ context.polkadotJs().events.xcmpQueue.Fail.is(event) ); expect(events).to.have.lengthOf(1); - expect(events[0].event.data[1].toString()).equals("BadOrigin"); + expect(events[0].event.data[2].toString()).equals("BadOrigin"); }, }); }, diff --git a/typescript-api/src/moonbase/interfaces/augment-api-consts.ts b/typescript-api/src/moonbase/interfaces/augment-api-consts.ts index a16880a805..42701cad12 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-consts.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-consts.ts @@ -53,8 +53,21 @@ declare module "@polkadot/api-base/types/consts" { [key: string]: Codec; }; balances: { - /** The minimum amount required to keep an account open. */ + /** + * The minimum amount required to keep an account open. MUST BE GREATER THAN ZERO! + * + * If you _really_ need it to be zero, you can enable the feature `insecure_zero_ed` for this + * pallet. However, you do so at your own risk: this will open up a major DoS vector. In case + * you have multiple sources of provider references, you may also get unexpected behaviour if + * you set this to zero. + * + * Bottom line: Do yourself a favour and make it at least one! + */ existentialDeposit: u128 & AugmentedConst; + /** The maximum number of individual freeze locks that can exist on an account at any time. */ + maxFreezes: u32 & AugmentedConst; + /** The maximum number of holds that can exist on an account at any time. */ + maxHolds: u32 & AugmentedConst; /** * The maximum number of locks that should exist on an account. Not strictly enforced, but * used for weight estimation. @@ -83,6 +96,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + councilCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; crowdloanRewards: { /** Percentage to be payed at initialization */ initializationPayment: Perbill & AugmentedConst; @@ -230,6 +249,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + openTechCommitteeCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; parachainStaking: { /** Number of rounds candidate requests to decrease self-bond must wait to be executable */ candidateBondLessDelay: u32 & AugmentedConst; @@ -241,6 +266,8 @@ declare module "@polkadot/api-base/types/consts" { leaveDelegatorsDelay: u32 & AugmentedConst; /** Maximum bottom delegations (not counted) per candidate */ maxBottomDelegationsPerCandidate: u32 & AugmentedConst; + /** Maximum candidates */ + maxCandidates: u32 & AugmentedConst; /** Maximum delegations per delegator */ maxDelegationsPerDelegator: u32 & AugmentedConst; /** Maximum top delegations counted per candidate */ @@ -251,8 +278,6 @@ declare module "@polkadot/api-base/types/consts" { minCandidateStk: u128 & AugmentedConst; /** Minimum stake for any registered on-chain account to delegate */ minDelegation: u128 & AugmentedConst; - /** Minimum stake for any registered on-chain account to be a delegator */ - minDelegatorStk: u128 & AugmentedConst; /** Minimum number of selected candidates every round */ minSelectedCandidates: u32 & AugmentedConst; /** Number of rounds that delegations remain bonded before revocation request is executable */ @@ -344,7 +369,14 @@ declare module "@polkadot/api-base/types/consts" { scheduler: { /** The maximum weight that may be scheduled per block for any dispatchables. */ maximumWeight: SpWeightsWeightV2Weight & AugmentedConst; - /** The maximum number of scheduled calls in the queue for a single block. */ + /** + * The maximum number of scheduled calls in the queue for a single block. + * + * NOTE: + * + * - Dependent pallets' benchmarks might require a higher limit for the setting. Set a higher + * limit under `runtime-benchmarks` feature. + */ maxScheduledPerBlock: u32 & AugmentedConst; /** Generic const */ [key: string]: Codec; @@ -370,6 +402,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + techCommitteeCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; timestamp: { /** * The minimum period between blocks. Beware that this is different to the _expected_ period @@ -432,6 +470,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + treasuryCouncilCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; utility: { /** The limit on the number of batched calls. */ batchedCallsLimit: u32 & AugmentedConst; diff --git a/typescript-api/src/moonbase/interfaces/augment-api-errors.ts b/typescript-api/src/moonbase/interfaces/augment-api-errors.ts index 72df547c51..fb34aeb7ad 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-errors.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-errors.ts @@ -55,16 +55,16 @@ declare module "@polkadot/api-base/types/errors" { NoDeposit: AugmentedError; /** The signing account has no permission to do the operation. */ NoPermission: AugmentedError; - /** - * Unable to increment the consumer reference counters on the account. Either no provider - * reference exists to allow a non-zero balance of a non-self-sufficient asset, or the maximum - * number of consumers has been reached. - */ - NoProvider: AugmentedError; /** The asset should be frozen before the given operation. */ NotFrozen: AugmentedError; /** No approval exists that would allow the transfer. */ Unapproved: AugmentedError; + /** + * Unable to increment the consumer reference counters on the account. Either no provider + * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one fewer + * then the maximum number of consumers has been reached. + */ + UnavailableConsumer: AugmentedError; /** The given asset ID is unknown. */ Unknown: AugmentedError; /** The operation would result in funds being burned. */ @@ -105,21 +105,25 @@ declare module "@polkadot/api-base/types/errors" { [key: string]: AugmentedError; }; balances: { - /** Beneficiary account must pre-exist */ + /** Beneficiary account must pre-exist. */ DeadAccount: AugmentedError; - /** Value too low to create account due to existential deposit */ + /** Value too low to create account due to existential deposit. */ ExistentialDeposit: AugmentedError; - /** A vesting schedule already exists for this account */ + /** A vesting schedule already exists for this account. */ ExistingVestingSchedule: AugmentedError; + /** Transfer/payment would kill account. */ + Expendability: AugmentedError; /** Balance too low to send value. */ InsufficientBalance: AugmentedError; - /** Transfer/payment would kill account */ - KeepAlive: AugmentedError; - /** Account liquidity restrictions prevent withdrawal */ + /** Account liquidity restrictions prevent withdrawal. */ LiquidityRestrictions: AugmentedError; - /** Number of named reserves exceed MaxReserves */ + /** Number of freezes exceed `MaxFreezes`. */ + TooManyFreezes: AugmentedError; + /** Number of holds exceed `MaxHolds`. */ + TooManyHolds: AugmentedError; + /** Number of named reserves exceed `MaxReserves`. */ TooManyReserves: AugmentedError; - /** Vesting balance too high to send value */ + /** Vesting balance too high to send value. */ VestingBalance: AugmentedError; /** Generic error */ [key: string]: AugmentedError; @@ -405,16 +409,16 @@ declare module "@polkadot/api-base/types/errors" { NoDeposit: AugmentedError; /** The signing account has no permission to do the operation. */ NoPermission: AugmentedError; - /** - * Unable to increment the consumer reference counters on the account. Either no provider - * reference exists to allow a non-zero balance of a non-self-sufficient asset, or the maximum - * number of consumers has been reached. - */ - NoProvider: AugmentedError; /** The asset should be frozen before the given operation. */ NotFrozen: AugmentedError; /** No approval exists that would allow the transfer. */ Unapproved: AugmentedError; + /** + * Unable to increment the consumer reference counters on the account. Either no provider + * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one fewer + * then the maximum number of consumers has been reached. + */ + UnavailableConsumer: AugmentedError; /** The given asset ID is unknown. */ Unknown: AugmentedError; /** The operation would result in funds being burned. */ @@ -534,10 +538,12 @@ declare module "@polkadot/api-base/types/errors" { CandidateCannotLeaveYet: AugmentedError; CandidateDNE: AugmentedError; CandidateExists: AugmentedError; + CandidateLimitReached: AugmentedError; CandidateNotLeaving: AugmentedError; CannotDelegateIfLeaving: AugmentedError; CannotDelegateLessThanOrEqualToLowestBottomWhenFull: AugmentedError; CannotGoOnlineIfLeaving: AugmentedError; + CannotSetAboveMaxCandidates: AugmentedError; CannotSetBelowMin: AugmentedError; DelegationBelowMin: AugmentedError; DelegationDNE: AugmentedError; @@ -560,6 +566,7 @@ declare module "@polkadot/api-base/types/errors" { PendingDelegationRequestDNE: AugmentedError; PendingDelegationRequestNotDueYet: AugmentedError; PendingDelegationRevoke: AugmentedError; + RemovedCall: AugmentedError; RoundLengthMustBeGreaterThanTotalSelectedCollators: AugmentedError; TooLowCandidateAutoCompoundingDelegationCountToAutoCompound: AugmentedError; TooLowCandidateAutoCompoundingDelegationCountToDelegate: AugmentedError; @@ -567,9 +574,7 @@ declare module "@polkadot/api-base/types/errors" { TooLowCandidateCountToLeaveCandidates: AugmentedError; TooLowCandidateCountWeightHint: AugmentedError; TooLowCandidateCountWeightHintCancelLeaveCandidates: AugmentedError; - TooLowCandidateCountWeightHintCandidateBondMore: AugmentedError; TooLowCandidateCountWeightHintGoOffline: AugmentedError; - TooLowCandidateCountWeightHintGoOnline: AugmentedError; TooLowCandidateCountWeightHintJoinCandidates: AugmentedError; TooLowCandidateDelegationCountToDelegate: AugmentedError; TooLowCandidateDelegationCountToLeaveCandidates: AugmentedError; @@ -621,7 +626,7 @@ declare module "@polkadot/api-base/types/errors" { FeesNotMet: AugmentedError; /** The message execution fails the filter. */ Filtered: AugmentedError; - /** The unlock operation cannot succeed because there are still users of the lock. */ + /** The unlock operation cannot succeed because there are still consumers of the lock. */ InUse: AugmentedError; /** Invalid asset for the operation. */ InvalidAsset: AugmentedError; @@ -886,6 +891,7 @@ declare module "@polkadot/api-base/types/errors" { NotCrossChainTransfer: AugmentedError; NotCrossChainTransferableCurrency: AugmentedError; NotOwner: AugmentedError; + RefundNotSupportedWithTransactInfo: AugmentedError; SignedTransactNotAllowedForDestination: AugmentedError; TooMuchFeeUsed: AugmentedError; TransactorInfoNotSet: AugmentedError; diff --git a/typescript-api/src/moonbase/interfaces/augment-api-events.ts b/typescript-api/src/moonbase/interfaces/augment-api-events.ts index 7048dc0b93..e5f5148989 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-events.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-events.ts @@ -153,6 +153,12 @@ declare module "@polkadot/api-base/types/events" { AssetStatusChanged: AugmentedEvent; /** Some asset `asset_id` was thawed. */ AssetThawed: AugmentedEvent; + /** Some account `who` was blocked. */ + Blocked: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20], + { assetId: u128; who: AccountId20 } + >; /** Some assets were destroyed. */ Burned: AugmentedEvent< ApiType, @@ -213,6 +219,12 @@ declare module "@polkadot/api-base/types/events" { [assetId: u128, who: AccountId20], { assetId: u128; who: AccountId20 } >; + /** Some account `who` was created with a deposit from `depositor`. */ + Touched: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20, depositor: AccountId20], + { assetId: u128; who: AccountId20; depositor: AccountId20 } + >; /** Some assets were transferred. */ Transferred: AugmentedEvent< ApiType, @@ -296,8 +308,14 @@ declare module "@polkadot/api-base/types/events" { /** A balance was set by root. */ BalanceSet: AugmentedEvent< ApiType, - [who: AccountId20, free: u128, reserved: u128], - { who: AccountId20; free: u128; reserved: u128 } + [who: AccountId20, free: u128], + { who: AccountId20; free: u128 } + >; + /** Some amount was burned from an account. */ + Burned: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } >; /** Some amount was deposited (e.g. for transaction fees). */ Deposit: AugmentedEvent< @@ -320,6 +338,28 @@ declare module "@polkadot/api-base/types/events" { [account: AccountId20, freeBalance: u128], { account: AccountId20; freeBalance: u128 } >; + /** Some balance was frozen. */ + Frozen: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Total issuance was increased by `amount`, creating a credit to be balanced. */ + Issued: AugmentedEvent; + /** Some balance was locked. */ + Locked: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Some amount was minted into an account. */ + Minted: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Total issuance was decreased by `amount`, creating a debt to be balanced. */ + Rescinded: AugmentedEvent; /** Some balance was reserved (moved from free to reserved). */ Reserved: AugmentedEvent< ApiType, @@ -345,24 +385,50 @@ declare module "@polkadot/api-base/types/events" { destinationStatus: FrameSupportTokensMiscBalanceStatus; } >; + /** Some amount was restored into an account. */ + Restored: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Some amount was removed from the account (e.g. for misbehavior). */ Slashed: AugmentedEvent< ApiType, [who: AccountId20, amount: u128], { who: AccountId20; amount: u128 } >; + /** Some amount was suspended from an account (it can be restored later). */ + Suspended: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Some balance was thawed. */ + Thawed: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Transfer succeeded. */ Transfer: AugmentedEvent< ApiType, [from: AccountId20, to: AccountId20, amount: u128], { from: AccountId20; to: AccountId20; amount: u128 } >; + /** Some balance was unlocked. */ + Unlocked: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Some balance was unreserved (moved from reserved to free). */ Unreserved: AugmentedEvent< ApiType, [who: AccountId20, amount: u128], { who: AccountId20; amount: u128 } >; + /** An account was upgraded. */ + Upgraded: AugmentedEvent; /** Some amount was withdrawn from the account (e.g. for transaction fees). */ Withdraw: AugmentedEvent< ApiType, @@ -715,6 +781,12 @@ declare module "@polkadot/api-base/types/events" { AssetStatusChanged: AugmentedEvent; /** Some asset `asset_id` was thawed. */ AssetThawed: AugmentedEvent; + /** Some account `who` was blocked. */ + Blocked: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20], + { assetId: u128; who: AccountId20 } + >; /** Some assets were destroyed. */ Burned: AugmentedEvent< ApiType, @@ -775,6 +847,12 @@ declare module "@polkadot/api-base/types/events" { [assetId: u128, who: AccountId20], { assetId: u128; who: AccountId20 } >; + /** Some account `who` was created with a deposit from `depositor`. */ + Touched: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20, depositor: AccountId20], + { assetId: u128; who: AccountId20; depositor: AccountId20 } + >; /** Some assets were transferred. */ Transferred: AugmentedEvent< ApiType, diff --git a/typescript-api/src/moonbase/interfaces/augment-api-query.ts b/typescript-api/src/moonbase/interfaces/augment-api-query.ts index b6cc9b9984..b8615c7cc7 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-query.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-query.ts @@ -58,6 +58,7 @@ import type { PalletAuthorMappingRegistrationInfo, PalletBalancesAccountData, PalletBalancesBalanceLock, + PalletBalancesIdAmount, PalletBalancesReserveData, PalletCollectiveVotes, PalletConvictionVotingVoteVoting, @@ -82,7 +83,7 @@ import type { PalletParachainStakingInflationInflationInfo, PalletParachainStakingParachainBondConfig, PalletParachainStakingRoundInfo, - PalletParachainStakingSetOrderedSet, + PalletParachainStakingSetBoundedOrderedSet, PalletPreimageRequestStatus, PalletProxyAnnouncement, PalletProxyProxyDefinition, @@ -98,9 +99,9 @@ import type { PalletXcmTransactorRemoteTransactInfoWithMaxWeight, PalletXcmVersionMigrationStage, PolkadotCorePrimitivesOutboundHrmpMessage, - PolkadotPrimitivesV2AbridgedHostConfiguration, - PolkadotPrimitivesV2PersistedValidationData, - PolkadotPrimitivesV2UpgradeRestriction, + PolkadotPrimitivesV4AbridgedHostConfiguration, + PolkadotPrimitivesV4PersistedValidationData, + PolkadotPrimitivesV4UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, SpWeightsWeightV2Weight, @@ -301,6 +302,20 @@ declare module "@polkadot/api-base/types/storage" { [AccountId20] > & QueryableStorageEntry; + /** Freeze locks on account balances. */ + freezes: AugmentedQuery< + ApiType, + (arg: AccountId20 | string | Uint8Array) => Observable>, + [AccountId20] + > & + QueryableStorageEntry; + /** Holds on account balances. */ + holds: AugmentedQuery< + ApiType, + (arg: AccountId20 | string | Uint8Array) => Observable>, + [AccountId20] + > & + QueryableStorageEntry; /** The total units of outstanding deactivated balance in the system. */ inactiveIssuance: AugmentedQuery Observable, []> & QueryableStorageEntry; @@ -1046,7 +1061,7 @@ declare module "@polkadot/api-base/types/storage" { */ hostConfiguration: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; @@ -1174,7 +1189,7 @@ declare module "@polkadot/api-base/types/storage" { */ upgradeRestrictionSignal: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; @@ -1191,7 +1206,7 @@ declare module "@polkadot/api-base/types/storage" { */ validationData: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; diff --git a/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts b/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts index bec563709c..5a8e8cb6a6 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-runtime.ts @@ -6,30 +6,12 @@ import "@polkadot/api-base/types/calls"; import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types"; -import type { - Bytes, - Null, - Option, - Result, - U256, - Vec, - bool, - u256, - u32, - u64, -} from "@polkadot/types-codec"; +import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec"; import type { AnyNumber, ITuple } from "@polkadot/types-codec/types"; import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder"; import type { BlockHash } from "@polkadot/types/interfaces/chain"; import type { CollationInfo } from "@polkadot/types/interfaces/cumulus"; -import type { - BlockV2, - EthReceiptV3, - EthTransaction, - EthTransactionStatus, - TransactionV2, -} from "@polkadot/types/interfaces/eth"; -import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm"; +import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth"; import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics"; import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata"; import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment"; @@ -37,12 +19,10 @@ import type { AccountId, Balance, Block, - H160, H256, Header, Index, KeyTypeId, - Permill, Weight, } from "@polkadot/types/interfaces/runtime"; import type { RuntimeVersion } from "@polkadot/types/interfaces/state"; @@ -214,105 +194,17 @@ declare module "@polkadot/api-base/types/calls" { /** Generic call */ [key: string]: DecoratedCallBase; }; - /** 0x582211f65bb14b89/4 */ - ethereumRuntimeRPCApi: { - /** Returns pallet_evm::Accounts by address. */ - accountBasic: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** For a given account address, returns pallet_evm::AccountCodes. */ - accountCodeAt: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** Returns the converted FindAuthor::find_author authority id. */ - author: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - call: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - to: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Returns runtime defined pallet_evm::ChainId. */ - chainId: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - create: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Return all the current data for a block in a single runtime call. */ - currentAll: AugmentedCall< - ApiType, - () => Observable< - ITuple<[Option, Option>, Option>]> - > - >; - /** Return the current block. */ - currentBlock: AugmentedCall Observable>; - /** Return the current receipt. */ - currentReceipts: AugmentedCall Observable>>>; - /** Return the current transaction status. */ - currentTransactionStatuses: AugmentedCall< - ApiType, - () => Observable>> - >; - /** Return the elasticity multiplier. */ - elasticity: AugmentedCall Observable>>; - /** Receives a `Vec` and filters all the ethereum transactions. */ - extrinsicFilter: AugmentedCall< - ApiType, - ( - xts: Vec | (Extrinsic | IExtrinsic | string | Uint8Array)[] - ) => Observable> - >; - /** Returns FixedGasPrice::min_gas_price */ - gasPrice: AugmentedCall Observable>; - /** For a given account address and index, returns pallet_evm::AccountStorages. */ - storageAt: AugmentedCall< - ApiType, - ( - address: H160 | string | Uint8Array, - index: u256 | AnyNumber | Uint8Array - ) => Observable - >; - /** Generic call */ - [key: string]: DecoratedCallBase; - }; - /** 0x37e397fc7c91f5e4/1 */ + /** 0x37e397fc7c91f5e4/2 */ metadata: { /** Returns the metadata of a runtime */ metadata: AugmentedCall Observable>; + /** Returns the metadata at a given version. */ + metadataAtVersion: AugmentedCall< + ApiType, + (version: u32 | AnyNumber | Uint8Array) => Observable> + >; + /** Returns the supported metadata versions. */ + metadataVersions: AugmentedCall Observable>>; /** Generic call */ [key: string]: DecoratedCallBase; }; @@ -393,7 +285,7 @@ declare module "@polkadot/api-base/types/calls" { /** Generic call */ [key: string]: DecoratedCallBase; }; - /** 0x37c8bb1350a9a2a8/3 */ + /** 0x37c8bb1350a9a2a8/4 */ transactionPaymentApi: { /** The transaction fee details */ queryFeeDetails: AugmentedCall< diff --git a/typescript-api/src/moonbase/interfaces/augment-api-tx.ts b/typescript-api/src/moonbase/interfaces/augment-api-tx.ts index f787181777..a29f26b7b9 100644 --- a/typescript-api/src/moonbase/interfaces/augment-api-tx.ts +++ b/typescript-api/src/moonbase/interfaces/augment-api-tx.ts @@ -201,6 +201,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, AccountId20, Compact] >; + /** + * Disallow further unprivileged transfers of an asset `id` to and from an account `who`. + * + * Origin must be Signed and the sender should be the Freezer of the asset `id`. + * + * - `id`: The identifier of the account's asset. + * - `who`: The account to be unblocked. + * + * Emits `Blocked`. + * + * Weight: `O(1)` + */ + block: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Reduce the balance of `who` by as much as possible up to `amount` assets of `id`. * @@ -510,7 +529,9 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, AccountId20, Compact] >; /** - * Disallow further unprivileged transfers from an account. + * Disallow further unprivileged transfers of an asset `id` from an account `who`. `who` must + * already exist as an entry in `Account`s of the asset. If you want to freeze an account that + * does not have an entry, use `touch_other` first. * * Origin must be Signed and the sender should be the Freezer of the asset `id`. * @@ -565,11 +586,11 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, Compact] >; /** - * Return the deposit (if any) of an asset account. + * Return the deposit (if any) of an asset account or a consumer reference (if any) of an account. * * The origin must be Signed. * - * - `id`: The identifier of the asset for the account to be created. + * - `id`: The identifier of the asset for which the caller would like the deposit refunded. * - `allow_burn`: If `true` then assets may be destroyed in order to complete the refund. * * Emits `Refunded` event when successful. @@ -581,6 +602,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, bool] >; + /** + * Return the deposit (if any) of a target asset account. Useful if you are the depositor. + * + * The origin must be Signed and either the account owner, depositor, or asset `Admin`. In + * order to burn a non-zero balance of the asset, the caller must be the account and should + * use `refund`. + * + * - `id`: The identifier of the asset for the account holding a deposit. + * - `who`: The account to refund. + * + * Emits `Refunded` event when successful. + */ + refundOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Set the metadata for an asset. * @@ -667,7 +707,7 @@ declare module "@polkadot/api-base/types/submittable" { [Compact] >; /** - * Allow unprivileged transfers from an account again. + * Allow unprivileged transfers to and from an account again. * * Origin must be Signed and the sender should be the Admin of the asset `id`. * @@ -714,6 +754,25 @@ declare module "@polkadot/api-base/types/submittable" { (id: Compact | AnyNumber | Uint8Array) => SubmittableExtrinsic, [Compact] >; + /** + * Create an asset account for `who`. + * + * A deposit will be taken from the signer account. + * + * - `origin`: Must be Signed by `Freezer` or `Admin` of the asset `id`; the signer account must + * have sufficient funds for a deposit to be taken. + * - `id`: The identifier of the asset for the account to be created. + * - `who`: The account to be created. + * + * Emits `Touched` event when successful. + */ + touchOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Move some assets from the sender account to another. * @@ -893,12 +952,20 @@ declare module "@polkadot/api-base/types/submittable" { }; balances: { /** - * Exactly as `transfer`, except the origin must be root and the source account may be specified. - * - * ## Complexity + * Set the regular balance of a given account. * - * - Same as transfer, but additional read and write because the source account is not assumed - * to be in the overlay. + * The dispatch origin for this call is `root`. + */ + forceSetBalance: AugmentedSubmittable< + ( + who: AccountId20 | string | Uint8Array, + newFree: Compact | AnyNumber | Uint8Array + ) => SubmittableExtrinsic, + [AccountId20, Compact] + >; + /** + * Exactly as `transfer_allow_death`, except the origin must be root and the source account + * may be specified. */ forceTransfer: AugmentedSubmittable< ( @@ -921,45 +988,25 @@ declare module "@polkadot/api-base/types/submittable" { [AccountId20, u128] >; /** - * Set the balances of a given account. - * - * This will alter `FreeBalance` and `ReservedBalance` in storage. it will also alter the - * total issuance of the system (`TotalIssuance`) appropriately. If the new free or reserved - * balance is below the existential deposit, it will reset the account nonce - * (`frame_system::AccountNonce`). + * Set the regular balance of a given account; it also takes a reserved balance but this must + * be the same as the account's current reserved balance. * * The dispatch origin for this call is `root`. + * + * WARNING: This call is DEPRECATED! Use `force_set_balance` instead. */ - setBalance: AugmentedSubmittable< + setBalanceDeprecated: AugmentedSubmittable< ( who: AccountId20 | string | Uint8Array, newFree: Compact | AnyNumber | Uint8Array, - newReserved: Compact | AnyNumber | Uint8Array + oldReserved: Compact | AnyNumber | Uint8Array ) => SubmittableExtrinsic, [AccountId20, Compact, Compact] >; /** - * Transfer some liquid free balance to another account. + * Alias for `transfer_allow_death`, provided only for name-wise compatibility. * - * `transfer` will set the `FreeBalance` of the sender and receiver. If the sender's account - * is below the existential deposit as a result of the transfer, the account will be reaped. - * - * The dispatch origin for this call must be `Signed` by the transactor. - * - * ## Complexity - * - * - Dependent on arguments but not critical, given proper implementations for input config - * types. See related functions below. - * - It contains a limited number of reads and writes internally and no complex computation. - * - * Related functions: - * - * - `ensure_can_withdraw` is always called internally but has a bounded complexity. - * - Transferring balances to accounts that did not exist before will cause - * `T::OnNewAccount::on_new_account` to be called. - * - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`. - * - `transfer_keep_alive` works the same way as `transfer`, but has an additional check that - * the transfer will not kill the origin account. + * WARNING: DEPRECATED! Will be released in approximately 3 months. */ transfer: AugmentedSubmittable< ( @@ -982,8 +1029,7 @@ declare module "@polkadot/api-base/types/submittable" { * - `keep_alive`: A boolean to determine if the `transfer_all` operation should send all of the * funds the account has, causing the sender account to be killed (false), or transfer * everything except at least the existential deposit, which will guarantee to keep the - * sender account alive (true). ## Complexity - * - O(1). Just like transfer, but reading the user's transferable balance first. + * sender account alive (true). */ transferAll: AugmentedSubmittable< ( @@ -993,12 +1039,28 @@ declare module "@polkadot/api-base/types/submittable" { [AccountId20, bool] >; /** - * Same as the [`transfer`][`transfer`] call, but with a check that the transfer will not kill - * the origin account. + * Transfer some liquid free balance to another account. + * + * `transfer_allow_death` will set the `FreeBalance` of the sender and receiver. If the + * sender's account is below the existential deposit as a result of the transfer, the account + * will be reaped. + * + * The dispatch origin for this call must be `Signed` by the transactor. + */ + transferAllowDeath: AugmentedSubmittable< + ( + dest: AccountId20 | string | Uint8Array, + value: Compact | AnyNumber | Uint8Array + ) => SubmittableExtrinsic, + [AccountId20, Compact] + >; + /** + * Same as the [`transfer_allow_death`][`transfer_allow_death`] call, but with a check that + * the transfer will not kill the origin account. * - * 99% of the time you want [`transfer`][`transfer`] instead. + * 99% of the time you want [`transfer_allow_death`][`transfer_allow_death`] instead. * - * [`transfer`]: struct.Pallet.html#method.transfer + * [`transfer_allow_death`]: struct.Pallet.html#method.transfer */ transferKeepAlive: AugmentedSubmittable< ( @@ -1007,6 +1069,22 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [AccountId20, Compact] >; + /** + * Upgrade a specified account. + * + * - `origin`: Must be `Signed`. + * - `who`: The account to be upgraded. + * + * This will waive the transaction fee if at least all but 10% of the accounts needed to be + * upgraded. (We let some not have to be upgraded just in order to allow for the possibililty + * of churn). + */ + upgradeAccounts: AugmentedSubmittable< + ( + who: Vec | (AccountId20 | string | Uint8Array)[] + ) => SubmittableExtrinsic, + [Vec] + >; /** Generic tx */ [key: string]: SubmittableExtrinsicFunction; }; @@ -1221,41 +1299,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -2403,6 +2446,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, AccountId20, Compact] >; + /** + * Disallow further unprivileged transfers of an asset `id` to and from an account `who`. + * + * Origin must be Signed and the sender should be the Freezer of the asset `id`. + * + * - `id`: The identifier of the account's asset. + * - `who`: The account to be unblocked. + * + * Emits `Blocked`. + * + * Weight: `O(1)` + */ + block: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Reduce the balance of `who` by as much as possible up to `amount` assets of `id`. * @@ -2712,7 +2774,9 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, AccountId20, Compact] >; /** - * Disallow further unprivileged transfers from an account. + * Disallow further unprivileged transfers of an asset `id` from an account `who`. `who` must + * already exist as an entry in `Account`s of the asset. If you want to freeze an account that + * does not have an entry, use `touch_other` first. * * Origin must be Signed and the sender should be the Freezer of the asset `id`. * @@ -2767,11 +2831,11 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, Compact] >; /** - * Return the deposit (if any) of an asset account. + * Return the deposit (if any) of an asset account or a consumer reference (if any) of an account. * * The origin must be Signed. * - * - `id`: The identifier of the asset for the account to be created. + * - `id`: The identifier of the asset for which the caller would like the deposit refunded. * - `allow_burn`: If `true` then assets may be destroyed in order to complete the refund. * * Emits `Refunded` event when successful. @@ -2783,6 +2847,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, bool] >; + /** + * Return the deposit (if any) of a target asset account. Useful if you are the depositor. + * + * The origin must be Signed and either the account owner, depositor, or asset `Admin`. In + * order to burn a non-zero balance of the asset, the caller must be the account and should + * use `refund`. + * + * - `id`: The identifier of the asset for the account holding a deposit. + * - `who`: The account to refund. + * + * Emits `Refunded` event when successful. + */ + refundOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Set the metadata for an asset. * @@ -2869,7 +2952,7 @@ declare module "@polkadot/api-base/types/submittable" { [Compact] >; /** - * Allow unprivileged transfers from an account again. + * Allow unprivileged transfers to and from an account again. * * Origin must be Signed and the sender should be the Admin of the asset `id`. * @@ -2916,6 +2999,25 @@ declare module "@polkadot/api-base/types/submittable" { (id: Compact | AnyNumber | Uint8Array) => SubmittableExtrinsic, [Compact] >; + /** + * Create an asset account for `who`. + * + * A deposit will be taken from the signer account. + * + * - `origin`: Must be Signed by `Freezer` or `Admin` of the asset `id`; the signer account must + * have sufficient funds for a deposit to be taken. + * - `id`: The identifier of the asset for the account to be created. + * - `who`: The account to be created. + * + * Emits `Touched` event when successful. + */ + touchOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Move some assets from the sender account to another. * @@ -3039,17 +3141,6 @@ declare module "@polkadot/api-base/types/submittable" { /** Generic tx */ [key: string]: SubmittableExtrinsicFunction; }; - migrations: { - migrateDemocracyPreimage: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - proposalLenUpperBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact] - >; - /** Generic tx */ - [key: string]: SubmittableExtrinsicFunction; - }; moonbeamOrbiters: { /** Add a collator to orbiters program. */ addCollator: AugmentedSubmittable< @@ -3298,41 +3389,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -3469,12 +3525,6 @@ declare module "@polkadot/api-base/types/submittable" { (candidateCount: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32] >; - /** - * DEPRECATED use batch util with cancel_delegation_request for all delegations Cancel a - * pending request to exit the set of delegators. Success clears the pending exit request - * (thereby resetting the delay upon another `leave_delegators` call). - */ - cancelLeaveDelegators: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Increase collator candidate self bond by `more` */ candidateBondMore: AugmentedSubmittable< (more: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, @@ -3539,17 +3589,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [AccountId20, u32] >; - /** - * DEPRECATED use batch util with execute_delegation_request for all delegations Execute the - * right to exit the set of delegators and revoke all ongoing delegations. - */ - executeLeaveDelegators: AugmentedSubmittable< - ( - delegator: AccountId20 | string | Uint8Array, - delegationCount: u32 | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [AccountId20, u32] - >; /** Temporarily leave the set of collator candidates without unbonding */ goOffline: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Rejoin the set of collator candidates if previously had called `go_offline` */ @@ -3569,6 +3608,12 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [u128, u32] >; + /** REMOVED, was schedule_leave_delegators */ + removedCall19: AugmentedSubmittable<() => SubmittableExtrinsic, []>; + /** REMOVED, was execute_leave_delegators */ + removedCall20: AugmentedSubmittable<() => SubmittableExtrinsic, []>; + /** REMOVED, was cancel_leave_delegators */ + removedCall21: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Request by collator candidate to decrease self bond by `less` */ scheduleCandidateBondLess: AugmentedSubmittable< (less: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, @@ -3594,13 +3639,6 @@ declare module "@polkadot/api-base/types/submittable" { (candidateCount: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32] >; - /** - * DEPRECATED use batch util with schedule_revoke_delegation for all delegations Request to - * leave the set of delegators. If successful, the caller is scheduled to be allowed to exit - * via a [DelegationAction::Revoke] towards all existing delegations. Success forbids future - * delegation requests until the request is invoked or cancelled. - */ - scheduleLeaveDelegators: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** * Request to revoke an existing delegation. If successful, the delegation is scheduled to be * allowed to be revoked via the `execute_delegation_request` extrinsic. The delegation @@ -4651,8 +4689,6 @@ declare module "@polkadot/api-base/types/submittable" { /** * Make some on-chain remark. * - * ## Complexity - * * - `O(1)` */ remark: AugmentedSubmittable< @@ -4664,24 +4700,12 @@ declare module "@polkadot/api-base/types/submittable" { (remark: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] >; - /** - * Set the new runtime code. - * - * ## Complexity - * - * - `O(C + S)` where `C` length of `code` and `S` complexity of `can_set_code` - */ + /** Set the new runtime code. */ setCode: AugmentedSubmittable< (code: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] >; - /** - * Set the new runtime code without doing any checks of the given `code`. - * - * ## Complexity - * - * - `O(C)` where `C` length of `code` - */ + /** Set the new runtime code without doing any checks of the given `code`. */ setCodeWithoutChecks: AugmentedSubmittable< (code: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] @@ -4743,41 +4767,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -5044,41 +5033,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -5624,14 +5578,16 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ MoonbaseRuntimeXcmConfigTransactors, u16, PalletXcmTransactorCurrencyPayment, Bytes, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** @@ -5654,13 +5610,15 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ XcmVersionedMultiLocation, PalletXcmTransactorCurrencyPayment, Bytes, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** @@ -5690,7 +5648,8 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ XcmVersionedMultiLocation, @@ -5698,7 +5657,8 @@ declare module "@polkadot/api-base/types/submittable" { PalletXcmTransactorCurrencyPayment, Bytes, XcmV2OriginKind, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** Generic tx */ diff --git a/typescript-api/src/moonbase/interfaces/lookup.ts b/typescript-api/src/moonbase/interfaces/lookup.ts index a15194053f..1758204596 100644 --- a/typescript-api/src/moonbase/interfaces/lookup.ts +++ b/typescript-api/src/moonbase/interfaces/lookup.ts @@ -4,7 +4,7 @@ /* eslint-disable sort-keys */ export default { - /** Lookup3: frame_system::AccountInfo> */ + /** Lookup3: frame_system::AccountInfo> */ FrameSystemAccountInfo: { nonce: "u32", consumers: "u32", @@ -12,29 +12,29 @@ export default { sufficients: "u32", data: "PalletBalancesAccountData", }, - /** Lookup5: pallet_balances::AccountData */ + /** Lookup5: pallet_balances::types::AccountData */ PalletBalancesAccountData: { free: "u128", reserved: "u128", - miscFrozen: "u128", - feeFrozen: "u128", + frozen: "u128", + flags: "u128", }, - /** Lookup7: frame_support::dispatch::PerDispatchClass */ + /** Lookup8: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassWeight: { normal: "SpWeightsWeightV2Weight", operational: "SpWeightsWeightV2Weight", mandatory: "SpWeightsWeightV2Weight", }, - /** Lookup8: sp_weights::weight_v2::Weight */ + /** Lookup9: sp_weights::weight_v2::Weight */ SpWeightsWeightV2Weight: { refTime: "Compact", proofSize: "Compact", }, - /** Lookup14: sp_runtime::generic::digest::Digest */ + /** Lookup15: sp_runtime::generic::digest::Digest */ SpRuntimeDigest: { logs: "Vec", }, - /** Lookup16: sp_runtime::generic::digest::DigestItem */ + /** Lookup17: sp_runtime::generic::digest::DigestItem */ SpRuntimeDigestDigestItem: { _enum: { Other: "Bytes", @@ -48,13 +48,13 @@ export default { RuntimeEnvironmentUpdated: "Null", }, }, - /** Lookup19: frame_system::EventRecord */ + /** Lookup20: frame_system::EventRecord */ FrameSystemEventRecord: { phase: "FrameSystemPhase", event: "Event", topics: "Vec", }, - /** Lookup21: frame_system::pallet::Event */ + /** Lookup22: frame_system::pallet::Event */ FrameSystemEvent: { _enum: { ExtrinsicSuccess: { @@ -80,21 +80,21 @@ export default { }, }, }, - /** Lookup22: frame_support::dispatch::DispatchInfo */ + /** Lookup23: frame_support::dispatch::DispatchInfo */ FrameSupportDispatchDispatchInfo: { weight: "SpWeightsWeightV2Weight", class: "FrameSupportDispatchDispatchClass", paysFee: "FrameSupportDispatchPays", }, - /** Lookup23: frame_support::dispatch::DispatchClass */ + /** Lookup24: frame_support::dispatch::DispatchClass */ FrameSupportDispatchDispatchClass: { _enum: ["Normal", "Operational", "Mandatory"], }, - /** Lookup24: frame_support::dispatch::Pays */ + /** Lookup25: frame_support::dispatch::Pays */ FrameSupportDispatchPays: { _enum: ["Yes", "No"], }, - /** Lookup25: sp_runtime::DispatchError */ + /** Lookup26: sp_runtime::DispatchError */ SpRuntimeDispatchError: { _enum: { Other: "Null", @@ -110,34 +110,38 @@ export default { Exhausted: "Null", Corruption: "Null", Unavailable: "Null", + RootNotAllowed: "Null", }, }, - /** Lookup26: sp_runtime::ModuleError */ + /** Lookup27: sp_runtime::ModuleError */ SpRuntimeModuleError: { index: "u8", error: "[u8;4]", }, - /** Lookup27: sp_runtime::TokenError */ + /** Lookup28: sp_runtime::TokenError */ SpRuntimeTokenError: { _enum: [ - "NoFunds", - "WouldDie", + "FundsUnavailable", + "OnlyProvider", "BelowMinimum", "CannotCreate", "UnknownAsset", "Frozen", "Unsupported", + "CannotCreateHold", + "NotExpendable", + "Blocked", ], }, - /** Lookup28: sp_arithmetic::ArithmeticError */ + /** Lookup29: sp_arithmetic::ArithmeticError */ SpArithmeticArithmeticError: { _enum: ["Underflow", "Overflow", "DivisionByZero"], }, - /** Lookup29: sp_runtime::TransactionalError */ + /** Lookup30: sp_runtime::TransactionalError */ SpRuntimeTransactionalError: { _enum: ["LimitReached", "NoLayer"], }, - /** Lookup30: pallet_utility::pallet::Event */ + /** Lookup31: pallet_utility::pallet::Event */ PalletUtilityEvent: { _enum: { BatchInterrupted: { @@ -155,7 +159,7 @@ export default { }, }, }, - /** Lookup33: pallet_balances::pallet::Event */ + /** Lookup34: pallet_balances::pallet::Event */ PalletBalancesEvent: { _enum: { Endowed: { @@ -174,7 +178,6 @@ export default { BalanceSet: { who: "AccountId20", free: "u128", - reserved: "u128", }, Reserved: { who: "AccountId20", @@ -202,13 +205,54 @@ export default { who: "AccountId20", amount: "u128", }, + Minted: { + who: "AccountId20", + amount: "u128", + }, + Burned: { + who: "AccountId20", + amount: "u128", + }, + Suspended: { + who: "AccountId20", + amount: "u128", + }, + Restored: { + who: "AccountId20", + amount: "u128", + }, + Upgraded: { + who: "AccountId20", + }, + Issued: { + amount: "u128", + }, + Rescinded: { + amount: "u128", + }, + Locked: { + who: "AccountId20", + amount: "u128", + }, + Unlocked: { + who: "AccountId20", + amount: "u128", + }, + Frozen: { + who: "AccountId20", + amount: "u128", + }, + Thawed: { + who: "AccountId20", + amount: "u128", + }, }, }, - /** Lookup34: frame_support::traits::tokens::misc::BalanceStatus */ + /** Lookup35: frame_support::traits::tokens::misc::BalanceStatus */ FrameSupportTokensMiscBalanceStatus: { _enum: ["Free", "Reserved"], }, - /** Lookup35: pallet_sudo::pallet::Event */ + /** Lookup36: pallet_sudo::pallet::Event */ PalletSudoEvent: { _enum: { Sudid: { @@ -222,7 +266,7 @@ export default { }, }, }, - /** Lookup37: cumulus_pallet_parachain_system::pallet::Event */ + /** Lookup38: cumulus_pallet_parachain_system::pallet::Event */ CumulusPalletParachainSystemEvent: { _enum: { ValidationFunctionStored: "Null", @@ -245,7 +289,7 @@ export default { }, }, }, - /** Lookup39: pallet_transaction_payment::pallet::Event */ + /** Lookup40: pallet_transaction_payment::pallet::Event */ PalletTransactionPaymentEvent: { _enum: { TransactionFeePaid: { @@ -255,7 +299,7 @@ export default { }, }, }, - /** Lookup40: pallet_evm::pallet::Event */ + /** Lookup41: pallet_evm::pallet::Event */ PalletEvmEvent: { _enum: { Log: { @@ -275,13 +319,13 @@ export default { }, }, }, - /** Lookup41: ethereum::log::Log */ + /** Lookup42: ethereum::log::Log */ EthereumLog: { address: "H160", topics: "Vec", data: "Bytes", }, - /** Lookup44: pallet_ethereum::pallet::Event */ + /** Lookup45: pallet_ethereum::pallet::Event */ PalletEthereumEvent: { _enum: { Executed: { @@ -293,7 +337,7 @@ export default { }, }, }, - /** Lookup45: evm_core::error::ExitReason */ + /** Lookup46: evm_core::error::ExitReason */ EvmCoreErrorExitReason: { _enum: { Succeed: "EvmCoreErrorExitSucceed", @@ -302,11 +346,11 @@ export default { Fatal: "EvmCoreErrorExitFatal", }, }, - /** Lookup46: evm_core::error::ExitSucceed */ + /** Lookup47: evm_core::error::ExitSucceed */ EvmCoreErrorExitSucceed: { _enum: ["Stopped", "Returned", "Suicided"], }, - /** Lookup47: evm_core::error::ExitError */ + /** Lookup48: evm_core::error::ExitError */ EvmCoreErrorExitError: { _enum: { StackUnderflow: "Null", @@ -327,11 +371,11 @@ export default { InvalidCode: "u8", }, }, - /** Lookup51: evm_core::error::ExitRevert */ + /** Lookup52: evm_core::error::ExitRevert */ EvmCoreErrorExitRevert: { _enum: ["Reverted"], }, - /** Lookup52: evm_core::error::ExitFatal */ + /** Lookup53: evm_core::error::ExitFatal */ EvmCoreErrorExitFatal: { _enum: { NotSupported: "Null", @@ -340,7 +384,7 @@ export default { Other: "Text", }, }, - /** Lookup53: pallet_parachain_staking::pallet::Event */ + /** Lookup54: pallet_parachain_staking::pallet::Event */ PalletParachainStakingEvent: { _enum: { NewRound: { @@ -535,19 +579,19 @@ export default { }, }, }, - /** Lookup55: pallet_parachain_staking::delegation_requests::CancelledScheduledRequest */ + /** Lookup56: pallet_parachain_staking::delegation_requests::CancelledScheduledRequest */ PalletParachainStakingDelegationRequestsCancelledScheduledRequest: { whenExecutable: "u32", action: "PalletParachainStakingDelegationRequestsDelegationAction", }, - /** Lookup56: pallet_parachain_staking::delegation_requests::DelegationAction */ + /** Lookup57: pallet_parachain_staking::delegation_requests::DelegationAction */ PalletParachainStakingDelegationRequestsDelegationAction: { _enum: { Revoke: "u128", Decrease: "u128", }, }, - /** Lookup57: pallet_parachain_staking::types::DelegatorAdded */ + /** Lookup58: pallet_parachain_staking::types::DelegatorAdded */ PalletParachainStakingDelegatorAdded: { _enum: { AddedToTop: { @@ -556,7 +600,7 @@ export default { AddedToBottom: "Null", }, }, - /** Lookup60: pallet_scheduler::pallet::Event */ + /** Lookup61: pallet_scheduler::pallet::Event */ PalletSchedulerEvent: { _enum: { Scheduled: { @@ -586,7 +630,7 @@ export default { }, }, }, - /** Lookup62: pallet_democracy::pallet::Event */ + /** Lookup63: pallet_democracy::pallet::Event */ PalletDemocracyEvent: { _enum: { Proposed: { @@ -662,11 +706,11 @@ export default { }, }, }, - /** Lookup63: pallet_democracy::vote_threshold::VoteThreshold */ + /** Lookup64: pallet_democracy::vote_threshold::VoteThreshold */ PalletDemocracyVoteThreshold: { _enum: ["SuperMajorityApprove", "SuperMajorityAgainst", "SimpleMajority"], }, - /** Lookup64: pallet_democracy::vote::AccountVote */ + /** Lookup65: pallet_democracy::vote::AccountVote */ PalletDemocracyVoteAccountVote: { _enum: { Standard: { @@ -679,7 +723,7 @@ export default { }, }, }, - /** Lookup66: pallet_democracy::types::MetadataOwner */ + /** Lookup67: pallet_democracy::types::MetadataOwner */ PalletDemocracyMetadataOwner: { _enum: { External: "Null", @@ -687,7 +731,7 @@ export default { Referendum: "u32", }, }, - /** Lookup67: pallet_collective::pallet::Event */ + /** Lookup68: pallet_collective::pallet::Event */ PalletCollectiveEvent: { _enum: { Proposed: { @@ -724,7 +768,7 @@ export default { }, }, }, - /** Lookup69: pallet_treasury::pallet::Event */ + /** Lookup70: pallet_treasury::pallet::Event */ PalletTreasuryEvent: { _enum: { Proposed: { @@ -762,13 +806,13 @@ export default { }, }, }, - /** Lookup70: pallet_author_slot_filter::pallet::Event */ + /** Lookup71: pallet_author_slot_filter::pallet::Event */ PalletAuthorSlotFilterEvent: { _enum: { EligibleUpdated: "u32", }, }, - /** Lookup72: pallet_crowdloan_rewards::pallet::Event */ + /** Lookup73: pallet_crowdloan_rewards::pallet::Event */ PalletCrowdloanRewardsEvent: { _enum: { InitialPaymentMade: "(AccountId20,u128)", @@ -779,7 +823,7 @@ export default { InitializedAccountWithNotEnoughContribution: "([u8;32],Option,u128)", }, }, - /** Lookup73: pallet_author_mapping::pallet::Event */ + /** Lookup74: pallet_author_mapping::pallet::Event */ PalletAuthorMappingEvent: { _enum: { KeysRegistered: { @@ -805,13 +849,13 @@ export default { }, }, }, - /** Lookup74: nimbus_primitives::nimbus_crypto::Public */ + /** Lookup75: nimbus_primitives::nimbus_crypto::Public */ NimbusPrimitivesNimbusCryptoPublic: "SpCoreSr25519Public", - /** Lookup75: sp_core::sr25519::Public */ + /** Lookup76: sp_core::sr25519::Public */ SpCoreSr25519Public: "[u8;32]", - /** Lookup76: session_keys_primitives::vrf::vrf_crypto::Public */ + /** Lookup77: session_keys_primitives::vrf::vrf_crypto::Public */ SessionKeysPrimitivesVrfVrfCryptoPublic: "SpCoreSr25519Public", - /** Lookup77: pallet_proxy::pallet::Event */ + /** Lookup78: pallet_proxy::pallet::Event */ PalletProxyEvent: { _enum: { ProxyExecuted: { @@ -842,7 +886,7 @@ export default { }, }, }, - /** Lookup78: moonbase_runtime::ProxyType */ + /** Lookup79: moonbase_runtime::ProxyType */ MoonbaseRuntimeProxyType: { _enum: [ "Any", @@ -855,7 +899,7 @@ export default { "IdentityJudgement", ], }, - /** Lookup80: pallet_maintenance_mode::pallet::Event */ + /** Lookup81: pallet_maintenance_mode::pallet::Event */ PalletMaintenanceModeEvent: { _enum: { EnteredMaintenanceMode: "Null", @@ -868,7 +912,7 @@ export default { }, }, }, - /** Lookup81: pallet_identity::pallet::Event */ + /** Lookup82: pallet_identity::pallet::Event */ PalletIdentityEvent: { _enum: { IdentitySet: { @@ -914,7 +958,7 @@ export default { }, }, }, - /** Lookup82: cumulus_pallet_xcmp_queue::pallet::Event */ + /** Lookup83: cumulus_pallet_xcmp_queue::pallet::Event */ CumulusPalletXcmpQueueEvent: { _enum: { Success: { @@ -947,7 +991,7 @@ export default { }, }, }, - /** Lookup83: xcm::v3::traits::Error */ + /** Lookup84: xcm::v3::traits::Error */ XcmV3TraitsError: { _enum: { Overflow: "Null", @@ -992,7 +1036,7 @@ export default { ExceedsStackLimit: "Null", }, }, - /** Lookup85: cumulus_pallet_xcm::pallet::Event */ + /** Lookup86: cumulus_pallet_xcm::pallet::Event */ CumulusPalletXcmEvent: { _enum: { InvalidFormat: "[u8;32]", @@ -1000,7 +1044,7 @@ export default { ExecutedDownward: "([u8;32],XcmV3TraitsOutcome)", }, }, - /** Lookup86: xcm::v3::traits::Outcome */ + /** Lookup87: xcm::v3::traits::Outcome */ XcmV3TraitsOutcome: { _enum: { Complete: "SpWeightsWeightV2Weight", @@ -1008,7 +1052,7 @@ export default { Error: "XcmV3TraitsError", }, }, - /** Lookup87: cumulus_pallet_dmp_queue::pallet::Event */ + /** Lookup88: cumulus_pallet_dmp_queue::pallet::Event */ CumulusPalletDmpQueueEvent: { _enum: { InvalidFormat: { @@ -1040,7 +1084,7 @@ export default { }, }, }, - /** Lookup88: pallet_xcm::pallet::Event */ + /** Lookup89: pallet_xcm::pallet::Event */ PalletXcmEvent: { _enum: { Attempted: "XcmV3TraitsOutcome", @@ -1068,12 +1112,12 @@ export default { AssetsClaimed: "(H256,XcmV3MultiLocation,XcmVersionedMultiAssets)", }, }, - /** Lookup89: xcm::v3::multilocation::MultiLocation */ + /** Lookup90: xcm::v3::multilocation::MultiLocation */ XcmV3MultiLocation: { parents: "u8", interior: "XcmV3Junctions", }, - /** Lookup90: xcm::v3::junctions::Junctions */ + /** Lookup91: xcm::v3::junctions::Junctions */ XcmV3Junctions: { _enum: { Here: "Null", @@ -1087,7 +1131,7 @@ export default { X8: "(XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction)", }, }, - /** Lookup91: xcm::v3::junction::Junction */ + /** Lookup92: xcm::v3::junction::Junction */ XcmV3Junction: { _enum: { Parachain: "Compact", @@ -1117,7 +1161,7 @@ export default { GlobalConsensus: "XcmV3JunctionNetworkId", }, }, - /** Lookup94: xcm::v3::junction::NetworkId */ + /** Lookup95: xcm::v3::junction::NetworkId */ XcmV3JunctionNetworkId: { _enum: { ByGenesis: "[u8;32]", @@ -1137,7 +1181,7 @@ export default { BitcoinCash: "Null", }, }, - /** Lookup96: xcm::v3::junction::BodyId */ + /** Lookup97: xcm::v3::junction::BodyId */ XcmV3JunctionBodyId: { _enum: { Unit: "Null", @@ -1152,7 +1196,7 @@ export default { Treasury: "Null", }, }, - /** Lookup97: xcm::v3::junction::BodyPart */ + /** Lookup98: xcm::v3::junction::BodyPart */ XcmV3JunctionBodyPart: { _enum: { Voice: "Null", @@ -1173,9 +1217,9 @@ export default { }, }, }, - /** Lookup98: xcm::v3::Xcm */ + /** Lookup99: xcm::v3::Xcm */ XcmV3Xcm: "Vec", - /** Lookup100: xcm::v3::Instruction */ + /** Lookup101: xcm::v3::Instruction */ XcmV3Instruction: { _enum: { WithdrawAsset: "XcmV3MultiassetMultiAssets", @@ -1315,28 +1359,28 @@ export default { }, }, }, - /** Lookup101: xcm::v3::multiasset::MultiAssets */ + /** Lookup102: xcm::v3::multiasset::MultiAssets */ XcmV3MultiassetMultiAssets: "Vec", - /** Lookup103: xcm::v3::multiasset::MultiAsset */ + /** Lookup104: xcm::v3::multiasset::MultiAsset */ XcmV3MultiAsset: { id: "XcmV3MultiassetAssetId", fun: "XcmV3MultiassetFungibility", }, - /** Lookup104: xcm::v3::multiasset::AssetId */ + /** Lookup105: xcm::v3::multiasset::AssetId */ XcmV3MultiassetAssetId: { _enum: { Concrete: "XcmV3MultiLocation", Abstract: "[u8;32]", }, }, - /** Lookup105: xcm::v3::multiasset::Fungibility */ + /** Lookup106: xcm::v3::multiasset::Fungibility */ XcmV3MultiassetFungibility: { _enum: { Fungible: "Compact", NonFungible: "XcmV3MultiassetAssetInstance", }, }, - /** Lookup106: xcm::v3::multiasset::AssetInstance */ + /** Lookup107: xcm::v3::multiasset::AssetInstance */ XcmV3MultiassetAssetInstance: { _enum: { Undefined: "Null", @@ -1347,7 +1391,7 @@ export default { Array32: "[u8;32]", }, }, - /** Lookup109: xcm::v3::Response */ + /** Lookup110: xcm::v3::Response */ XcmV3Response: { _enum: { Null: "Null", @@ -1358,7 +1402,7 @@ export default { DispatchResult: "XcmV3MaybeErrorCode", }, }, - /** Lookup113: xcm::v3::PalletInfo */ + /** Lookup114: xcm::v3::PalletInfo */ XcmV3PalletInfo: { index: "Compact", name: "Bytes", @@ -1367,7 +1411,7 @@ export default { minor: "Compact", patch: "Compact", }, - /** Lookup116: xcm::v3::MaybeErrorCode */ + /** Lookup117: xcm::v3::MaybeErrorCode */ XcmV3MaybeErrorCode: { _enum: { Success: "Null", @@ -1375,28 +1419,28 @@ export default { TruncatedError: "Bytes", }, }, - /** Lookup119: xcm::v2::OriginKind */ + /** Lookup120: xcm::v2::OriginKind */ XcmV2OriginKind: { _enum: ["Native", "SovereignAccount", "Superuser", "Xcm"], }, - /** Lookup120: xcm::double_encoded::DoubleEncoded */ + /** Lookup121: xcm::double_encoded::DoubleEncoded */ XcmDoubleEncoded: { encoded: "Bytes", }, - /** Lookup121: xcm::v3::QueryResponseInfo */ + /** Lookup122: xcm::v3::QueryResponseInfo */ XcmV3QueryResponseInfo: { destination: "XcmV3MultiLocation", queryId: "Compact", maxWeight: "SpWeightsWeightV2Weight", }, - /** Lookup122: xcm::v3::multiasset::MultiAssetFilter */ + /** Lookup123: xcm::v3::multiasset::MultiAssetFilter */ XcmV3MultiassetMultiAssetFilter: { _enum: { Definite: "XcmV3MultiassetMultiAssets", Wild: "XcmV3MultiassetWildMultiAsset", }, }, - /** Lookup123: xcm::v3::multiasset::WildMultiAsset */ + /** Lookup124: xcm::v3::multiasset::WildMultiAsset */ XcmV3MultiassetWildMultiAsset: { _enum: { All: "Null", @@ -1412,18 +1456,18 @@ export default { }, }, }, - /** Lookup124: xcm::v3::multiasset::WildFungibility */ + /** Lookup125: xcm::v3::multiasset::WildFungibility */ XcmV3MultiassetWildFungibility: { _enum: ["Fungible", "NonFungible"], }, - /** Lookup125: xcm::v3::WeightLimit */ + /** Lookup126: xcm::v3::WeightLimit */ XcmV3WeightLimit: { _enum: { Unlimited: "Null", Limited: "SpWeightsWeightV2Weight", }, }, - /** Lookup126: xcm::VersionedMultiAssets */ + /** Lookup127: xcm::VersionedMultiAssets */ XcmVersionedMultiAssets: { _enum: { __Unused0: "Null", @@ -1432,26 +1476,26 @@ export default { V3: "XcmV3MultiassetMultiAssets", }, }, - /** Lookup127: xcm::v2::multiasset::MultiAssets */ + /** Lookup128: xcm::v2::multiasset::MultiAssets */ XcmV2MultiassetMultiAssets: "Vec", - /** Lookup129: xcm::v2::multiasset::MultiAsset */ + /** Lookup130: xcm::v2::multiasset::MultiAsset */ XcmV2MultiAsset: { id: "XcmV2MultiassetAssetId", fun: "XcmV2MultiassetFungibility", }, - /** Lookup130: xcm::v2::multiasset::AssetId */ + /** Lookup131: xcm::v2::multiasset::AssetId */ XcmV2MultiassetAssetId: { _enum: { Concrete: "XcmV2MultiLocation", Abstract: "Bytes", }, }, - /** Lookup131: xcm::v2::multilocation::MultiLocation */ + /** Lookup132: xcm::v2::multilocation::MultiLocation */ XcmV2MultiLocation: { parents: "u8", interior: "XcmV2MultilocationJunctions", }, - /** Lookup132: xcm::v2::multilocation::Junctions */ + /** Lookup133: xcm::v2::multilocation::Junctions */ XcmV2MultilocationJunctions: { _enum: { Here: "Null", @@ -1465,7 +1509,7 @@ export default { X8: "(XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction)", }, }, - /** Lookup133: xcm::v2::junction::Junction */ + /** Lookup134: xcm::v2::junction::Junction */ XcmV2Junction: { _enum: { Parachain: "Compact", @@ -1491,7 +1535,7 @@ export default { }, }, }, - /** Lookup134: xcm::v2::NetworkId */ + /** Lookup135: xcm::v2::NetworkId */ XcmV2NetworkId: { _enum: { Any: "Null", @@ -1500,7 +1544,7 @@ export default { Kusama: "Null", }, }, - /** Lookup136: xcm::v2::BodyId */ + /** Lookup137: xcm::v2::BodyId */ XcmV2BodyId: { _enum: { Unit: "Null", @@ -1515,7 +1559,7 @@ export default { Treasury: "Null", }, }, - /** Lookup137: xcm::v2::BodyPart */ + /** Lookup138: xcm::v2::BodyPart */ XcmV2BodyPart: { _enum: { Voice: "Null", @@ -1536,14 +1580,14 @@ export default { }, }, }, - /** Lookup138: xcm::v2::multiasset::Fungibility */ + /** Lookup139: xcm::v2::multiasset::Fungibility */ XcmV2MultiassetFungibility: { _enum: { Fungible: "Compact", NonFungible: "XcmV2MultiassetAssetInstance", }, }, - /** Lookup139: xcm::v2::multiasset::AssetInstance */ + /** Lookup140: xcm::v2::multiasset::AssetInstance */ XcmV2MultiassetAssetInstance: { _enum: { Undefined: "Null", @@ -1555,7 +1599,7 @@ export default { Blob: "Bytes", }, }, - /** Lookup140: xcm::VersionedMultiLocation */ + /** Lookup141: xcm::VersionedMultiLocation */ XcmVersionedMultiLocation: { _enum: { __Unused0: "Null", @@ -1564,7 +1608,7 @@ export default { V3: "XcmV3MultiLocation", }, }, - /** Lookup141: pallet_assets::pallet::Event */ + /** Lookup142: pallet_assets::pallet::Event */ PalletAssetsEvent: { _enum: { Created: { @@ -1667,9 +1711,18 @@ export default { assetId: "u128", newMinBalance: "u128", }, + Touched: { + assetId: "u128", + who: "AccountId20", + depositor: "AccountId20", + }, + Blocked: { + assetId: "u128", + who: "AccountId20", + }, }, }, - /** Lookup142: orml_xtokens::module::Event */ + /** Lookup143: orml_xtokens::module::Event */ OrmlXtokensModuleEvent: { _enum: { TransferredMultiAssets: { @@ -1680,7 +1733,7 @@ export default { }, }, }, - /** Lookup143: pallet_asset_manager::pallet::Event */ + /** Lookup144: pallet_asset_manager::pallet::Event */ PalletAssetManagerEvent: { _enum: { ForeignAssetRegistered: { @@ -1717,20 +1770,20 @@ export default { }, }, }, - /** Lookup144: moonbase_runtime::xcm_config::AssetType */ + /** Lookup145: moonbase_runtime::xcm_config::AssetType */ MoonbaseRuntimeXcmConfigAssetType: { _enum: { Xcm: "XcmV3MultiLocation", }, }, - /** Lookup145: moonbase_runtime::asset_config::AssetRegistrarMetadata */ + /** Lookup146: moonbase_runtime::asset_config::AssetRegistrarMetadata */ MoonbaseRuntimeAssetConfigAssetRegistrarMetadata: { name: "Bytes", symbol: "Bytes", decimals: "u8", isFrozen: "bool", }, - /** Lookup146: pallet_migrations::pallet::Event */ + /** Lookup147: pallet_migrations::pallet::Event */ PalletMigrationsEvent: { _enum: { RuntimeUpgradeStarted: "Null", @@ -1752,7 +1805,7 @@ export default { }, }, }, - /** Lookup147: pallet_xcm_transactor::pallet::Event */ + /** Lookup148: pallet_xcm_transactor::pallet::Event */ PalletXcmTransactorEvent: { _enum: { TransactedDerivative: { @@ -1800,13 +1853,13 @@ export default { }, }, }, - /** Lookup148: pallet_xcm_transactor::pallet::RemoteTransactInfoWithMaxWeight */ + /** Lookup149: pallet_xcm_transactor::pallet::RemoteTransactInfoWithMaxWeight */ PalletXcmTransactorRemoteTransactInfoWithMaxWeight: { transactExtraWeight: "SpWeightsWeightV2Weight", maxWeight: "SpWeightsWeightV2Weight", transactExtraWeightSigned: "Option", }, - /** Lookup150: pallet_xcm_transactor::pallet::HrmpOperation */ + /** Lookup151: pallet_xcm_transactor::pallet::HrmpOperation */ PalletXcmTransactorHrmpOperation: { _enum: { InitOpen: "PalletXcmTransactorHrmpInitParams", @@ -1820,18 +1873,18 @@ export default { }, }, }, - /** Lookup151: pallet_xcm_transactor::pallet::HrmpInitParams */ + /** Lookup152: pallet_xcm_transactor::pallet::HrmpInitParams */ PalletXcmTransactorHrmpInitParams: { paraId: "u32", proposedMaxCapacity: "u32", proposedMaxMessageSize: "u32", }, - /** Lookup152: polkadot_parachain::primitives::HrmpChannelId */ + /** Lookup153: polkadot_parachain::primitives::HrmpChannelId */ PolkadotParachainPrimitivesHrmpChannelId: { sender: "u32", recipient: "u32", }, - /** Lookup154: pallet_moonbeam_orbiters::pallet::Event */ + /** Lookup155: pallet_moonbeam_orbiters::pallet::Event */ PalletMoonbeamOrbitersEvent: { _enum: { OrbiterJoinCollatorPool: { @@ -1860,7 +1913,7 @@ export default { }, }, }, - /** Lookup155: pallet_randomness::pallet::Event */ + /** Lookup156: pallet_randomness::pallet::Event */ PalletRandomnessEvent: { _enum: { RandomnessRequestedBabeEpoch: { @@ -1895,14 +1948,14 @@ export default { }, }, }, - /** Lookup157: pallet_conviction_voting::pallet::Event */ + /** Lookup158: pallet_conviction_voting::pallet::Event */ PalletConvictionVotingEvent: { _enum: { Delegated: "(AccountId20,AccountId20)", Undelegated: "AccountId20", }, }, - /** Lookup158: pallet_referenda::pallet::Event */ + /** Lookup159: pallet_referenda::pallet::Event */ PalletReferendaEvent: { _enum: { Submitted: { @@ -1980,7 +2033,7 @@ export default { }, }, }, - /** Lookup159: frame_support::traits::preimages::Bounded */ + /** Lookup160: frame_support::traits::preimages::Bounded */ FrameSupportPreimagesBounded: { _enum: { Legacy: { @@ -1999,7 +2052,7 @@ export default { }, }, }, - /** Lookup161: frame_system::pallet::Call */ + /** Lookup162: frame_system::pallet::Call */ FrameSystemCall: { _enum: { remark: { @@ -2032,7 +2085,7 @@ export default { }, }, }, - /** Lookup165: pallet_utility::pallet::Call */ + /** Lookup166: pallet_utility::pallet::Call */ PalletUtilityCall: { _enum: { batch: { @@ -2058,7 +2111,7 @@ export default { }, }, }, - /** Lookup167: moonbase_runtime::OriginCaller */ + /** Lookup168: moonbase_runtime::OriginCaller */ MoonbaseRuntimeOriginCaller: { _enum: { system: "FrameSupportDispatchRawOrigin", @@ -2110,7 +2163,7 @@ export default { OpenTechCommitteeCollective: "PalletCollectiveRawOrigin", }, }, - /** Lookup168: frame_support::dispatch::RawOrigin[account::AccountId20](account::AccountId20) */ + /** Lookup169: frame_support::dispatch::RawOrigin[account::AccountId20](account::AccountId20) */ FrameSupportDispatchRawOrigin: { _enum: { Root: "Null", @@ -2118,13 +2171,13 @@ export default { None: "Null", }, }, - /** Lookup169: pallet_ethereum::RawOrigin */ + /** Lookup170: pallet_ethereum::RawOrigin */ PalletEthereumRawOrigin: { _enum: { EthereumTransaction: "H160", }, }, - /** Lookup170: pallet_collective::RawOrigin */ + /** Lookup171: pallet_collective::RawOrigin */ PalletCollectiveRawOrigin: { _enum: { Members: "(u32,u32)", @@ -2132,33 +2185,33 @@ export default { _Phantom: "Null", }, }, - /** Lookup172: cumulus_pallet_xcm::pallet::Origin */ + /** Lookup173: cumulus_pallet_xcm::pallet::Origin */ CumulusPalletXcmOrigin: { _enum: { Relay: "Null", SiblingParachain: "u32", }, }, - /** Lookup173: pallet_xcm::pallet::Origin */ + /** Lookup174: pallet_xcm::pallet::Origin */ PalletXcmOrigin: { _enum: { Xcm: "XcmV3MultiLocation", Response: "XcmV3MultiLocation", }, }, - /** Lookup174: pallet_ethereum_xcm::RawOrigin */ + /** Lookup175: pallet_ethereum_xcm::RawOrigin */ PalletEthereumXcmRawOrigin: { _enum: { XcmEthereumTransaction: "H160", }, }, - /** Lookup176: moonbase_runtime::governance::origins::custom_origins::Origin */ + /** Lookup177: moonbase_runtime::governance::origins::custom_origins::Origin */ MoonbaseRuntimeGovernanceOriginsCustomOriginsOrigin: { _enum: ["WhitelistedCaller", "GeneralAdmin", "ReferendumCanceller", "ReferendumKiller"], }, - /** Lookup178: sp_core::Void */ + /** Lookup179: sp_core::Void */ SpCoreVoid: "Null", - /** Lookup179: pallet_timestamp::pallet::Call */ + /** Lookup180: pallet_timestamp::pallet::Call */ PalletTimestampCall: { _enum: { set: { @@ -2166,17 +2219,17 @@ export default { }, }, }, - /** Lookup180: pallet_balances::pallet::Call */ + /** Lookup181: pallet_balances::pallet::Call */ PalletBalancesCall: { _enum: { - transfer: { + transfer_allow_death: { dest: "AccountId20", value: "Compact", }, - set_balance: { + set_balance_deprecated: { who: "AccountId20", newFree: "Compact", - newReserved: "Compact", + oldReserved: "Compact", }, force_transfer: { source: "AccountId20", @@ -2195,9 +2248,20 @@ export default { who: "AccountId20", amount: "u128", }, + upgrade_accounts: { + who: "Vec", + }, + transfer: { + dest: "AccountId20", + value: "Compact", + }, + force_set_balance: { + who: "AccountId20", + newFree: "Compact", + }, }, }, - /** Lookup181: pallet_sudo::pallet::Call */ + /** Lookup183: pallet_sudo::pallet::Call */ PalletSudoCall: { _enum: { sudo: { @@ -2219,7 +2283,7 @@ export default { }, }, }, - /** Lookup182: cumulus_pallet_parachain_system::pallet::Call */ + /** Lookup184: cumulus_pallet_parachain_system::pallet::Call */ CumulusPalletParachainSystemCall: { _enum: { set_validation_data: { @@ -2237,35 +2301,35 @@ export default { }, }, }, - /** Lookup183: cumulus_primitives_parachain_inherent::ParachainInherentData */ + /** Lookup185: cumulus_primitives_parachain_inherent::ParachainInherentData */ CumulusPrimitivesParachainInherentParachainInherentData: { - validationData: "PolkadotPrimitivesV2PersistedValidationData", + validationData: "PolkadotPrimitivesV4PersistedValidationData", relayChainState: "SpTrieStorageProof", downwardMessages: "Vec", horizontalMessages: "BTreeMap>", }, - /** Lookup184: polkadot_primitives::v2::PersistedValidationData */ - PolkadotPrimitivesV2PersistedValidationData: { + /** Lookup186: polkadot_primitives::v4::PersistedValidationData */ + PolkadotPrimitivesV4PersistedValidationData: { parentHead: "Bytes", relayParentNumber: "u32", relayParentStorageRoot: "H256", maxPovSize: "u32", }, - /** Lookup186: sp_trie::storage_proof::StorageProof */ + /** Lookup188: sp_trie::storage_proof::StorageProof */ SpTrieStorageProof: { trieNodes: "BTreeSet", }, - /** Lookup189: polkadot_core_primitives::InboundDownwardMessage */ + /** Lookup191: polkadot_core_primitives::InboundDownwardMessage */ PolkadotCorePrimitivesInboundDownwardMessage: { sentAt: "u32", msg: "Bytes", }, - /** Lookup192: polkadot_core_primitives::InboundHrmpMessage */ + /** Lookup194: polkadot_core_primitives::InboundHrmpMessage */ PolkadotCorePrimitivesInboundHrmpMessage: { sentAt: "u32", data: "Bytes", }, - /** Lookup195: pallet_evm::pallet::Call */ + /** Lookup197: pallet_evm::pallet::Call */ PalletEvmCall: { _enum: { withdraw: { @@ -2306,7 +2370,7 @@ export default { }, }, }, - /** Lookup201: pallet_ethereum::pallet::Call */ + /** Lookup203: pallet_ethereum::pallet::Call */ PalletEthereumCall: { _enum: { transact: { @@ -2314,7 +2378,7 @@ export default { }, }, }, - /** Lookup202: ethereum::transaction::TransactionV2 */ + /** Lookup204: ethereum::transaction::TransactionV2 */ EthereumTransactionTransactionV2: { _enum: { Legacy: "EthereumTransactionLegacyTransaction", @@ -2322,7 +2386,7 @@ export default { EIP1559: "EthereumTransactionEip1559Transaction", }, }, - /** Lookup203: ethereum::transaction::LegacyTransaction */ + /** Lookup205: ethereum::transaction::LegacyTransaction */ EthereumTransactionLegacyTransaction: { nonce: "U256", gasPrice: "U256", @@ -2332,20 +2396,20 @@ export default { input: "Bytes", signature: "EthereumTransactionTransactionSignature", }, - /** Lookup204: ethereum::transaction::TransactionAction */ + /** Lookup206: ethereum::transaction::TransactionAction */ EthereumTransactionTransactionAction: { _enum: { Call: "H160", Create: "Null", }, }, - /** Lookup205: ethereum::transaction::TransactionSignature */ + /** Lookup207: ethereum::transaction::TransactionSignature */ EthereumTransactionTransactionSignature: { v: "u64", r: "H256", s: "H256", }, - /** Lookup207: ethereum::transaction::EIP2930Transaction */ + /** Lookup209: ethereum::transaction::EIP2930Transaction */ EthereumTransactionEip2930Transaction: { chainId: "u64", nonce: "U256", @@ -2359,12 +2423,12 @@ export default { r: "H256", s: "H256", }, - /** Lookup209: ethereum::transaction::AccessListItem */ + /** Lookup211: ethereum::transaction::AccessListItem */ EthereumTransactionAccessListItem: { address: "H160", storageKeys: "Vec", }, - /** Lookup210: ethereum::transaction::EIP1559Transaction */ + /** Lookup212: ethereum::transaction::EIP1559Transaction */ EthereumTransactionEip1559Transaction: { chainId: "u64", nonce: "U256", @@ -2379,7 +2443,7 @@ export default { r: "H256", s: "H256", }, - /** Lookup211: pallet_parachain_staking::pallet::Call */ + /** Lookup213: pallet_parachain_staking::pallet::Call */ PalletParachainStakingCall: { _enum: { set_staking_expectations: { @@ -2466,12 +2530,9 @@ export default { candidateAutoCompoundingDelegationCount: "u32", delegationCount: "u32", }, - schedule_leave_delegators: "Null", - execute_leave_delegators: { - delegator: "AccountId20", - delegationCount: "u32", - }, - cancel_leave_delegators: "Null", + removed_call_19: "Null", + removed_call_20: "Null", + removed_call_21: "Null", schedule_revoke_delegation: { collator: "AccountId20", }, @@ -2501,7 +2562,7 @@ export default { }, }, }, - /** Lookup215: pallet_scheduler::pallet::Call */ + /** Lookup216: pallet_scheduler::pallet::Call */ PalletSchedulerCall: { _enum: { schedule: { @@ -2539,7 +2600,7 @@ export default { }, }, }, - /** Lookup217: pallet_democracy::pallet::Call */ + /** Lookup218: pallet_democracy::pallet::Call */ PalletDemocracyCall: { _enum: { propose: { @@ -2606,11 +2667,11 @@ export default { }, }, }, - /** Lookup218: pallet_democracy::conviction::Conviction */ + /** Lookup219: pallet_democracy::conviction::Conviction */ PalletDemocracyConviction: { _enum: ["None", "Locked1x", "Locked2x", "Locked3x", "Locked4x", "Locked5x", "Locked6x"], }, - /** Lookup221: pallet_collective::pallet::Call */ + /** Lookup222: pallet_collective::pallet::Call */ PalletCollectiveCall: { _enum: { set_members: { @@ -2632,12 +2693,7 @@ export default { index: "Compact", approve: "bool", }, - close_old_weight: { - proposalHash: "H256", - index: "Compact", - proposalWeightBound: "Compact", - lengthBound: "Compact", - }, + __Unused4: "Null", disapprove_proposal: { proposalHash: "H256", }, @@ -2649,7 +2705,7 @@ export default { }, }, }, - /** Lookup225: pallet_treasury::pallet::Call */ + /** Lookup224: pallet_treasury::pallet::Call */ PalletTreasuryCall: { _enum: { propose_spend: { @@ -2671,11 +2727,11 @@ export default { }, }, }, - /** Lookup226: pallet_author_inherent::pallet::Call */ + /** Lookup225: pallet_author_inherent::pallet::Call */ PalletAuthorInherentCall: { _enum: ["kick_off_authorship_validation"], }, - /** Lookup227: pallet_author_slot_filter::pallet::Call */ + /** Lookup226: pallet_author_slot_filter::pallet::Call */ PalletAuthorSlotFilterCall: { _enum: { set_eligible: { @@ -2686,7 +2742,7 @@ export default { }, }, }, - /** Lookup228: pallet_crowdloan_rewards::pallet::Call */ + /** Lookup227: pallet_crowdloan_rewards::pallet::Call */ PalletCrowdloanRewardsCall: { _enum: { associate_native_identity: { @@ -2711,7 +2767,7 @@ export default { }, }, }, - /** Lookup229: sp_runtime::MultiSignature */ + /** Lookup228: sp_runtime::MultiSignature */ SpRuntimeMultiSignature: { _enum: { Ed25519: "SpCoreEd25519Signature", @@ -2719,13 +2775,13 @@ export default { Ecdsa: "SpCoreEcdsaSignature", }, }, - /** Lookup230: sp_core::ed25519::Signature */ + /** Lookup229: sp_core::ed25519::Signature */ SpCoreEd25519Signature: "[u8;64]", - /** Lookup232: sp_core::sr25519::Signature */ + /** Lookup231: sp_core::sr25519::Signature */ SpCoreSr25519Signature: "[u8;64]", - /** Lookup233: sp_core::ecdsa::Signature */ + /** Lookup232: sp_core::ecdsa::Signature */ SpCoreEcdsaSignature: "[u8;65]", - /** Lookup239: pallet_author_mapping::pallet::Call */ + /** Lookup238: pallet_author_mapping::pallet::Call */ PalletAuthorMappingCall: { _enum: { add_association: { @@ -2747,7 +2803,7 @@ export default { }, }, }, - /** Lookup240: pallet_proxy::pallet::Call */ + /** Lookup239: pallet_proxy::pallet::Call */ PalletProxyCall: { _enum: { proxy: { @@ -2798,11 +2854,11 @@ export default { }, }, }, - /** Lookup242: pallet_maintenance_mode::pallet::Call */ + /** Lookup241: pallet_maintenance_mode::pallet::Call */ PalletMaintenanceModeCall: { _enum: ["enter_maintenance_mode", "resume_normal_operation"], }, - /** Lookup243: pallet_identity::pallet::Call */ + /** Lookup242: pallet_identity::pallet::Call */ PalletIdentityCall: { _enum: { add_registrar: { @@ -2860,7 +2916,7 @@ export default { quit_sub: "Null", }, }, - /** Lookup244: pallet_identity::types::IdentityInfo */ + /** Lookup243: pallet_identity::types::IdentityInfo */ PalletIdentityIdentityInfo: { additional: "Vec<(Data,Data)>", display: "Data", @@ -2872,7 +2928,7 @@ export default { image: "Data", twitter: "Data", }, - /** Lookup280: pallet_identity::types::BitFlags */ + /** Lookup279: pallet_identity::types::BitFlags */ PalletIdentityBitFlags: { _bitLength: 64, Display: 1, @@ -2884,7 +2940,7 @@ export default { Image: 64, Twitter: 128, }, - /** Lookup281: pallet_identity::types::IdentityField */ + /** Lookup280: pallet_identity::types::IdentityField */ PalletIdentityIdentityField: { _enum: [ "__Unused0", @@ -3018,7 +3074,7 @@ export default { "Twitter", ], }, - /** Lookup282: pallet_identity::types::Judgement */ + /** Lookup281: pallet_identity::types::Judgement */ PalletIdentityJudgement: { _enum: { Unknown: "Null", @@ -3030,7 +3086,7 @@ export default { Erroneous: "Null", }, }, - /** Lookup283: cumulus_pallet_xcmp_queue::pallet::Call */ + /** Lookup282: cumulus_pallet_xcmp_queue::pallet::Call */ CumulusPalletXcmpQueueCall: { _enum: { service_overweight: { @@ -3077,7 +3133,7 @@ export default { }, }, }, - /** Lookup284: cumulus_pallet_dmp_queue::pallet::Call */ + /** Lookup283: cumulus_pallet_dmp_queue::pallet::Call */ CumulusPalletDmpQueueCall: { _enum: { service_overweight: { @@ -3086,7 +3142,7 @@ export default { }, }, }, - /** Lookup285: pallet_xcm::pallet::Call */ + /** Lookup284: pallet_xcm::pallet::Call */ PalletXcmCall: { _enum: { send: { @@ -3141,7 +3197,7 @@ export default { }, }, }, - /** Lookup286: xcm::VersionedXcm */ + /** Lookup285: xcm::VersionedXcm */ XcmVersionedXcm: { _enum: { __Unused0: "Null", @@ -3150,9 +3206,9 @@ export default { V3: "XcmV3Xcm", }, }, - /** Lookup287: xcm::v2::Xcm */ + /** Lookup286: xcm::v2::Xcm */ XcmV2Xcm: "Vec", - /** Lookup289: xcm::v2::Instruction */ + /** Lookup288: xcm::v2::Instruction */ XcmV2Instruction: { _enum: { WithdrawAsset: "XcmV2MultiassetMultiAssets", @@ -3248,7 +3304,7 @@ export default { UnsubscribeVersion: "Null", }, }, - /** Lookup290: xcm::v2::Response */ + /** Lookup289: xcm::v2::Response */ XcmV2Response: { _enum: { Null: "Null", @@ -3257,7 +3313,7 @@ export default { Version: "u32", }, }, - /** Lookup293: xcm::v2::traits::Error */ + /** Lookup292: xcm::v2::traits::Error */ XcmV2TraitsError: { _enum: { Overflow: "Null", @@ -3288,14 +3344,14 @@ export default { WeightNotComputable: "Null", }, }, - /** Lookup294: xcm::v2::multiasset::MultiAssetFilter */ + /** Lookup293: xcm::v2::multiasset::MultiAssetFilter */ XcmV2MultiassetMultiAssetFilter: { _enum: { Definite: "XcmV2MultiassetMultiAssets", Wild: "XcmV2MultiassetWildMultiAsset", }, }, - /** Lookup295: xcm::v2::multiasset::WildMultiAsset */ + /** Lookup294: xcm::v2::multiasset::WildMultiAsset */ XcmV2MultiassetWildMultiAsset: { _enum: { All: "Null", @@ -3305,18 +3361,18 @@ export default { }, }, }, - /** Lookup296: xcm::v2::multiasset::WildFungibility */ + /** Lookup295: xcm::v2::multiasset::WildFungibility */ XcmV2MultiassetWildFungibility: { _enum: ["Fungible", "NonFungible"], }, - /** Lookup297: xcm::v2::WeightLimit */ + /** Lookup296: xcm::v2::WeightLimit */ XcmV2WeightLimit: { _enum: { Unlimited: "Null", Limited: "Compact", }, }, - /** Lookup306: pallet_assets::pallet::Call */ + /** Lookup305: pallet_assets::pallet::Call */ PalletAssetsCall: { _enum: { create: { @@ -3452,9 +3508,21 @@ export default { id: "Compact", minBalance: "u128", }, + touch_other: { + id: "Compact", + who: "AccountId20", + }, + refund_other: { + id: "Compact", + who: "AccountId20", + }, + block: { + id: "Compact", + who: "AccountId20", + }, }, }, - /** Lookup307: orml_xtokens::module::Call */ + /** Lookup306: orml_xtokens::module::Call */ OrmlXtokensModuleCall: { _enum: { transfer: { @@ -3495,7 +3563,7 @@ export default { }, }, }, - /** Lookup308: moonbase_runtime::xcm_config::CurrencyId */ + /** Lookup307: moonbase_runtime::xcm_config::CurrencyId */ MoonbaseRuntimeXcmConfigCurrencyId: { _enum: { SelfReserve: "Null", @@ -3506,7 +3574,7 @@ export default { }, }, }, - /** Lookup309: xcm::VersionedMultiAsset */ + /** Lookup308: xcm::VersionedMultiAsset */ XcmVersionedMultiAsset: { _enum: { __Unused0: "Null", @@ -3515,7 +3583,7 @@ export default { V3: "XcmV3MultiAsset", }, }, - /** Lookup312: pallet_asset_manager::pallet::Call */ + /** Lookup311: pallet_asset_manager::pallet::Call */ PalletAssetManagerCall: { _enum: { register_foreign_asset: { @@ -3557,16 +3625,7 @@ export default { }, }, }, - /** Lookup313: pallet_migrations::pallet::Call */ - PalletMigrationsCall: { - _enum: { - migrate_democracy_preimage: { - proposalHash: "H256", - proposalLenUpperBound: "Compact", - }, - }, - }, - /** Lookup314: pallet_xcm_transactor::pallet::Call */ + /** Lookup312: pallet_xcm_transactor::pallet::Call */ PalletXcmTransactorCall: { _enum: { register: { @@ -3582,6 +3641,7 @@ export default { fee: "PalletXcmTransactorCurrencyPayment", innerCall: "Bytes", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, transact_through_sovereign: { dest: "XcmVersionedMultiLocation", @@ -3590,6 +3650,7 @@ export default { call: "Bytes", originKind: "XcmV2OriginKind", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, set_transact_info: { location: "XcmVersionedMultiLocation", @@ -3605,6 +3666,7 @@ export default { fee: "PalletXcmTransactorCurrencyPayment", call: "Bytes", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, set_fee_per_second: { assetLocation: "XcmVersionedMultiLocation", @@ -3620,28 +3682,28 @@ export default { }, }, }, - /** Lookup315: moonbase_runtime::xcm_config::Transactors */ + /** Lookup313: moonbase_runtime::xcm_config::Transactors */ MoonbaseRuntimeXcmConfigTransactors: { _enum: ["Relay"], }, - /** Lookup316: pallet_xcm_transactor::pallet::CurrencyPayment */ + /** Lookup314: pallet_xcm_transactor::pallet::CurrencyPayment */ PalletXcmTransactorCurrencyPayment: { currency: "PalletXcmTransactorCurrency", feeAmount: "Option", }, - /** Lookup317: pallet_xcm_transactor::pallet::Currency */ + /** Lookup315: pallet_xcm_transactor::pallet::Currency */ PalletXcmTransactorCurrency: { _enum: { AsCurrencyId: "MoonbaseRuntimeXcmConfigCurrencyId", AsMultiLocation: "XcmVersionedMultiLocation", }, }, - /** Lookup319: pallet_xcm_transactor::pallet::TransactWeights */ + /** Lookup317: pallet_xcm_transactor::pallet::TransactWeights */ PalletXcmTransactorTransactWeights: { transactRequiredWeightAtMost: "SpWeightsWeightV2Weight", overallWeight: "Option", }, - /** Lookup321: pallet_moonbeam_orbiters::pallet::Call */ + /** Lookup319: pallet_moonbeam_orbiters::pallet::Call */ PalletMoonbeamOrbitersCall: { _enum: { collator_add_orbiter: { @@ -3665,7 +3727,7 @@ export default { }, }, }, - /** Lookup322: pallet_ethereum_xcm::pallet::Call */ + /** Lookup320: pallet_ethereum_xcm::pallet::Call */ PalletEthereumXcmCall: { _enum: { transact: { @@ -3679,14 +3741,14 @@ export default { resume_ethereum_xcm_execution: "Null", }, }, - /** Lookup323: xcm_primitives::ethereum_xcm::EthereumXcmTransaction */ + /** Lookup321: xcm_primitives::ethereum_xcm::EthereumXcmTransaction */ XcmPrimitivesEthereumXcmEthereumXcmTransaction: { _enum: { V1: "XcmPrimitivesEthereumXcmEthereumXcmTransactionV1", V2: "XcmPrimitivesEthereumXcmEthereumXcmTransactionV2", }, }, - /** Lookup324: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV1 */ + /** Lookup322: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV1 */ XcmPrimitivesEthereumXcmEthereumXcmTransactionV1: { gasLimit: "U256", feePayment: "XcmPrimitivesEthereumXcmEthereumXcmFee", @@ -3695,19 +3757,19 @@ export default { input: "Bytes", accessList: "Option)>>", }, - /** Lookup325: xcm_primitives::ethereum_xcm::EthereumXcmFee */ + /** Lookup323: xcm_primitives::ethereum_xcm::EthereumXcmFee */ XcmPrimitivesEthereumXcmEthereumXcmFee: { _enum: { Manual: "XcmPrimitivesEthereumXcmManualEthereumXcmFee", Auto: "Null", }, }, - /** Lookup326: xcm_primitives::ethereum_xcm::ManualEthereumXcmFee */ + /** Lookup324: xcm_primitives::ethereum_xcm::ManualEthereumXcmFee */ XcmPrimitivesEthereumXcmManualEthereumXcmFee: { gasPrice: "Option", maxFeePerGas: "Option", }, - /** Lookup329: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV2 */ + /** Lookup327: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV2 */ XcmPrimitivesEthereumXcmEthereumXcmTransactionV2: { gasLimit: "U256", action: "EthereumTransactionTransactionAction", @@ -3715,11 +3777,11 @@ export default { input: "Bytes", accessList: "Option)>>", }, - /** Lookup330: pallet_randomness::pallet::Call */ + /** Lookup328: pallet_randomness::pallet::Call */ PalletRandomnessCall: { _enum: ["set_babe_randomness_results"], }, - /** Lookup332: pallet_conviction_voting::pallet::Call */ + /** Lookup330: pallet_conviction_voting::pallet::Call */ PalletConvictionVotingCall: { _enum: { vote: { @@ -3750,7 +3812,7 @@ export default { }, }, }, - /** Lookup333: pallet_conviction_voting::vote::AccountVote */ + /** Lookup331: pallet_conviction_voting::vote::AccountVote */ PalletConvictionVotingVoteAccountVote: { _enum: { Standard: { @@ -3768,11 +3830,11 @@ export default { }, }, }, - /** Lookup335: pallet_conviction_voting::conviction::Conviction */ + /** Lookup333: pallet_conviction_voting::conviction::Conviction */ PalletConvictionVotingConviction: { _enum: ["None", "Locked1x", "Locked2x", "Locked3x", "Locked4x", "Locked5x", "Locked6x"], }, - /** Lookup337: pallet_referenda::pallet::Call */ + /** Lookup335: pallet_referenda::pallet::Call */ PalletReferendaCall: { _enum: { submit: { @@ -3807,14 +3869,14 @@ export default { }, }, }, - /** Lookup338: frame_support::traits::schedule::DispatchTime */ + /** Lookup336: frame_support::traits::schedule::DispatchTime */ FrameSupportScheduleDispatchTime: { _enum: { At: "u32", After: "u32", }, }, - /** Lookup339: pallet_preimage::pallet::Call */ + /** Lookup337: pallet_preimage::pallet::Call */ PalletPreimageCall: { _enum: { note_preimage: { @@ -3840,7 +3902,7 @@ export default { }, }, }, - /** Lookup340: pallet_whitelist::pallet::Call */ + /** Lookup338: pallet_whitelist::pallet::Call */ PalletWhitelistCall: { _enum: { whitelist_call: { @@ -3859,7 +3921,7 @@ export default { }, }, }, - /** Lookup342: pallet_root_testing::pallet::Call */ + /** Lookup340: pallet_root_testing::pallet::Call */ PalletRootTestingCall: { _enum: { fill_block: { @@ -3867,7 +3929,7 @@ export default { }, }, }, - /** Lookup343: pallet_multisig::pallet::Call */ + /** Lookup341: pallet_multisig::pallet::Call */ PalletMultisigCall: { _enum: { as_multi_threshold_1: { @@ -3896,18 +3958,18 @@ export default { }, }, }, - /** Lookup345: pallet_multisig::Timepoint */ + /** Lookup343: pallet_multisig::Timepoint */ PalletMultisigTimepoint: { height: "u32", index: "u32", }, - /** Lookup347: pallet_conviction_voting::types::Tally */ + /** Lookup345: pallet_conviction_voting::types::Tally */ PalletConvictionVotingTally: { ayes: "u128", nays: "u128", support: "u128", }, - /** Lookup348: pallet_preimage::pallet::Event */ + /** Lookup346: pallet_preimage::pallet::Event */ PalletPreimageEvent: { _enum: { Noted: { @@ -3930,7 +3992,7 @@ export default { }, }, }, - /** Lookup349: pallet_whitelist::pallet::Event */ + /** Lookup347: pallet_whitelist::pallet::Event */ PalletWhitelistEvent: { _enum: { CallWhitelisted: { @@ -3945,17 +4007,17 @@ export default { }, }, }, - /** Lookup351: frame_support::dispatch::PostDispatchInfo */ + /** Lookup349: frame_support::dispatch::PostDispatchInfo */ FrameSupportDispatchPostDispatchInfo: { actualWeight: "Option", paysFee: "FrameSupportDispatchPays", }, - /** Lookup352: sp_runtime::DispatchErrorWithPostInfo */ + /** Lookup350: sp_runtime::DispatchErrorWithPostInfo */ SpRuntimeDispatchErrorWithPostInfo: { postInfo: "FrameSupportDispatchPostDispatchInfo", error: "SpRuntimeDispatchError", }, - /** Lookup354: pallet_multisig::pallet::Event */ + /** Lookup352: pallet_multisig::pallet::Event */ PalletMultisigEvent: { _enum: { NewMultisig: { @@ -3984,7 +4046,7 @@ export default { }, }, }, - /** Lookup355: frame_system::Phase */ + /** Lookup353: frame_system::Phase */ FrameSystemPhase: { _enum: { ApplyExtrinsic: "u32", @@ -3992,46 +4054,46 @@ export default { Initialization: "Null", }, }, - /** Lookup357: frame_system::LastRuntimeUpgradeInfo */ + /** Lookup355: frame_system::LastRuntimeUpgradeInfo */ FrameSystemLastRuntimeUpgradeInfo: { specVersion: "Compact", specName: "Text", }, - /** Lookup358: frame_system::limits::BlockWeights */ + /** Lookup356: frame_system::limits::BlockWeights */ FrameSystemLimitsBlockWeights: { baseBlock: "SpWeightsWeightV2Weight", maxBlock: "SpWeightsWeightV2Weight", perClass: "FrameSupportDispatchPerDispatchClassWeightsPerClass", }, - /** Lookup359: frame_support::dispatch::PerDispatchClass */ + /** Lookup357: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassWeightsPerClass: { normal: "FrameSystemLimitsWeightsPerClass", operational: "FrameSystemLimitsWeightsPerClass", mandatory: "FrameSystemLimitsWeightsPerClass", }, - /** Lookup360: frame_system::limits::WeightsPerClass */ + /** Lookup358: frame_system::limits::WeightsPerClass */ FrameSystemLimitsWeightsPerClass: { baseExtrinsic: "SpWeightsWeightV2Weight", maxExtrinsic: "Option", maxTotal: "Option", reserved: "Option", }, - /** Lookup361: frame_system::limits::BlockLength */ + /** Lookup359: frame_system::limits::BlockLength */ FrameSystemLimitsBlockLength: { max: "FrameSupportDispatchPerDispatchClassU32", }, - /** Lookup362: frame_support::dispatch::PerDispatchClass */ + /** Lookup360: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassU32: { normal: "u32", operational: "u32", mandatory: "u32", }, - /** Lookup363: sp_weights::RuntimeDbWeight */ + /** Lookup361: sp_weights::RuntimeDbWeight */ SpWeightsRuntimeDbWeight: { read: "u64", write: "u64", }, - /** Lookup364: sp_version::RuntimeVersion */ + /** Lookup362: sp_version::RuntimeVersion */ SpVersionRuntimeVersion: { specName: "Text", implName: "Text", @@ -4042,7 +4104,7 @@ export default { transactionVersion: "u32", stateVersion: "u8", }, - /** Lookup368: frame_system::pallet::Error */ + /** Lookup366: frame_system::pallet::Error */ FrameSystemError: { _enum: [ "InvalidSpecName", @@ -4053,55 +4115,67 @@ export default { "CallFiltered", ], }, - /** Lookup369: pallet_utility::pallet::Error */ + /** Lookup367: pallet_utility::pallet::Error */ PalletUtilityError: { _enum: ["TooManyCalls"], }, - /** Lookup371: pallet_balances::BalanceLock */ + /** Lookup369: pallet_balances::types::BalanceLock */ PalletBalancesBalanceLock: { id: "[u8;8]", amount: "u128", reasons: "PalletBalancesReasons", }, - /** Lookup372: pallet_balances::Reasons */ + /** Lookup370: pallet_balances::types::Reasons */ PalletBalancesReasons: { _enum: ["Fee", "Misc", "All"], }, - /** Lookup375: pallet_balances::ReserveData */ + /** Lookup373: pallet_balances::types::ReserveData */ PalletBalancesReserveData: { id: "[u8;4]", amount: "u128", }, - /** Lookup377: pallet_balances::pallet::Error */ + /** Lookup376: pallet_balances::types::IdAmount */ + PalletBalancesIdAmount: { + id: "Null", + amount: "u128", + }, + /** Lookup378: pallet_balances::pallet::Error */ PalletBalancesError: { _enum: [ "VestingBalance", "LiquidityRestrictions", "InsufficientBalance", "ExistentialDeposit", - "KeepAlive", + "Expendability", "ExistingVestingSchedule", "DeadAccount", "TooManyReserves", + "TooManyHolds", + "TooManyFreezes", ], }, - /** Lookup378: pallet_sudo::pallet::Error */ + /** Lookup379: pallet_sudo::pallet::Error */ PalletSudoError: { _enum: ["RequireSudo"], }, - /** Lookup380: polkadot_primitives::v2::UpgradeRestriction */ - PolkadotPrimitivesV2UpgradeRestriction: { + /** Lookup381: polkadot_primitives::v4::UpgradeRestriction */ + PolkadotPrimitivesV4UpgradeRestriction: { _enum: ["Present"], }, - /** Lookup381: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot */ + /** Lookup382: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot */ CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: { dmqMqcHead: "H256", - relayDispatchQueueSize: "(u32,u32)", - ingressChannels: "Vec<(u32,PolkadotPrimitivesV2AbridgedHrmpChannel)>", - egressChannels: "Vec<(u32,PolkadotPrimitivesV2AbridgedHrmpChannel)>", + relayDispatchQueueSize: "CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize", + ingressChannels: "Vec<(u32,PolkadotPrimitivesV4AbridgedHrmpChannel)>", + egressChannels: "Vec<(u32,PolkadotPrimitivesV4AbridgedHrmpChannel)>", + }, + /** Lookup383: cumulus_pallet_parachain_system::relay_state_snapshot::RelayDispachQueueSize */ + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize: { + remainingCount: "u32", + remainingSize: "u32", }, - /** Lookup384: polkadot_primitives::v2::AbridgedHrmpChannel */ - PolkadotPrimitivesV2AbridgedHrmpChannel: { + /** Lookup386: polkadot_primitives::v4::AbridgedHrmpChannel */ + PolkadotPrimitivesV4AbridgedHrmpChannel: { maxCapacity: "u32", maxTotalSize: "u32", maxMessageSize: "u32", @@ -4109,8 +4183,8 @@ export default { totalSize: "u32", mqcHead: "Option", }, - /** Lookup385: polkadot_primitives::v2::AbridgedHostConfiguration */ - PolkadotPrimitivesV2AbridgedHostConfiguration: { + /** Lookup387: polkadot_primitives::v4::AbridgedHostConfiguration */ + PolkadotPrimitivesV4AbridgedHostConfiguration: { maxCodeSize: "u32", maxHeadDataSize: "u32", maxUpwardQueueCount: "u32", @@ -4121,17 +4195,17 @@ export default { validationUpgradeCooldown: "u32", validationUpgradeDelay: "u32", }, - /** Lookup391: polkadot_core_primitives::OutboundHrmpMessage */ + /** Lookup393: polkadot_core_primitives::OutboundHrmpMessage */ PolkadotCorePrimitivesOutboundHrmpMessage: { recipient: "u32", data: "Bytes", }, - /** Lookup392: cumulus_pallet_parachain_system::CodeUpgradeAuthorization */ + /** Lookup394: cumulus_pallet_parachain_system::CodeUpgradeAuthorization */ CumulusPalletParachainSystemCodeUpgradeAuthorization: { codeHash: "H256", checkVersion: "bool", }, - /** Lookup393: cumulus_pallet_parachain_system::pallet::Error */ + /** Lookup395: cumulus_pallet_parachain_system::pallet::Error */ CumulusPalletParachainSystemError: { _enum: [ "OverlappingUpgrades", @@ -4144,11 +4218,11 @@ export default { "Unauthorized", ], }, - /** Lookup395: pallet_transaction_payment::Releases */ + /** Lookup397: pallet_transaction_payment::Releases */ PalletTransactionPaymentReleases: { _enum: ["V1Ancient", "V2"], }, - /** Lookup396: pallet_evm::CodeMetadata */ + /** Lookup398: pallet_evm::CodeMetadata */ PalletEvmCodeMetadata: { _alias: { size_: "size", @@ -4157,7 +4231,7 @@ export default { size_: "u64", hash_: "H256", }, - /** Lookup398: pallet_evm::pallet::Error */ + /** Lookup400: pallet_evm::pallet::Error */ PalletEvmError: { _enum: [ "BalanceLow", @@ -4173,7 +4247,7 @@ export default { "TransactionMustComeFromEOA", ], }, - /** Lookup401: fp_rpc::TransactionStatus */ + /** Lookup403: fp_rpc::TransactionStatus */ FpRpcTransactionStatus: { transactionHash: "H256", transactionIndex: "u32", @@ -4183,9 +4257,9 @@ export default { logs: "Vec", logsBloom: "EthbloomBloom", }, - /** Lookup404: ethbloom::Bloom */ + /** Lookup406: ethbloom::Bloom */ EthbloomBloom: "[u8;256]", - /** Lookup406: ethereum::receipt::ReceiptV3 */ + /** Lookup408: ethereum::receipt::ReceiptV3 */ EthereumReceiptReceiptV3: { _enum: { Legacy: "EthereumReceiptEip658ReceiptData", @@ -4193,7 +4267,7 @@ export default { EIP1559: "EthereumReceiptEip658ReceiptData", }, }, - /** Lookup407: ethereum::receipt::EIP658ReceiptData */ + /** Lookup409: ethereum::receipt::EIP658ReceiptData */ EthereumReceiptEip658ReceiptData: { statusCode: "u8", usedGas: "U256", @@ -4201,7 +4275,7 @@ export default { logs: "Vec", }, /** - * Lookup408: + * Lookup410: * ethereum::block::Block[ethereum::transaction::TransactionV2](ethereum::transaction::TransactionV2) */ EthereumBlock: { @@ -4209,7 +4283,7 @@ export default { transactions: "Vec", ommers: "Vec", }, - /** Lookup409: ethereum::header::Header */ + /** Lookup411: ethereum::header::Header */ EthereumHeader: { parentHash: "H256", ommersHash: "H256", @@ -4227,27 +4301,27 @@ export default { mixHash: "H256", nonce: "EthereumTypesHashH64", }, - /** Lookup410: ethereum_types::hash::H64 */ + /** Lookup412: ethereum_types::hash::H64 */ EthereumTypesHashH64: "[u8;8]", - /** Lookup415: pallet_ethereum::pallet::Error */ + /** Lookup417: pallet_ethereum::pallet::Error */ PalletEthereumError: { _enum: ["InvalidSignature", "PreLogExists"], }, /** - * Lookup416: + * Lookup418: * pallet_parachain_staking::types::ParachainBondConfig[account::AccountId20](account::AccountId20) */ PalletParachainStakingParachainBondConfig: { account: "AccountId20", percent: "Percent", }, - /** Lookup417: pallet_parachain_staking::types::RoundInfo */ + /** Lookup419: pallet_parachain_staking::types::RoundInfo */ PalletParachainStakingRoundInfo: { current: "u32", first: "u32", length: "u32", }, - /** Lookup418: pallet_parachain_staking::types::Delegator */ + /** Lookup420: pallet_parachain_staking::types::Delegator */ PalletParachainStakingDelegator: { id: "AccountId20", delegations: "PalletParachainStakingSetOrderedSet", @@ -4256,24 +4330,24 @@ export default { status: "PalletParachainStakingDelegatorStatus", }, /** - * Lookup419: + * Lookup421: * pallet_parachain_staking::set::OrderedSet> */ PalletParachainStakingSetOrderedSet: "Vec", - /** Lookup420: pallet_parachain_staking::types::Bond */ + /** Lookup422: pallet_parachain_staking::types::Bond */ PalletParachainStakingBond: { owner: "AccountId20", amount: "u128", }, - /** Lookup422: pallet_parachain_staking::types::DelegatorStatus */ + /** Lookup424: pallet_parachain_staking::types::DelegatorStatus */ PalletParachainStakingDelegatorStatus: { _enum: { Active: "Null", Leaving: "u32", }, }, - /** Lookup423: pallet_parachain_staking::types::CandidateMetadata */ + /** Lookup425: pallet_parachain_staking::types::CandidateMetadata */ PalletParachainStakingCandidateMetadata: { bond: "u128", delegationCount: "u32", @@ -4286,16 +4360,16 @@ export default { request: "Option", status: "PalletParachainStakingCollatorStatus", }, - /** Lookup424: pallet_parachain_staking::types::CapacityStatus */ + /** Lookup426: pallet_parachain_staking::types::CapacityStatus */ PalletParachainStakingCapacityStatus: { _enum: ["Full", "Empty", "Partial"], }, - /** Lookup426: pallet_parachain_staking::types::CandidateBondLessRequest */ + /** Lookup428: pallet_parachain_staking::types::CandidateBondLessRequest */ PalletParachainStakingCandidateBondLessRequest: { amount: "u128", whenExecutable: "u32", }, - /** Lookup427: pallet_parachain_staking::types::CollatorStatus */ + /** Lookup429: pallet_parachain_staking::types::CollatorStatus */ PalletParachainStakingCollatorStatus: { _enum: { Active: "Null", @@ -4303,44 +4377,50 @@ export default { Leaving: "u32", }, }, - /** Lookup429: pallet_parachain_staking::delegation_requests::ScheduledRequest */ + /** Lookup431: pallet_parachain_staking::delegation_requests::ScheduledRequest */ PalletParachainStakingDelegationRequestsScheduledRequest: { delegator: "AccountId20", whenExecutable: "u32", action: "PalletParachainStakingDelegationRequestsDelegationAction", }, /** - * Lookup432: + * Lookup434: * pallet_parachain_staking::auto_compound::AutoCompoundConfig[account::AccountId20](account::AccountId20) */ PalletParachainStakingAutoCompoundAutoCompoundConfig: { delegator: "AccountId20", value: "Percent", }, - /** Lookup434: pallet_parachain_staking::types::Delegations */ + /** Lookup436: pallet_parachain_staking::types::Delegations */ PalletParachainStakingDelegations: { delegations: "Vec", total: "u128", }, - /** Lookup436: pallet_parachain_staking::types::CollatorSnapshot */ + /** + * Lookup438: + * pallet_parachain_staking::set::BoundedOrderedSet, S> + */ + PalletParachainStakingSetBoundedOrderedSet: "Vec", + /** Lookup441: pallet_parachain_staking::types::CollatorSnapshot */ PalletParachainStakingCollatorSnapshot: { bond: "u128", delegations: "Vec", total: "u128", }, - /** Lookup438: pallet_parachain_staking::types::BondWithAutoCompound */ + /** Lookup443: pallet_parachain_staking::types::BondWithAutoCompound */ PalletParachainStakingBondWithAutoCompound: { owner: "AccountId20", amount: "u128", autoCompound: "Percent", }, - /** Lookup439: pallet_parachain_staking::types::DelayedPayout */ + /** Lookup444: pallet_parachain_staking::types::DelayedPayout */ PalletParachainStakingDelayedPayout: { roundIssuance: "u128", totalStakingReward: "u128", collatorCommission: "Perbill", }, - /** Lookup440: pallet_parachain_staking::inflation::InflationInfo */ + /** Lookup445: pallet_parachain_staking::inflation::InflationInfo */ PalletParachainStakingInflationInflationInfo: { expect: { min: "u128", @@ -4358,7 +4438,7 @@ export default { max: "Perbill", }, }, - /** Lookup441: pallet_parachain_staking::pallet::Error */ + /** Lookup446: pallet_parachain_staking::pallet::Error */ PalletParachainStakingError: { _enum: [ "DelegatorDNE", @@ -4409,12 +4489,13 @@ export default { "TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates", "TooLowCandidateCountWeightHint", "TooLowCandidateCountWeightHintGoOffline", - "TooLowCandidateCountWeightHintGoOnline", - "TooLowCandidateCountWeightHintCandidateBondMore", + "CandidateLimitReached", + "CannotSetAboveMaxCandidates", + "RemovedCall", ], }, /** - * Lookup444: pallet_scheduler::Scheduled, BlockNumber, * moonbase_runtime::OriginCaller, account::AccountId20> */ @@ -4425,7 +4506,7 @@ export default { maybePeriodic: "Option<(u32,u32)>", origin: "MoonbaseRuntimeOriginCaller", }, - /** Lookup446: pallet_scheduler::pallet::Error */ + /** Lookup451: pallet_scheduler::pallet::Error */ PalletSchedulerError: { _enum: [ "FailedToSchedule", @@ -4436,7 +4517,7 @@ export default { ], }, /** - * Lookup452: pallet_democracy::types::ReferendumInfo, Balance> */ PalletDemocracyReferendumInfo: { @@ -4449,7 +4530,7 @@ export default { }, }, /** - * Lookup453: pallet_democracy::types::ReferendumStatus, Balance> */ PalletDemocracyReferendumStatus: { @@ -4459,13 +4540,13 @@ export default { delay: "u32", tally: "PalletDemocracyTally", }, - /** Lookup454: pallet_democracy::types::Tally */ + /** Lookup459: pallet_democracy::types::Tally */ PalletDemocracyTally: { ayes: "u128", nays: "u128", turnout: "u128", }, - /** Lookup455: pallet_democracy::vote::Voting */ + /** Lookup460: pallet_democracy::vote::Voting */ PalletDemocracyVoteVoting: { _enum: { Direct: { @@ -4482,14 +4563,14 @@ export default { }, }, }, - /** Lookup459: pallet_democracy::types::Delegations */ + /** Lookup464: pallet_democracy::types::Delegations */ PalletDemocracyDelegations: { votes: "u128", capital: "u128", }, - /** Lookup460: pallet_democracy::vote::PriorLock */ + /** Lookup465: pallet_democracy::vote::PriorLock */ PalletDemocracyVotePriorLock: "(u32,u128)", - /** Lookup463: pallet_democracy::pallet::Error */ + /** Lookup468: pallet_democracy::pallet::Error */ PalletDemocracyError: { _enum: [ "ValueLow", @@ -4518,7 +4599,7 @@ export default { "PreimageNotExist", ], }, - /** Lookup465: pallet_collective::Votes */ + /** Lookup470: pallet_collective::Votes */ PalletCollectiveVotes: { index: "u32", threshold: "u32", @@ -4526,7 +4607,7 @@ export default { nays: "Vec", end: "u32", }, - /** Lookup466: pallet_collective::pallet::Error */ + /** Lookup471: pallet_collective::pallet::Error */ PalletCollectiveError: { _enum: [ "NotMember", @@ -4541,16 +4622,16 @@ export default { "WrongProposalLength", ], }, - /** Lookup468: pallet_treasury::Proposal */ + /** Lookup473: pallet_treasury::Proposal */ PalletTreasuryProposal: { proposer: "AccountId20", value: "u128", beneficiary: "AccountId20", bond: "u128", }, - /** Lookup472: frame_support::PalletId */ + /** Lookup477: frame_support::PalletId */ FrameSupportPalletId: "[u8;8]", - /** Lookup473: pallet_treasury::pallet::Error */ + /** Lookup478: pallet_treasury::pallet::Error */ PalletTreasuryError: { _enum: [ "InsufficientProposersBalance", @@ -4560,17 +4641,17 @@ export default { "ProposalNotApproved", ], }, - /** Lookup474: pallet_author_inherent::pallet::Error */ + /** Lookup479: pallet_author_inherent::pallet::Error */ PalletAuthorInherentError: { _enum: ["AuthorAlreadySet", "NoAccountId", "CannotBeAuthor"], }, - /** Lookup475: pallet_crowdloan_rewards::pallet::RewardInfo */ + /** Lookup480: pallet_crowdloan_rewards::pallet::RewardInfo */ PalletCrowdloanRewardsRewardInfo: { totalReward: "u128", claimedReward: "u128", contributedRelayAddresses: "Vec<[u8;32]>", }, - /** Lookup477: pallet_crowdloan_rewards::pallet::Error */ + /** Lookup482: pallet_crowdloan_rewards::pallet::Error */ PalletCrowdloanRewardsError: { _enum: [ "AlreadyAssociated", @@ -4590,7 +4671,7 @@ export default { "InsufficientNumberOfValidProofs", ], }, - /** Lookup478: pallet_author_mapping::pallet::RegistrationInfo */ + /** Lookup483: pallet_author_mapping::pallet::RegistrationInfo */ PalletAuthorMappingRegistrationInfo: { _alias: { keys_: "keys", @@ -4599,7 +4680,7 @@ export default { deposit: "u128", keys_: "SessionKeysPrimitivesVrfVrfCryptoPublic", }, - /** Lookup479: pallet_author_mapping::pallet::Error */ + /** Lookup484: pallet_author_mapping::pallet::Error */ PalletAuthorMappingError: { _enum: [ "AssociationNotFound", @@ -4612,19 +4693,19 @@ export default { "DecodeKeysFailed", ], }, - /** Lookup482: pallet_proxy::ProxyDefinition */ + /** Lookup487: pallet_proxy::ProxyDefinition */ PalletProxyProxyDefinition: { delegate: "AccountId20", proxyType: "MoonbaseRuntimeProxyType", delay: "u32", }, - /** Lookup486: pallet_proxy::Announcement */ + /** Lookup491: pallet_proxy::Announcement */ PalletProxyAnnouncement: { real: "AccountId20", callHash: "H256", height: "u32", }, - /** Lookup488: pallet_proxy::pallet::Error */ + /** Lookup493: pallet_proxy::pallet::Error */ PalletProxyError: { _enum: [ "TooMany", @@ -4637,23 +4718,23 @@ export default { "NoSelfProxy", ], }, - /** Lookup489: pallet_maintenance_mode::pallet::Error */ + /** Lookup494: pallet_maintenance_mode::pallet::Error */ PalletMaintenanceModeError: { _enum: ["AlreadyInMaintenanceMode", "NotInMaintenanceMode"], }, - /** Lookup490: pallet_identity::types::Registration */ + /** Lookup495: pallet_identity::types::Registration */ PalletIdentityRegistration: { judgements: "Vec<(u32,PalletIdentityJudgement)>", deposit: "u128", info: "PalletIdentityIdentityInfo", }, - /** Lookup497: pallet_identity::types::RegistrarInfo */ + /** Lookup502: pallet_identity::types::RegistrarInfo */ PalletIdentityRegistrarInfo: { account: "AccountId20", fee: "u128", fields: "PalletIdentityBitFlags", }, - /** Lookup499: pallet_identity::pallet::Error */ + /** Lookup504: pallet_identity::pallet::Error */ PalletIdentityError: { _enum: [ "TooManySubAccounts", @@ -4676,21 +4757,21 @@ export default { "JudgementPaymentFailed", ], }, - /** Lookup501: cumulus_pallet_xcmp_queue::InboundChannelDetails */ + /** Lookup506: cumulus_pallet_xcmp_queue::InboundChannelDetails */ CumulusPalletXcmpQueueInboundChannelDetails: { sender: "u32", state: "CumulusPalletXcmpQueueInboundState", messageMetadata: "Vec<(u32,PolkadotParachainPrimitivesXcmpMessageFormat)>", }, - /** Lookup502: cumulus_pallet_xcmp_queue::InboundState */ + /** Lookup507: cumulus_pallet_xcmp_queue::InboundState */ CumulusPalletXcmpQueueInboundState: { _enum: ["Ok", "Suspended"], }, - /** Lookup505: polkadot_parachain::primitives::XcmpMessageFormat */ + /** Lookup510: polkadot_parachain::primitives::XcmpMessageFormat */ PolkadotParachainPrimitivesXcmpMessageFormat: { _enum: ["ConcatenatedVersionedXcm", "ConcatenatedEncodedBlob", "Signals"], }, - /** Lookup508: cumulus_pallet_xcmp_queue::OutboundChannelDetails */ + /** Lookup513: cumulus_pallet_xcmp_queue::OutboundChannelDetails */ CumulusPalletXcmpQueueOutboundChannelDetails: { recipient: "u32", state: "CumulusPalletXcmpQueueOutboundState", @@ -4698,11 +4779,11 @@ export default { firstIndex: "u16", lastIndex: "u16", }, - /** Lookup509: cumulus_pallet_xcmp_queue::OutboundState */ + /** Lookup514: cumulus_pallet_xcmp_queue::OutboundState */ CumulusPalletXcmpQueueOutboundState: { _enum: ["Ok", "Suspended"], }, - /** Lookup511: cumulus_pallet_xcmp_queue::QueueConfigData */ + /** Lookup516: cumulus_pallet_xcmp_queue::QueueConfigData */ CumulusPalletXcmpQueueQueueConfigData: { suspendThreshold: "u32", dropThreshold: "u32", @@ -4711,27 +4792,27 @@ export default { weightRestrictDecay: "SpWeightsWeightV2Weight", xcmpMaxIndividualWeight: "SpWeightsWeightV2Weight", }, - /** Lookup513: cumulus_pallet_xcmp_queue::pallet::Error */ + /** Lookup518: cumulus_pallet_xcmp_queue::pallet::Error */ CumulusPalletXcmpQueueError: { _enum: ["FailedToSend", "BadXcmOrigin", "BadXcm", "BadOverweightIndex", "WeightOverLimit"], }, - /** Lookup514: cumulus_pallet_xcm::pallet::Error */ + /** Lookup519: cumulus_pallet_xcm::pallet::Error */ CumulusPalletXcmError: "Null", - /** Lookup515: cumulus_pallet_dmp_queue::ConfigData */ + /** Lookup520: cumulus_pallet_dmp_queue::ConfigData */ CumulusPalletDmpQueueConfigData: { maxIndividual: "SpWeightsWeightV2Weight", }, - /** Lookup516: cumulus_pallet_dmp_queue::PageIndexData */ + /** Lookup521: cumulus_pallet_dmp_queue::PageIndexData */ CumulusPalletDmpQueuePageIndexData: { beginUsed: "u32", endUsed: "u32", overweightCount: "u64", }, - /** Lookup519: cumulus_pallet_dmp_queue::pallet::Error */ + /** Lookup524: cumulus_pallet_dmp_queue::pallet::Error */ CumulusPalletDmpQueueError: { _enum: ["Unknown", "OverLimit"], }, - /** Lookup520: pallet_xcm::pallet::QueryStatus */ + /** Lookup525: pallet_xcm::pallet::QueryStatus */ PalletXcmQueryStatus: { _enum: { Pending: { @@ -4750,7 +4831,7 @@ export default { }, }, }, - /** Lookup524: xcm::VersionedResponse */ + /** Lookup529: xcm::VersionedResponse */ XcmVersionedResponse: { _enum: { __Unused0: "Null", @@ -4759,7 +4840,7 @@ export default { V3: "XcmV3Response", }, }, - /** Lookup530: pallet_xcm::pallet::VersionMigrationStage */ + /** Lookup535: pallet_xcm::pallet::VersionMigrationStage */ PalletXcmVersionMigrationStage: { _enum: { MigrateSupportedVersion: "Null", @@ -4768,7 +4849,7 @@ export default { MigrateAndNotifyOldTargets: "Null", }, }, - /** Lookup533: xcm::VersionedAssetId */ + /** Lookup538: xcm::VersionedAssetId */ XcmVersionedAssetId: { _enum: { __Unused0: "Null", @@ -4777,14 +4858,14 @@ export default { V3: "XcmV3MultiassetAssetId", }, }, - /** Lookup534: pallet_xcm::pallet::RemoteLockedFungibleRecord */ + /** Lookup539: pallet_xcm::pallet::RemoteLockedFungibleRecord */ PalletXcmRemoteLockedFungibleRecord: { amount: "u128", owner: "XcmVersionedMultiLocation", locker: "XcmVersionedMultiLocation", - users: "u32", + consumers: "Vec<(Null,u128)>", }, - /** Lookup538: pallet_xcm::pallet::Error */ + /** Lookup546: pallet_xcm::pallet::Error */ PalletXcmError: { _enum: [ "Unreachable", @@ -4809,7 +4890,7 @@ export default { "InUse", ], }, - /** Lookup539: pallet_assets::types::AssetDetails */ + /** Lookup547: pallet_assets::types::AssetDetails */ PalletAssetsAssetDetails: { owner: "AccountId20", issuer: "AccountId20", @@ -4824,33 +4905,38 @@ export default { approvals: "u32", status: "PalletAssetsAssetStatus", }, - /** Lookup540: pallet_assets::types::AssetStatus */ + /** Lookup548: pallet_assets::types::AssetStatus */ PalletAssetsAssetStatus: { _enum: ["Live", "Frozen", "Destroying"], }, - /** Lookup542: pallet_assets::types::AssetAccount */ + /** Lookup550: pallet_assets::types::AssetAccount */ PalletAssetsAssetAccount: { balance: "u128", - isFrozen: "bool", + status: "PalletAssetsAccountStatus", reason: "PalletAssetsExistenceReason", extra: "Null", }, - /** Lookup543: pallet_assets::types::ExistenceReason */ + /** Lookup551: pallet_assets::types::AccountStatus */ + PalletAssetsAccountStatus: { + _enum: ["Liquid", "Frozen", "Blocked"], + }, + /** Lookup552: pallet_assets::types::ExistenceReason */ PalletAssetsExistenceReason: { _enum: { Consumer: "Null", Sufficient: "Null", DepositHeld: "u128", DepositRefunded: "Null", + DepositFrom: "(AccountId20,u128)", }, }, - /** Lookup545: pallet_assets::types::Approval */ + /** Lookup554: pallet_assets::types::Approval */ PalletAssetsApproval: { amount: "u128", deposit: "u128", }, /** - * Lookup546: pallet_assets::types::AssetMetadata> */ PalletAssetsAssetMetadata: { @@ -4860,7 +4946,7 @@ export default { decimals: "u8", isFrozen: "bool", }, - /** Lookup548: pallet_assets::pallet::Error */ + /** Lookup557: pallet_assets::pallet::Error */ PalletAssetsError: { _enum: [ "BalanceLow", @@ -4871,7 +4957,7 @@ export default { "InUse", "BadWitness", "MinBalanceZero", - "NoProvider", + "UnavailableConsumer", "BadMetadata", "Unapproved", "WouldDie", @@ -4885,7 +4971,7 @@ export default { "CallbackFailed", ], }, - /** Lookup549: orml_xtokens::module::Error */ + /** Lookup558: orml_xtokens::module::Error */ OrmlXtokensModuleError: { _enum: [ "AssetHasNoReserve", @@ -4909,12 +4995,12 @@ export default { "MinXcmFeeNotDefined", ], }, - /** Lookup550: pallet_asset_manager::pallet::AssetInfo */ + /** Lookup559: pallet_asset_manager::pallet::AssetInfo */ PalletAssetManagerAssetInfo: { creator: "AccountId20", deposit: "u128", }, - /** Lookup552: pallet_asset_manager::pallet::Error */ + /** Lookup561: pallet_asset_manager::pallet::Error */ PalletAssetManagerError: { _enum: [ "ErrorCreatingAsset", @@ -4927,11 +5013,11 @@ export default { "NonExistentLocalAsset", ], }, - /** Lookup553: pallet_migrations::pallet::Error */ + /** Lookup562: pallet_migrations::pallet::Error */ PalletMigrationsError: { _enum: ["PreimageMissing", "WrongUpperBound", "PreimageIsTooBig", "PreimageAlreadyExists"], }, - /** Lookup554: pallet_xcm_transactor::pallet::Error */ + /** Lookup563: pallet_xcm_transactor::pallet::Error */ PalletXcmTransactorError: { _enum: [ "IndexAlreadyClaimed", @@ -4960,20 +5046,21 @@ export default { "HrmpHandlerNotImplemented", "TooMuchFeeUsed", "ErrorValidating", + "RefundNotSupportedWithTransactInfo", ], }, - /** Lookup556: pallet_moonbeam_orbiters::types::CollatorPoolInfo[account::AccountId20](account::AccountId20) */ + /** Lookup565: pallet_moonbeam_orbiters::types::CollatorPoolInfo[account::AccountId20](account::AccountId20) */ PalletMoonbeamOrbitersCollatorPoolInfo: { orbiters: "Vec", maybeCurrentOrbiter: "Option", nextOrbiter: "u32", }, - /** Lookup558: pallet_moonbeam_orbiters::types::CurrentOrbiter[account::AccountId20](account::AccountId20) */ + /** Lookup567: pallet_moonbeam_orbiters::types::CurrentOrbiter[account::AccountId20](account::AccountId20) */ PalletMoonbeamOrbitersCurrentOrbiter: { accountId: "AccountId20", removed: "bool", }, - /** Lookup559: pallet_moonbeam_orbiters::pallet::Error */ + /** Lookup568: pallet_moonbeam_orbiters::pallet::Error */ PalletMoonbeamOrbitersError: { _enum: [ "CollatorAlreadyAdded", @@ -4987,16 +5074,16 @@ export default { "OrbiterStillInAPool", ], }, - /** Lookup560: pallet_ethereum_xcm::pallet::Error */ + /** Lookup569: pallet_ethereum_xcm::pallet::Error */ PalletEthereumXcmError: { _enum: ["EthereumXcmExecutionSuspended"], }, - /** Lookup561: pallet_randomness::types::RequestState */ + /** Lookup570: pallet_randomness::types::RequestState */ PalletRandomnessRequestState: { request: "PalletRandomnessRequest", deposit: "u128", }, - /** Lookup562: pallet_randomness::types::Request> */ + /** Lookup571: pallet_randomness::types::Request> */ PalletRandomnessRequest: { refundAddress: "H160", contractAddress: "H160", @@ -5006,26 +5093,26 @@ export default { salt: "H256", info: "PalletRandomnessRequestInfo", }, - /** Lookup563: pallet_randomness::types::RequestInfo */ + /** Lookup572: pallet_randomness::types::RequestInfo */ PalletRandomnessRequestInfo: { _enum: { BabeEpoch: "(u64,u64)", Local: "(u32,u32)", }, }, - /** Lookup564: pallet_randomness::types::RequestType */ + /** Lookup573: pallet_randomness::types::RequestType */ PalletRandomnessRequestType: { _enum: { BabeEpoch: "u64", Local: "u32", }, }, - /** Lookup565: pallet_randomness::types::RandomnessResult */ + /** Lookup574: pallet_randomness::types::RandomnessResult */ PalletRandomnessRandomnessResult: { randomness: "Option", requestCount: "u64", }, - /** Lookup566: pallet_randomness::pallet::Error */ + /** Lookup575: pallet_randomness::pallet::Error */ PalletRandomnessError: { _enum: [ "RequestCounterOverflowed", @@ -5043,7 +5130,7 @@ export default { ], }, /** - * Lookup570: pallet_conviction_voting::vote::Voting */ PalletConvictionVotingVoteVoting: { @@ -5052,20 +5139,20 @@ export default { Delegating: "PalletConvictionVotingVoteDelegating", }, }, - /** Lookup571: pallet_conviction_voting::vote::Casting */ + /** Lookup580: pallet_conviction_voting::vote::Casting */ PalletConvictionVotingVoteCasting: { votes: "Vec<(u32,PalletConvictionVotingVoteAccountVote)>", delegations: "PalletConvictionVotingDelegations", prior: "PalletConvictionVotingVotePriorLock", }, - /** Lookup575: pallet_conviction_voting::types::Delegations */ + /** Lookup584: pallet_conviction_voting::types::Delegations */ PalletConvictionVotingDelegations: { votes: "u128", capital: "u128", }, - /** Lookup576: pallet_conviction_voting::vote::PriorLock */ + /** Lookup585: pallet_conviction_voting::vote::PriorLock */ PalletConvictionVotingVotePriorLock: "(u32,u128)", - /** Lookup577: pallet_conviction_voting::vote::Delegating */ + /** Lookup586: pallet_conviction_voting::vote::Delegating */ PalletConvictionVotingVoteDelegating: { balance: "u128", target: "AccountId20", @@ -5073,7 +5160,7 @@ export default { delegations: "PalletConvictionVotingDelegations", prior: "PalletConvictionVotingVotePriorLock", }, - /** Lookup581: pallet_conviction_voting::pallet::Error */ + /** Lookup590: pallet_conviction_voting::pallet::Error */ PalletConvictionVotingError: { _enum: [ "NotOngoing", @@ -5091,7 +5178,7 @@ export default { ], }, /** - * Lookup582: pallet_referenda::types::ReferendumInfo, Balance, * pallet_conviction_voting::types::Tally, account::AccountId20, ScheduleAddress> */ @@ -5106,7 +5193,7 @@ export default { }, }, /** - * Lookup583: pallet_referenda::types::ReferendumStatus, Balance, * pallet_conviction_voting::types::Tally, account::AccountId20, ScheduleAddress> */ @@ -5123,17 +5210,17 @@ export default { inQueue: "bool", alarm: "Option<(u32,(u32,u32))>", }, - /** Lookup584: pallet_referenda::types::Deposit */ + /** Lookup593: pallet_referenda::types::Deposit */ PalletReferendaDeposit: { who: "AccountId20", amount: "u128", }, - /** Lookup587: pallet_referenda::types::DecidingStatus */ + /** Lookup596: pallet_referenda::types::DecidingStatus */ PalletReferendaDecidingStatus: { since: "u32", confirming: "Option", }, - /** Lookup595: pallet_referenda::types::TrackInfo */ + /** Lookup604: pallet_referenda::types::TrackInfo */ PalletReferendaTrackInfo: { name: "Text", maxDeciding: "u32", @@ -5145,7 +5232,7 @@ export default { minApproval: "PalletReferendaCurve", minSupport: "PalletReferendaCurve", }, - /** Lookup596: pallet_referenda::types::Curve */ + /** Lookup605: pallet_referenda::types::Curve */ PalletReferendaCurve: { _enum: { LinearDecreasing: { @@ -5166,7 +5253,7 @@ export default { }, }, }, - /** Lookup599: pallet_referenda::pallet::Error */ + /** Lookup608: pallet_referenda::pallet::Error */ PalletReferendaError: { _enum: [ "NotOngoing", @@ -5184,7 +5271,7 @@ export default { "PreimageNotExist", ], }, - /** Lookup600: pallet_preimage::RequestStatus */ + /** Lookup609: pallet_preimage::RequestStatus */ PalletPreimageRequestStatus: { _enum: { Unrequested: { @@ -5198,11 +5285,11 @@ export default { }, }, }, - /** Lookup605: pallet_preimage::pallet::Error */ + /** Lookup614: pallet_preimage::pallet::Error */ PalletPreimageError: { _enum: ["TooBig", "AlreadyNoted", "NotAuthorized", "NotNoted", "Requested", "NotRequested"], }, - /** Lookup606: pallet_whitelist::pallet::Error */ + /** Lookup615: pallet_whitelist::pallet::Error */ PalletWhitelistError: { _enum: [ "UnavailablePreImage", @@ -5212,14 +5299,14 @@ export default { "CallAlreadyWhitelisted", ], }, - /** Lookup609: pallet_multisig::Multisig */ + /** Lookup618: pallet_multisig::Multisig */ PalletMultisigMultisig: { when: "PalletMultisigTimepoint", deposit: "u128", depositor: "AccountId20", approvals: "Vec", }, - /** Lookup611: pallet_multisig::pallet::Error */ + /** Lookup620: pallet_multisig::pallet::Error */ PalletMultisigError: { _enum: [ "MinimumThreshold", @@ -5238,22 +5325,22 @@ export default { "AlreadyStored", ], }, - /** Lookup613: account::EthereumSignature */ + /** Lookup622: account::EthereumSignature */ AccountEthereumSignature: "SpCoreEcdsaSignature", - /** Lookup615: frame_system::extensions::check_non_zero_sender::CheckNonZeroSender */ + /** Lookup624: frame_system::extensions::check_non_zero_sender::CheckNonZeroSender */ FrameSystemExtensionsCheckNonZeroSender: "Null", - /** Lookup616: frame_system::extensions::check_spec_version::CheckSpecVersion */ + /** Lookup625: frame_system::extensions::check_spec_version::CheckSpecVersion */ FrameSystemExtensionsCheckSpecVersion: "Null", - /** Lookup617: frame_system::extensions::check_tx_version::CheckTxVersion */ + /** Lookup626: frame_system::extensions::check_tx_version::CheckTxVersion */ FrameSystemExtensionsCheckTxVersion: "Null", - /** Lookup618: frame_system::extensions::check_genesis::CheckGenesis */ + /** Lookup627: frame_system::extensions::check_genesis::CheckGenesis */ FrameSystemExtensionsCheckGenesis: "Null", - /** Lookup621: frame_system::extensions::check_nonce::CheckNonce */ + /** Lookup630: frame_system::extensions::check_nonce::CheckNonce */ FrameSystemExtensionsCheckNonce: "Compact", - /** Lookup622: frame_system::extensions::check_weight::CheckWeight */ + /** Lookup631: frame_system::extensions::check_weight::CheckWeight */ FrameSystemExtensionsCheckWeight: "Null", - /** Lookup623: pallet_transaction_payment::ChargeTransactionPayment */ + /** Lookup632: pallet_transaction_payment::ChargeTransactionPayment */ PalletTransactionPaymentChargeTransactionPayment: "Compact", - /** Lookup625: moonbase_runtime::Runtime */ + /** Lookup634: moonbase_runtime::Runtime */ MoonbaseRuntimeRuntime: "Null", }; diff --git a/typescript-api/src/moonbase/interfaces/registry.ts b/typescript-api/src/moonbase/interfaces/registry.ts index 18b297ada5..80657c3f37 100644 --- a/typescript-api/src/moonbase/interfaces/registry.ts +++ b/typescript-api/src/moonbase/interfaces/registry.ts @@ -17,6 +17,7 @@ import type { CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, @@ -93,6 +94,7 @@ import type { PalletAssetManagerCall, PalletAssetManagerError, PalletAssetManagerEvent, + PalletAssetsAccountStatus, PalletAssetsApproval, PalletAssetsAssetAccount, PalletAssetsAssetDetails, @@ -115,6 +117,7 @@ import type { PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, + PalletBalancesIdAmount, PalletBalancesReasons, PalletBalancesReserveData, PalletCollectiveCall, @@ -173,7 +176,6 @@ import type { PalletMaintenanceModeCall, PalletMaintenanceModeError, PalletMaintenanceModeEvent, - PalletMigrationsCall, PalletMigrationsError, PalletMigrationsEvent, PalletMoonbeamOrbitersCall, @@ -208,6 +210,7 @@ import type { PalletParachainStakingInflationInflationInfo, PalletParachainStakingParachainBondConfig, PalletParachainStakingRoundInfo, + PalletParachainStakingSetBoundedOrderedSet, PalletParachainStakingSetOrderedSet, PalletPreimageCall, PalletPreimageError, @@ -278,10 +281,10 @@ import type { PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesHrmpChannelId, PolkadotParachainPrimitivesXcmpMessageFormat, - PolkadotPrimitivesV2AbridgedHostConfiguration, - PolkadotPrimitivesV2AbridgedHrmpChannel, - PolkadotPrimitivesV2PersistedValidationData, - PolkadotPrimitivesV2UpgradeRestriction, + PolkadotPrimitivesV4AbridgedHostConfiguration, + PolkadotPrimitivesV4AbridgedHrmpChannel, + PolkadotPrimitivesV4PersistedValidationData, + PolkadotPrimitivesV4UpgradeRestriction, SessionKeysPrimitivesVrfVrfCryptoPublic, SpArithmeticArithmeticError, SpCoreEcdsaSignature, @@ -371,6 +374,7 @@ declare module "@polkadot/types/types/registry" { CumulusPalletParachainSystemError: CumulusPalletParachainSystemError; CumulusPalletParachainSystemEvent: CumulusPalletParachainSystemEvent; CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot; + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize: CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize; CumulusPalletXcmError: CumulusPalletXcmError; CumulusPalletXcmEvent: CumulusPalletXcmEvent; CumulusPalletXcmOrigin: CumulusPalletXcmOrigin; @@ -447,6 +451,7 @@ declare module "@polkadot/types/types/registry" { PalletAssetManagerCall: PalletAssetManagerCall; PalletAssetManagerError: PalletAssetManagerError; PalletAssetManagerEvent: PalletAssetManagerEvent; + PalletAssetsAccountStatus: PalletAssetsAccountStatus; PalletAssetsApproval: PalletAssetsApproval; PalletAssetsAssetAccount: PalletAssetsAssetAccount; PalletAssetsAssetDetails: PalletAssetsAssetDetails; @@ -469,6 +474,7 @@ declare module "@polkadot/types/types/registry" { PalletBalancesCall: PalletBalancesCall; PalletBalancesError: PalletBalancesError; PalletBalancesEvent: PalletBalancesEvent; + PalletBalancesIdAmount: PalletBalancesIdAmount; PalletBalancesReasons: PalletBalancesReasons; PalletBalancesReserveData: PalletBalancesReserveData; PalletCollectiveCall: PalletCollectiveCall; @@ -527,7 +533,6 @@ declare module "@polkadot/types/types/registry" { PalletMaintenanceModeCall: PalletMaintenanceModeCall; PalletMaintenanceModeError: PalletMaintenanceModeError; PalletMaintenanceModeEvent: PalletMaintenanceModeEvent; - PalletMigrationsCall: PalletMigrationsCall; PalletMigrationsError: PalletMigrationsError; PalletMigrationsEvent: PalletMigrationsEvent; PalletMoonbeamOrbitersCall: PalletMoonbeamOrbitersCall; @@ -562,6 +567,7 @@ declare module "@polkadot/types/types/registry" { PalletParachainStakingInflationInflationInfo: PalletParachainStakingInflationInflationInfo; PalletParachainStakingParachainBondConfig: PalletParachainStakingParachainBondConfig; PalletParachainStakingRoundInfo: PalletParachainStakingRoundInfo; + PalletParachainStakingSetBoundedOrderedSet: PalletParachainStakingSetBoundedOrderedSet; PalletParachainStakingSetOrderedSet: PalletParachainStakingSetOrderedSet; PalletPreimageCall: PalletPreimageCall; PalletPreimageError: PalletPreimageError; @@ -632,10 +638,10 @@ declare module "@polkadot/types/types/registry" { PolkadotCorePrimitivesOutboundHrmpMessage: PolkadotCorePrimitivesOutboundHrmpMessage; PolkadotParachainPrimitivesHrmpChannelId: PolkadotParachainPrimitivesHrmpChannelId; PolkadotParachainPrimitivesXcmpMessageFormat: PolkadotParachainPrimitivesXcmpMessageFormat; - PolkadotPrimitivesV2AbridgedHostConfiguration: PolkadotPrimitivesV2AbridgedHostConfiguration; - PolkadotPrimitivesV2AbridgedHrmpChannel: PolkadotPrimitivesV2AbridgedHrmpChannel; - PolkadotPrimitivesV2PersistedValidationData: PolkadotPrimitivesV2PersistedValidationData; - PolkadotPrimitivesV2UpgradeRestriction: PolkadotPrimitivesV2UpgradeRestriction; + PolkadotPrimitivesV4AbridgedHostConfiguration: PolkadotPrimitivesV4AbridgedHostConfiguration; + PolkadotPrimitivesV4AbridgedHrmpChannel: PolkadotPrimitivesV4AbridgedHrmpChannel; + PolkadotPrimitivesV4PersistedValidationData: PolkadotPrimitivesV4PersistedValidationData; + PolkadotPrimitivesV4UpgradeRestriction: PolkadotPrimitivesV4UpgradeRestriction; SessionKeysPrimitivesVrfVrfCryptoPublic: SessionKeysPrimitivesVrfVrfCryptoPublic; SpArithmeticArithmeticError: SpArithmeticArithmeticError; SpCoreEcdsaSignature: SpCoreEcdsaSignature; diff --git a/typescript-api/src/moonbase/interfaces/types-lookup.ts b/typescript-api/src/moonbase/interfaces/types-lookup.ts index 14b60c4d99..1e9f4d5514 100644 --- a/typescript-api/src/moonbase/interfaces/types-lookup.ts +++ b/typescript-api/src/moonbase/interfaces/types-lookup.ts @@ -55,29 +55,29 @@ declare module "@polkadot/types/lookup" { interface PalletBalancesAccountData extends Struct { readonly free: u128; readonly reserved: u128; - readonly miscFrozen: u128; - readonly feeFrozen: u128; + readonly frozen: u128; + readonly flags: u128; } - /** @name FrameSupportDispatchPerDispatchClassWeight (7) */ + /** @name FrameSupportDispatchPerDispatchClassWeight (8) */ interface FrameSupportDispatchPerDispatchClassWeight extends Struct { readonly normal: SpWeightsWeightV2Weight; readonly operational: SpWeightsWeightV2Weight; readonly mandatory: SpWeightsWeightV2Weight; } - /** @name SpWeightsWeightV2Weight (8) */ + /** @name SpWeightsWeightV2Weight (9) */ interface SpWeightsWeightV2Weight extends Struct { readonly refTime: Compact; readonly proofSize: Compact; } - /** @name SpRuntimeDigest (14) */ + /** @name SpRuntimeDigest (15) */ interface SpRuntimeDigest extends Struct { readonly logs: Vec; } - /** @name SpRuntimeDigestDigestItem (16) */ + /** @name SpRuntimeDigestDigestItem (17) */ interface SpRuntimeDigestDigestItem extends Enum { readonly isOther: boolean; readonly asOther: Bytes; @@ -91,14 +91,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Other" | "Consensus" | "Seal" | "PreRuntime" | "RuntimeEnvironmentUpdated"; } - /** @name FrameSystemEventRecord (19) */ + /** @name FrameSystemEventRecord (20) */ interface FrameSystemEventRecord extends Struct { readonly phase: FrameSystemPhase; readonly event: Event; readonly topics: Vec; } - /** @name FrameSystemEvent (21) */ + /** @name FrameSystemEvent (22) */ interface FrameSystemEvent extends Enum { readonly isExtrinsicSuccess: boolean; readonly asExtrinsicSuccess: { @@ -132,14 +132,14 @@ declare module "@polkadot/types/lookup" { | "Remarked"; } - /** @name FrameSupportDispatchDispatchInfo (22) */ + /** @name FrameSupportDispatchDispatchInfo (23) */ interface FrameSupportDispatchDispatchInfo extends Struct { readonly weight: SpWeightsWeightV2Weight; readonly class: FrameSupportDispatchDispatchClass; readonly paysFee: FrameSupportDispatchPays; } - /** @name FrameSupportDispatchDispatchClass (23) */ + /** @name FrameSupportDispatchDispatchClass (24) */ interface FrameSupportDispatchDispatchClass extends Enum { readonly isNormal: boolean; readonly isOperational: boolean; @@ -147,14 +147,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Normal" | "Operational" | "Mandatory"; } - /** @name FrameSupportDispatchPays (24) */ + /** @name FrameSupportDispatchPays (25) */ interface FrameSupportDispatchPays extends Enum { readonly isYes: boolean; readonly isNo: boolean; readonly type: "Yes" | "No"; } - /** @name SpRuntimeDispatchError (25) */ + /** @name SpRuntimeDispatchError (26) */ interface SpRuntimeDispatchError extends Enum { readonly isOther: boolean; readonly isCannotLookup: boolean; @@ -173,6 +173,7 @@ declare module "@polkadot/types/lookup" { readonly isExhausted: boolean; readonly isCorruption: boolean; readonly isUnavailable: boolean; + readonly isRootNotAllowed: boolean; readonly type: | "Other" | "CannotLookup" @@ -186,35 +187,42 @@ declare module "@polkadot/types/lookup" { | "Transactional" | "Exhausted" | "Corruption" - | "Unavailable"; + | "Unavailable" + | "RootNotAllowed"; } - /** @name SpRuntimeModuleError (26) */ + /** @name SpRuntimeModuleError (27) */ interface SpRuntimeModuleError extends Struct { readonly index: u8; readonly error: U8aFixed; } - /** @name SpRuntimeTokenError (27) */ + /** @name SpRuntimeTokenError (28) */ interface SpRuntimeTokenError extends Enum { - readonly isNoFunds: boolean; - readonly isWouldDie: boolean; + readonly isFundsUnavailable: boolean; + readonly isOnlyProvider: boolean; readonly isBelowMinimum: boolean; readonly isCannotCreate: boolean; readonly isUnknownAsset: boolean; readonly isFrozen: boolean; readonly isUnsupported: boolean; + readonly isCannotCreateHold: boolean; + readonly isNotExpendable: boolean; + readonly isBlocked: boolean; readonly type: - | "NoFunds" - | "WouldDie" + | "FundsUnavailable" + | "OnlyProvider" | "BelowMinimum" | "CannotCreate" | "UnknownAsset" | "Frozen" - | "Unsupported"; + | "Unsupported" + | "CannotCreateHold" + | "NotExpendable" + | "Blocked"; } - /** @name SpArithmeticArithmeticError (28) */ + /** @name SpArithmeticArithmeticError (29) */ interface SpArithmeticArithmeticError extends Enum { readonly isUnderflow: boolean; readonly isOverflow: boolean; @@ -222,14 +230,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Underflow" | "Overflow" | "DivisionByZero"; } - /** @name SpRuntimeTransactionalError (29) */ + /** @name SpRuntimeTransactionalError (30) */ interface SpRuntimeTransactionalError extends Enum { readonly isLimitReached: boolean; readonly isNoLayer: boolean; readonly type: "LimitReached" | "NoLayer"; } - /** @name PalletUtilityEvent (30) */ + /** @name PalletUtilityEvent (31) */ interface PalletUtilityEvent extends Enum { readonly isBatchInterrupted: boolean; readonly asBatchInterrupted: { @@ -256,7 +264,7 @@ declare module "@polkadot/types/lookup" { | "DispatchedAs"; } - /** @name PalletBalancesEvent (33) */ + /** @name PalletBalancesEvent (34) */ interface PalletBalancesEvent extends Enum { readonly isEndowed: boolean; readonly asEndowed: { @@ -278,7 +286,6 @@ declare module "@polkadot/types/lookup" { readonly asBalanceSet: { readonly who: AccountId20; readonly free: u128; - readonly reserved: u128; } & Struct; readonly isReserved: boolean; readonly asReserved: { @@ -312,6 +319,58 @@ declare module "@polkadot/types/lookup" { readonly who: AccountId20; readonly amount: u128; } & Struct; + readonly isMinted: boolean; + readonly asMinted: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isBurned: boolean; + readonly asBurned: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isSuspended: boolean; + readonly asSuspended: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isRestored: boolean; + readonly asRestored: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isUpgraded: boolean; + readonly asUpgraded: { + readonly who: AccountId20; + } & Struct; + readonly isIssued: boolean; + readonly asIssued: { + readonly amount: u128; + } & Struct; + readonly isRescinded: boolean; + readonly asRescinded: { + readonly amount: u128; + } & Struct; + readonly isLocked: boolean; + readonly asLocked: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isUnlocked: boolean; + readonly asUnlocked: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isFrozen: boolean; + readonly asFrozen: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isThawed: boolean; + readonly asThawed: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; readonly type: | "Endowed" | "DustLost" @@ -322,17 +381,28 @@ declare module "@polkadot/types/lookup" { | "ReserveRepatriated" | "Deposit" | "Withdraw" - | "Slashed"; + | "Slashed" + | "Minted" + | "Burned" + | "Suspended" + | "Restored" + | "Upgraded" + | "Issued" + | "Rescinded" + | "Locked" + | "Unlocked" + | "Frozen" + | "Thawed"; } - /** @name FrameSupportTokensMiscBalanceStatus (34) */ + /** @name FrameSupportTokensMiscBalanceStatus (35) */ interface FrameSupportTokensMiscBalanceStatus extends Enum { readonly isFree: boolean; readonly isReserved: boolean; readonly type: "Free" | "Reserved"; } - /** @name PalletSudoEvent (35) */ + /** @name PalletSudoEvent (36) */ interface PalletSudoEvent extends Enum { readonly isSudid: boolean; readonly asSudid: { @@ -349,7 +419,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Sudid" | "KeyChanged" | "SudoAsDone"; } - /** @name CumulusPalletParachainSystemEvent (37) */ + /** @name CumulusPalletParachainSystemEvent (38) */ interface CumulusPalletParachainSystemEvent extends Enum { readonly isValidationFunctionStored: boolean; readonly isValidationFunctionApplied: boolean; @@ -384,7 +454,7 @@ declare module "@polkadot/types/lookup" { | "UpwardMessageSent"; } - /** @name PalletTransactionPaymentEvent (39) */ + /** @name PalletTransactionPaymentEvent (40) */ interface PalletTransactionPaymentEvent extends Enum { readonly isTransactionFeePaid: boolean; readonly asTransactionFeePaid: { @@ -395,7 +465,7 @@ declare module "@polkadot/types/lookup" { readonly type: "TransactionFeePaid"; } - /** @name PalletEvmEvent (40) */ + /** @name PalletEvmEvent (41) */ interface PalletEvmEvent extends Enum { readonly isLog: boolean; readonly asLog: { @@ -420,14 +490,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Log" | "Created" | "CreatedFailed" | "Executed" | "ExecutedFailed"; } - /** @name EthereumLog (41) */ + /** @name EthereumLog (42) */ interface EthereumLog extends Struct { readonly address: H160; readonly topics: Vec; readonly data: Bytes; } - /** @name PalletEthereumEvent (44) */ + /** @name PalletEthereumEvent (45) */ interface PalletEthereumEvent extends Enum { readonly isExecuted: boolean; readonly asExecuted: { @@ -440,7 +510,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Executed"; } - /** @name EvmCoreErrorExitReason (45) */ + /** @name EvmCoreErrorExitReason (46) */ interface EvmCoreErrorExitReason extends Enum { readonly isSucceed: boolean; readonly asSucceed: EvmCoreErrorExitSucceed; @@ -453,7 +523,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Succeed" | "Error" | "Revert" | "Fatal"; } - /** @name EvmCoreErrorExitSucceed (46) */ + /** @name EvmCoreErrorExitSucceed (47) */ interface EvmCoreErrorExitSucceed extends Enum { readonly isStopped: boolean; readonly isReturned: boolean; @@ -461,7 +531,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Stopped" | "Returned" | "Suicided"; } - /** @name EvmCoreErrorExitError (47) */ + /** @name EvmCoreErrorExitError (48) */ interface EvmCoreErrorExitError extends Enum { readonly isStackUnderflow: boolean; readonly isStackOverflow: boolean; @@ -500,13 +570,13 @@ declare module "@polkadot/types/lookup" { | "InvalidCode"; } - /** @name EvmCoreErrorExitRevert (51) */ + /** @name EvmCoreErrorExitRevert (52) */ interface EvmCoreErrorExitRevert extends Enum { readonly isReverted: boolean; readonly type: "Reverted"; } - /** @name EvmCoreErrorExitFatal (52) */ + /** @name EvmCoreErrorExitFatal (53) */ interface EvmCoreErrorExitFatal extends Enum { readonly isNotSupported: boolean; readonly isUnhandledInterrupt: boolean; @@ -517,7 +587,7 @@ declare module "@polkadot/types/lookup" { readonly type: "NotSupported" | "UnhandledInterrupt" | "CallErrorAsFatal" | "Other"; } - /** @name PalletParachainStakingEvent (53) */ + /** @name PalletParachainStakingEvent (54) */ interface PalletParachainStakingEvent extends Enum { readonly isNewRound: boolean; readonly asNewRound: { @@ -767,13 +837,13 @@ declare module "@polkadot/types/lookup" { | "Compounded"; } - /** @name PalletParachainStakingDelegationRequestsCancelledScheduledRequest (55) */ + /** @name PalletParachainStakingDelegationRequestsCancelledScheduledRequest (56) */ interface PalletParachainStakingDelegationRequestsCancelledScheduledRequest extends Struct { readonly whenExecutable: u32; readonly action: PalletParachainStakingDelegationRequestsDelegationAction; } - /** @name PalletParachainStakingDelegationRequestsDelegationAction (56) */ + /** @name PalletParachainStakingDelegationRequestsDelegationAction (57) */ interface PalletParachainStakingDelegationRequestsDelegationAction extends Enum { readonly isRevoke: boolean; readonly asRevoke: u128; @@ -782,7 +852,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Revoke" | "Decrease"; } - /** @name PalletParachainStakingDelegatorAdded (57) */ + /** @name PalletParachainStakingDelegatorAdded (58) */ interface PalletParachainStakingDelegatorAdded extends Enum { readonly isAddedToTop: boolean; readonly asAddedToTop: { @@ -792,7 +862,7 @@ declare module "@polkadot/types/lookup" { readonly type: "AddedToTop" | "AddedToBottom"; } - /** @name PalletSchedulerEvent (60) */ + /** @name PalletSchedulerEvent (61) */ interface PalletSchedulerEvent extends Enum { readonly isScheduled: boolean; readonly asScheduled: { @@ -834,7 +904,7 @@ declare module "@polkadot/types/lookup" { | "PermanentlyOverweight"; } - /** @name PalletDemocracyEvent (62) */ + /** @name PalletDemocracyEvent (63) */ interface PalletDemocracyEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -934,7 +1004,7 @@ declare module "@polkadot/types/lookup" { | "MetadataTransferred"; } - /** @name PalletDemocracyVoteThreshold (63) */ + /** @name PalletDemocracyVoteThreshold (64) */ interface PalletDemocracyVoteThreshold extends Enum { readonly isSuperMajorityApprove: boolean; readonly isSuperMajorityAgainst: boolean; @@ -942,7 +1012,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SuperMajorityApprove" | "SuperMajorityAgainst" | "SimpleMajority"; } - /** @name PalletDemocracyVoteAccountVote (64) */ + /** @name PalletDemocracyVoteAccountVote (65) */ interface PalletDemocracyVoteAccountVote extends Enum { readonly isStandard: boolean; readonly asStandard: { @@ -957,7 +1027,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Standard" | "Split"; } - /** @name PalletDemocracyMetadataOwner (66) */ + /** @name PalletDemocracyMetadataOwner (67) */ interface PalletDemocracyMetadataOwner extends Enum { readonly isExternal: boolean; readonly isProposal: boolean; @@ -967,7 +1037,7 @@ declare module "@polkadot/types/lookup" { readonly type: "External" | "Proposal" | "Referendum"; } - /** @name PalletCollectiveEvent (67) */ + /** @name PalletCollectiveEvent (68) */ interface PalletCollectiveEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -1018,7 +1088,7 @@ declare module "@polkadot/types/lookup" { | "Closed"; } - /** @name PalletTreasuryEvent (69) */ + /** @name PalletTreasuryEvent (70) */ interface PalletTreasuryEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -1074,14 +1144,14 @@ declare module "@polkadot/types/lookup" { | "UpdatedInactive"; } - /** @name PalletAuthorSlotFilterEvent (70) */ + /** @name PalletAuthorSlotFilterEvent (71) */ interface PalletAuthorSlotFilterEvent extends Enum { readonly isEligibleUpdated: boolean; readonly asEligibleUpdated: u32; readonly type: "EligibleUpdated"; } - /** @name PalletCrowdloanRewardsEvent (72) */ + /** @name PalletCrowdloanRewardsEvent (73) */ interface PalletCrowdloanRewardsEvent extends Enum { readonly isInitialPaymentMade: boolean; readonly asInitialPaymentMade: ITuple<[AccountId20, u128]>; @@ -1106,7 +1176,7 @@ declare module "@polkadot/types/lookup" { | "InitializedAccountWithNotEnoughContribution"; } - /** @name PalletAuthorMappingEvent (73) */ + /** @name PalletAuthorMappingEvent (74) */ interface PalletAuthorMappingEvent extends Enum { readonly isKeysRegistered: boolean; readonly asKeysRegistered: { @@ -1129,16 +1199,16 @@ declare module "@polkadot/types/lookup" { readonly type: "KeysRegistered" | "KeysRemoved" | "KeysRotated"; } - /** @name NimbusPrimitivesNimbusCryptoPublic (74) */ + /** @name NimbusPrimitivesNimbusCryptoPublic (75) */ interface NimbusPrimitivesNimbusCryptoPublic extends SpCoreSr25519Public {} - /** @name SpCoreSr25519Public (75) */ + /** @name SpCoreSr25519Public (76) */ interface SpCoreSr25519Public extends U8aFixed {} - /** @name SessionKeysPrimitivesVrfVrfCryptoPublic (76) */ + /** @name SessionKeysPrimitivesVrfVrfCryptoPublic (77) */ interface SessionKeysPrimitivesVrfVrfCryptoPublic extends SpCoreSr25519Public {} - /** @name PalletProxyEvent (77) */ + /** @name PalletProxyEvent (78) */ interface PalletProxyEvent extends Enum { readonly isProxyExecuted: boolean; readonly asProxyExecuted: { @@ -1174,7 +1244,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ProxyExecuted" | "PureCreated" | "Announced" | "ProxyAdded" | "ProxyRemoved"; } - /** @name MoonbaseRuntimeProxyType (78) */ + /** @name MoonbaseRuntimeProxyType (79) */ interface MoonbaseRuntimeProxyType extends Enum { readonly isAny: boolean; readonly isNonTransfer: boolean; @@ -1195,7 +1265,7 @@ declare module "@polkadot/types/lookup" { | "IdentityJudgement"; } - /** @name PalletMaintenanceModeEvent (80) */ + /** @name PalletMaintenanceModeEvent (81) */ interface PalletMaintenanceModeEvent extends Enum { readonly isEnteredMaintenanceMode: boolean; readonly isNormalOperationResumed: boolean; @@ -1214,7 +1284,7 @@ declare module "@polkadot/types/lookup" { | "FailedToResumeIdleXcmExecution"; } - /** @name PalletIdentityEvent (81) */ + /** @name PalletIdentityEvent (82) */ interface PalletIdentityEvent extends Enum { readonly isIdentitySet: boolean; readonly asIdentitySet: { @@ -1280,7 +1350,7 @@ declare module "@polkadot/types/lookup" { | "SubIdentityRevoked"; } - /** @name CumulusPalletXcmpQueueEvent (82) */ + /** @name CumulusPalletXcmpQueueEvent (83) */ interface CumulusPalletXcmpQueueEvent extends Enum { readonly isSuccess: boolean; readonly asSuccess: { @@ -1327,7 +1397,7 @@ declare module "@polkadot/types/lookup" { | "OverweightServiced"; } - /** @name XcmV3TraitsError (83) */ + /** @name XcmV3TraitsError (84) */ interface XcmV3TraitsError extends Enum { readonly isOverflow: boolean; readonly isUnimplemented: boolean; @@ -1414,7 +1484,7 @@ declare module "@polkadot/types/lookup" { | "ExceedsStackLimit"; } - /** @name CumulusPalletXcmEvent (85) */ + /** @name CumulusPalletXcmEvent (86) */ interface CumulusPalletXcmEvent extends Enum { readonly isInvalidFormat: boolean; readonly asInvalidFormat: U8aFixed; @@ -1425,7 +1495,7 @@ declare module "@polkadot/types/lookup" { readonly type: "InvalidFormat" | "UnsupportedVersion" | "ExecutedDownward"; } - /** @name XcmV3TraitsOutcome (86) */ + /** @name XcmV3TraitsOutcome (87) */ interface XcmV3TraitsOutcome extends Enum { readonly isComplete: boolean; readonly asComplete: SpWeightsWeightV2Weight; @@ -1436,7 +1506,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Complete" | "Incomplete" | "Error"; } - /** @name CumulusPalletDmpQueueEvent (87) */ + /** @name CumulusPalletDmpQueueEvent (88) */ interface CumulusPalletDmpQueueEvent extends Enum { readonly isInvalidFormat: boolean; readonly asInvalidFormat: { @@ -1482,7 +1552,7 @@ declare module "@polkadot/types/lookup" { | "MaxMessagesExhausted"; } - /** @name PalletXcmEvent (88) */ + /** @name PalletXcmEvent (89) */ interface PalletXcmEvent extends Enum { readonly isAttempted: boolean; readonly asAttempted: XcmV3TraitsOutcome; @@ -1560,13 +1630,13 @@ declare module "@polkadot/types/lookup" { | "AssetsClaimed"; } - /** @name XcmV3MultiLocation (89) */ + /** @name XcmV3MultiLocation (90) */ interface XcmV3MultiLocation extends Struct { readonly parents: u8; readonly interior: XcmV3Junctions; } - /** @name XcmV3Junctions (90) */ + /** @name XcmV3Junctions (91) */ interface XcmV3Junctions extends Enum { readonly isHere: boolean; readonly isX1: boolean; @@ -1613,7 +1683,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Here" | "X1" | "X2" | "X3" | "X4" | "X5" | "X6" | "X7" | "X8"; } - /** @name XcmV3Junction (91) */ + /** @name XcmV3Junction (92) */ interface XcmV3Junction extends Enum { readonly isParachain: boolean; readonly asParachain: Compact; @@ -1662,7 +1732,7 @@ declare module "@polkadot/types/lookup" { | "GlobalConsensus"; } - /** @name XcmV3JunctionNetworkId (94) */ + /** @name XcmV3JunctionNetworkId (95) */ interface XcmV3JunctionNetworkId extends Enum { readonly isByGenesis: boolean; readonly asByGenesis: U8aFixed; @@ -1695,7 +1765,7 @@ declare module "@polkadot/types/lookup" { | "BitcoinCash"; } - /** @name XcmV3JunctionBodyId (96) */ + /** @name XcmV3JunctionBodyId (97) */ interface XcmV3JunctionBodyId extends Enum { readonly isUnit: boolean; readonly isMoniker: boolean; @@ -1722,7 +1792,7 @@ declare module "@polkadot/types/lookup" { | "Treasury"; } - /** @name XcmV3JunctionBodyPart (97) */ + /** @name XcmV3JunctionBodyPart (98) */ interface XcmV3JunctionBodyPart extends Enum { readonly isVoice: boolean; readonly isMembers: boolean; @@ -1747,10 +1817,10 @@ declare module "@polkadot/types/lookup" { readonly type: "Voice" | "Members" | "Fraction" | "AtLeastProportion" | "MoreThanProportion"; } - /** @name XcmV3Xcm (98) */ + /** @name XcmV3Xcm (99) */ interface XcmV3Xcm extends Vec {} - /** @name XcmV3Instruction (100) */ + /** @name XcmV3Instruction (101) */ interface XcmV3Instruction extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: XcmV3MultiassetMultiAssets; @@ -1980,16 +2050,16 @@ declare module "@polkadot/types/lookup" { | "UnpaidExecution"; } - /** @name XcmV3MultiassetMultiAssets (101) */ + /** @name XcmV3MultiassetMultiAssets (102) */ interface XcmV3MultiassetMultiAssets extends Vec {} - /** @name XcmV3MultiAsset (103) */ + /** @name XcmV3MultiAsset (104) */ interface XcmV3MultiAsset extends Struct { readonly id: XcmV3MultiassetAssetId; readonly fun: XcmV3MultiassetFungibility; } - /** @name XcmV3MultiassetAssetId (104) */ + /** @name XcmV3MultiassetAssetId (105) */ interface XcmV3MultiassetAssetId extends Enum { readonly isConcrete: boolean; readonly asConcrete: XcmV3MultiLocation; @@ -1998,7 +2068,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Concrete" | "Abstract"; } - /** @name XcmV3MultiassetFungibility (105) */ + /** @name XcmV3MultiassetFungibility (106) */ interface XcmV3MultiassetFungibility extends Enum { readonly isFungible: boolean; readonly asFungible: Compact; @@ -2007,7 +2077,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV3MultiassetAssetInstance (106) */ + /** @name XcmV3MultiassetAssetInstance (107) */ interface XcmV3MultiassetAssetInstance extends Enum { readonly isUndefined: boolean; readonly isIndex: boolean; @@ -2023,7 +2093,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Undefined" | "Index" | "Array4" | "Array8" | "Array16" | "Array32"; } - /** @name XcmV3Response (109) */ + /** @name XcmV3Response (110) */ interface XcmV3Response extends Enum { readonly isNull: boolean; readonly isAssets: boolean; @@ -2045,7 +2115,7 @@ declare module "@polkadot/types/lookup" { | "DispatchResult"; } - /** @name XcmV3PalletInfo (113) */ + /** @name XcmV3PalletInfo (114) */ interface XcmV3PalletInfo extends Struct { readonly index: Compact; readonly name: Bytes; @@ -2055,7 +2125,7 @@ declare module "@polkadot/types/lookup" { readonly patch: Compact; } - /** @name XcmV3MaybeErrorCode (116) */ + /** @name XcmV3MaybeErrorCode (117) */ interface XcmV3MaybeErrorCode extends Enum { readonly isSuccess: boolean; readonly isError: boolean; @@ -2065,7 +2135,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Success" | "Error" | "TruncatedError"; } - /** @name XcmV2OriginKind (119) */ + /** @name XcmV2OriginKind (120) */ interface XcmV2OriginKind extends Enum { readonly isNative: boolean; readonly isSovereignAccount: boolean; @@ -2074,19 +2144,19 @@ declare module "@polkadot/types/lookup" { readonly type: "Native" | "SovereignAccount" | "Superuser" | "Xcm"; } - /** @name XcmDoubleEncoded (120) */ + /** @name XcmDoubleEncoded (121) */ interface XcmDoubleEncoded extends Struct { readonly encoded: Bytes; } - /** @name XcmV3QueryResponseInfo (121) */ + /** @name XcmV3QueryResponseInfo (122) */ interface XcmV3QueryResponseInfo extends Struct { readonly destination: XcmV3MultiLocation; readonly queryId: Compact; readonly maxWeight: SpWeightsWeightV2Weight; } - /** @name XcmV3MultiassetMultiAssetFilter (122) */ + /** @name XcmV3MultiassetMultiAssetFilter (123) */ interface XcmV3MultiassetMultiAssetFilter extends Enum { readonly isDefinite: boolean; readonly asDefinite: XcmV3MultiassetMultiAssets; @@ -2095,7 +2165,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Definite" | "Wild"; } - /** @name XcmV3MultiassetWildMultiAsset (123) */ + /** @name XcmV3MultiassetWildMultiAsset (124) */ interface XcmV3MultiassetWildMultiAsset extends Enum { readonly isAll: boolean; readonly isAllOf: boolean; @@ -2114,14 +2184,14 @@ declare module "@polkadot/types/lookup" { readonly type: "All" | "AllOf" | "AllCounted" | "AllOfCounted"; } - /** @name XcmV3MultiassetWildFungibility (124) */ + /** @name XcmV3MultiassetWildFungibility (125) */ interface XcmV3MultiassetWildFungibility extends Enum { readonly isFungible: boolean; readonly isNonFungible: boolean; readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV3WeightLimit (125) */ + /** @name XcmV3WeightLimit (126) */ interface XcmV3WeightLimit extends Enum { readonly isUnlimited: boolean; readonly isLimited: boolean; @@ -2129,7 +2199,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Unlimited" | "Limited"; } - /** @name XcmVersionedMultiAssets (126) */ + /** @name XcmVersionedMultiAssets (127) */ interface XcmVersionedMultiAssets extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiassetMultiAssets; @@ -2138,16 +2208,16 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name XcmV2MultiassetMultiAssets (127) */ + /** @name XcmV2MultiassetMultiAssets (128) */ interface XcmV2MultiassetMultiAssets extends Vec {} - /** @name XcmV2MultiAsset (129) */ + /** @name XcmV2MultiAsset (130) */ interface XcmV2MultiAsset extends Struct { readonly id: XcmV2MultiassetAssetId; readonly fun: XcmV2MultiassetFungibility; } - /** @name XcmV2MultiassetAssetId (130) */ + /** @name XcmV2MultiassetAssetId (131) */ interface XcmV2MultiassetAssetId extends Enum { readonly isConcrete: boolean; readonly asConcrete: XcmV2MultiLocation; @@ -2156,13 +2226,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Concrete" | "Abstract"; } - /** @name XcmV2MultiLocation (131) */ + /** @name XcmV2MultiLocation (132) */ interface XcmV2MultiLocation extends Struct { readonly parents: u8; readonly interior: XcmV2MultilocationJunctions; } - /** @name XcmV2MultilocationJunctions (132) */ + /** @name XcmV2MultilocationJunctions (133) */ interface XcmV2MultilocationJunctions extends Enum { readonly isHere: boolean; readonly isX1: boolean; @@ -2209,7 +2279,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Here" | "X1" | "X2" | "X3" | "X4" | "X5" | "X6" | "X7" | "X8"; } - /** @name XcmV2Junction (133) */ + /** @name XcmV2Junction (134) */ interface XcmV2Junction extends Enum { readonly isParachain: boolean; readonly asParachain: Compact; @@ -2252,7 +2322,7 @@ declare module "@polkadot/types/lookup" { | "Plurality"; } - /** @name XcmV2NetworkId (134) */ + /** @name XcmV2NetworkId (135) */ interface XcmV2NetworkId extends Enum { readonly isAny: boolean; readonly isNamed: boolean; @@ -2262,7 +2332,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Any" | "Named" | "Polkadot" | "Kusama"; } - /** @name XcmV2BodyId (136) */ + /** @name XcmV2BodyId (137) */ interface XcmV2BodyId extends Enum { readonly isUnit: boolean; readonly isNamed: boolean; @@ -2289,7 +2359,7 @@ declare module "@polkadot/types/lookup" { | "Treasury"; } - /** @name XcmV2BodyPart (137) */ + /** @name XcmV2BodyPart (138) */ interface XcmV2BodyPart extends Enum { readonly isVoice: boolean; readonly isMembers: boolean; @@ -2314,7 +2384,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Voice" | "Members" | "Fraction" | "AtLeastProportion" | "MoreThanProportion"; } - /** @name XcmV2MultiassetFungibility (138) */ + /** @name XcmV2MultiassetFungibility (139) */ interface XcmV2MultiassetFungibility extends Enum { readonly isFungible: boolean; readonly asFungible: Compact; @@ -2323,7 +2393,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV2MultiassetAssetInstance (139) */ + /** @name XcmV2MultiassetAssetInstance (140) */ interface XcmV2MultiassetAssetInstance extends Enum { readonly isUndefined: boolean; readonly isIndex: boolean; @@ -2341,7 +2411,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Undefined" | "Index" | "Array4" | "Array8" | "Array16" | "Array32" | "Blob"; } - /** @name XcmVersionedMultiLocation (140) */ + /** @name XcmVersionedMultiLocation (141) */ interface XcmVersionedMultiLocation extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiLocation; @@ -2350,7 +2420,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletAssetsEvent (141) */ + /** @name PalletAssetsEvent (142) */ interface PalletAssetsEvent extends Enum { readonly isCreated: boolean; readonly asCreated: { @@ -2474,6 +2544,17 @@ declare module "@polkadot/types/lookup" { readonly assetId: u128; readonly newMinBalance: u128; } & Struct; + readonly isTouched: boolean; + readonly asTouched: { + readonly assetId: u128; + readonly who: AccountId20; + readonly depositor: AccountId20; + } & Struct; + readonly isBlocked: boolean; + readonly asBlocked: { + readonly assetId: u128; + readonly who: AccountId20; + } & Struct; readonly type: | "Created" | "Issued" @@ -2496,10 +2577,12 @@ declare module "@polkadot/types/lookup" { | "ApprovalCancelled" | "TransferredApproved" | "AssetStatusChanged" - | "AssetMinBalanceChanged"; + | "AssetMinBalanceChanged" + | "Touched" + | "Blocked"; } - /** @name OrmlXtokensModuleEvent (142) */ + /** @name OrmlXtokensModuleEvent (143) */ interface OrmlXtokensModuleEvent extends Enum { readonly isTransferredMultiAssets: boolean; readonly asTransferredMultiAssets: { @@ -2511,7 +2594,7 @@ declare module "@polkadot/types/lookup" { readonly type: "TransferredMultiAssets"; } - /** @name PalletAssetManagerEvent (143) */ + /** @name PalletAssetManagerEvent (144) */ interface PalletAssetManagerEvent extends Enum { readonly isForeignAssetRegistered: boolean; readonly asForeignAssetRegistered: { @@ -2564,14 +2647,14 @@ declare module "@polkadot/types/lookup" { | "LocalAssetDestroyed"; } - /** @name MoonbaseRuntimeXcmConfigAssetType (144) */ + /** @name MoonbaseRuntimeXcmConfigAssetType (145) */ interface MoonbaseRuntimeXcmConfigAssetType extends Enum { readonly isXcm: boolean; readonly asXcm: XcmV3MultiLocation; readonly type: "Xcm"; } - /** @name MoonbaseRuntimeAssetConfigAssetRegistrarMetadata (145) */ + /** @name MoonbaseRuntimeAssetConfigAssetRegistrarMetadata (146) */ interface MoonbaseRuntimeAssetConfigAssetRegistrarMetadata extends Struct { readonly name: Bytes; readonly symbol: Bytes; @@ -2579,7 +2662,7 @@ declare module "@polkadot/types/lookup" { readonly isFrozen: bool; } - /** @name PalletMigrationsEvent (146) */ + /** @name PalletMigrationsEvent (147) */ interface PalletMigrationsEvent extends Enum { readonly isRuntimeUpgradeStarted: boolean; readonly isRuntimeUpgradeCompleted: boolean; @@ -2612,7 +2695,7 @@ declare module "@polkadot/types/lookup" { | "FailedToResumeIdleXcmExecution"; } - /** @name PalletXcmTransactorEvent (147) */ + /** @name PalletXcmTransactorEvent (148) */ interface PalletXcmTransactorEvent extends Enum { readonly isTransactedDerivative: boolean; readonly asTransactedDerivative: { @@ -2682,14 +2765,14 @@ declare module "@polkadot/types/lookup" { | "HrmpManagementSent"; } - /** @name PalletXcmTransactorRemoteTransactInfoWithMaxWeight (148) */ + /** @name PalletXcmTransactorRemoteTransactInfoWithMaxWeight (149) */ interface PalletXcmTransactorRemoteTransactInfoWithMaxWeight extends Struct { readonly transactExtraWeight: SpWeightsWeightV2Weight; readonly maxWeight: SpWeightsWeightV2Weight; readonly transactExtraWeightSigned: Option; } - /** @name PalletXcmTransactorHrmpOperation (150) */ + /** @name PalletXcmTransactorHrmpOperation (151) */ interface PalletXcmTransactorHrmpOperation extends Enum { readonly isInitOpen: boolean; readonly asInitOpen: PalletXcmTransactorHrmpInitParams; @@ -2707,20 +2790,20 @@ declare module "@polkadot/types/lookup" { readonly type: "InitOpen" | "Accept" | "Close" | "Cancel"; } - /** @name PalletXcmTransactorHrmpInitParams (151) */ + /** @name PalletXcmTransactorHrmpInitParams (152) */ interface PalletXcmTransactorHrmpInitParams extends Struct { readonly paraId: u32; readonly proposedMaxCapacity: u32; readonly proposedMaxMessageSize: u32; } - /** @name PolkadotParachainPrimitivesHrmpChannelId (152) */ + /** @name PolkadotParachainPrimitivesHrmpChannelId (153) */ interface PolkadotParachainPrimitivesHrmpChannelId extends Struct { readonly sender: u32; readonly recipient: u32; } - /** @name PalletMoonbeamOrbitersEvent (154) */ + /** @name PalletMoonbeamOrbitersEvent (155) */ interface PalletMoonbeamOrbitersEvent extends Enum { readonly isOrbiterJoinCollatorPool: boolean; readonly asOrbiterJoinCollatorPool: { @@ -2761,7 +2844,7 @@ declare module "@polkadot/types/lookup" { | "OrbiterUnregistered"; } - /** @name PalletRandomnessEvent (155) */ + /** @name PalletRandomnessEvent (156) */ interface PalletRandomnessEvent extends Enum { readonly isRandomnessRequestedBabeEpoch: boolean; readonly asRandomnessRequestedBabeEpoch: { @@ -2806,7 +2889,7 @@ declare module "@polkadot/types/lookup" { | "RequestExpirationExecuted"; } - /** @name PalletConvictionVotingEvent (157) */ + /** @name PalletConvictionVotingEvent (158) */ interface PalletConvictionVotingEvent extends Enum { readonly isDelegated: boolean; readonly asDelegated: ITuple<[AccountId20, AccountId20]>; @@ -2815,7 +2898,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Delegated" | "Undelegated"; } - /** @name PalletReferendaEvent (158) */ + /** @name PalletReferendaEvent (159) */ interface PalletReferendaEvent extends Enum { readonly isSubmitted: boolean; readonly asSubmitted: { @@ -2919,7 +3002,7 @@ declare module "@polkadot/types/lookup" { | "MetadataCleared"; } - /** @name FrameSupportPreimagesBounded (159) */ + /** @name FrameSupportPreimagesBounded (160) */ interface FrameSupportPreimagesBounded extends Enum { readonly isLegacy: boolean; readonly asLegacy: { @@ -2935,7 +3018,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Legacy" | "Inline" | "Lookup"; } - /** @name FrameSystemCall (161) */ + /** @name FrameSystemCall (162) */ interface FrameSystemCall extends Enum { readonly isRemark: boolean; readonly asRemark: { @@ -2981,7 +3064,7 @@ declare module "@polkadot/types/lookup" { | "RemarkWithEvent"; } - /** @name PalletUtilityCall (165) */ + /** @name PalletUtilityCall (166) */ interface PalletUtilityCall extends Enum { readonly isBatch: boolean; readonly asBatch: { @@ -3019,7 +3102,7 @@ declare module "@polkadot/types/lookup" { | "WithWeight"; } - /** @name MoonbaseRuntimeOriginCaller (167) */ + /** @name MoonbaseRuntimeOriginCaller (168) */ interface MoonbaseRuntimeOriginCaller extends Enum { readonly isSystem: boolean; readonly asSystem: FrameSupportDispatchRawOrigin; @@ -3056,7 +3139,7 @@ declare module "@polkadot/types/lookup" { | "OpenTechCommitteeCollective"; } - /** @name FrameSupportDispatchRawOrigin (168) */ + /** @name FrameSupportDispatchRawOrigin (169) */ interface FrameSupportDispatchRawOrigin extends Enum { readonly isRoot: boolean; readonly isSigned: boolean; @@ -3065,14 +3148,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Root" | "Signed" | "None"; } - /** @name PalletEthereumRawOrigin (169) */ + /** @name PalletEthereumRawOrigin (170) */ interface PalletEthereumRawOrigin extends Enum { readonly isEthereumTransaction: boolean; readonly asEthereumTransaction: H160; readonly type: "EthereumTransaction"; } - /** @name PalletCollectiveRawOrigin (170) */ + /** @name PalletCollectiveRawOrigin (171) */ interface PalletCollectiveRawOrigin extends Enum { readonly isMembers: boolean; readonly asMembers: ITuple<[u32, u32]>; @@ -3082,7 +3165,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Members" | "Member" | "Phantom"; } - /** @name CumulusPalletXcmOrigin (172) */ + /** @name CumulusPalletXcmOrigin (173) */ interface CumulusPalletXcmOrigin extends Enum { readonly isRelay: boolean; readonly isSiblingParachain: boolean; @@ -3090,7 +3173,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Relay" | "SiblingParachain"; } - /** @name PalletXcmOrigin (173) */ + /** @name PalletXcmOrigin (174) */ interface PalletXcmOrigin extends Enum { readonly isXcm: boolean; readonly asXcm: XcmV3MultiLocation; @@ -3099,14 +3182,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Xcm" | "Response"; } - /** @name PalletEthereumXcmRawOrigin (174) */ + /** @name PalletEthereumXcmRawOrigin (175) */ interface PalletEthereumXcmRawOrigin extends Enum { readonly isXcmEthereumTransaction: boolean; readonly asXcmEthereumTransaction: H160; readonly type: "XcmEthereumTransaction"; } - /** @name MoonbaseRuntimeGovernanceOriginsCustomOriginsOrigin (176) */ + /** @name MoonbaseRuntimeGovernanceOriginsCustomOriginsOrigin (177) */ interface MoonbaseRuntimeGovernanceOriginsCustomOriginsOrigin extends Enum { readonly isWhitelistedCaller: boolean; readonly isGeneralAdmin: boolean; @@ -3119,10 +3202,10 @@ declare module "@polkadot/types/lookup" { | "ReferendumKiller"; } - /** @name SpCoreVoid (178) */ + /** @name SpCoreVoid (179) */ type SpCoreVoid = Null; - /** @name PalletTimestampCall (179) */ + /** @name PalletTimestampCall (180) */ interface PalletTimestampCall extends Enum { readonly isSet: boolean; readonly asSet: { @@ -3131,18 +3214,18 @@ declare module "@polkadot/types/lookup" { readonly type: "Set"; } - /** @name PalletBalancesCall (180) */ + /** @name PalletBalancesCall (181) */ interface PalletBalancesCall extends Enum { - readonly isTransfer: boolean; - readonly asTransfer: { + readonly isTransferAllowDeath: boolean; + readonly asTransferAllowDeath: { readonly dest: AccountId20; readonly value: Compact; } & Struct; - readonly isSetBalance: boolean; - readonly asSetBalance: { + readonly isSetBalanceDeprecated: boolean; + readonly asSetBalanceDeprecated: { readonly who: AccountId20; readonly newFree: Compact; - readonly newReserved: Compact; + readonly oldReserved: Compact; } & Struct; readonly isForceTransfer: boolean; readonly asForceTransfer: { @@ -3165,16 +3248,33 @@ declare module "@polkadot/types/lookup" { readonly who: AccountId20; readonly amount: u128; } & Struct; + readonly isUpgradeAccounts: boolean; + readonly asUpgradeAccounts: { + readonly who: Vec; + } & Struct; + readonly isTransfer: boolean; + readonly asTransfer: { + readonly dest: AccountId20; + readonly value: Compact; + } & Struct; + readonly isForceSetBalance: boolean; + readonly asForceSetBalance: { + readonly who: AccountId20; + readonly newFree: Compact; + } & Struct; readonly type: - | "Transfer" - | "SetBalance" + | "TransferAllowDeath" + | "SetBalanceDeprecated" | "ForceTransfer" | "TransferKeepAlive" | "TransferAll" - | "ForceUnreserve"; + | "ForceUnreserve" + | "UpgradeAccounts" + | "Transfer" + | "ForceSetBalance"; } - /** @name PalletSudoCall (181) */ + /** @name PalletSudoCall (183) */ interface PalletSudoCall extends Enum { readonly isSudo: boolean; readonly asSudo: { @@ -3197,7 +3297,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Sudo" | "SudoUncheckedWeight" | "SetKey" | "SudoAs"; } - /** @name CumulusPalletParachainSystemCall (182) */ + /** @name CumulusPalletParachainSystemCall (184) */ interface CumulusPalletParachainSystemCall extends Enum { readonly isSetValidationData: boolean; readonly asSetValidationData: { @@ -3223,40 +3323,40 @@ declare module "@polkadot/types/lookup" { | "EnactAuthorizedUpgrade"; } - /** @name CumulusPrimitivesParachainInherentParachainInherentData (183) */ + /** @name CumulusPrimitivesParachainInherentParachainInherentData (185) */ interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct { - readonly validationData: PolkadotPrimitivesV2PersistedValidationData; + readonly validationData: PolkadotPrimitivesV4PersistedValidationData; readonly relayChainState: SpTrieStorageProof; readonly downwardMessages: Vec; readonly horizontalMessages: BTreeMap>; } - /** @name PolkadotPrimitivesV2PersistedValidationData (184) */ - interface PolkadotPrimitivesV2PersistedValidationData extends Struct { + /** @name PolkadotPrimitivesV4PersistedValidationData (186) */ + interface PolkadotPrimitivesV4PersistedValidationData extends Struct { readonly parentHead: Bytes; readonly relayParentNumber: u32; readonly relayParentStorageRoot: H256; readonly maxPovSize: u32; } - /** @name SpTrieStorageProof (186) */ + /** @name SpTrieStorageProof (188) */ interface SpTrieStorageProof extends Struct { readonly trieNodes: BTreeSet; } - /** @name PolkadotCorePrimitivesInboundDownwardMessage (189) */ + /** @name PolkadotCorePrimitivesInboundDownwardMessage (191) */ interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct { readonly sentAt: u32; readonly msg: Bytes; } - /** @name PolkadotCorePrimitivesInboundHrmpMessage (192) */ + /** @name PolkadotCorePrimitivesInboundHrmpMessage (194) */ interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct { readonly sentAt: u32; readonly data: Bytes; } - /** @name PalletEvmCall (195) */ + /** @name PalletEvmCall (197) */ interface PalletEvmCall extends Enum { readonly isWithdraw: boolean; readonly asWithdraw: { @@ -3301,7 +3401,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Withdraw" | "Call" | "Create" | "Create2"; } - /** @name PalletEthereumCall (201) */ + /** @name PalletEthereumCall (203) */ interface PalletEthereumCall extends Enum { readonly isTransact: boolean; readonly asTransact: { @@ -3310,7 +3410,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Transact"; } - /** @name EthereumTransactionTransactionV2 (202) */ + /** @name EthereumTransactionTransactionV2 (204) */ interface EthereumTransactionTransactionV2 extends Enum { readonly isLegacy: boolean; readonly asLegacy: EthereumTransactionLegacyTransaction; @@ -3321,7 +3421,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Legacy" | "Eip2930" | "Eip1559"; } - /** @name EthereumTransactionLegacyTransaction (203) */ + /** @name EthereumTransactionLegacyTransaction (205) */ interface EthereumTransactionLegacyTransaction extends Struct { readonly nonce: U256; readonly gasPrice: U256; @@ -3332,7 +3432,7 @@ declare module "@polkadot/types/lookup" { readonly signature: EthereumTransactionTransactionSignature; } - /** @name EthereumTransactionTransactionAction (204) */ + /** @name EthereumTransactionTransactionAction (206) */ interface EthereumTransactionTransactionAction extends Enum { readonly isCall: boolean; readonly asCall: H160; @@ -3340,14 +3440,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Call" | "Create"; } - /** @name EthereumTransactionTransactionSignature (205) */ + /** @name EthereumTransactionTransactionSignature (207) */ interface EthereumTransactionTransactionSignature extends Struct { readonly v: u64; readonly r: H256; readonly s: H256; } - /** @name EthereumTransactionEip2930Transaction (207) */ + /** @name EthereumTransactionEip2930Transaction (209) */ interface EthereumTransactionEip2930Transaction extends Struct { readonly chainId: u64; readonly nonce: U256; @@ -3362,13 +3462,13 @@ declare module "@polkadot/types/lookup" { readonly s: H256; } - /** @name EthereumTransactionAccessListItem (209) */ + /** @name EthereumTransactionAccessListItem (211) */ interface EthereumTransactionAccessListItem extends Struct { readonly address: H160; readonly storageKeys: Vec; } - /** @name EthereumTransactionEip1559Transaction (210) */ + /** @name EthereumTransactionEip1559Transaction (212) */ interface EthereumTransactionEip1559Transaction extends Struct { readonly chainId: u64; readonly nonce: U256; @@ -3384,7 +3484,7 @@ declare module "@polkadot/types/lookup" { readonly s: H256; } - /** @name PalletParachainStakingCall (211) */ + /** @name PalletParachainStakingCall (213) */ interface PalletParachainStakingCall extends Enum { readonly isSetStakingExpectations: boolean; readonly asSetStakingExpectations: { @@ -3471,13 +3571,9 @@ declare module "@polkadot/types/lookup" { readonly candidateAutoCompoundingDelegationCount: u32; readonly delegationCount: u32; } & Struct; - readonly isScheduleLeaveDelegators: boolean; - readonly isExecuteLeaveDelegators: boolean; - readonly asExecuteLeaveDelegators: { - readonly delegator: AccountId20; - readonly delegationCount: u32; - } & Struct; - readonly isCancelLeaveDelegators: boolean; + readonly isRemovedCall19: boolean; + readonly isRemovedCall20: boolean; + readonly isRemovedCall21: boolean; readonly isScheduleRevokeDelegation: boolean; readonly asScheduleRevokeDelegation: { readonly collator: AccountId20; @@ -3532,9 +3628,9 @@ declare module "@polkadot/types/lookup" { | "CancelCandidateBondLess" | "Delegate" | "DelegateWithAutoCompound" - | "ScheduleLeaveDelegators" - | "ExecuteLeaveDelegators" - | "CancelLeaveDelegators" + | "RemovedCall19" + | "RemovedCall20" + | "RemovedCall21" | "ScheduleRevokeDelegation" | "DelegatorBondMore" | "ScheduleDelegatorBondLess" @@ -3544,7 +3640,7 @@ declare module "@polkadot/types/lookup" { | "HotfixRemoveDelegationRequestsExitedCandidates"; } - /** @name PalletSchedulerCall (215) */ + /** @name PalletSchedulerCall (216) */ interface PalletSchedulerCall extends Enum { readonly isSchedule: boolean; readonly asSchedule: { @@ -3594,7 +3690,7 @@ declare module "@polkadot/types/lookup" { | "ScheduleNamedAfter"; } - /** @name PalletDemocracyCall (217) */ + /** @name PalletDemocracyCall (218) */ interface PalletDemocracyCall extends Enum { readonly isPropose: boolean; readonly asPropose: { @@ -3697,7 +3793,7 @@ declare module "@polkadot/types/lookup" { | "SetMetadata"; } - /** @name PalletDemocracyConviction (218) */ + /** @name PalletDemocracyConviction (219) */ interface PalletDemocracyConviction extends Enum { readonly isNone: boolean; readonly isLocked1x: boolean; @@ -3716,7 +3812,7 @@ declare module "@polkadot/types/lookup" { | "Locked6x"; } - /** @name PalletCollectiveCall (221) */ + /** @name PalletCollectiveCall (222) */ interface PalletCollectiveCall extends Enum { readonly isSetMembers: boolean; readonly asSetMembers: { @@ -3741,13 +3837,6 @@ declare module "@polkadot/types/lookup" { readonly index: Compact; readonly approve: bool; } & Struct; - readonly isCloseOldWeight: boolean; - readonly asCloseOldWeight: { - readonly proposalHash: H256; - readonly index: Compact; - readonly proposalWeightBound: Compact; - readonly lengthBound: Compact; - } & Struct; readonly isDisapproveProposal: boolean; readonly asDisapproveProposal: { readonly proposalHash: H256; @@ -3759,17 +3848,10 @@ declare module "@polkadot/types/lookup" { readonly proposalWeightBound: SpWeightsWeightV2Weight; readonly lengthBound: Compact; } & Struct; - readonly type: - | "SetMembers" - | "Execute" - | "Propose" - | "Vote" - | "CloseOldWeight" - | "DisapproveProposal" - | "Close"; + readonly type: "SetMembers" | "Execute" | "Propose" | "Vote" | "DisapproveProposal" | "Close"; } - /** @name PalletTreasuryCall (225) */ + /** @name PalletTreasuryCall (224) */ interface PalletTreasuryCall extends Enum { readonly isProposeSpend: boolean; readonly asProposeSpend: { @@ -3801,13 +3883,13 @@ declare module "@polkadot/types/lookup" { | "RemoveApproval"; } - /** @name PalletAuthorInherentCall (226) */ + /** @name PalletAuthorInherentCall (225) */ interface PalletAuthorInherentCall extends Enum { readonly isKickOffAuthorshipValidation: boolean; readonly type: "KickOffAuthorshipValidation"; } - /** @name PalletAuthorSlotFilterCall (227) */ + /** @name PalletAuthorSlotFilterCall (226) */ interface PalletAuthorSlotFilterCall extends Enum { readonly isSetEligible: boolean; readonly asSetEligible: { @@ -3816,7 +3898,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SetEligible"; } - /** @name PalletCrowdloanRewardsCall (228) */ + /** @name PalletCrowdloanRewardsCall (227) */ interface PalletCrowdloanRewardsCall extends Enum { readonly isAssociateNativeIdentity: boolean; readonly asAssociateNativeIdentity: { @@ -3852,7 +3934,7 @@ declare module "@polkadot/types/lookup" { | "InitializeRewardVec"; } - /** @name SpRuntimeMultiSignature (229) */ + /** @name SpRuntimeMultiSignature (228) */ interface SpRuntimeMultiSignature extends Enum { readonly isEd25519: boolean; readonly asEd25519: SpCoreEd25519Signature; @@ -3863,16 +3945,16 @@ declare module "@polkadot/types/lookup" { readonly type: "Ed25519" | "Sr25519" | "Ecdsa"; } - /** @name SpCoreEd25519Signature (230) */ + /** @name SpCoreEd25519Signature (229) */ interface SpCoreEd25519Signature extends U8aFixed {} - /** @name SpCoreSr25519Signature (232) */ + /** @name SpCoreSr25519Signature (231) */ interface SpCoreSr25519Signature extends U8aFixed {} - /** @name SpCoreEcdsaSignature (233) */ + /** @name SpCoreEcdsaSignature (232) */ interface SpCoreEcdsaSignature extends U8aFixed {} - /** @name PalletAuthorMappingCall (239) */ + /** @name PalletAuthorMappingCall (238) */ interface PalletAuthorMappingCall extends Enum { readonly isAddAssociation: boolean; readonly asAddAssociation: { @@ -3900,7 +3982,7 @@ declare module "@polkadot/types/lookup" { | "SetKeys"; } - /** @name PalletProxyCall (240) */ + /** @name PalletProxyCall (239) */ interface PalletProxyCall extends Enum { readonly isProxy: boolean; readonly asProxy: { @@ -3970,14 +4052,14 @@ declare module "@polkadot/types/lookup" { | "ProxyAnnounced"; } - /** @name PalletMaintenanceModeCall (242) */ + /** @name PalletMaintenanceModeCall (241) */ interface PalletMaintenanceModeCall extends Enum { readonly isEnterMaintenanceMode: boolean; readonly isResumeNormalOperation: boolean; readonly type: "EnterMaintenanceMode" | "ResumeNormalOperation"; } - /** @name PalletIdentityCall (243) */ + /** @name PalletIdentityCall (242) */ interface PalletIdentityCall extends Enum { readonly isAddRegistrar: boolean; readonly asAddRegistrar: { @@ -4060,7 +4142,7 @@ declare module "@polkadot/types/lookup" { | "QuitSub"; } - /** @name PalletIdentityIdentityInfo (244) */ + /** @name PalletIdentityIdentityInfo (243) */ interface PalletIdentityIdentityInfo extends Struct { readonly additional: Vec>; readonly display: Data; @@ -4073,7 +4155,7 @@ declare module "@polkadot/types/lookup" { readonly twitter: Data; } - /** @name PalletIdentityBitFlags (280) */ + /** @name PalletIdentityBitFlags (279) */ interface PalletIdentityBitFlags extends Set { readonly isDisplay: boolean; readonly isLegal: boolean; @@ -4085,7 +4167,7 @@ declare module "@polkadot/types/lookup" { readonly isTwitter: boolean; } - /** @name PalletIdentityIdentityField (281) */ + /** @name PalletIdentityIdentityField (280) */ interface PalletIdentityIdentityField extends Enum { readonly isDisplay: boolean; readonly isLegal: boolean; @@ -4106,7 +4188,7 @@ declare module "@polkadot/types/lookup" { | "Twitter"; } - /** @name PalletIdentityJudgement (282) */ + /** @name PalletIdentityJudgement (281) */ interface PalletIdentityJudgement extends Enum { readonly isUnknown: boolean; readonly isFeePaid: boolean; @@ -4126,7 +4208,7 @@ declare module "@polkadot/types/lookup" { | "Erroneous"; } - /** @name CumulusPalletXcmpQueueCall (283) */ + /** @name CumulusPalletXcmpQueueCall (282) */ interface CumulusPalletXcmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -4171,7 +4253,7 @@ declare module "@polkadot/types/lookup" { | "UpdateXcmpMaxIndividualWeight"; } - /** @name CumulusPalletDmpQueueCall (284) */ + /** @name CumulusPalletDmpQueueCall (283) */ interface CumulusPalletDmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -4181,7 +4263,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ServiceOverweight"; } - /** @name PalletXcmCall (285) */ + /** @name PalletXcmCall (284) */ interface PalletXcmCall extends Enum { readonly isSend: boolean; readonly asSend: { @@ -4258,7 +4340,7 @@ declare module "@polkadot/types/lookup" { | "ForceSuspension"; } - /** @name XcmVersionedXcm (286) */ + /** @name XcmVersionedXcm (285) */ interface XcmVersionedXcm extends Enum { readonly isV2: boolean; readonly asV2: XcmV2Xcm; @@ -4267,10 +4349,10 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name XcmV2Xcm (287) */ + /** @name XcmV2Xcm (286) */ interface XcmV2Xcm extends Vec {} - /** @name XcmV2Instruction (289) */ + /** @name XcmV2Instruction (288) */ interface XcmV2Instruction extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: XcmV2MultiassetMultiAssets; @@ -4418,7 +4500,7 @@ declare module "@polkadot/types/lookup" { | "UnsubscribeVersion"; } - /** @name XcmV2Response (290) */ + /** @name XcmV2Response (289) */ interface XcmV2Response extends Enum { readonly isNull: boolean; readonly isAssets: boolean; @@ -4430,7 +4512,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Null" | "Assets" | "ExecutionResult" | "Version"; } - /** @name XcmV2TraitsError (293) */ + /** @name XcmV2TraitsError (292) */ interface XcmV2TraitsError extends Enum { readonly isOverflow: boolean; readonly isUnimplemented: boolean; @@ -4489,7 +4571,7 @@ declare module "@polkadot/types/lookup" { | "WeightNotComputable"; } - /** @name XcmV2MultiassetMultiAssetFilter (294) */ + /** @name XcmV2MultiassetMultiAssetFilter (293) */ interface XcmV2MultiassetMultiAssetFilter extends Enum { readonly isDefinite: boolean; readonly asDefinite: XcmV2MultiassetMultiAssets; @@ -4498,7 +4580,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Definite" | "Wild"; } - /** @name XcmV2MultiassetWildMultiAsset (295) */ + /** @name XcmV2MultiassetWildMultiAsset (294) */ interface XcmV2MultiassetWildMultiAsset extends Enum { readonly isAll: boolean; readonly isAllOf: boolean; @@ -4509,14 +4591,14 @@ declare module "@polkadot/types/lookup" { readonly type: "All" | "AllOf"; } - /** @name XcmV2MultiassetWildFungibility (296) */ + /** @name XcmV2MultiassetWildFungibility (295) */ interface XcmV2MultiassetWildFungibility extends Enum { readonly isFungible: boolean; readonly isNonFungible: boolean; readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV2WeightLimit (297) */ + /** @name XcmV2WeightLimit (296) */ interface XcmV2WeightLimit extends Enum { readonly isUnlimited: boolean; readonly isLimited: boolean; @@ -4524,7 +4606,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Unlimited" | "Limited"; } - /** @name PalletAssetsCall (306) */ + /** @name PalletAssetsCall (305) */ interface PalletAssetsCall extends Enum { readonly isCreate: boolean; readonly asCreate: { @@ -4688,6 +4770,21 @@ declare module "@polkadot/types/lookup" { readonly id: Compact; readonly minBalance: u128; } & Struct; + readonly isTouchOther: boolean; + readonly asTouchOther: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; + readonly isRefundOther: boolean; + readonly asRefundOther: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; + readonly isBlock: boolean; + readonly asBlock: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; readonly type: | "Create" | "ForceCreate" @@ -4717,10 +4814,13 @@ declare module "@polkadot/types/lookup" { | "TransferApproved" | "Touch" | "Refund" - | "SetMinBalance"; + | "SetMinBalance" + | "TouchOther" + | "RefundOther" + | "Block"; } - /** @name OrmlXtokensModuleCall (307) */ + /** @name OrmlXtokensModuleCall (306) */ interface OrmlXtokensModuleCall extends Enum { readonly isTransfer: boolean; readonly asTransfer: { @@ -4773,7 +4873,7 @@ declare module "@polkadot/types/lookup" { | "TransferMultiassets"; } - /** @name MoonbaseRuntimeXcmConfigCurrencyId (308) */ + /** @name MoonbaseRuntimeXcmConfigCurrencyId (307) */ interface MoonbaseRuntimeXcmConfigCurrencyId extends Enum { readonly isSelfReserve: boolean; readonly isForeignAsset: boolean; @@ -4787,7 +4887,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SelfReserve" | "ForeignAsset" | "LocalAssetReserve" | "Erc20"; } - /** @name XcmVersionedMultiAsset (309) */ + /** @name XcmVersionedMultiAsset (308) */ interface XcmVersionedMultiAsset extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiAsset; @@ -4796,7 +4896,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletAssetManagerCall (312) */ + /** @name PalletAssetManagerCall (311) */ interface PalletAssetManagerCall extends Enum { readonly isRegisterForeignAsset: boolean; readonly asRegisterForeignAsset: { @@ -4854,17 +4954,7 @@ declare module "@polkadot/types/lookup" { | "DestroyLocalAsset"; } - /** @name PalletMigrationsCall (313) */ - interface PalletMigrationsCall extends Enum { - readonly isMigrateDemocracyPreimage: boolean; - readonly asMigrateDemocracyPreimage: { - readonly proposalHash: H256; - readonly proposalLenUpperBound: Compact; - } & Struct; - readonly type: "MigrateDemocracyPreimage"; - } - - /** @name PalletXcmTransactorCall (314) */ + /** @name PalletXcmTransactorCall (312) */ interface PalletXcmTransactorCall extends Enum { readonly isRegister: boolean; readonly asRegister: { @@ -4882,6 +4972,7 @@ declare module "@polkadot/types/lookup" { readonly fee: PalletXcmTransactorCurrencyPayment; readonly innerCall: Bytes; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isTransactThroughSovereign: boolean; readonly asTransactThroughSovereign: { @@ -4891,6 +4982,7 @@ declare module "@polkadot/types/lookup" { readonly call: Bytes; readonly originKind: XcmV2OriginKind; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isSetTransactInfo: boolean; readonly asSetTransactInfo: { @@ -4909,6 +5001,7 @@ declare module "@polkadot/types/lookup" { readonly fee: PalletXcmTransactorCurrencyPayment; readonly call: Bytes; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isSetFeePerSecond: boolean; readonly asSetFeePerSecond: { @@ -4938,19 +5031,19 @@ declare module "@polkadot/types/lookup" { | "HrmpManage"; } - /** @name MoonbaseRuntimeXcmConfigTransactors (315) */ + /** @name MoonbaseRuntimeXcmConfigTransactors (313) */ interface MoonbaseRuntimeXcmConfigTransactors extends Enum { readonly isRelay: boolean; readonly type: "Relay"; } - /** @name PalletXcmTransactorCurrencyPayment (316) */ + /** @name PalletXcmTransactorCurrencyPayment (314) */ interface PalletXcmTransactorCurrencyPayment extends Struct { readonly currency: PalletXcmTransactorCurrency; readonly feeAmount: Option; } - /** @name PalletXcmTransactorCurrency (317) */ + /** @name PalletXcmTransactorCurrency (315) */ interface PalletXcmTransactorCurrency extends Enum { readonly isAsCurrencyId: boolean; readonly asAsCurrencyId: MoonbaseRuntimeXcmConfigCurrencyId; @@ -4959,13 +5052,13 @@ declare module "@polkadot/types/lookup" { readonly type: "AsCurrencyId" | "AsMultiLocation"; } - /** @name PalletXcmTransactorTransactWeights (319) */ + /** @name PalletXcmTransactorTransactWeights (317) */ interface PalletXcmTransactorTransactWeights extends Struct { readonly transactRequiredWeightAtMost: SpWeightsWeightV2Weight; readonly overallWeight: Option; } - /** @name PalletMoonbeamOrbitersCall (321) */ + /** @name PalletMoonbeamOrbitersCall (319) */ interface PalletMoonbeamOrbitersCall extends Enum { readonly isCollatorAddOrbiter: boolean; readonly asCollatorAddOrbiter: { @@ -5002,7 +5095,7 @@ declare module "@polkadot/types/lookup" { | "RemoveCollator"; } - /** @name PalletEthereumXcmCall (322) */ + /** @name PalletEthereumXcmCall (320) */ interface PalletEthereumXcmCall extends Enum { readonly isTransact: boolean; readonly asTransact: { @@ -5022,7 +5115,7 @@ declare module "@polkadot/types/lookup" { | "ResumeEthereumXcmExecution"; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransaction (323) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransaction (321) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransaction extends Enum { readonly isV1: boolean; readonly asV1: XcmPrimitivesEthereumXcmEthereumXcmTransactionV1; @@ -5031,7 +5124,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V1" | "V2"; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 (324) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 (322) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 extends Struct { readonly gasLimit: U256; readonly feePayment: XcmPrimitivesEthereumXcmEthereumXcmFee; @@ -5041,7 +5134,7 @@ declare module "@polkadot/types/lookup" { readonly accessList: Option]>>>; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmFee (325) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmFee (323) */ interface XcmPrimitivesEthereumXcmEthereumXcmFee extends Enum { readonly isManual: boolean; readonly asManual: XcmPrimitivesEthereumXcmManualEthereumXcmFee; @@ -5049,13 +5142,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Manual" | "Auto"; } - /** @name XcmPrimitivesEthereumXcmManualEthereumXcmFee (326) */ + /** @name XcmPrimitivesEthereumXcmManualEthereumXcmFee (324) */ interface XcmPrimitivesEthereumXcmManualEthereumXcmFee extends Struct { readonly gasPrice: Option; readonly maxFeePerGas: Option; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 (329) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 (327) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 extends Struct { readonly gasLimit: U256; readonly action: EthereumTransactionTransactionAction; @@ -5064,13 +5157,13 @@ declare module "@polkadot/types/lookup" { readonly accessList: Option]>>>; } - /** @name PalletRandomnessCall (330) */ + /** @name PalletRandomnessCall (328) */ interface PalletRandomnessCall extends Enum { readonly isSetBabeRandomnessResults: boolean; readonly type: "SetBabeRandomnessResults"; } - /** @name PalletConvictionVotingCall (332) */ + /** @name PalletConvictionVotingCall (330) */ interface PalletConvictionVotingCall extends Enum { readonly isVote: boolean; readonly asVote: { @@ -5107,7 +5200,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Vote" | "Delegate" | "Undelegate" | "Unlock" | "RemoveVote" | "RemoveOtherVote"; } - /** @name PalletConvictionVotingVoteAccountVote (333) */ + /** @name PalletConvictionVotingVoteAccountVote (331) */ interface PalletConvictionVotingVoteAccountVote extends Enum { readonly isStandard: boolean; readonly asStandard: { @@ -5128,7 +5221,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Standard" | "Split" | "SplitAbstain"; } - /** @name PalletConvictionVotingConviction (335) */ + /** @name PalletConvictionVotingConviction (333) */ interface PalletConvictionVotingConviction extends Enum { readonly isNone: boolean; readonly isLocked1x: boolean; @@ -5147,7 +5240,7 @@ declare module "@polkadot/types/lookup" { | "Locked6x"; } - /** @name PalletReferendaCall (337) */ + /** @name PalletReferendaCall (335) */ interface PalletReferendaCall extends Enum { readonly isSubmit: boolean; readonly asSubmit: { @@ -5200,7 +5293,7 @@ declare module "@polkadot/types/lookup" { | "SetMetadata"; } - /** @name FrameSupportScheduleDispatchTime (338) */ + /** @name FrameSupportScheduleDispatchTime (336) */ interface FrameSupportScheduleDispatchTime extends Enum { readonly isAt: boolean; readonly asAt: u32; @@ -5209,7 +5302,7 @@ declare module "@polkadot/types/lookup" { readonly type: "At" | "After"; } - /** @name PalletPreimageCall (339) */ + /** @name PalletPreimageCall (337) */ interface PalletPreimageCall extends Enum { readonly isNotePreimage: boolean; readonly asNotePreimage: { @@ -5230,7 +5323,7 @@ declare module "@polkadot/types/lookup" { readonly type: "NotePreimage" | "UnnotePreimage" | "RequestPreimage" | "UnrequestPreimage"; } - /** @name PalletWhitelistCall (340) */ + /** @name PalletWhitelistCall (338) */ interface PalletWhitelistCall extends Enum { readonly isWhitelistCall: boolean; readonly asWhitelistCall: { @@ -5257,7 +5350,7 @@ declare module "@polkadot/types/lookup" { | "DispatchWhitelistedCallWithPreimage"; } - /** @name PalletRootTestingCall (342) */ + /** @name PalletRootTestingCall (340) */ interface PalletRootTestingCall extends Enum { readonly isFillBlock: boolean; readonly asFillBlock: { @@ -5266,7 +5359,7 @@ declare module "@polkadot/types/lookup" { readonly type: "FillBlock"; } - /** @name PalletMultisigCall (343) */ + /** @name PalletMultisigCall (341) */ interface PalletMultisigCall extends Enum { readonly isAsMultiThreshold1: boolean; readonly asAsMultiThreshold1: { @@ -5299,20 +5392,20 @@ declare module "@polkadot/types/lookup" { readonly type: "AsMultiThreshold1" | "AsMulti" | "ApproveAsMulti" | "CancelAsMulti"; } - /** @name PalletMultisigTimepoint (345) */ + /** @name PalletMultisigTimepoint (343) */ interface PalletMultisigTimepoint extends Struct { readonly height: u32; readonly index: u32; } - /** @name PalletConvictionVotingTally (347) */ + /** @name PalletConvictionVotingTally (345) */ interface PalletConvictionVotingTally extends Struct { readonly ayes: u128; readonly nays: u128; readonly support: u128; } - /** @name PalletPreimageEvent (348) */ + /** @name PalletPreimageEvent (346) */ interface PalletPreimageEvent extends Enum { readonly isNoted: boolean; readonly asNoted: { @@ -5329,7 +5422,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Noted" | "Requested" | "Cleared"; } - /** @name PalletWhitelistEvent (349) */ + /** @name PalletWhitelistEvent (347) */ interface PalletWhitelistEvent extends Enum { readonly isCallWhitelisted: boolean; readonly asCallWhitelisted: { @@ -5350,19 +5443,19 @@ declare module "@polkadot/types/lookup" { readonly type: "CallWhitelisted" | "WhitelistedCallRemoved" | "WhitelistedCallDispatched"; } - /** @name FrameSupportDispatchPostDispatchInfo (351) */ + /** @name FrameSupportDispatchPostDispatchInfo (349) */ interface FrameSupportDispatchPostDispatchInfo extends Struct { readonly actualWeight: Option; readonly paysFee: FrameSupportDispatchPays; } - /** @name SpRuntimeDispatchErrorWithPostInfo (352) */ + /** @name SpRuntimeDispatchErrorWithPostInfo (350) */ interface SpRuntimeDispatchErrorWithPostInfo extends Struct { readonly postInfo: FrameSupportDispatchPostDispatchInfo; readonly error: SpRuntimeDispatchError; } - /** @name PalletMultisigEvent (354) */ + /** @name PalletMultisigEvent (352) */ interface PalletMultisigEvent extends Enum { readonly isNewMultisig: boolean; readonly asNewMultisig: { @@ -5395,7 +5488,7 @@ declare module "@polkadot/types/lookup" { readonly type: "NewMultisig" | "MultisigApproval" | "MultisigExecuted" | "MultisigCancelled"; } - /** @name FrameSystemPhase (355) */ + /** @name FrameSystemPhase (353) */ interface FrameSystemPhase extends Enum { readonly isApplyExtrinsic: boolean; readonly asApplyExtrinsic: u32; @@ -5404,27 +5497,27 @@ declare module "@polkadot/types/lookup" { readonly type: "ApplyExtrinsic" | "Finalization" | "Initialization"; } - /** @name FrameSystemLastRuntimeUpgradeInfo (357) */ + /** @name FrameSystemLastRuntimeUpgradeInfo (355) */ interface FrameSystemLastRuntimeUpgradeInfo extends Struct { readonly specVersion: Compact; readonly specName: Text; } - /** @name FrameSystemLimitsBlockWeights (358) */ + /** @name FrameSystemLimitsBlockWeights (356) */ interface FrameSystemLimitsBlockWeights extends Struct { readonly baseBlock: SpWeightsWeightV2Weight; readonly maxBlock: SpWeightsWeightV2Weight; readonly perClass: FrameSupportDispatchPerDispatchClassWeightsPerClass; } - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (359) */ + /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (357) */ interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct { readonly normal: FrameSystemLimitsWeightsPerClass; readonly operational: FrameSystemLimitsWeightsPerClass; readonly mandatory: FrameSystemLimitsWeightsPerClass; } - /** @name FrameSystemLimitsWeightsPerClass (360) */ + /** @name FrameSystemLimitsWeightsPerClass (358) */ interface FrameSystemLimitsWeightsPerClass extends Struct { readonly baseExtrinsic: SpWeightsWeightV2Weight; readonly maxExtrinsic: Option; @@ -5432,25 +5525,25 @@ declare module "@polkadot/types/lookup" { readonly reserved: Option; } - /** @name FrameSystemLimitsBlockLength (361) */ + /** @name FrameSystemLimitsBlockLength (359) */ interface FrameSystemLimitsBlockLength extends Struct { readonly max: FrameSupportDispatchPerDispatchClassU32; } - /** @name FrameSupportDispatchPerDispatchClassU32 (362) */ + /** @name FrameSupportDispatchPerDispatchClassU32 (360) */ interface FrameSupportDispatchPerDispatchClassU32 extends Struct { readonly normal: u32; readonly operational: u32; readonly mandatory: u32; } - /** @name SpWeightsRuntimeDbWeight (363) */ + /** @name SpWeightsRuntimeDbWeight (361) */ interface SpWeightsRuntimeDbWeight extends Struct { readonly read: u64; readonly write: u64; } - /** @name SpVersionRuntimeVersion (364) */ + /** @name SpVersionRuntimeVersion (362) */ interface SpVersionRuntimeVersion extends Struct { readonly specName: Text; readonly implName: Text; @@ -5462,7 +5555,7 @@ declare module "@polkadot/types/lookup" { readonly stateVersion: u8; } - /** @name FrameSystemError (368) */ + /** @name FrameSystemError (366) */ interface FrameSystemError extends Enum { readonly isInvalidSpecName: boolean; readonly isSpecVersionNeedsToIncrease: boolean; @@ -5479,20 +5572,20 @@ declare module "@polkadot/types/lookup" { | "CallFiltered"; } - /** @name PalletUtilityError (369) */ + /** @name PalletUtilityError (367) */ interface PalletUtilityError extends Enum { readonly isTooManyCalls: boolean; readonly type: "TooManyCalls"; } - /** @name PalletBalancesBalanceLock (371) */ + /** @name PalletBalancesBalanceLock (369) */ interface PalletBalancesBalanceLock extends Struct { readonly id: U8aFixed; readonly amount: u128; readonly reasons: PalletBalancesReasons; } - /** @name PalletBalancesReasons (372) */ + /** @name PalletBalancesReasons (370) */ interface PalletBalancesReasons extends Enum { readonly isFee: boolean; readonly isMisc: boolean; @@ -5500,55 +5593,71 @@ declare module "@polkadot/types/lookup" { readonly type: "Fee" | "Misc" | "All"; } - /** @name PalletBalancesReserveData (375) */ + /** @name PalletBalancesReserveData (373) */ interface PalletBalancesReserveData extends Struct { readonly id: U8aFixed; readonly amount: u128; } - /** @name PalletBalancesError (377) */ + /** @name PalletBalancesIdAmount (376) */ + interface PalletBalancesIdAmount extends Struct { + readonly id: Null; + readonly amount: u128; + } + + /** @name PalletBalancesError (378) */ interface PalletBalancesError extends Enum { readonly isVestingBalance: boolean; readonly isLiquidityRestrictions: boolean; readonly isInsufficientBalance: boolean; readonly isExistentialDeposit: boolean; - readonly isKeepAlive: boolean; + readonly isExpendability: boolean; readonly isExistingVestingSchedule: boolean; readonly isDeadAccount: boolean; readonly isTooManyReserves: boolean; + readonly isTooManyHolds: boolean; + readonly isTooManyFreezes: boolean; readonly type: | "VestingBalance" | "LiquidityRestrictions" | "InsufficientBalance" | "ExistentialDeposit" - | "KeepAlive" + | "Expendability" | "ExistingVestingSchedule" | "DeadAccount" - | "TooManyReserves"; + | "TooManyReserves" + | "TooManyHolds" + | "TooManyFreezes"; } - /** @name PalletSudoError (378) */ + /** @name PalletSudoError (379) */ interface PalletSudoError extends Enum { readonly isRequireSudo: boolean; readonly type: "RequireSudo"; } - /** @name PolkadotPrimitivesV2UpgradeRestriction (380) */ - interface PolkadotPrimitivesV2UpgradeRestriction extends Enum { + /** @name PolkadotPrimitivesV4UpgradeRestriction (381) */ + interface PolkadotPrimitivesV4UpgradeRestriction extends Enum { readonly isPresent: boolean; readonly type: "Present"; } - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (381) */ + /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (382) */ interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct { readonly dmqMqcHead: H256; - readonly relayDispatchQueueSize: ITuple<[u32, u32]>; - readonly ingressChannels: Vec>; - readonly egressChannels: Vec>; + readonly relayDispatchQueueSize: CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize; + readonly ingressChannels: Vec>; + readonly egressChannels: Vec>; + } + + /** @name CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize (383) */ + interface CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize extends Struct { + readonly remainingCount: u32; + readonly remainingSize: u32; } - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (384) */ - interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct { + /** @name PolkadotPrimitivesV4AbridgedHrmpChannel (386) */ + interface PolkadotPrimitivesV4AbridgedHrmpChannel extends Struct { readonly maxCapacity: u32; readonly maxTotalSize: u32; readonly maxMessageSize: u32; @@ -5557,8 +5666,8 @@ declare module "@polkadot/types/lookup" { readonly mqcHead: Option; } - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (385) */ - interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct { + /** @name PolkadotPrimitivesV4AbridgedHostConfiguration (387) */ + interface PolkadotPrimitivesV4AbridgedHostConfiguration extends Struct { readonly maxCodeSize: u32; readonly maxHeadDataSize: u32; readonly maxUpwardQueueCount: u32; @@ -5570,19 +5679,19 @@ declare module "@polkadot/types/lookup" { readonly validationUpgradeDelay: u32; } - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (391) */ + /** @name PolkadotCorePrimitivesOutboundHrmpMessage (393) */ interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct { readonly recipient: u32; readonly data: Bytes; } - /** @name CumulusPalletParachainSystemCodeUpgradeAuthorization (392) */ + /** @name CumulusPalletParachainSystemCodeUpgradeAuthorization (394) */ interface CumulusPalletParachainSystemCodeUpgradeAuthorization extends Struct { readonly codeHash: H256; readonly checkVersion: bool; } - /** @name CumulusPalletParachainSystemError (393) */ + /** @name CumulusPalletParachainSystemError (395) */ interface CumulusPalletParachainSystemError extends Enum { readonly isOverlappingUpgrades: boolean; readonly isProhibitedByPolkadot: boolean; @@ -5603,20 +5712,20 @@ declare module "@polkadot/types/lookup" { | "Unauthorized"; } - /** @name PalletTransactionPaymentReleases (395) */ + /** @name PalletTransactionPaymentReleases (397) */ interface PalletTransactionPaymentReleases extends Enum { readonly isV1Ancient: boolean; readonly isV2: boolean; readonly type: "V1Ancient" | "V2"; } - /** @name PalletEvmCodeMetadata (396) */ + /** @name PalletEvmCodeMetadata (398) */ interface PalletEvmCodeMetadata extends Struct { readonly size_: u64; readonly hash_: H256; } - /** @name PalletEvmError (398) */ + /** @name PalletEvmError (400) */ interface PalletEvmError extends Enum { readonly isBalanceLow: boolean; readonly isFeeOverflow: boolean; @@ -5643,7 +5752,7 @@ declare module "@polkadot/types/lookup" { | "TransactionMustComeFromEOA"; } - /** @name FpRpcTransactionStatus (401) */ + /** @name FpRpcTransactionStatus (403) */ interface FpRpcTransactionStatus extends Struct { readonly transactionHash: H256; readonly transactionIndex: u32; @@ -5654,10 +5763,10 @@ declare module "@polkadot/types/lookup" { readonly logsBloom: EthbloomBloom; } - /** @name EthbloomBloom (404) */ + /** @name EthbloomBloom (406) */ interface EthbloomBloom extends U8aFixed {} - /** @name EthereumReceiptReceiptV3 (406) */ + /** @name EthereumReceiptReceiptV3 (408) */ interface EthereumReceiptReceiptV3 extends Enum { readonly isLegacy: boolean; readonly asLegacy: EthereumReceiptEip658ReceiptData; @@ -5668,7 +5777,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Legacy" | "Eip2930" | "Eip1559"; } - /** @name EthereumReceiptEip658ReceiptData (407) */ + /** @name EthereumReceiptEip658ReceiptData (409) */ interface EthereumReceiptEip658ReceiptData extends Struct { readonly statusCode: u8; readonly usedGas: U256; @@ -5676,14 +5785,14 @@ declare module "@polkadot/types/lookup" { readonly logs: Vec; } - /** @name EthereumBlock (408) */ + /** @name EthereumBlock (410) */ interface EthereumBlock extends Struct { readonly header: EthereumHeader; readonly transactions: Vec; readonly ommers: Vec; } - /** @name EthereumHeader (409) */ + /** @name EthereumHeader (411) */ interface EthereumHeader extends Struct { readonly parentHash: H256; readonly ommersHash: H256; @@ -5702,30 +5811,30 @@ declare module "@polkadot/types/lookup" { readonly nonce: EthereumTypesHashH64; } - /** @name EthereumTypesHashH64 (410) */ + /** @name EthereumTypesHashH64 (412) */ interface EthereumTypesHashH64 extends U8aFixed {} - /** @name PalletEthereumError (415) */ + /** @name PalletEthereumError (417) */ interface PalletEthereumError extends Enum { readonly isInvalidSignature: boolean; readonly isPreLogExists: boolean; readonly type: "InvalidSignature" | "PreLogExists"; } - /** @name PalletParachainStakingParachainBondConfig (416) */ + /** @name PalletParachainStakingParachainBondConfig (418) */ interface PalletParachainStakingParachainBondConfig extends Struct { readonly account: AccountId20; readonly percent: Percent; } - /** @name PalletParachainStakingRoundInfo (417) */ + /** @name PalletParachainStakingRoundInfo (419) */ interface PalletParachainStakingRoundInfo extends Struct { readonly current: u32; readonly first: u32; readonly length: u32; } - /** @name PalletParachainStakingDelegator (418) */ + /** @name PalletParachainStakingDelegator (420) */ interface PalletParachainStakingDelegator extends Struct { readonly id: AccountId20; readonly delegations: PalletParachainStakingSetOrderedSet; @@ -5734,16 +5843,16 @@ declare module "@polkadot/types/lookup" { readonly status: PalletParachainStakingDelegatorStatus; } - /** @name PalletParachainStakingSetOrderedSet (419) */ + /** @name PalletParachainStakingSetOrderedSet (421) */ interface PalletParachainStakingSetOrderedSet extends Vec {} - /** @name PalletParachainStakingBond (420) */ + /** @name PalletParachainStakingBond (422) */ interface PalletParachainStakingBond extends Struct { readonly owner: AccountId20; readonly amount: u128; } - /** @name PalletParachainStakingDelegatorStatus (422) */ + /** @name PalletParachainStakingDelegatorStatus (424) */ interface PalletParachainStakingDelegatorStatus extends Enum { readonly isActive: boolean; readonly isLeaving: boolean; @@ -5751,7 +5860,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Active" | "Leaving"; } - /** @name PalletParachainStakingCandidateMetadata (423) */ + /** @name PalletParachainStakingCandidateMetadata (425) */ interface PalletParachainStakingCandidateMetadata extends Struct { readonly bond: u128; readonly delegationCount: u32; @@ -5765,7 +5874,7 @@ declare module "@polkadot/types/lookup" { readonly status: PalletParachainStakingCollatorStatus; } - /** @name PalletParachainStakingCapacityStatus (424) */ + /** @name PalletParachainStakingCapacityStatus (426) */ interface PalletParachainStakingCapacityStatus extends Enum { readonly isFull: boolean; readonly isEmpty: boolean; @@ -5773,13 +5882,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Full" | "Empty" | "Partial"; } - /** @name PalletParachainStakingCandidateBondLessRequest (426) */ + /** @name PalletParachainStakingCandidateBondLessRequest (428) */ interface PalletParachainStakingCandidateBondLessRequest extends Struct { readonly amount: u128; readonly whenExecutable: u32; } - /** @name PalletParachainStakingCollatorStatus (427) */ + /** @name PalletParachainStakingCollatorStatus (429) */ interface PalletParachainStakingCollatorStatus extends Enum { readonly isActive: boolean; readonly isIdle: boolean; @@ -5788,47 +5897,50 @@ declare module "@polkadot/types/lookup" { readonly type: "Active" | "Idle" | "Leaving"; } - /** @name PalletParachainStakingDelegationRequestsScheduledRequest (429) */ + /** @name PalletParachainStakingDelegationRequestsScheduledRequest (431) */ interface PalletParachainStakingDelegationRequestsScheduledRequest extends Struct { readonly delegator: AccountId20; readonly whenExecutable: u32; readonly action: PalletParachainStakingDelegationRequestsDelegationAction; } - /** @name PalletParachainStakingAutoCompoundAutoCompoundConfig (432) */ + /** @name PalletParachainStakingAutoCompoundAutoCompoundConfig (434) */ interface PalletParachainStakingAutoCompoundAutoCompoundConfig extends Struct { readonly delegator: AccountId20; readonly value: Percent; } - /** @name PalletParachainStakingDelegations (434) */ + /** @name PalletParachainStakingDelegations (436) */ interface PalletParachainStakingDelegations extends Struct { readonly delegations: Vec; readonly total: u128; } - /** @name PalletParachainStakingCollatorSnapshot (436) */ + /** @name PalletParachainStakingSetBoundedOrderedSet (438) */ + interface PalletParachainStakingSetBoundedOrderedSet extends Vec {} + + /** @name PalletParachainStakingCollatorSnapshot (441) */ interface PalletParachainStakingCollatorSnapshot extends Struct { readonly bond: u128; readonly delegations: Vec; readonly total: u128; } - /** @name PalletParachainStakingBondWithAutoCompound (438) */ + /** @name PalletParachainStakingBondWithAutoCompound (443) */ interface PalletParachainStakingBondWithAutoCompound extends Struct { readonly owner: AccountId20; readonly amount: u128; readonly autoCompound: Percent; } - /** @name PalletParachainStakingDelayedPayout (439) */ + /** @name PalletParachainStakingDelayedPayout (444) */ interface PalletParachainStakingDelayedPayout extends Struct { readonly roundIssuance: u128; readonly totalStakingReward: u128; readonly collatorCommission: Perbill; } - /** @name PalletParachainStakingInflationInflationInfo (440) */ + /** @name PalletParachainStakingInflationInflationInfo (445) */ interface PalletParachainStakingInflationInflationInfo extends Struct { readonly expect: { readonly min: u128; @@ -5847,7 +5959,7 @@ declare module "@polkadot/types/lookup" { } & Struct; } - /** @name PalletParachainStakingError (441) */ + /** @name PalletParachainStakingError (446) */ interface PalletParachainStakingError extends Enum { readonly isDelegatorDNE: boolean; readonly isDelegatorDNEinTopNorBottom: boolean; @@ -5897,8 +6009,9 @@ declare module "@polkadot/types/lookup" { readonly isTooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates: boolean; readonly isTooLowCandidateCountWeightHint: boolean; readonly isTooLowCandidateCountWeightHintGoOffline: boolean; - readonly isTooLowCandidateCountWeightHintGoOnline: boolean; - readonly isTooLowCandidateCountWeightHintCandidateBondMore: boolean; + readonly isCandidateLimitReached: boolean; + readonly isCannotSetAboveMaxCandidates: boolean; + readonly isRemovedCall: boolean; readonly type: | "DelegatorDNE" | "DelegatorDNEinTopNorBottom" @@ -5948,11 +6061,12 @@ declare module "@polkadot/types/lookup" { | "TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates" | "TooLowCandidateCountWeightHint" | "TooLowCandidateCountWeightHintGoOffline" - | "TooLowCandidateCountWeightHintGoOnline" - | "TooLowCandidateCountWeightHintCandidateBondMore"; + | "CandidateLimitReached" + | "CannotSetAboveMaxCandidates" + | "RemovedCall"; } - /** @name PalletSchedulerScheduled (444) */ + /** @name PalletSchedulerScheduled (449) */ interface PalletSchedulerScheduled extends Struct { readonly maybeId: Option; readonly priority: u8; @@ -5961,7 +6075,7 @@ declare module "@polkadot/types/lookup" { readonly origin: MoonbaseRuntimeOriginCaller; } - /** @name PalletSchedulerError (446) */ + /** @name PalletSchedulerError (451) */ interface PalletSchedulerError extends Enum { readonly isFailedToSchedule: boolean; readonly isNotFound: boolean; @@ -5976,7 +6090,7 @@ declare module "@polkadot/types/lookup" { | "Named"; } - /** @name PalletDemocracyReferendumInfo (452) */ + /** @name PalletDemocracyReferendumInfo (457) */ interface PalletDemocracyReferendumInfo extends Enum { readonly isOngoing: boolean; readonly asOngoing: PalletDemocracyReferendumStatus; @@ -5988,7 +6102,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Ongoing" | "Finished"; } - /** @name PalletDemocracyReferendumStatus (453) */ + /** @name PalletDemocracyReferendumStatus (458) */ interface PalletDemocracyReferendumStatus extends Struct { readonly end: u32; readonly proposal: FrameSupportPreimagesBounded; @@ -5997,14 +6111,14 @@ declare module "@polkadot/types/lookup" { readonly tally: PalletDemocracyTally; } - /** @name PalletDemocracyTally (454) */ + /** @name PalletDemocracyTally (459) */ interface PalletDemocracyTally extends Struct { readonly ayes: u128; readonly nays: u128; readonly turnout: u128; } - /** @name PalletDemocracyVoteVoting (455) */ + /** @name PalletDemocracyVoteVoting (460) */ interface PalletDemocracyVoteVoting extends Enum { readonly isDirect: boolean; readonly asDirect: { @@ -6023,16 +6137,16 @@ declare module "@polkadot/types/lookup" { readonly type: "Direct" | "Delegating"; } - /** @name PalletDemocracyDelegations (459) */ + /** @name PalletDemocracyDelegations (464) */ interface PalletDemocracyDelegations extends Struct { readonly votes: u128; readonly capital: u128; } - /** @name PalletDemocracyVotePriorLock (460) */ + /** @name PalletDemocracyVotePriorLock (465) */ interface PalletDemocracyVotePriorLock extends ITuple<[u32, u128]> {} - /** @name PalletDemocracyError (463) */ + /** @name PalletDemocracyError (468) */ interface PalletDemocracyError extends Enum { readonly isValueLow: boolean; readonly isProposalMissing: boolean; @@ -6085,7 +6199,7 @@ declare module "@polkadot/types/lookup" { | "PreimageNotExist"; } - /** @name PalletCollectiveVotes (465) */ + /** @name PalletCollectiveVotes (470) */ interface PalletCollectiveVotes extends Struct { readonly index: u32; readonly threshold: u32; @@ -6094,7 +6208,7 @@ declare module "@polkadot/types/lookup" { readonly end: u32; } - /** @name PalletCollectiveError (466) */ + /** @name PalletCollectiveError (471) */ interface PalletCollectiveError extends Enum { readonly isNotMember: boolean; readonly isDuplicateProposal: boolean; @@ -6119,7 +6233,7 @@ declare module "@polkadot/types/lookup" { | "WrongProposalLength"; } - /** @name PalletTreasuryProposal (468) */ + /** @name PalletTreasuryProposal (473) */ interface PalletTreasuryProposal extends Struct { readonly proposer: AccountId20; readonly value: u128; @@ -6127,10 +6241,10 @@ declare module "@polkadot/types/lookup" { readonly bond: u128; } - /** @name FrameSupportPalletId (472) */ + /** @name FrameSupportPalletId (477) */ interface FrameSupportPalletId extends U8aFixed {} - /** @name PalletTreasuryError (473) */ + /** @name PalletTreasuryError (478) */ interface PalletTreasuryError extends Enum { readonly isInsufficientProposersBalance: boolean; readonly isInvalidIndex: boolean; @@ -6145,7 +6259,7 @@ declare module "@polkadot/types/lookup" { | "ProposalNotApproved"; } - /** @name PalletAuthorInherentError (474) */ + /** @name PalletAuthorInherentError (479) */ interface PalletAuthorInherentError extends Enum { readonly isAuthorAlreadySet: boolean; readonly isNoAccountId: boolean; @@ -6153,14 +6267,14 @@ declare module "@polkadot/types/lookup" { readonly type: "AuthorAlreadySet" | "NoAccountId" | "CannotBeAuthor"; } - /** @name PalletCrowdloanRewardsRewardInfo (475) */ + /** @name PalletCrowdloanRewardsRewardInfo (480) */ interface PalletCrowdloanRewardsRewardInfo extends Struct { readonly totalReward: u128; readonly claimedReward: u128; readonly contributedRelayAddresses: Vec; } - /** @name PalletCrowdloanRewardsError (477) */ + /** @name PalletCrowdloanRewardsError (482) */ interface PalletCrowdloanRewardsError extends Enum { readonly isAlreadyAssociated: boolean; readonly isBatchBeyondFundPot: boolean; @@ -6195,14 +6309,14 @@ declare module "@polkadot/types/lookup" { | "InsufficientNumberOfValidProofs"; } - /** @name PalletAuthorMappingRegistrationInfo (478) */ + /** @name PalletAuthorMappingRegistrationInfo (483) */ interface PalletAuthorMappingRegistrationInfo extends Struct { readonly account: AccountId20; readonly deposit: u128; readonly keys_: SessionKeysPrimitivesVrfVrfCryptoPublic; } - /** @name PalletAuthorMappingError (479) */ + /** @name PalletAuthorMappingError (484) */ interface PalletAuthorMappingError extends Enum { readonly isAssociationNotFound: boolean; readonly isNotYourAssociation: boolean; @@ -6223,21 +6337,21 @@ declare module "@polkadot/types/lookup" { | "DecodeKeysFailed"; } - /** @name PalletProxyProxyDefinition (482) */ + /** @name PalletProxyProxyDefinition (487) */ interface PalletProxyProxyDefinition extends Struct { readonly delegate: AccountId20; readonly proxyType: MoonbaseRuntimeProxyType; readonly delay: u32; } - /** @name PalletProxyAnnouncement (486) */ + /** @name PalletProxyAnnouncement (491) */ interface PalletProxyAnnouncement extends Struct { readonly real: AccountId20; readonly callHash: H256; readonly height: u32; } - /** @name PalletProxyError (488) */ + /** @name PalletProxyError (493) */ interface PalletProxyError extends Enum { readonly isTooMany: boolean; readonly isNotFound: boolean; @@ -6258,28 +6372,28 @@ declare module "@polkadot/types/lookup" { | "NoSelfProxy"; } - /** @name PalletMaintenanceModeError (489) */ + /** @name PalletMaintenanceModeError (494) */ interface PalletMaintenanceModeError extends Enum { readonly isAlreadyInMaintenanceMode: boolean; readonly isNotInMaintenanceMode: boolean; readonly type: "AlreadyInMaintenanceMode" | "NotInMaintenanceMode"; } - /** @name PalletIdentityRegistration (490) */ + /** @name PalletIdentityRegistration (495) */ interface PalletIdentityRegistration extends Struct { readonly judgements: Vec>; readonly deposit: u128; readonly info: PalletIdentityIdentityInfo; } - /** @name PalletIdentityRegistrarInfo (497) */ + /** @name PalletIdentityRegistrarInfo (502) */ interface PalletIdentityRegistrarInfo extends Struct { readonly account: AccountId20; readonly fee: u128; readonly fields: PalletIdentityBitFlags; } - /** @name PalletIdentityError (499) */ + /** @name PalletIdentityError (504) */ interface PalletIdentityError extends Enum { readonly isTooManySubAccounts: boolean; readonly isNotFound: boolean; @@ -6320,21 +6434,21 @@ declare module "@polkadot/types/lookup" { | "JudgementPaymentFailed"; } - /** @name CumulusPalletXcmpQueueInboundChannelDetails (501) */ + /** @name CumulusPalletXcmpQueueInboundChannelDetails (506) */ interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct { readonly sender: u32; readonly state: CumulusPalletXcmpQueueInboundState; readonly messageMetadata: Vec>; } - /** @name CumulusPalletXcmpQueueInboundState (502) */ + /** @name CumulusPalletXcmpQueueInboundState (507) */ interface CumulusPalletXcmpQueueInboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: "Ok" | "Suspended"; } - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (505) */ + /** @name PolkadotParachainPrimitivesXcmpMessageFormat (510) */ interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum { readonly isConcatenatedVersionedXcm: boolean; readonly isConcatenatedEncodedBlob: boolean; @@ -6342,7 +6456,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ConcatenatedVersionedXcm" | "ConcatenatedEncodedBlob" | "Signals"; } - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (508) */ + /** @name CumulusPalletXcmpQueueOutboundChannelDetails (513) */ interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct { readonly recipient: u32; readonly state: CumulusPalletXcmpQueueOutboundState; @@ -6351,14 +6465,14 @@ declare module "@polkadot/types/lookup" { readonly lastIndex: u16; } - /** @name CumulusPalletXcmpQueueOutboundState (509) */ + /** @name CumulusPalletXcmpQueueOutboundState (514) */ interface CumulusPalletXcmpQueueOutboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: "Ok" | "Suspended"; } - /** @name CumulusPalletXcmpQueueQueueConfigData (511) */ + /** @name CumulusPalletXcmpQueueQueueConfigData (516) */ interface CumulusPalletXcmpQueueQueueConfigData extends Struct { readonly suspendThreshold: u32; readonly dropThreshold: u32; @@ -6368,7 +6482,7 @@ declare module "@polkadot/types/lookup" { readonly xcmpMaxIndividualWeight: SpWeightsWeightV2Weight; } - /** @name CumulusPalletXcmpQueueError (513) */ + /** @name CumulusPalletXcmpQueueError (518) */ interface CumulusPalletXcmpQueueError extends Enum { readonly isFailedToSend: boolean; readonly isBadXcmOrigin: boolean; @@ -6383,29 +6497,29 @@ declare module "@polkadot/types/lookup" { | "WeightOverLimit"; } - /** @name CumulusPalletXcmError (514) */ + /** @name CumulusPalletXcmError (519) */ type CumulusPalletXcmError = Null; - /** @name CumulusPalletDmpQueueConfigData (515) */ + /** @name CumulusPalletDmpQueueConfigData (520) */ interface CumulusPalletDmpQueueConfigData extends Struct { readonly maxIndividual: SpWeightsWeightV2Weight; } - /** @name CumulusPalletDmpQueuePageIndexData (516) */ + /** @name CumulusPalletDmpQueuePageIndexData (521) */ interface CumulusPalletDmpQueuePageIndexData extends Struct { readonly beginUsed: u32; readonly endUsed: u32; readonly overweightCount: u64; } - /** @name CumulusPalletDmpQueueError (519) */ + /** @name CumulusPalletDmpQueueError (524) */ interface CumulusPalletDmpQueueError extends Enum { readonly isUnknown: boolean; readonly isOverLimit: boolean; readonly type: "Unknown" | "OverLimit"; } - /** @name PalletXcmQueryStatus (520) */ + /** @name PalletXcmQueryStatus (525) */ interface PalletXcmQueryStatus extends Enum { readonly isPending: boolean; readonly asPending: { @@ -6427,7 +6541,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Pending" | "VersionNotifier" | "Ready"; } - /** @name XcmVersionedResponse (524) */ + /** @name XcmVersionedResponse (529) */ interface XcmVersionedResponse extends Enum { readonly isV2: boolean; readonly asV2: XcmV2Response; @@ -6436,7 +6550,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletXcmVersionMigrationStage (530) */ + /** @name PalletXcmVersionMigrationStage (535) */ interface PalletXcmVersionMigrationStage extends Enum { readonly isMigrateSupportedVersion: boolean; readonly isMigrateVersionNotifiers: boolean; @@ -6450,22 +6564,22 @@ declare module "@polkadot/types/lookup" { | "MigrateAndNotifyOldTargets"; } - /** @name XcmVersionedAssetId (533) */ + /** @name XcmVersionedAssetId (538) */ interface XcmVersionedAssetId extends Enum { readonly isV3: boolean; readonly asV3: XcmV3MultiassetAssetId; readonly type: "V3"; } - /** @name PalletXcmRemoteLockedFungibleRecord (534) */ + /** @name PalletXcmRemoteLockedFungibleRecord (539) */ interface PalletXcmRemoteLockedFungibleRecord extends Struct { readonly amount: u128; readonly owner: XcmVersionedMultiLocation; readonly locker: XcmVersionedMultiLocation; - readonly users: u32; + readonly consumers: Vec>; } - /** @name PalletXcmError (538) */ + /** @name PalletXcmError (546) */ interface PalletXcmError extends Enum { readonly isUnreachable: boolean; readonly isSendFailure: boolean; @@ -6510,7 +6624,7 @@ declare module "@polkadot/types/lookup" { | "InUse"; } - /** @name PalletAssetsAssetDetails (539) */ + /** @name PalletAssetsAssetDetails (547) */ interface PalletAssetsAssetDetails extends Struct { readonly owner: AccountId20; readonly issuer: AccountId20; @@ -6526,7 +6640,7 @@ declare module "@polkadot/types/lookup" { readonly status: PalletAssetsAssetStatus; } - /** @name PalletAssetsAssetStatus (540) */ + /** @name PalletAssetsAssetStatus (548) */ interface PalletAssetsAssetStatus extends Enum { readonly isLive: boolean; readonly isFrozen: boolean; @@ -6534,31 +6648,41 @@ declare module "@polkadot/types/lookup" { readonly type: "Live" | "Frozen" | "Destroying"; } - /** @name PalletAssetsAssetAccount (542) */ + /** @name PalletAssetsAssetAccount (550) */ interface PalletAssetsAssetAccount extends Struct { readonly balance: u128; - readonly isFrozen: bool; + readonly status: PalletAssetsAccountStatus; readonly reason: PalletAssetsExistenceReason; readonly extra: Null; } - /** @name PalletAssetsExistenceReason (543) */ + /** @name PalletAssetsAccountStatus (551) */ + interface PalletAssetsAccountStatus extends Enum { + readonly isLiquid: boolean; + readonly isFrozen: boolean; + readonly isBlocked: boolean; + readonly type: "Liquid" | "Frozen" | "Blocked"; + } + + /** @name PalletAssetsExistenceReason (552) */ interface PalletAssetsExistenceReason extends Enum { readonly isConsumer: boolean; readonly isSufficient: boolean; readonly isDepositHeld: boolean; readonly asDepositHeld: u128; readonly isDepositRefunded: boolean; - readonly type: "Consumer" | "Sufficient" | "DepositHeld" | "DepositRefunded"; + readonly isDepositFrom: boolean; + readonly asDepositFrom: ITuple<[AccountId20, u128]>; + readonly type: "Consumer" | "Sufficient" | "DepositHeld" | "DepositRefunded" | "DepositFrom"; } - /** @name PalletAssetsApproval (545) */ + /** @name PalletAssetsApproval (554) */ interface PalletAssetsApproval extends Struct { readonly amount: u128; readonly deposit: u128; } - /** @name PalletAssetsAssetMetadata (546) */ + /** @name PalletAssetsAssetMetadata (555) */ interface PalletAssetsAssetMetadata extends Struct { readonly deposit: u128; readonly name: Bytes; @@ -6567,7 +6691,7 @@ declare module "@polkadot/types/lookup" { readonly isFrozen: bool; } - /** @name PalletAssetsError (548) */ + /** @name PalletAssetsError (557) */ interface PalletAssetsError extends Enum { readonly isBalanceLow: boolean; readonly isNoAccount: boolean; @@ -6577,7 +6701,7 @@ declare module "@polkadot/types/lookup" { readonly isInUse: boolean; readonly isBadWitness: boolean; readonly isMinBalanceZero: boolean; - readonly isNoProvider: boolean; + readonly isUnavailableConsumer: boolean; readonly isBadMetadata: boolean; readonly isUnapproved: boolean; readonly isWouldDie: boolean; @@ -6598,7 +6722,7 @@ declare module "@polkadot/types/lookup" { | "InUse" | "BadWitness" | "MinBalanceZero" - | "NoProvider" + | "UnavailableConsumer" | "BadMetadata" | "Unapproved" | "WouldDie" @@ -6612,7 +6736,7 @@ declare module "@polkadot/types/lookup" { | "CallbackFailed"; } - /** @name OrmlXtokensModuleError (549) */ + /** @name OrmlXtokensModuleError (558) */ interface OrmlXtokensModuleError extends Enum { readonly isAssetHasNoReserve: boolean; readonly isNotCrossChainTransfer: boolean; @@ -6655,13 +6779,13 @@ declare module "@polkadot/types/lookup" { | "MinXcmFeeNotDefined"; } - /** @name PalletAssetManagerAssetInfo (550) */ + /** @name PalletAssetManagerAssetInfo (559) */ interface PalletAssetManagerAssetInfo extends Struct { readonly creator: AccountId20; readonly deposit: u128; } - /** @name PalletAssetManagerError (552) */ + /** @name PalletAssetManagerError (561) */ interface PalletAssetManagerError extends Enum { readonly isErrorCreatingAsset: boolean; readonly isAssetAlreadyExists: boolean; @@ -6682,7 +6806,7 @@ declare module "@polkadot/types/lookup" { | "NonExistentLocalAsset"; } - /** @name PalletMigrationsError (553) */ + /** @name PalletMigrationsError (562) */ interface PalletMigrationsError extends Enum { readonly isPreimageMissing: boolean; readonly isWrongUpperBound: boolean; @@ -6695,7 +6819,7 @@ declare module "@polkadot/types/lookup" { | "PreimageAlreadyExists"; } - /** @name PalletXcmTransactorError (554) */ + /** @name PalletXcmTransactorError (563) */ interface PalletXcmTransactorError extends Enum { readonly isIndexAlreadyClaimed: boolean; readonly isUnclaimedIndex: boolean; @@ -6723,6 +6847,7 @@ declare module "@polkadot/types/lookup" { readonly isHrmpHandlerNotImplemented: boolean; readonly isTooMuchFeeUsed: boolean; readonly isErrorValidating: boolean; + readonly isRefundNotSupportedWithTransactInfo: boolean; readonly type: | "IndexAlreadyClaimed" | "UnclaimedIndex" @@ -6749,23 +6874,24 @@ declare module "@polkadot/types/lookup" { | "FailedMultiLocationToJunction" | "HrmpHandlerNotImplemented" | "TooMuchFeeUsed" - | "ErrorValidating"; + | "ErrorValidating" + | "RefundNotSupportedWithTransactInfo"; } - /** @name PalletMoonbeamOrbitersCollatorPoolInfo (556) */ + /** @name PalletMoonbeamOrbitersCollatorPoolInfo (565) */ interface PalletMoonbeamOrbitersCollatorPoolInfo extends Struct { readonly orbiters: Vec; readonly maybeCurrentOrbiter: Option; readonly nextOrbiter: u32; } - /** @name PalletMoonbeamOrbitersCurrentOrbiter (558) */ + /** @name PalletMoonbeamOrbitersCurrentOrbiter (567) */ interface PalletMoonbeamOrbitersCurrentOrbiter extends Struct { readonly accountId: AccountId20; readonly removed: bool; } - /** @name PalletMoonbeamOrbitersError (559) */ + /** @name PalletMoonbeamOrbitersError (568) */ interface PalletMoonbeamOrbitersError extends Enum { readonly isCollatorAlreadyAdded: boolean; readonly isCollatorNotFound: boolean; @@ -6788,19 +6914,19 @@ declare module "@polkadot/types/lookup" { | "OrbiterStillInAPool"; } - /** @name PalletEthereumXcmError (560) */ + /** @name PalletEthereumXcmError (569) */ interface PalletEthereumXcmError extends Enum { readonly isEthereumXcmExecutionSuspended: boolean; readonly type: "EthereumXcmExecutionSuspended"; } - /** @name PalletRandomnessRequestState (561) */ + /** @name PalletRandomnessRequestState (570) */ interface PalletRandomnessRequestState extends Struct { readonly request: PalletRandomnessRequest; readonly deposit: u128; } - /** @name PalletRandomnessRequest (562) */ + /** @name PalletRandomnessRequest (571) */ interface PalletRandomnessRequest extends Struct { readonly refundAddress: H160; readonly contractAddress: H160; @@ -6811,7 +6937,7 @@ declare module "@polkadot/types/lookup" { readonly info: PalletRandomnessRequestInfo; } - /** @name PalletRandomnessRequestInfo (563) */ + /** @name PalletRandomnessRequestInfo (572) */ interface PalletRandomnessRequestInfo extends Enum { readonly isBabeEpoch: boolean; readonly asBabeEpoch: ITuple<[u64, u64]>; @@ -6820,7 +6946,7 @@ declare module "@polkadot/types/lookup" { readonly type: "BabeEpoch" | "Local"; } - /** @name PalletRandomnessRequestType (564) */ + /** @name PalletRandomnessRequestType (573) */ interface PalletRandomnessRequestType extends Enum { readonly isBabeEpoch: boolean; readonly asBabeEpoch: u64; @@ -6829,13 +6955,13 @@ declare module "@polkadot/types/lookup" { readonly type: "BabeEpoch" | "Local"; } - /** @name PalletRandomnessRandomnessResult (565) */ + /** @name PalletRandomnessRandomnessResult (574) */ interface PalletRandomnessRandomnessResult extends Struct { readonly randomness: Option; readonly requestCount: u64; } - /** @name PalletRandomnessError (566) */ + /** @name PalletRandomnessError (575) */ interface PalletRandomnessError extends Enum { readonly isRequestCounterOverflowed: boolean; readonly isRequestFeeOverflowed: boolean; @@ -6864,7 +6990,7 @@ declare module "@polkadot/types/lookup" { | "RandomnessResultNotFilled"; } - /** @name PalletConvictionVotingVoteVoting (570) */ + /** @name PalletConvictionVotingVoteVoting (579) */ interface PalletConvictionVotingVoteVoting extends Enum { readonly isCasting: boolean; readonly asCasting: PalletConvictionVotingVoteCasting; @@ -6873,23 +6999,23 @@ declare module "@polkadot/types/lookup" { readonly type: "Casting" | "Delegating"; } - /** @name PalletConvictionVotingVoteCasting (571) */ + /** @name PalletConvictionVotingVoteCasting (580) */ interface PalletConvictionVotingVoteCasting extends Struct { readonly votes: Vec>; readonly delegations: PalletConvictionVotingDelegations; readonly prior: PalletConvictionVotingVotePriorLock; } - /** @name PalletConvictionVotingDelegations (575) */ + /** @name PalletConvictionVotingDelegations (584) */ interface PalletConvictionVotingDelegations extends Struct { readonly votes: u128; readonly capital: u128; } - /** @name PalletConvictionVotingVotePriorLock (576) */ + /** @name PalletConvictionVotingVotePriorLock (585) */ interface PalletConvictionVotingVotePriorLock extends ITuple<[u32, u128]> {} - /** @name PalletConvictionVotingVoteDelegating (577) */ + /** @name PalletConvictionVotingVoteDelegating (586) */ interface PalletConvictionVotingVoteDelegating extends Struct { readonly balance: u128; readonly target: AccountId20; @@ -6898,7 +7024,7 @@ declare module "@polkadot/types/lookup" { readonly prior: PalletConvictionVotingVotePriorLock; } - /** @name PalletConvictionVotingError (581) */ + /** @name PalletConvictionVotingError (590) */ interface PalletConvictionVotingError extends Enum { readonly isNotOngoing: boolean; readonly isNotVoter: boolean; @@ -6927,7 +7053,7 @@ declare module "@polkadot/types/lookup" { | "BadClass"; } - /** @name PalletReferendaReferendumInfo (582) */ + /** @name PalletReferendaReferendumInfo (591) */ interface PalletReferendaReferendumInfo extends Enum { readonly isOngoing: boolean; readonly asOngoing: PalletReferendaReferendumStatus; @@ -6952,7 +7078,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Ongoing" | "Approved" | "Rejected" | "Cancelled" | "TimedOut" | "Killed"; } - /** @name PalletReferendaReferendumStatus (583) */ + /** @name PalletReferendaReferendumStatus (592) */ interface PalletReferendaReferendumStatus extends Struct { readonly track: u16; readonly origin: MoonbaseRuntimeOriginCaller; @@ -6967,19 +7093,19 @@ declare module "@polkadot/types/lookup" { readonly alarm: Option]>>; } - /** @name PalletReferendaDeposit (584) */ + /** @name PalletReferendaDeposit (593) */ interface PalletReferendaDeposit extends Struct { readonly who: AccountId20; readonly amount: u128; } - /** @name PalletReferendaDecidingStatus (587) */ + /** @name PalletReferendaDecidingStatus (596) */ interface PalletReferendaDecidingStatus extends Struct { readonly since: u32; readonly confirming: Option; } - /** @name PalletReferendaTrackInfo (595) */ + /** @name PalletReferendaTrackInfo (604) */ interface PalletReferendaTrackInfo extends Struct { readonly name: Text; readonly maxDeciding: u32; @@ -6992,7 +7118,7 @@ declare module "@polkadot/types/lookup" { readonly minSupport: PalletReferendaCurve; } - /** @name PalletReferendaCurve (596) */ + /** @name PalletReferendaCurve (605) */ interface PalletReferendaCurve extends Enum { readonly isLinearDecreasing: boolean; readonly asLinearDecreasing: { @@ -7016,7 +7142,7 @@ declare module "@polkadot/types/lookup" { readonly type: "LinearDecreasing" | "SteppedDecreasing" | "Reciprocal"; } - /** @name PalletReferendaError (599) */ + /** @name PalletReferendaError (608) */ interface PalletReferendaError extends Enum { readonly isNotOngoing: boolean; readonly isHasDeposit: boolean; @@ -7047,7 +7173,7 @@ declare module "@polkadot/types/lookup" { | "PreimageNotExist"; } - /** @name PalletPreimageRequestStatus (600) */ + /** @name PalletPreimageRequestStatus (609) */ interface PalletPreimageRequestStatus extends Enum { readonly isUnrequested: boolean; readonly asUnrequested: { @@ -7063,7 +7189,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Unrequested" | "Requested"; } - /** @name PalletPreimageError (605) */ + /** @name PalletPreimageError (614) */ interface PalletPreimageError extends Enum { readonly isTooBig: boolean; readonly isAlreadyNoted: boolean; @@ -7080,7 +7206,7 @@ declare module "@polkadot/types/lookup" { | "NotRequested"; } - /** @name PalletWhitelistError (606) */ + /** @name PalletWhitelistError (615) */ interface PalletWhitelistError extends Enum { readonly isUnavailablePreImage: boolean; readonly isUndecodableCall: boolean; @@ -7095,7 +7221,7 @@ declare module "@polkadot/types/lookup" { | "CallAlreadyWhitelisted"; } - /** @name PalletMultisigMultisig (609) */ + /** @name PalletMultisigMultisig (618) */ interface PalletMultisigMultisig extends Struct { readonly when: PalletMultisigTimepoint; readonly deposit: u128; @@ -7103,7 +7229,7 @@ declare module "@polkadot/types/lookup" { readonly approvals: Vec; } - /** @name PalletMultisigError (611) */ + /** @name PalletMultisigError (620) */ interface PalletMultisigError extends Enum { readonly isMinimumThreshold: boolean; readonly isAlreadyApproved: boolean; @@ -7136,30 +7262,30 @@ declare module "@polkadot/types/lookup" { | "AlreadyStored"; } - /** @name AccountEthereumSignature (613) */ + /** @name AccountEthereumSignature (622) */ interface AccountEthereumSignature extends SpCoreEcdsaSignature {} - /** @name FrameSystemExtensionsCheckNonZeroSender (615) */ + /** @name FrameSystemExtensionsCheckNonZeroSender (624) */ type FrameSystemExtensionsCheckNonZeroSender = Null; - /** @name FrameSystemExtensionsCheckSpecVersion (616) */ + /** @name FrameSystemExtensionsCheckSpecVersion (625) */ type FrameSystemExtensionsCheckSpecVersion = Null; - /** @name FrameSystemExtensionsCheckTxVersion (617) */ + /** @name FrameSystemExtensionsCheckTxVersion (626) */ type FrameSystemExtensionsCheckTxVersion = Null; - /** @name FrameSystemExtensionsCheckGenesis (618) */ + /** @name FrameSystemExtensionsCheckGenesis (627) */ type FrameSystemExtensionsCheckGenesis = Null; - /** @name FrameSystemExtensionsCheckNonce (621) */ + /** @name FrameSystemExtensionsCheckNonce (630) */ interface FrameSystemExtensionsCheckNonce extends Compact {} - /** @name FrameSystemExtensionsCheckWeight (622) */ + /** @name FrameSystemExtensionsCheckWeight (631) */ type FrameSystemExtensionsCheckWeight = Null; - /** @name PalletTransactionPaymentChargeTransactionPayment (623) */ + /** @name PalletTransactionPaymentChargeTransactionPayment (632) */ interface PalletTransactionPaymentChargeTransactionPayment extends Compact {} - /** @name MoonbaseRuntimeRuntime (625) */ + /** @name MoonbaseRuntimeRuntime (634) */ type MoonbaseRuntimeRuntime = Null; } // declare module diff --git a/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts b/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts index bec563709c..86c3b96bde 100644 --- a/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts +++ b/typescript-api/src/moonbeam/interfaces/augment-api-runtime.ts @@ -6,30 +6,12 @@ import "@polkadot/api-base/types/calls"; import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types"; -import type { - Bytes, - Null, - Option, - Result, - U256, - Vec, - bool, - u256, - u32, - u64, -} from "@polkadot/types-codec"; +import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec"; import type { AnyNumber, ITuple } from "@polkadot/types-codec/types"; import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder"; import type { BlockHash } from "@polkadot/types/interfaces/chain"; import type { CollationInfo } from "@polkadot/types/interfaces/cumulus"; -import type { - BlockV2, - EthReceiptV3, - EthTransaction, - EthTransactionStatus, - TransactionV2, -} from "@polkadot/types/interfaces/eth"; -import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm"; +import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth"; import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics"; import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata"; import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment"; @@ -37,12 +19,10 @@ import type { AccountId, Balance, Block, - H160, H256, Header, Index, KeyTypeId, - Permill, Weight, } from "@polkadot/types/interfaces/runtime"; import type { RuntimeVersion } from "@polkadot/types/interfaces/state"; @@ -214,101 +194,6 @@ declare module "@polkadot/api-base/types/calls" { /** Generic call */ [key: string]: DecoratedCallBase; }; - /** 0x582211f65bb14b89/4 */ - ethereumRuntimeRPCApi: { - /** Returns pallet_evm::Accounts by address. */ - accountBasic: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** For a given account address, returns pallet_evm::AccountCodes. */ - accountCodeAt: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** Returns the converted FindAuthor::find_author authority id. */ - author: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - call: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - to: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Returns runtime defined pallet_evm::ChainId. */ - chainId: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - create: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Return all the current data for a block in a single runtime call. */ - currentAll: AugmentedCall< - ApiType, - () => Observable< - ITuple<[Option, Option>, Option>]> - > - >; - /** Return the current block. */ - currentBlock: AugmentedCall Observable>; - /** Return the current receipt. */ - currentReceipts: AugmentedCall Observable>>>; - /** Return the current transaction status. */ - currentTransactionStatuses: AugmentedCall< - ApiType, - () => Observable>> - >; - /** Return the elasticity multiplier. */ - elasticity: AugmentedCall Observable>>; - /** Receives a `Vec` and filters all the ethereum transactions. */ - extrinsicFilter: AugmentedCall< - ApiType, - ( - xts: Vec | (Extrinsic | IExtrinsic | string | Uint8Array)[] - ) => Observable> - >; - /** Returns FixedGasPrice::min_gas_price */ - gasPrice: AugmentedCall Observable>; - /** For a given account address and index, returns pallet_evm::AccountStorages. */ - storageAt: AugmentedCall< - ApiType, - ( - address: H160 | string | Uint8Array, - index: u256 | AnyNumber | Uint8Array - ) => Observable - >; - /** Generic call */ - [key: string]: DecoratedCallBase; - }; /** 0x37e397fc7c91f5e4/1 */ metadata: { /** Returns the metadata of a runtime */ diff --git a/typescript-api/src/moonriver/interfaces/augment-api-consts.ts b/typescript-api/src/moonriver/interfaces/augment-api-consts.ts index a16880a805..42701cad12 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-consts.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-consts.ts @@ -53,8 +53,21 @@ declare module "@polkadot/api-base/types/consts" { [key: string]: Codec; }; balances: { - /** The minimum amount required to keep an account open. */ + /** + * The minimum amount required to keep an account open. MUST BE GREATER THAN ZERO! + * + * If you _really_ need it to be zero, you can enable the feature `insecure_zero_ed` for this + * pallet. However, you do so at your own risk: this will open up a major DoS vector. In case + * you have multiple sources of provider references, you may also get unexpected behaviour if + * you set this to zero. + * + * Bottom line: Do yourself a favour and make it at least one! + */ existentialDeposit: u128 & AugmentedConst; + /** The maximum number of individual freeze locks that can exist on an account at any time. */ + maxFreezes: u32 & AugmentedConst; + /** The maximum number of holds that can exist on an account at any time. */ + maxHolds: u32 & AugmentedConst; /** * The maximum number of locks that should exist on an account. Not strictly enforced, but * used for weight estimation. @@ -83,6 +96,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + councilCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; crowdloanRewards: { /** Percentage to be payed at initialization */ initializationPayment: Perbill & AugmentedConst; @@ -230,6 +249,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + openTechCommitteeCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; parachainStaking: { /** Number of rounds candidate requests to decrease self-bond must wait to be executable */ candidateBondLessDelay: u32 & AugmentedConst; @@ -241,6 +266,8 @@ declare module "@polkadot/api-base/types/consts" { leaveDelegatorsDelay: u32 & AugmentedConst; /** Maximum bottom delegations (not counted) per candidate */ maxBottomDelegationsPerCandidate: u32 & AugmentedConst; + /** Maximum candidates */ + maxCandidates: u32 & AugmentedConst; /** Maximum delegations per delegator */ maxDelegationsPerDelegator: u32 & AugmentedConst; /** Maximum top delegations counted per candidate */ @@ -251,8 +278,6 @@ declare module "@polkadot/api-base/types/consts" { minCandidateStk: u128 & AugmentedConst; /** Minimum stake for any registered on-chain account to delegate */ minDelegation: u128 & AugmentedConst; - /** Minimum stake for any registered on-chain account to be a delegator */ - minDelegatorStk: u128 & AugmentedConst; /** Minimum number of selected candidates every round */ minSelectedCandidates: u32 & AugmentedConst; /** Number of rounds that delegations remain bonded before revocation request is executable */ @@ -344,7 +369,14 @@ declare module "@polkadot/api-base/types/consts" { scheduler: { /** The maximum weight that may be scheduled per block for any dispatchables. */ maximumWeight: SpWeightsWeightV2Weight & AugmentedConst; - /** The maximum number of scheduled calls in the queue for a single block. */ + /** + * The maximum number of scheduled calls in the queue for a single block. + * + * NOTE: + * + * - Dependent pallets' benchmarks might require a higher limit for the setting. Set a higher + * limit under `runtime-benchmarks` feature. + */ maxScheduledPerBlock: u32 & AugmentedConst; /** Generic const */ [key: string]: Codec; @@ -370,6 +402,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + techCommitteeCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; timestamp: { /** * The minimum period between blocks. Beware that this is different to the _expected_ period @@ -432,6 +470,12 @@ declare module "@polkadot/api-base/types/consts" { /** Generic const */ [key: string]: Codec; }; + treasuryCouncilCollective: { + /** The maximum weight of a dispatch call that can be proposed and executed. */ + maxProposalWeight: SpWeightsWeightV2Weight & AugmentedConst; + /** Generic const */ + [key: string]: Codec; + }; utility: { /** The limit on the number of batched calls. */ batchedCallsLimit: u32 & AugmentedConst; diff --git a/typescript-api/src/moonriver/interfaces/augment-api-errors.ts b/typescript-api/src/moonriver/interfaces/augment-api-errors.ts index 4551be9730..d3d9f7aa1d 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-errors.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-errors.ts @@ -55,16 +55,16 @@ declare module "@polkadot/api-base/types/errors" { NoDeposit: AugmentedError; /** The signing account has no permission to do the operation. */ NoPermission: AugmentedError; - /** - * Unable to increment the consumer reference counters on the account. Either no provider - * reference exists to allow a non-zero balance of a non-self-sufficient asset, or the maximum - * number of consumers has been reached. - */ - NoProvider: AugmentedError; /** The asset should be frozen before the given operation. */ NotFrozen: AugmentedError; /** No approval exists that would allow the transfer. */ Unapproved: AugmentedError; + /** + * Unable to increment the consumer reference counters on the account. Either no provider + * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one fewer + * then the maximum number of consumers has been reached. + */ + UnavailableConsumer: AugmentedError; /** The given asset ID is unknown. */ Unknown: AugmentedError; /** The operation would result in funds being burned. */ @@ -105,21 +105,25 @@ declare module "@polkadot/api-base/types/errors" { [key: string]: AugmentedError; }; balances: { - /** Beneficiary account must pre-exist */ + /** Beneficiary account must pre-exist. */ DeadAccount: AugmentedError; - /** Value too low to create account due to existential deposit */ + /** Value too low to create account due to existential deposit. */ ExistentialDeposit: AugmentedError; - /** A vesting schedule already exists for this account */ + /** A vesting schedule already exists for this account. */ ExistingVestingSchedule: AugmentedError; + /** Transfer/payment would kill account. */ + Expendability: AugmentedError; /** Balance too low to send value. */ InsufficientBalance: AugmentedError; - /** Transfer/payment would kill account */ - KeepAlive: AugmentedError; - /** Account liquidity restrictions prevent withdrawal */ + /** Account liquidity restrictions prevent withdrawal. */ LiquidityRestrictions: AugmentedError; - /** Number of named reserves exceed MaxReserves */ + /** Number of freezes exceed `MaxFreezes`. */ + TooManyFreezes: AugmentedError; + /** Number of holds exceed `MaxHolds`. */ + TooManyHolds: AugmentedError; + /** Number of named reserves exceed `MaxReserves`. */ TooManyReserves: AugmentedError; - /** Vesting balance too high to send value */ + /** Vesting balance too high to send value. */ VestingBalance: AugmentedError; /** Generic error */ [key: string]: AugmentedError; @@ -405,16 +409,16 @@ declare module "@polkadot/api-base/types/errors" { NoDeposit: AugmentedError; /** The signing account has no permission to do the operation. */ NoPermission: AugmentedError; - /** - * Unable to increment the consumer reference counters on the account. Either no provider - * reference exists to allow a non-zero balance of a non-self-sufficient asset, or the maximum - * number of consumers has been reached. - */ - NoProvider: AugmentedError; /** The asset should be frozen before the given operation. */ NotFrozen: AugmentedError; /** No approval exists that would allow the transfer. */ Unapproved: AugmentedError; + /** + * Unable to increment the consumer reference counters on the account. Either no provider + * reference exists to allow a non-zero balance of a non-self-sufficient asset, or one fewer + * then the maximum number of consumers has been reached. + */ + UnavailableConsumer: AugmentedError; /** The given asset ID is unknown. */ Unknown: AugmentedError; /** The operation would result in funds being burned. */ @@ -534,10 +538,12 @@ declare module "@polkadot/api-base/types/errors" { CandidateCannotLeaveYet: AugmentedError; CandidateDNE: AugmentedError; CandidateExists: AugmentedError; + CandidateLimitReached: AugmentedError; CandidateNotLeaving: AugmentedError; CannotDelegateIfLeaving: AugmentedError; CannotDelegateLessThanOrEqualToLowestBottomWhenFull: AugmentedError; CannotGoOnlineIfLeaving: AugmentedError; + CannotSetAboveMaxCandidates: AugmentedError; CannotSetBelowMin: AugmentedError; DelegationBelowMin: AugmentedError; DelegationDNE: AugmentedError; @@ -560,6 +566,7 @@ declare module "@polkadot/api-base/types/errors" { PendingDelegationRequestDNE: AugmentedError; PendingDelegationRequestNotDueYet: AugmentedError; PendingDelegationRevoke: AugmentedError; + RemovedCall: AugmentedError; RoundLengthMustBeGreaterThanTotalSelectedCollators: AugmentedError; TooLowCandidateAutoCompoundingDelegationCountToAutoCompound: AugmentedError; TooLowCandidateAutoCompoundingDelegationCountToDelegate: AugmentedError; @@ -567,9 +574,7 @@ declare module "@polkadot/api-base/types/errors" { TooLowCandidateCountToLeaveCandidates: AugmentedError; TooLowCandidateCountWeightHint: AugmentedError; TooLowCandidateCountWeightHintCancelLeaveCandidates: AugmentedError; - TooLowCandidateCountWeightHintCandidateBondMore: AugmentedError; TooLowCandidateCountWeightHintGoOffline: AugmentedError; - TooLowCandidateCountWeightHintGoOnline: AugmentedError; TooLowCandidateCountWeightHintJoinCandidates: AugmentedError; TooLowCandidateDelegationCountToDelegate: AugmentedError; TooLowCandidateDelegationCountToLeaveCandidates: AugmentedError; @@ -621,7 +626,7 @@ declare module "@polkadot/api-base/types/errors" { FeesNotMet: AugmentedError; /** The message execution fails the filter. */ Filtered: AugmentedError; - /** The unlock operation cannot succeed because there are still users of the lock. */ + /** The unlock operation cannot succeed because there are still consumers of the lock. */ InUse: AugmentedError; /** Invalid asset for the operation. */ InvalidAsset: AugmentedError; @@ -880,6 +885,7 @@ declare module "@polkadot/api-base/types/errors" { NotCrossChainTransfer: AugmentedError; NotCrossChainTransferableCurrency: AugmentedError; NotOwner: AugmentedError; + RefundNotSupportedWithTransactInfo: AugmentedError; SignedTransactNotAllowedForDestination: AugmentedError; TooMuchFeeUsed: AugmentedError; TransactorInfoNotSet: AugmentedError; diff --git a/typescript-api/src/moonriver/interfaces/augment-api-events.ts b/typescript-api/src/moonriver/interfaces/augment-api-events.ts index 772404b92c..287d58ae87 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-events.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-events.ts @@ -153,6 +153,12 @@ declare module "@polkadot/api-base/types/events" { AssetStatusChanged: AugmentedEvent; /** Some asset `asset_id` was thawed. */ AssetThawed: AugmentedEvent; + /** Some account `who` was blocked. */ + Blocked: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20], + { assetId: u128; who: AccountId20 } + >; /** Some assets were destroyed. */ Burned: AugmentedEvent< ApiType, @@ -213,6 +219,12 @@ declare module "@polkadot/api-base/types/events" { [assetId: u128, who: AccountId20], { assetId: u128; who: AccountId20 } >; + /** Some account `who` was created with a deposit from `depositor`. */ + Touched: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20, depositor: AccountId20], + { assetId: u128; who: AccountId20; depositor: AccountId20 } + >; /** Some assets were transferred. */ Transferred: AugmentedEvent< ApiType, @@ -296,8 +308,14 @@ declare module "@polkadot/api-base/types/events" { /** A balance was set by root. */ BalanceSet: AugmentedEvent< ApiType, - [who: AccountId20, free: u128, reserved: u128], - { who: AccountId20; free: u128; reserved: u128 } + [who: AccountId20, free: u128], + { who: AccountId20; free: u128 } + >; + /** Some amount was burned from an account. */ + Burned: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } >; /** Some amount was deposited (e.g. for transaction fees). */ Deposit: AugmentedEvent< @@ -320,6 +338,28 @@ declare module "@polkadot/api-base/types/events" { [account: AccountId20, freeBalance: u128], { account: AccountId20; freeBalance: u128 } >; + /** Some balance was frozen. */ + Frozen: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Total issuance was increased by `amount`, creating a credit to be balanced. */ + Issued: AugmentedEvent; + /** Some balance was locked. */ + Locked: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Some amount was minted into an account. */ + Minted: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Total issuance was decreased by `amount`, creating a debt to be balanced. */ + Rescinded: AugmentedEvent; /** Some balance was reserved (moved from free to reserved). */ Reserved: AugmentedEvent< ApiType, @@ -345,24 +385,50 @@ declare module "@polkadot/api-base/types/events" { destinationStatus: FrameSupportTokensMiscBalanceStatus; } >; + /** Some amount was restored into an account. */ + Restored: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Some amount was removed from the account (e.g. for misbehavior). */ Slashed: AugmentedEvent< ApiType, [who: AccountId20, amount: u128], { who: AccountId20; amount: u128 } >; + /** Some amount was suspended from an account (it can be restored later). */ + Suspended: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; + /** Some balance was thawed. */ + Thawed: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Transfer succeeded. */ Transfer: AugmentedEvent< ApiType, [from: AccountId20, to: AccountId20, amount: u128], { from: AccountId20; to: AccountId20; amount: u128 } >; + /** Some balance was unlocked. */ + Unlocked: AugmentedEvent< + ApiType, + [who: AccountId20, amount: u128], + { who: AccountId20; amount: u128 } + >; /** Some balance was unreserved (moved from reserved to free). */ Unreserved: AugmentedEvent< ApiType, [who: AccountId20, amount: u128], { who: AccountId20; amount: u128 } >; + /** An account was upgraded. */ + Upgraded: AugmentedEvent; /** Some amount was withdrawn from the account (e.g. for transaction fees). */ Withdraw: AugmentedEvent< ApiType, @@ -715,6 +781,12 @@ declare module "@polkadot/api-base/types/events" { AssetStatusChanged: AugmentedEvent; /** Some asset `asset_id` was thawed. */ AssetThawed: AugmentedEvent; + /** Some account `who` was blocked. */ + Blocked: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20], + { assetId: u128; who: AccountId20 } + >; /** Some assets were destroyed. */ Burned: AugmentedEvent< ApiType, @@ -775,6 +847,12 @@ declare module "@polkadot/api-base/types/events" { [assetId: u128, who: AccountId20], { assetId: u128; who: AccountId20 } >; + /** Some account `who` was created with a deposit from `depositor`. */ + Touched: AugmentedEvent< + ApiType, + [assetId: u128, who: AccountId20, depositor: AccountId20], + { assetId: u128; who: AccountId20; depositor: AccountId20 } + >; /** Some assets were transferred. */ Transferred: AugmentedEvent< ApiType, diff --git a/typescript-api/src/moonriver/interfaces/augment-api-query.ts b/typescript-api/src/moonriver/interfaces/augment-api-query.ts index efe1f0bf8c..afe8228aca 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-query.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-query.ts @@ -58,6 +58,7 @@ import type { PalletAuthorMappingRegistrationInfo, PalletBalancesAccountData, PalletBalancesBalanceLock, + PalletBalancesIdAmount, PalletBalancesReserveData, PalletCollectiveVotes, PalletConvictionVotingVoteVoting, @@ -82,7 +83,7 @@ import type { PalletParachainStakingInflationInflationInfo, PalletParachainStakingParachainBondConfig, PalletParachainStakingRoundInfo, - PalletParachainStakingSetOrderedSet, + PalletParachainStakingSetBoundedOrderedSet, PalletPreimageRequestStatus, PalletProxyAnnouncement, PalletProxyProxyDefinition, @@ -98,9 +99,9 @@ import type { PalletXcmTransactorRemoteTransactInfoWithMaxWeight, PalletXcmVersionMigrationStage, PolkadotCorePrimitivesOutboundHrmpMessage, - PolkadotPrimitivesV2AbridgedHostConfiguration, - PolkadotPrimitivesV2PersistedValidationData, - PolkadotPrimitivesV2UpgradeRestriction, + PolkadotPrimitivesV4AbridgedHostConfiguration, + PolkadotPrimitivesV4PersistedValidationData, + PolkadotPrimitivesV4UpgradeRestriction, SpRuntimeDigest, SpTrieStorageProof, SpWeightsWeightV2Weight, @@ -301,6 +302,20 @@ declare module "@polkadot/api-base/types/storage" { [AccountId20] > & QueryableStorageEntry; + /** Freeze locks on account balances. */ + freezes: AugmentedQuery< + ApiType, + (arg: AccountId20 | string | Uint8Array) => Observable>, + [AccountId20] + > & + QueryableStorageEntry; + /** Holds on account balances. */ + holds: AugmentedQuery< + ApiType, + (arg: AccountId20 | string | Uint8Array) => Observable>, + [AccountId20] + > & + QueryableStorageEntry; /** The total units of outstanding deactivated balance in the system. */ inactiveIssuance: AugmentedQuery Observable, []> & QueryableStorageEntry; @@ -1046,7 +1061,7 @@ declare module "@polkadot/api-base/types/storage" { */ hostConfiguration: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; @@ -1174,7 +1189,7 @@ declare module "@polkadot/api-base/types/storage" { */ upgradeRestrictionSignal: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; @@ -1191,7 +1206,7 @@ declare module "@polkadot/api-base/types/storage" { */ validationData: AugmentedQuery< ApiType, - () => Observable>, + () => Observable>, [] > & QueryableStorageEntry; diff --git a/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts b/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts index bec563709c..5a8e8cb6a6 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-runtime.ts @@ -6,30 +6,12 @@ import "@polkadot/api-base/types/calls"; import type { ApiTypes, AugmentedCall, DecoratedCallBase } from "@polkadot/api-base/types"; -import type { - Bytes, - Null, - Option, - Result, - U256, - Vec, - bool, - u256, - u32, - u64, -} from "@polkadot/types-codec"; +import type { Bytes, Null, Option, Result, Vec, bool, u32 } from "@polkadot/types-codec"; import type { AnyNumber, ITuple } from "@polkadot/types-codec/types"; import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder"; import type { BlockHash } from "@polkadot/types/interfaces/chain"; import type { CollationInfo } from "@polkadot/types/interfaces/cumulus"; -import type { - BlockV2, - EthReceiptV3, - EthTransaction, - EthTransactionStatus, - TransactionV2, -} from "@polkadot/types/interfaces/eth"; -import type { EvmAccount, EvmCallInfo, EvmCreateInfo } from "@polkadot/types/interfaces/evm"; +import type { EthTransaction, TransactionV2 } from "@polkadot/types/interfaces/eth"; import type { Extrinsic } from "@polkadot/types/interfaces/extrinsics"; import type { OpaqueMetadata } from "@polkadot/types/interfaces/metadata"; import type { FeeDetails, RuntimeDispatchInfo } from "@polkadot/types/interfaces/payment"; @@ -37,12 +19,10 @@ import type { AccountId, Balance, Block, - H160, H256, Header, Index, KeyTypeId, - Permill, Weight, } from "@polkadot/types/interfaces/runtime"; import type { RuntimeVersion } from "@polkadot/types/interfaces/state"; @@ -214,105 +194,17 @@ declare module "@polkadot/api-base/types/calls" { /** Generic call */ [key: string]: DecoratedCallBase; }; - /** 0x582211f65bb14b89/4 */ - ethereumRuntimeRPCApi: { - /** Returns pallet_evm::Accounts by address. */ - accountBasic: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** For a given account address, returns pallet_evm::AccountCodes. */ - accountCodeAt: AugmentedCall< - ApiType, - (address: H160 | string | Uint8Array) => Observable - >; - /** Returns the converted FindAuthor::find_author authority id. */ - author: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - call: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - to: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Returns runtime defined pallet_evm::ChainId. */ - chainId: AugmentedCall Observable>; - /** Returns a frame_ethereum::call response. If `estimate` is true, */ - create: AugmentedCall< - ApiType, - ( - from: H160 | string | Uint8Array, - data: Bytes | string | Uint8Array, - value: U256 | AnyNumber | Uint8Array, - gasLimit: U256 | AnyNumber | Uint8Array, - maxFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - maxPriorityFeePerGas: Option | null | Uint8Array | U256 | AnyNumber, - nonce: Option | null | Uint8Array | U256 | AnyNumber, - estimate: bool | boolean | Uint8Array, - accessList: - | Option]>>> - | null - | Uint8Array - | Vec]>> - | [H160 | string | Uint8Array, Vec | (H256 | string | Uint8Array)[]][] - ) => Observable> - >; - /** Return all the current data for a block in a single runtime call. */ - currentAll: AugmentedCall< - ApiType, - () => Observable< - ITuple<[Option, Option>, Option>]> - > - >; - /** Return the current block. */ - currentBlock: AugmentedCall Observable>; - /** Return the current receipt. */ - currentReceipts: AugmentedCall Observable>>>; - /** Return the current transaction status. */ - currentTransactionStatuses: AugmentedCall< - ApiType, - () => Observable>> - >; - /** Return the elasticity multiplier. */ - elasticity: AugmentedCall Observable>>; - /** Receives a `Vec` and filters all the ethereum transactions. */ - extrinsicFilter: AugmentedCall< - ApiType, - ( - xts: Vec | (Extrinsic | IExtrinsic | string | Uint8Array)[] - ) => Observable> - >; - /** Returns FixedGasPrice::min_gas_price */ - gasPrice: AugmentedCall Observable>; - /** For a given account address and index, returns pallet_evm::AccountStorages. */ - storageAt: AugmentedCall< - ApiType, - ( - address: H160 | string | Uint8Array, - index: u256 | AnyNumber | Uint8Array - ) => Observable - >; - /** Generic call */ - [key: string]: DecoratedCallBase; - }; - /** 0x37e397fc7c91f5e4/1 */ + /** 0x37e397fc7c91f5e4/2 */ metadata: { /** Returns the metadata of a runtime */ metadata: AugmentedCall Observable>; + /** Returns the metadata at a given version. */ + metadataAtVersion: AugmentedCall< + ApiType, + (version: u32 | AnyNumber | Uint8Array) => Observable> + >; + /** Returns the supported metadata versions. */ + metadataVersions: AugmentedCall Observable>>; /** Generic call */ [key: string]: DecoratedCallBase; }; @@ -393,7 +285,7 @@ declare module "@polkadot/api-base/types/calls" { /** Generic call */ [key: string]: DecoratedCallBase; }; - /** 0x37c8bb1350a9a2a8/3 */ + /** 0x37c8bb1350a9a2a8/4 */ transactionPaymentApi: { /** The transaction fee details */ queryFeeDetails: AugmentedCall< diff --git a/typescript-api/src/moonriver/interfaces/augment-api-tx.ts b/typescript-api/src/moonriver/interfaces/augment-api-tx.ts index 993fad09ae..744ce6f769 100644 --- a/typescript-api/src/moonriver/interfaces/augment-api-tx.ts +++ b/typescript-api/src/moonriver/interfaces/augment-api-tx.ts @@ -201,6 +201,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, AccountId20, Compact] >; + /** + * Disallow further unprivileged transfers of an asset `id` to and from an account `who`. + * + * Origin must be Signed and the sender should be the Freezer of the asset `id`. + * + * - `id`: The identifier of the account's asset. + * - `who`: The account to be unblocked. + * + * Emits `Blocked`. + * + * Weight: `O(1)` + */ + block: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Reduce the balance of `who` by as much as possible up to `amount` assets of `id`. * @@ -510,7 +529,9 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, AccountId20, Compact] >; /** - * Disallow further unprivileged transfers from an account. + * Disallow further unprivileged transfers of an asset `id` from an account `who`. `who` must + * already exist as an entry in `Account`s of the asset. If you want to freeze an account that + * does not have an entry, use `touch_other` first. * * Origin must be Signed and the sender should be the Freezer of the asset `id`. * @@ -565,11 +586,11 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, Compact] >; /** - * Return the deposit (if any) of an asset account. + * Return the deposit (if any) of an asset account or a consumer reference (if any) of an account. * * The origin must be Signed. * - * - `id`: The identifier of the asset for the account to be created. + * - `id`: The identifier of the asset for which the caller would like the deposit refunded. * - `allow_burn`: If `true` then assets may be destroyed in order to complete the refund. * * Emits `Refunded` event when successful. @@ -581,6 +602,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, bool] >; + /** + * Return the deposit (if any) of a target asset account. Useful if you are the depositor. + * + * The origin must be Signed and either the account owner, depositor, or asset `Admin`. In + * order to burn a non-zero balance of the asset, the caller must be the account and should + * use `refund`. + * + * - `id`: The identifier of the asset for the account holding a deposit. + * - `who`: The account to refund. + * + * Emits `Refunded` event when successful. + */ + refundOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Set the metadata for an asset. * @@ -667,7 +707,7 @@ declare module "@polkadot/api-base/types/submittable" { [Compact] >; /** - * Allow unprivileged transfers from an account again. + * Allow unprivileged transfers to and from an account again. * * Origin must be Signed and the sender should be the Admin of the asset `id`. * @@ -714,6 +754,25 @@ declare module "@polkadot/api-base/types/submittable" { (id: Compact | AnyNumber | Uint8Array) => SubmittableExtrinsic, [Compact] >; + /** + * Create an asset account for `who`. + * + * A deposit will be taken from the signer account. + * + * - `origin`: Must be Signed by `Freezer` or `Admin` of the asset `id`; the signer account must + * have sufficient funds for a deposit to be taken. + * - `id`: The identifier of the asset for the account to be created. + * - `who`: The account to be created. + * + * Emits `Touched` event when successful. + */ + touchOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Move some assets from the sender account to another. * @@ -893,12 +952,20 @@ declare module "@polkadot/api-base/types/submittable" { }; balances: { /** - * Exactly as `transfer`, except the origin must be root and the source account may be specified. - * - * ## Complexity + * Set the regular balance of a given account. * - * - Same as transfer, but additional read and write because the source account is not assumed - * to be in the overlay. + * The dispatch origin for this call is `root`. + */ + forceSetBalance: AugmentedSubmittable< + ( + who: AccountId20 | string | Uint8Array, + newFree: Compact | AnyNumber | Uint8Array + ) => SubmittableExtrinsic, + [AccountId20, Compact] + >; + /** + * Exactly as `transfer_allow_death`, except the origin must be root and the source account + * may be specified. */ forceTransfer: AugmentedSubmittable< ( @@ -921,45 +988,25 @@ declare module "@polkadot/api-base/types/submittable" { [AccountId20, u128] >; /** - * Set the balances of a given account. - * - * This will alter `FreeBalance` and `ReservedBalance` in storage. it will also alter the - * total issuance of the system (`TotalIssuance`) appropriately. If the new free or reserved - * balance is below the existential deposit, it will reset the account nonce - * (`frame_system::AccountNonce`). + * Set the regular balance of a given account; it also takes a reserved balance but this must + * be the same as the account's current reserved balance. * * The dispatch origin for this call is `root`. + * + * WARNING: This call is DEPRECATED! Use `force_set_balance` instead. */ - setBalance: AugmentedSubmittable< + setBalanceDeprecated: AugmentedSubmittable< ( who: AccountId20 | string | Uint8Array, newFree: Compact | AnyNumber | Uint8Array, - newReserved: Compact | AnyNumber | Uint8Array + oldReserved: Compact | AnyNumber | Uint8Array ) => SubmittableExtrinsic, [AccountId20, Compact, Compact] >; /** - * Transfer some liquid free balance to another account. + * Alias for `transfer_allow_death`, provided only for name-wise compatibility. * - * `transfer` will set the `FreeBalance` of the sender and receiver. If the sender's account - * is below the existential deposit as a result of the transfer, the account will be reaped. - * - * The dispatch origin for this call must be `Signed` by the transactor. - * - * ## Complexity - * - * - Dependent on arguments but not critical, given proper implementations for input config - * types. See related functions below. - * - It contains a limited number of reads and writes internally and no complex computation. - * - * Related functions: - * - * - `ensure_can_withdraw` is always called internally but has a bounded complexity. - * - Transferring balances to accounts that did not exist before will cause - * `T::OnNewAccount::on_new_account` to be called. - * - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`. - * - `transfer_keep_alive` works the same way as `transfer`, but has an additional check that - * the transfer will not kill the origin account. + * WARNING: DEPRECATED! Will be released in approximately 3 months. */ transfer: AugmentedSubmittable< ( @@ -982,8 +1029,7 @@ declare module "@polkadot/api-base/types/submittable" { * - `keep_alive`: A boolean to determine if the `transfer_all` operation should send all of the * funds the account has, causing the sender account to be killed (false), or transfer * everything except at least the existential deposit, which will guarantee to keep the - * sender account alive (true). ## Complexity - * - O(1). Just like transfer, but reading the user's transferable balance first. + * sender account alive (true). */ transferAll: AugmentedSubmittable< ( @@ -993,12 +1039,28 @@ declare module "@polkadot/api-base/types/submittable" { [AccountId20, bool] >; /** - * Same as the [`transfer`][`transfer`] call, but with a check that the transfer will not kill - * the origin account. + * Transfer some liquid free balance to another account. + * + * `transfer_allow_death` will set the `FreeBalance` of the sender and receiver. If the + * sender's account is below the existential deposit as a result of the transfer, the account + * will be reaped. + * + * The dispatch origin for this call must be `Signed` by the transactor. + */ + transferAllowDeath: AugmentedSubmittable< + ( + dest: AccountId20 | string | Uint8Array, + value: Compact | AnyNumber | Uint8Array + ) => SubmittableExtrinsic, + [AccountId20, Compact] + >; + /** + * Same as the [`transfer_allow_death`][`transfer_allow_death`] call, but with a check that + * the transfer will not kill the origin account. * - * 99% of the time you want [`transfer`][`transfer`] instead. + * 99% of the time you want [`transfer_allow_death`][`transfer_allow_death`] instead. * - * [`transfer`]: struct.Pallet.html#method.transfer + * [`transfer_allow_death`]: struct.Pallet.html#method.transfer */ transferKeepAlive: AugmentedSubmittable< ( @@ -1007,6 +1069,22 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [AccountId20, Compact] >; + /** + * Upgrade a specified account. + * + * - `origin`: Must be `Signed`. + * - `who`: The account to be upgraded. + * + * This will waive the transaction fee if at least all but 10% of the accounts needed to be + * upgraded. (We let some not have to be upgraded just in order to allow for the possibililty + * of churn). + */ + upgradeAccounts: AugmentedSubmittable< + ( + who: Vec | (AccountId20 | string | Uint8Array)[] + ) => SubmittableExtrinsic, + [Vec] + >; /** Generic tx */ [key: string]: SubmittableExtrinsicFunction; }; @@ -1221,41 +1299,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -2403,6 +2446,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, AccountId20, Compact] >; + /** + * Disallow further unprivileged transfers of an asset `id` to and from an account `who`. + * + * Origin must be Signed and the sender should be the Freezer of the asset `id`. + * + * - `id`: The identifier of the account's asset. + * - `who`: The account to be unblocked. + * + * Emits `Blocked`. + * + * Weight: `O(1)` + */ + block: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Reduce the balance of `who` by as much as possible up to `amount` assets of `id`. * @@ -2712,7 +2774,9 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, AccountId20, Compact] >; /** - * Disallow further unprivileged transfers from an account. + * Disallow further unprivileged transfers of an asset `id` from an account `who`. `who` must + * already exist as an entry in `Account`s of the asset. If you want to freeze an account that + * does not have an entry, use `touch_other` first. * * Origin must be Signed and the sender should be the Freezer of the asset `id`. * @@ -2767,11 +2831,11 @@ declare module "@polkadot/api-base/types/submittable" { [Compact, AccountId20, Compact] >; /** - * Return the deposit (if any) of an asset account. + * Return the deposit (if any) of an asset account or a consumer reference (if any) of an account. * * The origin must be Signed. * - * - `id`: The identifier of the asset for the account to be created. + * - `id`: The identifier of the asset for which the caller would like the deposit refunded. * - `allow_burn`: If `true` then assets may be destroyed in order to complete the refund. * * Emits `Refunded` event when successful. @@ -2783,6 +2847,25 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [Compact, bool] >; + /** + * Return the deposit (if any) of a target asset account. Useful if you are the depositor. + * + * The origin must be Signed and either the account owner, depositor, or asset `Admin`. In + * order to burn a non-zero balance of the asset, the caller must be the account and should + * use `refund`. + * + * - `id`: The identifier of the asset for the account holding a deposit. + * - `who`: The account to refund. + * + * Emits `Refunded` event when successful. + */ + refundOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Set the metadata for an asset. * @@ -2869,7 +2952,7 @@ declare module "@polkadot/api-base/types/submittable" { [Compact] >; /** - * Allow unprivileged transfers from an account again. + * Allow unprivileged transfers to and from an account again. * * Origin must be Signed and the sender should be the Admin of the asset `id`. * @@ -2916,6 +2999,25 @@ declare module "@polkadot/api-base/types/submittable" { (id: Compact | AnyNumber | Uint8Array) => SubmittableExtrinsic, [Compact] >; + /** + * Create an asset account for `who`. + * + * A deposit will be taken from the signer account. + * + * - `origin`: Must be Signed by `Freezer` or `Admin` of the asset `id`; the signer account must + * have sufficient funds for a deposit to be taken. + * - `id`: The identifier of the asset for the account to be created. + * - `who`: The account to be created. + * + * Emits `Touched` event when successful. + */ + touchOther: AugmentedSubmittable< + ( + id: Compact | AnyNumber | Uint8Array, + who: AccountId20 | string | Uint8Array + ) => SubmittableExtrinsic, + [Compact, AccountId20] + >; /** * Move some assets from the sender account to another. * @@ -3039,17 +3141,6 @@ declare module "@polkadot/api-base/types/submittable" { /** Generic tx */ [key: string]: SubmittableExtrinsicFunction; }; - migrations: { - migrateDemocracyPreimage: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - proposalLenUpperBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact] - >; - /** Generic tx */ - [key: string]: SubmittableExtrinsicFunction; - }; moonbeamOrbiters: { /** Add a collator to orbiters program. */ addCollator: AugmentedSubmittable< @@ -3298,41 +3389,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -3469,12 +3525,6 @@ declare module "@polkadot/api-base/types/submittable" { (candidateCount: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32] >; - /** - * DEPRECATED use batch util with cancel_delegation_request for all delegations Cancel a - * pending request to exit the set of delegators. Success clears the pending exit request - * (thereby resetting the delay upon another `leave_delegators` call). - */ - cancelLeaveDelegators: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Increase collator candidate self bond by `more` */ candidateBondMore: AugmentedSubmittable< (more: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, @@ -3539,17 +3589,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [AccountId20, u32] >; - /** - * DEPRECATED use batch util with execute_delegation_request for all delegations Execute the - * right to exit the set of delegators and revoke all ongoing delegations. - */ - executeLeaveDelegators: AugmentedSubmittable< - ( - delegator: AccountId20 | string | Uint8Array, - delegationCount: u32 | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [AccountId20, u32] - >; /** Temporarily leave the set of collator candidates without unbonding */ goOffline: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Rejoin the set of collator candidates if previously had called `go_offline` */ @@ -3569,6 +3608,12 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [u128, u32] >; + /** REMOVED, was schedule_leave_delegators */ + removedCall19: AugmentedSubmittable<() => SubmittableExtrinsic, []>; + /** REMOVED, was execute_leave_delegators */ + removedCall20: AugmentedSubmittable<() => SubmittableExtrinsic, []>; + /** REMOVED, was cancel_leave_delegators */ + removedCall21: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** Request by collator candidate to decrease self bond by `less` */ scheduleCandidateBondLess: AugmentedSubmittable< (less: u128 | AnyNumber | Uint8Array) => SubmittableExtrinsic, @@ -3594,13 +3639,6 @@ declare module "@polkadot/api-base/types/submittable" { (candidateCount: u32 | AnyNumber | Uint8Array) => SubmittableExtrinsic, [u32] >; - /** - * DEPRECATED use batch util with schedule_revoke_delegation for all delegations Request to - * leave the set of delegators. If successful, the caller is scheduled to be allowed to exit - * via a [DelegationAction::Revoke] towards all existing delegations. Success forbids future - * delegation requests until the request is invoked or cancelled. - */ - scheduleLeaveDelegators: AugmentedSubmittable<() => SubmittableExtrinsic, []>; /** * Request to revoke an existing delegation. If successful, the delegation is scheduled to be * allowed to be revoked via the `execute_delegation_request` extrinsic. The delegation @@ -4587,8 +4625,6 @@ declare module "@polkadot/api-base/types/submittable" { /** * Make some on-chain remark. * - * ## Complexity - * * - `O(1)` */ remark: AugmentedSubmittable< @@ -4600,24 +4636,12 @@ declare module "@polkadot/api-base/types/submittable" { (remark: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] >; - /** - * Set the new runtime code. - * - * ## Complexity - * - * - `O(C + S)` where `C` length of `code` and `S` complexity of `can_set_code` - */ + /** Set the new runtime code. */ setCode: AugmentedSubmittable< (code: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] >; - /** - * Set the new runtime code without doing any checks of the given `code`. - * - * ## Complexity - * - * - `O(C)` where `C` length of `code` - */ + /** Set the new runtime code without doing any checks of the given `code`. */ setCodeWithoutChecks: AugmentedSubmittable< (code: Bytes | string | Uint8Array) => SubmittableExtrinsic, [Bytes] @@ -4679,41 +4703,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -4980,41 +4969,6 @@ declare module "@polkadot/api-base/types/submittable" { ) => SubmittableExtrinsic, [H256, Compact, SpWeightsWeightV2Weight, Compact] >; - /** - * Close a vote that is either approved, disapproved or whose voting period has ended. - * - * May be called by any signed account in order to finish voting and close the proposal. - * - * If called before the end of the voting period it will only close the vote if it is has - * enough votes to be approved or disapproved. - * - * If called after the end of the voting period abstentions are counted as rejections unless - * there is a prime member set and the prime member cast an approval. - * - * If the close operation completes successfully with disapproval, the transaction fee will be - * waived. Otherwise execution of the approved operation will be charged to the caller. - * - * - `proposal_weight_bound`: The maximum amount of weight consumed by executing the closed proposal. - * - `length_bound`: The upper bound for the length of the proposal in storage. Checked via - * `storage::read` so it is `size_of::() == 4` larger than the pure length. - * - * ## Complexity - * - * - `O(B + M + P1 + P2)` where: - * - `B` is `proposal` size in bytes (length-fee-bounded) - * - `M` is members-count (code- and governance-bounded) - * - `P1` is the complexity of `proposal` preimage. - * - `P2` is proposal-count (code-bounded) - */ - closeOldWeight: AugmentedSubmittable< - ( - proposalHash: H256 | string | Uint8Array, - index: Compact | AnyNumber | Uint8Array, - proposalWeightBound: Compact | AnyNumber | Uint8Array, - lengthBound: Compact | AnyNumber | Uint8Array - ) => SubmittableExtrinsic, - [H256, Compact, Compact, Compact] - >; /** * Disapprove a proposal, close, and remove it from the system, regardless of its current state. * @@ -5431,14 +5385,16 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ MoonriverRuntimeXcmConfigTransactors, u16, PalletXcmTransactorCurrencyPayment, Bytes, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** @@ -5461,13 +5417,15 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ XcmVersionedMultiLocation, PalletXcmTransactorCurrencyPayment, Bytes, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** @@ -5497,7 +5455,8 @@ declare module "@polkadot/api-base/types/submittable" { | PalletXcmTransactorTransactWeights | { transactRequiredWeightAtMost?: any; overallWeight?: any } | string - | Uint8Array + | Uint8Array, + refund: bool | boolean | Uint8Array ) => SubmittableExtrinsic, [ XcmVersionedMultiLocation, @@ -5505,7 +5464,8 @@ declare module "@polkadot/api-base/types/submittable" { PalletXcmTransactorCurrencyPayment, Bytes, XcmV2OriginKind, - PalletXcmTransactorTransactWeights + PalletXcmTransactorTransactWeights, + bool ] >; /** Generic tx */ diff --git a/typescript-api/src/moonriver/interfaces/lookup.ts b/typescript-api/src/moonriver/interfaces/lookup.ts index c524717585..a2d86b4ddb 100644 --- a/typescript-api/src/moonriver/interfaces/lookup.ts +++ b/typescript-api/src/moonriver/interfaces/lookup.ts @@ -4,7 +4,7 @@ /* eslint-disable sort-keys */ export default { - /** Lookup3: frame_system::AccountInfo> */ + /** Lookup3: frame_system::AccountInfo> */ FrameSystemAccountInfo: { nonce: "u32", consumers: "u32", @@ -12,29 +12,29 @@ export default { sufficients: "u32", data: "PalletBalancesAccountData", }, - /** Lookup5: pallet_balances::AccountData */ + /** Lookup5: pallet_balances::types::AccountData */ PalletBalancesAccountData: { free: "u128", reserved: "u128", - miscFrozen: "u128", - feeFrozen: "u128", + frozen: "u128", + flags: "u128", }, - /** Lookup7: frame_support::dispatch::PerDispatchClass */ + /** Lookup8: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassWeight: { normal: "SpWeightsWeightV2Weight", operational: "SpWeightsWeightV2Weight", mandatory: "SpWeightsWeightV2Weight", }, - /** Lookup8: sp_weights::weight_v2::Weight */ + /** Lookup9: sp_weights::weight_v2::Weight */ SpWeightsWeightV2Weight: { refTime: "Compact", proofSize: "Compact", }, - /** Lookup14: sp_runtime::generic::digest::Digest */ + /** Lookup15: sp_runtime::generic::digest::Digest */ SpRuntimeDigest: { logs: "Vec", }, - /** Lookup16: sp_runtime::generic::digest::DigestItem */ + /** Lookup17: sp_runtime::generic::digest::DigestItem */ SpRuntimeDigestDigestItem: { _enum: { Other: "Bytes", @@ -48,13 +48,13 @@ export default { RuntimeEnvironmentUpdated: "Null", }, }, - /** Lookup19: frame_system::EventRecord */ + /** Lookup20: frame_system::EventRecord */ FrameSystemEventRecord: { phase: "FrameSystemPhase", event: "Event", topics: "Vec", }, - /** Lookup21: frame_system::pallet::Event */ + /** Lookup22: frame_system::pallet::Event */ FrameSystemEvent: { _enum: { ExtrinsicSuccess: { @@ -80,21 +80,21 @@ export default { }, }, }, - /** Lookup22: frame_support::dispatch::DispatchInfo */ + /** Lookup23: frame_support::dispatch::DispatchInfo */ FrameSupportDispatchDispatchInfo: { weight: "SpWeightsWeightV2Weight", class: "FrameSupportDispatchDispatchClass", paysFee: "FrameSupportDispatchPays", }, - /** Lookup23: frame_support::dispatch::DispatchClass */ + /** Lookup24: frame_support::dispatch::DispatchClass */ FrameSupportDispatchDispatchClass: { _enum: ["Normal", "Operational", "Mandatory"], }, - /** Lookup24: frame_support::dispatch::Pays */ + /** Lookup25: frame_support::dispatch::Pays */ FrameSupportDispatchPays: { _enum: ["Yes", "No"], }, - /** Lookup25: sp_runtime::DispatchError */ + /** Lookup26: sp_runtime::DispatchError */ SpRuntimeDispatchError: { _enum: { Other: "Null", @@ -110,34 +110,38 @@ export default { Exhausted: "Null", Corruption: "Null", Unavailable: "Null", + RootNotAllowed: "Null", }, }, - /** Lookup26: sp_runtime::ModuleError */ + /** Lookup27: sp_runtime::ModuleError */ SpRuntimeModuleError: { index: "u8", error: "[u8;4]", }, - /** Lookup27: sp_runtime::TokenError */ + /** Lookup28: sp_runtime::TokenError */ SpRuntimeTokenError: { _enum: [ - "NoFunds", - "WouldDie", + "FundsUnavailable", + "OnlyProvider", "BelowMinimum", "CannotCreate", "UnknownAsset", "Frozen", "Unsupported", + "CannotCreateHold", + "NotExpendable", + "Blocked", ], }, - /** Lookup28: sp_arithmetic::ArithmeticError */ + /** Lookup29: sp_arithmetic::ArithmeticError */ SpArithmeticArithmeticError: { _enum: ["Underflow", "Overflow", "DivisionByZero"], }, - /** Lookup29: sp_runtime::TransactionalError */ + /** Lookup30: sp_runtime::TransactionalError */ SpRuntimeTransactionalError: { _enum: ["LimitReached", "NoLayer"], }, - /** Lookup30: cumulus_pallet_parachain_system::pallet::Event */ + /** Lookup31: cumulus_pallet_parachain_system::pallet::Event */ CumulusPalletParachainSystemEvent: { _enum: { ValidationFunctionStored: "Null", @@ -160,7 +164,7 @@ export default { }, }, }, - /** Lookup32: pallet_balances::pallet::Event */ + /** Lookup33: pallet_balances::pallet::Event */ PalletBalancesEvent: { _enum: { Endowed: { @@ -179,7 +183,6 @@ export default { BalanceSet: { who: "AccountId20", free: "u128", - reserved: "u128", }, Reserved: { who: "AccountId20", @@ -207,13 +210,54 @@ export default { who: "AccountId20", amount: "u128", }, + Minted: { + who: "AccountId20", + amount: "u128", + }, + Burned: { + who: "AccountId20", + amount: "u128", + }, + Suspended: { + who: "AccountId20", + amount: "u128", + }, + Restored: { + who: "AccountId20", + amount: "u128", + }, + Upgraded: { + who: "AccountId20", + }, + Issued: { + amount: "u128", + }, + Rescinded: { + amount: "u128", + }, + Locked: { + who: "AccountId20", + amount: "u128", + }, + Unlocked: { + who: "AccountId20", + amount: "u128", + }, + Frozen: { + who: "AccountId20", + amount: "u128", + }, + Thawed: { + who: "AccountId20", + amount: "u128", + }, }, }, - /** Lookup33: frame_support::traits::tokens::misc::BalanceStatus */ + /** Lookup34: frame_support::traits::tokens::misc::BalanceStatus */ FrameSupportTokensMiscBalanceStatus: { _enum: ["Free", "Reserved"], }, - /** Lookup34: pallet_transaction_payment::pallet::Event */ + /** Lookup35: pallet_transaction_payment::pallet::Event */ PalletTransactionPaymentEvent: { _enum: { TransactionFeePaid: { @@ -223,7 +267,7 @@ export default { }, }, }, - /** Lookup35: pallet_parachain_staking::pallet::Event */ + /** Lookup36: pallet_parachain_staking::pallet::Event */ PalletParachainStakingEvent: { _enum: { NewRound: { @@ -418,19 +462,19 @@ export default { }, }, }, - /** Lookup37: pallet_parachain_staking::delegation_requests::CancelledScheduledRequest */ + /** Lookup38: pallet_parachain_staking::delegation_requests::CancelledScheduledRequest */ PalletParachainStakingDelegationRequestsCancelledScheduledRequest: { whenExecutable: "u32", action: "PalletParachainStakingDelegationRequestsDelegationAction", }, - /** Lookup38: pallet_parachain_staking::delegation_requests::DelegationAction */ + /** Lookup39: pallet_parachain_staking::delegation_requests::DelegationAction */ PalletParachainStakingDelegationRequestsDelegationAction: { _enum: { Revoke: "u128", Decrease: "u128", }, }, - /** Lookup39: pallet_parachain_staking::types::DelegatorAdded */ + /** Lookup40: pallet_parachain_staking::types::DelegatorAdded */ PalletParachainStakingDelegatorAdded: { _enum: { AddedToTop: { @@ -439,13 +483,13 @@ export default { AddedToBottom: "Null", }, }, - /** Lookup42: pallet_author_slot_filter::pallet::Event */ + /** Lookup43: pallet_author_slot_filter::pallet::Event */ PalletAuthorSlotFilterEvent: { _enum: { EligibleUpdated: "u32", }, }, - /** Lookup44: pallet_author_mapping::pallet::Event */ + /** Lookup45: pallet_author_mapping::pallet::Event */ PalletAuthorMappingEvent: { _enum: { KeysRegistered: { @@ -471,13 +515,13 @@ export default { }, }, }, - /** Lookup45: nimbus_primitives::nimbus_crypto::Public */ + /** Lookup46: nimbus_primitives::nimbus_crypto::Public */ NimbusPrimitivesNimbusCryptoPublic: "SpCoreSr25519Public", - /** Lookup46: sp_core::sr25519::Public */ + /** Lookup47: sp_core::sr25519::Public */ SpCoreSr25519Public: "[u8;32]", - /** Lookup47: session_keys_primitives::vrf::vrf_crypto::Public */ + /** Lookup48: session_keys_primitives::vrf::vrf_crypto::Public */ SessionKeysPrimitivesVrfVrfCryptoPublic: "SpCoreSr25519Public", - /** Lookup48: pallet_moonbeam_orbiters::pallet::Event */ + /** Lookup49: pallet_moonbeam_orbiters::pallet::Event */ PalletMoonbeamOrbitersEvent: { _enum: { OrbiterJoinCollatorPool: { @@ -506,7 +550,7 @@ export default { }, }, }, - /** Lookup50: pallet_utility::pallet::Event */ + /** Lookup51: pallet_utility::pallet::Event */ PalletUtilityEvent: { _enum: { BatchInterrupted: { @@ -524,7 +568,7 @@ export default { }, }, }, - /** Lookup53: pallet_proxy::pallet::Event */ + /** Lookup54: pallet_proxy::pallet::Event */ PalletProxyEvent: { _enum: { ProxyExecuted: { @@ -555,7 +599,7 @@ export default { }, }, }, - /** Lookup54: moonriver_runtime::ProxyType */ + /** Lookup55: moonriver_runtime::ProxyType */ MoonriverRuntimeProxyType: { _enum: [ "Any", @@ -568,7 +612,7 @@ export default { "IdentityJudgement", ], }, - /** Lookup56: pallet_maintenance_mode::pallet::Event */ + /** Lookup57: pallet_maintenance_mode::pallet::Event */ PalletMaintenanceModeEvent: { _enum: { EnteredMaintenanceMode: "Null", @@ -581,7 +625,7 @@ export default { }, }, }, - /** Lookup57: pallet_identity::pallet::Event */ + /** Lookup58: pallet_identity::pallet::Event */ PalletIdentityEvent: { _enum: { IdentitySet: { @@ -627,7 +671,7 @@ export default { }, }, }, - /** Lookup58: pallet_migrations::pallet::Event */ + /** Lookup59: pallet_migrations::pallet::Event */ PalletMigrationsEvent: { _enum: { RuntimeUpgradeStarted: "Null", @@ -649,7 +693,7 @@ export default { }, }, }, - /** Lookup59: pallet_multisig::pallet::Event */ + /** Lookup60: pallet_multisig::pallet::Event */ PalletMultisigEvent: { _enum: { NewMultisig: { @@ -678,12 +722,12 @@ export default { }, }, }, - /** Lookup60: pallet_multisig::Timepoint */ + /** Lookup61: pallet_multisig::Timepoint */ PalletMultisigTimepoint: { height: "u32", index: "u32", }, - /** Lookup61: pallet_evm::pallet::Event */ + /** Lookup62: pallet_evm::pallet::Event */ PalletEvmEvent: { _enum: { Log: { @@ -703,13 +747,13 @@ export default { }, }, }, - /** Lookup62: ethereum::log::Log */ + /** Lookup63: ethereum::log::Log */ EthereumLog: { address: "H160", topics: "Vec", data: "Bytes", }, - /** Lookup65: pallet_ethereum::pallet::Event */ + /** Lookup66: pallet_ethereum::pallet::Event */ PalletEthereumEvent: { _enum: { Executed: { @@ -721,7 +765,7 @@ export default { }, }, }, - /** Lookup66: evm_core::error::ExitReason */ + /** Lookup67: evm_core::error::ExitReason */ EvmCoreErrorExitReason: { _enum: { Succeed: "EvmCoreErrorExitSucceed", @@ -730,11 +774,11 @@ export default { Fatal: "EvmCoreErrorExitFatal", }, }, - /** Lookup67: evm_core::error::ExitSucceed */ + /** Lookup68: evm_core::error::ExitSucceed */ EvmCoreErrorExitSucceed: { _enum: ["Stopped", "Returned", "Suicided"], }, - /** Lookup68: evm_core::error::ExitError */ + /** Lookup69: evm_core::error::ExitError */ EvmCoreErrorExitError: { _enum: { StackUnderflow: "Null", @@ -755,11 +799,11 @@ export default { InvalidCode: "u8", }, }, - /** Lookup72: evm_core::error::ExitRevert */ + /** Lookup73: evm_core::error::ExitRevert */ EvmCoreErrorExitRevert: { _enum: ["Reverted"], }, - /** Lookup73: evm_core::error::ExitFatal */ + /** Lookup74: evm_core::error::ExitFatal */ EvmCoreErrorExitFatal: { _enum: { NotSupported: "Null", @@ -768,7 +812,7 @@ export default { Other: "Text", }, }, - /** Lookup74: pallet_scheduler::pallet::Event */ + /** Lookup75: pallet_scheduler::pallet::Event */ PalletSchedulerEvent: { _enum: { Scheduled: { @@ -798,7 +842,7 @@ export default { }, }, }, - /** Lookup76: pallet_democracy::pallet::Event */ + /** Lookup77: pallet_democracy::pallet::Event */ PalletDemocracyEvent: { _enum: { Proposed: { @@ -874,11 +918,11 @@ export default { }, }, }, - /** Lookup77: pallet_democracy::vote_threshold::VoteThreshold */ + /** Lookup78: pallet_democracy::vote_threshold::VoteThreshold */ PalletDemocracyVoteThreshold: { _enum: ["SuperMajorityApprove", "SuperMajorityAgainst", "SimpleMajority"], }, - /** Lookup78: pallet_democracy::vote::AccountVote */ + /** Lookup79: pallet_democracy::vote::AccountVote */ PalletDemocracyVoteAccountVote: { _enum: { Standard: { @@ -891,7 +935,7 @@ export default { }, }, }, - /** Lookup80: pallet_democracy::types::MetadataOwner */ + /** Lookup81: pallet_democracy::types::MetadataOwner */ PalletDemocracyMetadataOwner: { _enum: { External: "Null", @@ -899,7 +943,7 @@ export default { Referendum: "u32", }, }, - /** Lookup81: pallet_preimage::pallet::Event */ + /** Lookup82: pallet_preimage::pallet::Event */ PalletPreimageEvent: { _enum: { Noted: { @@ -922,14 +966,14 @@ export default { }, }, }, - /** Lookup82: pallet_conviction_voting::pallet::Event */ + /** Lookup83: pallet_conviction_voting::pallet::Event */ PalletConvictionVotingEvent: { _enum: { Delegated: "(AccountId20,AccountId20)", Undelegated: "AccountId20", }, }, - /** Lookup83: pallet_referenda::pallet::Event */ + /** Lookup84: pallet_referenda::pallet::Event */ PalletReferendaEvent: { _enum: { Submitted: { @@ -1007,7 +1051,7 @@ export default { }, }, }, - /** Lookup84: frame_support::traits::preimages::Bounded */ + /** Lookup85: frame_support::traits::preimages::Bounded */ FrameSupportPreimagesBounded: { _enum: { Legacy: { @@ -1026,7 +1070,7 @@ export default { }, }, }, - /** Lookup86: frame_system::pallet::Call */ + /** Lookup87: frame_system::pallet::Call */ FrameSystemCall: { _enum: { remark: { @@ -1059,7 +1103,7 @@ export default { }, }, }, - /** Lookup90: cumulus_pallet_parachain_system::pallet::Call */ + /** Lookup91: cumulus_pallet_parachain_system::pallet::Call */ CumulusPalletParachainSystemCall: { _enum: { set_validation_data: { @@ -1077,35 +1121,35 @@ export default { }, }, }, - /** Lookup91: cumulus_primitives_parachain_inherent::ParachainInherentData */ + /** Lookup92: cumulus_primitives_parachain_inherent::ParachainInherentData */ CumulusPrimitivesParachainInherentParachainInherentData: { - validationData: "PolkadotPrimitivesV2PersistedValidationData", + validationData: "PolkadotPrimitivesV4PersistedValidationData", relayChainState: "SpTrieStorageProof", downwardMessages: "Vec", horizontalMessages: "BTreeMap>", }, - /** Lookup92: polkadot_primitives::v2::PersistedValidationData */ - PolkadotPrimitivesV2PersistedValidationData: { + /** Lookup93: polkadot_primitives::v4::PersistedValidationData */ + PolkadotPrimitivesV4PersistedValidationData: { parentHead: "Bytes", relayParentNumber: "u32", relayParentStorageRoot: "H256", maxPovSize: "u32", }, - /** Lookup94: sp_trie::storage_proof::StorageProof */ + /** Lookup95: sp_trie::storage_proof::StorageProof */ SpTrieStorageProof: { trieNodes: "BTreeSet", }, - /** Lookup97: polkadot_core_primitives::InboundDownwardMessage */ + /** Lookup98: polkadot_core_primitives::InboundDownwardMessage */ PolkadotCorePrimitivesInboundDownwardMessage: { sentAt: "u32", msg: "Bytes", }, - /** Lookup101: polkadot_core_primitives::InboundHrmpMessage */ + /** Lookup102: polkadot_core_primitives::InboundHrmpMessage */ PolkadotCorePrimitivesInboundHrmpMessage: { sentAt: "u32", data: "Bytes", }, - /** Lookup104: pallet_timestamp::pallet::Call */ + /** Lookup105: pallet_timestamp::pallet::Call */ PalletTimestampCall: { _enum: { set: { @@ -1113,7 +1157,7 @@ export default { }, }, }, - /** Lookup105: pallet_root_testing::pallet::Call */ + /** Lookup106: pallet_root_testing::pallet::Call */ PalletRootTestingCall: { _enum: { fill_block: { @@ -1121,17 +1165,17 @@ export default { }, }, }, - /** Lookup106: pallet_balances::pallet::Call */ + /** Lookup107: pallet_balances::pallet::Call */ PalletBalancesCall: { _enum: { - transfer: { + transfer_allow_death: { dest: "AccountId20", value: "Compact", }, - set_balance: { + set_balance_deprecated: { who: "AccountId20", newFree: "Compact", - newReserved: "Compact", + oldReserved: "Compact", }, force_transfer: { source: "AccountId20", @@ -1150,9 +1194,20 @@ export default { who: "AccountId20", amount: "u128", }, + upgrade_accounts: { + who: "Vec", + }, + transfer: { + dest: "AccountId20", + value: "Compact", + }, + force_set_balance: { + who: "AccountId20", + newFree: "Compact", + }, }, }, - /** Lookup108: pallet_parachain_staking::pallet::Call */ + /** Lookup110: pallet_parachain_staking::pallet::Call */ PalletParachainStakingCall: { _enum: { set_staking_expectations: { @@ -1239,12 +1294,9 @@ export default { candidateAutoCompoundingDelegationCount: "u32", delegationCount: "u32", }, - schedule_leave_delegators: "Null", - execute_leave_delegators: { - delegator: "AccountId20", - delegationCount: "u32", - }, - cancel_leave_delegators: "Null", + removed_call_19: "Null", + removed_call_20: "Null", + removed_call_21: "Null", schedule_revoke_delegation: { collator: "AccountId20", }, @@ -1274,11 +1326,11 @@ export default { }, }, }, - /** Lookup112: pallet_author_inherent::pallet::Call */ + /** Lookup113: pallet_author_inherent::pallet::Call */ PalletAuthorInherentCall: { _enum: ["kick_off_authorship_validation"], }, - /** Lookup113: pallet_author_slot_filter::pallet::Call */ + /** Lookup114: pallet_author_slot_filter::pallet::Call */ PalletAuthorSlotFilterCall: { _enum: { set_eligible: { @@ -1289,7 +1341,7 @@ export default { }, }, }, - /** Lookup114: pallet_author_mapping::pallet::Call */ + /** Lookup115: pallet_author_mapping::pallet::Call */ PalletAuthorMappingCall: { _enum: { add_association: { @@ -1311,7 +1363,7 @@ export default { }, }, }, - /** Lookup115: pallet_moonbeam_orbiters::pallet::Call */ + /** Lookup116: pallet_moonbeam_orbiters::pallet::Call */ PalletMoonbeamOrbitersCall: { _enum: { collator_add_orbiter: { @@ -1335,7 +1387,7 @@ export default { }, }, }, - /** Lookup116: pallet_utility::pallet::Call */ + /** Lookup117: pallet_utility::pallet::Call */ PalletUtilityCall: { _enum: { batch: { @@ -1361,7 +1413,7 @@ export default { }, }, }, - /** Lookup118: moonriver_runtime::OriginCaller */ + /** Lookup119: moonriver_runtime::OriginCaller */ MoonriverRuntimeOriginCaller: { _enum: { system: "FrameSupportDispatchRawOrigin", @@ -1476,7 +1528,7 @@ export default { EthereumXcm: "PalletEthereumXcmRawOrigin", }, }, - /** Lookup119: frame_support::dispatch::RawOrigin[account::AccountId20](account::AccountId20) */ + /** Lookup120: frame_support::dispatch::RawOrigin[account::AccountId20](account::AccountId20) */ FrameSupportDispatchRawOrigin: { _enum: { Root: "Null", @@ -1484,17 +1536,17 @@ export default { None: "Null", }, }, - /** Lookup120: pallet_ethereum::RawOrigin */ + /** Lookup121: pallet_ethereum::RawOrigin */ PalletEthereumRawOrigin: { _enum: { EthereumTransaction: "H160", }, }, - /** Lookup121: moonriver_runtime::governance::origins::custom_origins::Origin */ + /** Lookup122: moonriver_runtime::governance::origins::custom_origins::Origin */ MoonriverRuntimeGovernanceOriginsCustomOriginsOrigin: { _enum: ["WhitelistedCaller", "GeneralAdmin", "ReferendumCanceller", "ReferendumKiller"], }, - /** Lookup122: pallet_collective::RawOrigin */ + /** Lookup123: pallet_collective::RawOrigin */ PalletCollectiveRawOrigin: { _enum: { Members: "(u32,u32)", @@ -1502,26 +1554,26 @@ export default { _Phantom: "Null", }, }, - /** Lookup126: cumulus_pallet_xcm::pallet::Origin */ + /** Lookup127: cumulus_pallet_xcm::pallet::Origin */ CumulusPalletXcmOrigin: { _enum: { Relay: "Null", SiblingParachain: "u32", }, }, - /** Lookup127: pallet_xcm::pallet::Origin */ + /** Lookup128: pallet_xcm::pallet::Origin */ PalletXcmOrigin: { _enum: { Xcm: "XcmV3MultiLocation", Response: "XcmV3MultiLocation", }, }, - /** Lookup128: xcm::v3::multilocation::MultiLocation */ + /** Lookup129: xcm::v3::multilocation::MultiLocation */ XcmV3MultiLocation: { parents: "u8", interior: "XcmV3Junctions", }, - /** Lookup129: xcm::v3::junctions::Junctions */ + /** Lookup130: xcm::v3::junctions::Junctions */ XcmV3Junctions: { _enum: { Here: "Null", @@ -1535,7 +1587,7 @@ export default { X8: "(XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction,XcmV3Junction)", }, }, - /** Lookup130: xcm::v3::junction::Junction */ + /** Lookup131: xcm::v3::junction::Junction */ XcmV3Junction: { _enum: { Parachain: "Compact", @@ -1565,7 +1617,7 @@ export default { GlobalConsensus: "XcmV3JunctionNetworkId", }, }, - /** Lookup133: xcm::v3::junction::NetworkId */ + /** Lookup134: xcm::v3::junction::NetworkId */ XcmV3JunctionNetworkId: { _enum: { ByGenesis: "[u8;32]", @@ -1585,7 +1637,7 @@ export default { BitcoinCash: "Null", }, }, - /** Lookup134: xcm::v3::junction::BodyId */ + /** Lookup135: xcm::v3::junction::BodyId */ XcmV3JunctionBodyId: { _enum: { Unit: "Null", @@ -1600,7 +1652,7 @@ export default { Treasury: "Null", }, }, - /** Lookup135: xcm::v3::junction::BodyPart */ + /** Lookup136: xcm::v3::junction::BodyPart */ XcmV3JunctionBodyPart: { _enum: { Voice: "Null", @@ -1621,15 +1673,15 @@ export default { }, }, }, - /** Lookup136: pallet_ethereum_xcm::RawOrigin */ + /** Lookup137: pallet_ethereum_xcm::RawOrigin */ PalletEthereumXcmRawOrigin: { _enum: { XcmEthereumTransaction: "H160", }, }, - /** Lookup137: sp_core::Void */ + /** Lookup138: sp_core::Void */ SpCoreVoid: "Null", - /** Lookup138: pallet_proxy::pallet::Call */ + /** Lookup139: pallet_proxy::pallet::Call */ PalletProxyCall: { _enum: { proxy: { @@ -1680,11 +1732,11 @@ export default { }, }, }, - /** Lookup140: pallet_maintenance_mode::pallet::Call */ + /** Lookup141: pallet_maintenance_mode::pallet::Call */ PalletMaintenanceModeCall: { _enum: ["enter_maintenance_mode", "resume_normal_operation"], }, - /** Lookup141: pallet_identity::pallet::Call */ + /** Lookup142: pallet_identity::pallet::Call */ PalletIdentityCall: { _enum: { add_registrar: { @@ -1742,7 +1794,7 @@ export default { quit_sub: "Null", }, }, - /** Lookup142: pallet_identity::types::IdentityInfo */ + /** Lookup143: pallet_identity::types::IdentityInfo */ PalletIdentityIdentityInfo: { additional: "Vec<(Data,Data)>", display: "Data", @@ -1754,7 +1806,7 @@ export default { image: "Data", twitter: "Data", }, - /** Lookup180: pallet_identity::types::BitFlags */ + /** Lookup181: pallet_identity::types::BitFlags */ PalletIdentityBitFlags: { _bitLength: 64, Display: 1, @@ -1766,7 +1818,7 @@ export default { Image: 64, Twitter: 128, }, - /** Lookup181: pallet_identity::types::IdentityField */ + /** Lookup182: pallet_identity::types::IdentityField */ PalletIdentityIdentityField: { _enum: [ "__Unused0", @@ -1900,7 +1952,7 @@ export default { "Twitter", ], }, - /** Lookup182: pallet_identity::types::Judgement */ + /** Lookup183: pallet_identity::types::Judgement */ PalletIdentityJudgement: { _enum: { Unknown: "Null", @@ -1912,15 +1964,6 @@ export default { Erroneous: "Null", }, }, - /** Lookup183: pallet_migrations::pallet::Call */ - PalletMigrationsCall: { - _enum: { - migrate_democracy_preimage: { - proposalHash: "H256", - proposalLenUpperBound: "Compact", - }, - }, - }, /** Lookup184: pallet_multisig::pallet::Call */ PalletMultisigCall: { _enum: { @@ -2335,12 +2378,7 @@ export default { index: "Compact", approve: "bool", }, - close_old_weight: { - proposalHash: "H256", - index: "Compact", - proposalWeightBound: "Compact", - lengthBound: "Compact", - }, + __Unused4: "Null", disapprove_proposal: { proposalHash: "H256", }, @@ -2352,7 +2390,7 @@ export default { }, }, }, - /** Lookup223: pallet_treasury::pallet::Call */ + /** Lookup221: pallet_treasury::pallet::Call */ PalletTreasuryCall: { _enum: { propose_spend: { @@ -2374,7 +2412,7 @@ export default { }, }, }, - /** Lookup224: pallet_crowdloan_rewards::pallet::Call */ + /** Lookup222: pallet_crowdloan_rewards::pallet::Call */ PalletCrowdloanRewardsCall: { _enum: { associate_native_identity: { @@ -2399,7 +2437,7 @@ export default { }, }, }, - /** Lookup225: sp_runtime::MultiSignature */ + /** Lookup223: sp_runtime::MultiSignature */ SpRuntimeMultiSignature: { _enum: { Ed25519: "SpCoreEd25519Signature", @@ -2407,13 +2445,13 @@ export default { Ecdsa: "SpCoreEcdsaSignature", }, }, - /** Lookup226: sp_core::ed25519::Signature */ + /** Lookup224: sp_core::ed25519::Signature */ SpCoreEd25519Signature: "[u8;64]", - /** Lookup228: sp_core::sr25519::Signature */ + /** Lookup226: sp_core::sr25519::Signature */ SpCoreSr25519Signature: "[u8;64]", - /** Lookup229: sp_core::ecdsa::Signature */ + /** Lookup227: sp_core::ecdsa::Signature */ SpCoreEcdsaSignature: "[u8;65]", - /** Lookup235: cumulus_pallet_dmp_queue::pallet::Call */ + /** Lookup233: cumulus_pallet_dmp_queue::pallet::Call */ CumulusPalletDmpQueueCall: { _enum: { service_overweight: { @@ -2422,7 +2460,7 @@ export default { }, }, }, - /** Lookup236: pallet_xcm::pallet::Call */ + /** Lookup234: pallet_xcm::pallet::Call */ PalletXcmCall: { _enum: { send: { @@ -2477,7 +2515,7 @@ export default { }, }, }, - /** Lookup237: xcm::VersionedMultiLocation */ + /** Lookup235: xcm::VersionedMultiLocation */ XcmVersionedMultiLocation: { _enum: { __Unused0: "Null", @@ -2486,12 +2524,12 @@ export default { V3: "XcmV3MultiLocation", }, }, - /** Lookup238: xcm::v2::multilocation::MultiLocation */ + /** Lookup236: xcm::v2::multilocation::MultiLocation */ XcmV2MultiLocation: { parents: "u8", interior: "XcmV2MultilocationJunctions", }, - /** Lookup239: xcm::v2::multilocation::Junctions */ + /** Lookup237: xcm::v2::multilocation::Junctions */ XcmV2MultilocationJunctions: { _enum: { Here: "Null", @@ -2505,7 +2543,7 @@ export default { X8: "(XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction,XcmV2Junction)", }, }, - /** Lookup240: xcm::v2::junction::Junction */ + /** Lookup238: xcm::v2::junction::Junction */ XcmV2Junction: { _enum: { Parachain: "Compact", @@ -2531,7 +2569,7 @@ export default { }, }, }, - /** Lookup241: xcm::v2::NetworkId */ + /** Lookup239: xcm::v2::NetworkId */ XcmV2NetworkId: { _enum: { Any: "Null", @@ -2540,7 +2578,7 @@ export default { Kusama: "Null", }, }, - /** Lookup243: xcm::v2::BodyId */ + /** Lookup241: xcm::v2::BodyId */ XcmV2BodyId: { _enum: { Unit: "Null", @@ -2555,7 +2593,7 @@ export default { Treasury: "Null", }, }, - /** Lookup244: xcm::v2::BodyPart */ + /** Lookup242: xcm::v2::BodyPart */ XcmV2BodyPart: { _enum: { Voice: "Null", @@ -2576,7 +2614,7 @@ export default { }, }, }, - /** Lookup245: xcm::VersionedXcm */ + /** Lookup243: xcm::VersionedXcm */ XcmVersionedXcm: { _enum: { __Unused0: "Null", @@ -2585,9 +2623,9 @@ export default { V3: "XcmV3Xcm", }, }, - /** Lookup246: xcm::v2::Xcm */ + /** Lookup244: xcm::v2::Xcm */ XcmV2Xcm: "Vec", - /** Lookup248: xcm::v2::Instruction */ + /** Lookup246: xcm::v2::Instruction */ XcmV2Instruction: { _enum: { WithdrawAsset: "XcmV2MultiassetMultiAssets", @@ -2683,28 +2721,28 @@ export default { UnsubscribeVersion: "Null", }, }, - /** Lookup249: xcm::v2::multiasset::MultiAssets */ + /** Lookup247: xcm::v2::multiasset::MultiAssets */ XcmV2MultiassetMultiAssets: "Vec", - /** Lookup251: xcm::v2::multiasset::MultiAsset */ + /** Lookup249: xcm::v2::multiasset::MultiAsset */ XcmV2MultiAsset: { id: "XcmV2MultiassetAssetId", fun: "XcmV2MultiassetFungibility", }, - /** Lookup252: xcm::v2::multiasset::AssetId */ + /** Lookup250: xcm::v2::multiasset::AssetId */ XcmV2MultiassetAssetId: { _enum: { Concrete: "XcmV2MultiLocation", Abstract: "Bytes", }, }, - /** Lookup253: xcm::v2::multiasset::Fungibility */ + /** Lookup251: xcm::v2::multiasset::Fungibility */ XcmV2MultiassetFungibility: { _enum: { Fungible: "Compact", NonFungible: "XcmV2MultiassetAssetInstance", }, }, - /** Lookup254: xcm::v2::multiasset::AssetInstance */ + /** Lookup252: xcm::v2::multiasset::AssetInstance */ XcmV2MultiassetAssetInstance: { _enum: { Undefined: "Null", @@ -2716,7 +2754,7 @@ export default { Blob: "Bytes", }, }, - /** Lookup255: xcm::v2::Response */ + /** Lookup253: xcm::v2::Response */ XcmV2Response: { _enum: { Null: "Null", @@ -2725,7 +2763,7 @@ export default { Version: "u32", }, }, - /** Lookup258: xcm::v2::traits::Error */ + /** Lookup256: xcm::v2::traits::Error */ XcmV2TraitsError: { _enum: { Overflow: "Null", @@ -2756,22 +2794,22 @@ export default { WeightNotComputable: "Null", }, }, - /** Lookup259: xcm::v2::OriginKind */ + /** Lookup257: xcm::v2::OriginKind */ XcmV2OriginKind: { _enum: ["Native", "SovereignAccount", "Superuser", "Xcm"], }, - /** Lookup260: xcm::double_encoded::DoubleEncoded */ + /** Lookup258: xcm::double_encoded::DoubleEncoded */ XcmDoubleEncoded: { encoded: "Bytes", }, - /** Lookup261: xcm::v2::multiasset::MultiAssetFilter */ + /** Lookup259: xcm::v2::multiasset::MultiAssetFilter */ XcmV2MultiassetMultiAssetFilter: { _enum: { Definite: "XcmV2MultiassetMultiAssets", Wild: "XcmV2MultiassetWildMultiAsset", }, }, - /** Lookup262: xcm::v2::multiasset::WildMultiAsset */ + /** Lookup260: xcm::v2::multiasset::WildMultiAsset */ XcmV2MultiassetWildMultiAsset: { _enum: { All: "Null", @@ -2781,20 +2819,20 @@ export default { }, }, }, - /** Lookup263: xcm::v2::multiasset::WildFungibility */ + /** Lookup261: xcm::v2::multiasset::WildFungibility */ XcmV2MultiassetWildFungibility: { _enum: ["Fungible", "NonFungible"], }, - /** Lookup264: xcm::v2::WeightLimit */ + /** Lookup262: xcm::v2::WeightLimit */ XcmV2WeightLimit: { _enum: { Unlimited: "Null", Limited: "Compact", }, }, - /** Lookup265: xcm::v3::Xcm */ + /** Lookup263: xcm::v3::Xcm */ XcmV3Xcm: "Vec", - /** Lookup267: xcm::v3::Instruction */ + /** Lookup265: xcm::v3::Instruction */ XcmV3Instruction: { _enum: { WithdrawAsset: "XcmV3MultiassetMultiAssets", @@ -2934,28 +2972,28 @@ export default { }, }, }, - /** Lookup268: xcm::v3::multiasset::MultiAssets */ + /** Lookup266: xcm::v3::multiasset::MultiAssets */ XcmV3MultiassetMultiAssets: "Vec", - /** Lookup270: xcm::v3::multiasset::MultiAsset */ + /** Lookup268: xcm::v3::multiasset::MultiAsset */ XcmV3MultiAsset: { id: "XcmV3MultiassetAssetId", fun: "XcmV3MultiassetFungibility", }, - /** Lookup271: xcm::v3::multiasset::AssetId */ + /** Lookup269: xcm::v3::multiasset::AssetId */ XcmV3MultiassetAssetId: { _enum: { Concrete: "XcmV3MultiLocation", Abstract: "[u8;32]", }, }, - /** Lookup272: xcm::v3::multiasset::Fungibility */ + /** Lookup270: xcm::v3::multiasset::Fungibility */ XcmV3MultiassetFungibility: { _enum: { Fungible: "Compact", NonFungible: "XcmV3MultiassetAssetInstance", }, }, - /** Lookup273: xcm::v3::multiasset::AssetInstance */ + /** Lookup271: xcm::v3::multiasset::AssetInstance */ XcmV3MultiassetAssetInstance: { _enum: { Undefined: "Null", @@ -2966,7 +3004,7 @@ export default { Array32: "[u8;32]", }, }, - /** Lookup274: xcm::v3::Response */ + /** Lookup272: xcm::v3::Response */ XcmV3Response: { _enum: { Null: "Null", @@ -2977,7 +3015,7 @@ export default { DispatchResult: "XcmV3MaybeErrorCode", }, }, - /** Lookup277: xcm::v3::traits::Error */ + /** Lookup275: xcm::v3::traits::Error */ XcmV3TraitsError: { _enum: { Overflow: "Null", @@ -3022,7 +3060,7 @@ export default { ExceedsStackLimit: "Null", }, }, - /** Lookup279: xcm::v3::PalletInfo */ + /** Lookup277: xcm::v3::PalletInfo */ XcmV3PalletInfo: { index: "Compact", name: "Bytes", @@ -3031,7 +3069,7 @@ export default { minor: "Compact", patch: "Compact", }, - /** Lookup282: xcm::v3::MaybeErrorCode */ + /** Lookup280: xcm::v3::MaybeErrorCode */ XcmV3MaybeErrorCode: { _enum: { Success: "Null", @@ -3039,20 +3077,20 @@ export default { TruncatedError: "Bytes", }, }, - /** Lookup285: xcm::v3::QueryResponseInfo */ + /** Lookup283: xcm::v3::QueryResponseInfo */ XcmV3QueryResponseInfo: { destination: "XcmV3MultiLocation", queryId: "Compact", maxWeight: "SpWeightsWeightV2Weight", }, - /** Lookup286: xcm::v3::multiasset::MultiAssetFilter */ + /** Lookup284: xcm::v3::multiasset::MultiAssetFilter */ XcmV3MultiassetMultiAssetFilter: { _enum: { Definite: "XcmV3MultiassetMultiAssets", Wild: "XcmV3MultiassetWildMultiAsset", }, }, - /** Lookup287: xcm::v3::multiasset::WildMultiAsset */ + /** Lookup285: xcm::v3::multiasset::WildMultiAsset */ XcmV3MultiassetWildMultiAsset: { _enum: { All: "Null", @@ -3068,18 +3106,18 @@ export default { }, }, }, - /** Lookup288: xcm::v3::multiasset::WildFungibility */ + /** Lookup286: xcm::v3::multiasset::WildFungibility */ XcmV3MultiassetWildFungibility: { _enum: ["Fungible", "NonFungible"], }, - /** Lookup289: xcm::v3::WeightLimit */ + /** Lookup287: xcm::v3::WeightLimit */ XcmV3WeightLimit: { _enum: { Unlimited: "Null", Limited: "SpWeightsWeightV2Weight", }, }, - /** Lookup290: xcm::VersionedMultiAssets */ + /** Lookup288: xcm::VersionedMultiAssets */ XcmVersionedMultiAssets: { _enum: { __Unused0: "Null", @@ -3088,7 +3126,7 @@ export default { V3: "XcmV3MultiassetMultiAssets", }, }, - /** Lookup299: pallet_assets::pallet::Call */ + /** Lookup297: pallet_assets::pallet::Call */ PalletAssetsCall: { _enum: { create: { @@ -3224,9 +3262,21 @@ export default { id: "Compact", minBalance: "u128", }, + touch_other: { + id: "Compact", + who: "AccountId20", + }, + refund_other: { + id: "Compact", + who: "AccountId20", + }, + block: { + id: "Compact", + who: "AccountId20", + }, }, }, - /** Lookup300: pallet_asset_manager::pallet::Call */ + /** Lookup298: pallet_asset_manager::pallet::Call */ PalletAssetManagerCall: { _enum: { register_foreign_asset: { @@ -3268,20 +3318,20 @@ export default { }, }, }, - /** Lookup301: moonriver_runtime::xcm_config::AssetType */ + /** Lookup299: moonriver_runtime::xcm_config::AssetType */ MoonriverRuntimeXcmConfigAssetType: { _enum: { Xcm: "XcmV3MultiLocation", }, }, - /** Lookup302: moonriver_runtime::asset_config::AssetRegistrarMetadata */ + /** Lookup300: moonriver_runtime::asset_config::AssetRegistrarMetadata */ MoonriverRuntimeAssetConfigAssetRegistrarMetadata: { name: "Bytes", symbol: "Bytes", decimals: "u8", isFrozen: "bool", }, - /** Lookup303: orml_xtokens::module::Call */ + /** Lookup301: orml_xtokens::module::Call */ OrmlXtokensModuleCall: { _enum: { transfer: { @@ -3322,7 +3372,7 @@ export default { }, }, }, - /** Lookup304: moonriver_runtime::xcm_config::CurrencyId */ + /** Lookup302: moonriver_runtime::xcm_config::CurrencyId */ MoonriverRuntimeXcmConfigCurrencyId: { _enum: { SelfReserve: "Null", @@ -3333,7 +3383,7 @@ export default { }, }, }, - /** Lookup305: xcm::VersionedMultiAsset */ + /** Lookup303: xcm::VersionedMultiAsset */ XcmVersionedMultiAsset: { _enum: { __Unused0: "Null", @@ -3342,7 +3392,7 @@ export default { V3: "XcmV3MultiAsset", }, }, - /** Lookup308: pallet_xcm_transactor::pallet::Call */ + /** Lookup306: pallet_xcm_transactor::pallet::Call */ PalletXcmTransactorCall: { _enum: { register: { @@ -3358,6 +3408,7 @@ export default { fee: "PalletXcmTransactorCurrencyPayment", innerCall: "Bytes", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, transact_through_sovereign: { dest: "XcmVersionedMultiLocation", @@ -3366,6 +3417,7 @@ export default { call: "Bytes", originKind: "XcmV2OriginKind", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, set_transact_info: { location: "XcmVersionedMultiLocation", @@ -3381,6 +3433,7 @@ export default { fee: "PalletXcmTransactorCurrencyPayment", call: "Bytes", weightInfo: "PalletXcmTransactorTransactWeights", + refund: "bool", }, set_fee_per_second: { assetLocation: "XcmVersionedMultiLocation", @@ -3396,28 +3449,28 @@ export default { }, }, }, - /** Lookup309: moonriver_runtime::xcm_config::Transactors */ + /** Lookup307: moonriver_runtime::xcm_config::Transactors */ MoonriverRuntimeXcmConfigTransactors: { _enum: ["Relay"], }, - /** Lookup310: pallet_xcm_transactor::pallet::CurrencyPayment */ + /** Lookup308: pallet_xcm_transactor::pallet::CurrencyPayment */ PalletXcmTransactorCurrencyPayment: { currency: "PalletXcmTransactorCurrency", feeAmount: "Option", }, - /** Lookup311: pallet_xcm_transactor::pallet::Currency */ + /** Lookup309: pallet_xcm_transactor::pallet::Currency */ PalletXcmTransactorCurrency: { _enum: { AsCurrencyId: "MoonriverRuntimeXcmConfigCurrencyId", AsMultiLocation: "XcmVersionedMultiLocation", }, }, - /** Lookup313: pallet_xcm_transactor::pallet::TransactWeights */ + /** Lookup311: pallet_xcm_transactor::pallet::TransactWeights */ PalletXcmTransactorTransactWeights: { transactRequiredWeightAtMost: "SpWeightsWeightV2Weight", overallWeight: "Option", }, - /** Lookup315: pallet_xcm_transactor::pallet::HrmpOperation */ + /** Lookup313: pallet_xcm_transactor::pallet::HrmpOperation */ PalletXcmTransactorHrmpOperation: { _enum: { InitOpen: "PalletXcmTransactorHrmpInitParams", @@ -3431,18 +3484,18 @@ export default { }, }, }, - /** Lookup316: pallet_xcm_transactor::pallet::HrmpInitParams */ + /** Lookup314: pallet_xcm_transactor::pallet::HrmpInitParams */ PalletXcmTransactorHrmpInitParams: { paraId: "u32", proposedMaxCapacity: "u32", proposedMaxMessageSize: "u32", }, - /** Lookup317: polkadot_parachain::primitives::HrmpChannelId */ + /** Lookup315: polkadot_parachain::primitives::HrmpChannelId */ PolkadotParachainPrimitivesHrmpChannelId: { sender: "u32", recipient: "u32", }, - /** Lookup319: pallet_ethereum_xcm::pallet::Call */ + /** Lookup317: pallet_ethereum_xcm::pallet::Call */ PalletEthereumXcmCall: { _enum: { transact: { @@ -3456,14 +3509,14 @@ export default { resume_ethereum_xcm_execution: "Null", }, }, - /** Lookup320: xcm_primitives::ethereum_xcm::EthereumXcmTransaction */ + /** Lookup318: xcm_primitives::ethereum_xcm::EthereumXcmTransaction */ XcmPrimitivesEthereumXcmEthereumXcmTransaction: { _enum: { V1: "XcmPrimitivesEthereumXcmEthereumXcmTransactionV1", V2: "XcmPrimitivesEthereumXcmEthereumXcmTransactionV2", }, }, - /** Lookup321: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV1 */ + /** Lookup319: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV1 */ XcmPrimitivesEthereumXcmEthereumXcmTransactionV1: { gasLimit: "U256", feePayment: "XcmPrimitivesEthereumXcmEthereumXcmFee", @@ -3472,19 +3525,19 @@ export default { input: "Bytes", accessList: "Option)>>", }, - /** Lookup322: xcm_primitives::ethereum_xcm::EthereumXcmFee */ + /** Lookup320: xcm_primitives::ethereum_xcm::EthereumXcmFee */ XcmPrimitivesEthereumXcmEthereumXcmFee: { _enum: { Manual: "XcmPrimitivesEthereumXcmManualEthereumXcmFee", Auto: "Null", }, }, - /** Lookup323: xcm_primitives::ethereum_xcm::ManualEthereumXcmFee */ + /** Lookup321: xcm_primitives::ethereum_xcm::ManualEthereumXcmFee */ XcmPrimitivesEthereumXcmManualEthereumXcmFee: { gasPrice: "Option", maxFeePerGas: "Option", }, - /** Lookup326: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV2 */ + /** Lookup324: xcm_primitives::ethereum_xcm::EthereumXcmTransactionV2 */ XcmPrimitivesEthereumXcmEthereumXcmTransactionV2: { gasLimit: "U256", action: "EthereumTransactionTransactionAction", @@ -3492,17 +3545,17 @@ export default { input: "Bytes", accessList: "Option)>>", }, - /** Lookup327: pallet_randomness::pallet::Call */ + /** Lookup325: pallet_randomness::pallet::Call */ PalletRandomnessCall: { _enum: ["set_babe_randomness_results"], }, - /** Lookup329: pallet_conviction_voting::types::Tally */ + /** Lookup327: pallet_conviction_voting::types::Tally */ PalletConvictionVotingTally: { ayes: "u128", nays: "u128", support: "u128", }, - /** Lookup330: pallet_whitelist::pallet::Event */ + /** Lookup328: pallet_whitelist::pallet::Event */ PalletWhitelistEvent: { _enum: { CallWhitelisted: { @@ -3517,17 +3570,17 @@ export default { }, }, }, - /** Lookup332: frame_support::dispatch::PostDispatchInfo */ + /** Lookup330: frame_support::dispatch::PostDispatchInfo */ FrameSupportDispatchPostDispatchInfo: { actualWeight: "Option", paysFee: "FrameSupportDispatchPays", }, - /** Lookup333: sp_runtime::DispatchErrorWithPostInfo */ + /** Lookup331: sp_runtime::DispatchErrorWithPostInfo */ SpRuntimeDispatchErrorWithPostInfo: { postInfo: "FrameSupportDispatchPostDispatchInfo", error: "SpRuntimeDispatchError", }, - /** Lookup334: pallet_collective::pallet::Event */ + /** Lookup332: pallet_collective::pallet::Event */ PalletCollectiveEvent: { _enum: { Proposed: { @@ -3564,7 +3617,7 @@ export default { }, }, }, - /** Lookup338: pallet_treasury::pallet::Event */ + /** Lookup336: pallet_treasury::pallet::Event */ PalletTreasuryEvent: { _enum: { Proposed: { @@ -3602,7 +3655,7 @@ export default { }, }, }, - /** Lookup339: pallet_crowdloan_rewards::pallet::Event */ + /** Lookup337: pallet_crowdloan_rewards::pallet::Event */ PalletCrowdloanRewardsEvent: { _enum: { InitialPaymentMade: "(AccountId20,u128)", @@ -3613,7 +3666,7 @@ export default { InitializedAccountWithNotEnoughContribution: "([u8;32],Option,u128)", }, }, - /** Lookup340: cumulus_pallet_xcmp_queue::pallet::Event */ + /** Lookup338: cumulus_pallet_xcmp_queue::pallet::Event */ CumulusPalletXcmpQueueEvent: { _enum: { Success: { @@ -3646,7 +3699,7 @@ export default { }, }, }, - /** Lookup341: cumulus_pallet_xcm::pallet::Event */ + /** Lookup339: cumulus_pallet_xcm::pallet::Event */ CumulusPalletXcmEvent: { _enum: { InvalidFormat: "[u8;32]", @@ -3654,7 +3707,7 @@ export default { ExecutedDownward: "([u8;32],XcmV3TraitsOutcome)", }, }, - /** Lookup342: xcm::v3::traits::Outcome */ + /** Lookup340: xcm::v3::traits::Outcome */ XcmV3TraitsOutcome: { _enum: { Complete: "SpWeightsWeightV2Weight", @@ -3662,7 +3715,7 @@ export default { Error: "XcmV3TraitsError", }, }, - /** Lookup343: cumulus_pallet_dmp_queue::pallet::Event */ + /** Lookup341: cumulus_pallet_dmp_queue::pallet::Event */ CumulusPalletDmpQueueEvent: { _enum: { InvalidFormat: { @@ -3694,7 +3747,7 @@ export default { }, }, }, - /** Lookup344: pallet_xcm::pallet::Event */ + /** Lookup342: pallet_xcm::pallet::Event */ PalletXcmEvent: { _enum: { Attempted: "XcmV3TraitsOutcome", @@ -3722,7 +3775,7 @@ export default { AssetsClaimed: "(H256,XcmV3MultiLocation,XcmVersionedMultiAssets)", }, }, - /** Lookup345: pallet_assets::pallet::Event */ + /** Lookup343: pallet_assets::pallet::Event */ PalletAssetsEvent: { _enum: { Created: { @@ -3825,9 +3878,18 @@ export default { assetId: "u128", newMinBalance: "u128", }, + Touched: { + assetId: "u128", + who: "AccountId20", + depositor: "AccountId20", + }, + Blocked: { + assetId: "u128", + who: "AccountId20", + }, }, }, - /** Lookup346: pallet_asset_manager::pallet::Event */ + /** Lookup344: pallet_asset_manager::pallet::Event */ PalletAssetManagerEvent: { _enum: { ForeignAssetRegistered: { @@ -3864,7 +3926,7 @@ export default { }, }, }, - /** Lookup347: orml_xtokens::module::Event */ + /** Lookup345: orml_xtokens::module::Event */ OrmlXtokensModuleEvent: { _enum: { TransferredMultiAssets: { @@ -3875,7 +3937,7 @@ export default { }, }, }, - /** Lookup348: pallet_xcm_transactor::pallet::Event */ + /** Lookup346: pallet_xcm_transactor::pallet::Event */ PalletXcmTransactorEvent: { _enum: { TransactedDerivative: { @@ -3923,13 +3985,13 @@ export default { }, }, }, - /** Lookup349: pallet_xcm_transactor::pallet::RemoteTransactInfoWithMaxWeight */ + /** Lookup347: pallet_xcm_transactor::pallet::RemoteTransactInfoWithMaxWeight */ PalletXcmTransactorRemoteTransactInfoWithMaxWeight: { transactExtraWeight: "SpWeightsWeightV2Weight", maxWeight: "SpWeightsWeightV2Weight", transactExtraWeightSigned: "Option", }, - /** Lookup351: pallet_randomness::pallet::Event */ + /** Lookup349: pallet_randomness::pallet::Event */ PalletRandomnessEvent: { _enum: { RandomnessRequestedBabeEpoch: { @@ -3964,7 +4026,7 @@ export default { }, }, }, - /** Lookup352: frame_system::Phase */ + /** Lookup350: frame_system::Phase */ FrameSystemPhase: { _enum: { ApplyExtrinsic: "u32", @@ -3972,46 +4034,46 @@ export default { Initialization: "Null", }, }, - /** Lookup354: frame_system::LastRuntimeUpgradeInfo */ + /** Lookup352: frame_system::LastRuntimeUpgradeInfo */ FrameSystemLastRuntimeUpgradeInfo: { specVersion: "Compact", specName: "Text", }, - /** Lookup355: frame_system::limits::BlockWeights */ + /** Lookup353: frame_system::limits::BlockWeights */ FrameSystemLimitsBlockWeights: { baseBlock: "SpWeightsWeightV2Weight", maxBlock: "SpWeightsWeightV2Weight", perClass: "FrameSupportDispatchPerDispatchClassWeightsPerClass", }, - /** Lookup356: frame_support::dispatch::PerDispatchClass */ + /** Lookup354: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassWeightsPerClass: { normal: "FrameSystemLimitsWeightsPerClass", operational: "FrameSystemLimitsWeightsPerClass", mandatory: "FrameSystemLimitsWeightsPerClass", }, - /** Lookup357: frame_system::limits::WeightsPerClass */ + /** Lookup355: frame_system::limits::WeightsPerClass */ FrameSystemLimitsWeightsPerClass: { baseExtrinsic: "SpWeightsWeightV2Weight", maxExtrinsic: "Option", maxTotal: "Option", reserved: "Option", }, - /** Lookup358: frame_system::limits::BlockLength */ + /** Lookup356: frame_system::limits::BlockLength */ FrameSystemLimitsBlockLength: { max: "FrameSupportDispatchPerDispatchClassU32", }, - /** Lookup359: frame_support::dispatch::PerDispatchClass */ + /** Lookup357: frame_support::dispatch::PerDispatchClass */ FrameSupportDispatchPerDispatchClassU32: { normal: "u32", operational: "u32", mandatory: "u32", }, - /** Lookup360: sp_weights::RuntimeDbWeight */ + /** Lookup358: sp_weights::RuntimeDbWeight */ SpWeightsRuntimeDbWeight: { read: "u64", write: "u64", }, - /** Lookup361: sp_version::RuntimeVersion */ + /** Lookup359: sp_version::RuntimeVersion */ SpVersionRuntimeVersion: { specName: "Text", implName: "Text", @@ -4022,7 +4084,7 @@ export default { transactionVersion: "u32", stateVersion: "u8", }, - /** Lookup365: frame_system::pallet::Error */ + /** Lookup363: frame_system::pallet::Error */ FrameSystemError: { _enum: [ "InvalidSpecName", @@ -4033,19 +4095,24 @@ export default { "CallFiltered", ], }, - /** Lookup367: polkadot_primitives::v2::UpgradeRestriction */ - PolkadotPrimitivesV2UpgradeRestriction: { + /** Lookup365: polkadot_primitives::v4::UpgradeRestriction */ + PolkadotPrimitivesV4UpgradeRestriction: { _enum: ["Present"], }, - /** Lookup368: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot */ + /** Lookup366: cumulus_pallet_parachain_system::relay_state_snapshot::MessagingStateSnapshot */ CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: { dmqMqcHead: "H256", - relayDispatchQueueSize: "(u32,u32)", - ingressChannels: "Vec<(u32,PolkadotPrimitivesV2AbridgedHrmpChannel)>", - egressChannels: "Vec<(u32,PolkadotPrimitivesV2AbridgedHrmpChannel)>", + relayDispatchQueueSize: "CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize", + ingressChannels: "Vec<(u32,PolkadotPrimitivesV4AbridgedHrmpChannel)>", + egressChannels: "Vec<(u32,PolkadotPrimitivesV4AbridgedHrmpChannel)>", + }, + /** Lookup367: cumulus_pallet_parachain_system::relay_state_snapshot::RelayDispachQueueSize */ + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize: { + remainingCount: "u32", + remainingSize: "u32", }, - /** Lookup371: polkadot_primitives::v2::AbridgedHrmpChannel */ - PolkadotPrimitivesV2AbridgedHrmpChannel: { + /** Lookup370: polkadot_primitives::v4::AbridgedHrmpChannel */ + PolkadotPrimitivesV4AbridgedHrmpChannel: { maxCapacity: "u32", maxTotalSize: "u32", maxMessageSize: "u32", @@ -4053,8 +4120,8 @@ export default { totalSize: "u32", mqcHead: "Option", }, - /** Lookup372: polkadot_primitives::v2::AbridgedHostConfiguration */ - PolkadotPrimitivesV2AbridgedHostConfiguration: { + /** Lookup371: polkadot_primitives::v4::AbridgedHostConfiguration */ + PolkadotPrimitivesV4AbridgedHostConfiguration: { maxCodeSize: "u32", maxHeadDataSize: "u32", maxUpwardQueueCount: "u32", @@ -4065,17 +4132,17 @@ export default { validationUpgradeCooldown: "u32", validationUpgradeDelay: "u32", }, - /** Lookup378: polkadot_core_primitives::OutboundHrmpMessage */ + /** Lookup377: polkadot_core_primitives::OutboundHrmpMessage */ PolkadotCorePrimitivesOutboundHrmpMessage: { recipient: "u32", data: "Bytes", }, - /** Lookup379: cumulus_pallet_parachain_system::CodeUpgradeAuthorization */ + /** Lookup378: cumulus_pallet_parachain_system::CodeUpgradeAuthorization */ CumulusPalletParachainSystemCodeUpgradeAuthorization: { codeHash: "H256", checkVersion: "bool", }, - /** Lookup380: cumulus_pallet_parachain_system::pallet::Error */ + /** Lookup379: cumulus_pallet_parachain_system::pallet::Error */ CumulusPalletParachainSystemError: { _enum: [ "OverlappingUpgrades", @@ -4088,53 +4155,60 @@ export default { "Unauthorized", ], }, - /** Lookup382: pallet_balances::BalanceLock */ + /** Lookup381: pallet_balances::types::BalanceLock */ PalletBalancesBalanceLock: { id: "[u8;8]", amount: "u128", reasons: "PalletBalancesReasons", }, - /** Lookup383: pallet_balances::Reasons */ + /** Lookup382: pallet_balances::types::Reasons */ PalletBalancesReasons: { _enum: ["Fee", "Misc", "All"], }, - /** Lookup386: pallet_balances::ReserveData */ + /** Lookup385: pallet_balances::types::ReserveData */ PalletBalancesReserveData: { id: "[u8;4]", amount: "u128", }, - /** Lookup388: pallet_balances::pallet::Error */ + /** Lookup388: pallet_balances::types::IdAmount */ + PalletBalancesIdAmount: { + id: "Null", + amount: "u128", + }, + /** Lookup390: pallet_balances::pallet::Error */ PalletBalancesError: { _enum: [ "VestingBalance", "LiquidityRestrictions", "InsufficientBalance", "ExistentialDeposit", - "KeepAlive", + "Expendability", "ExistingVestingSchedule", "DeadAccount", "TooManyReserves", + "TooManyHolds", + "TooManyFreezes", ], }, - /** Lookup390: pallet_transaction_payment::Releases */ + /** Lookup392: pallet_transaction_payment::Releases */ PalletTransactionPaymentReleases: { _enum: ["V1Ancient", "V2"], }, /** - * Lookup391: + * Lookup393: * pallet_parachain_staking::types::ParachainBondConfig[account::AccountId20](account::AccountId20) */ PalletParachainStakingParachainBondConfig: { account: "AccountId20", percent: "Percent", }, - /** Lookup392: pallet_parachain_staking::types::RoundInfo */ + /** Lookup394: pallet_parachain_staking::types::RoundInfo */ PalletParachainStakingRoundInfo: { current: "u32", first: "u32", length: "u32", }, - /** Lookup393: pallet_parachain_staking::types::Delegator */ + /** Lookup395: pallet_parachain_staking::types::Delegator */ PalletParachainStakingDelegator: { id: "AccountId20", delegations: "PalletParachainStakingSetOrderedSet", @@ -4143,24 +4217,24 @@ export default { status: "PalletParachainStakingDelegatorStatus", }, /** - * Lookup394: + * Lookup396: * pallet_parachain_staking::set::OrderedSet> */ PalletParachainStakingSetOrderedSet: "Vec", - /** Lookup395: pallet_parachain_staking::types::Bond */ + /** Lookup397: pallet_parachain_staking::types::Bond */ PalletParachainStakingBond: { owner: "AccountId20", amount: "u128", }, - /** Lookup397: pallet_parachain_staking::types::DelegatorStatus */ + /** Lookup399: pallet_parachain_staking::types::DelegatorStatus */ PalletParachainStakingDelegatorStatus: { _enum: { Active: "Null", Leaving: "u32", }, }, - /** Lookup398: pallet_parachain_staking::types::CandidateMetadata */ + /** Lookup400: pallet_parachain_staking::types::CandidateMetadata */ PalletParachainStakingCandidateMetadata: { bond: "u128", delegationCount: "u32", @@ -4173,16 +4247,16 @@ export default { request: "Option", status: "PalletParachainStakingCollatorStatus", }, - /** Lookup399: pallet_parachain_staking::types::CapacityStatus */ + /** Lookup401: pallet_parachain_staking::types::CapacityStatus */ PalletParachainStakingCapacityStatus: { _enum: ["Full", "Empty", "Partial"], }, - /** Lookup401: pallet_parachain_staking::types::CandidateBondLessRequest */ + /** Lookup403: pallet_parachain_staking::types::CandidateBondLessRequest */ PalletParachainStakingCandidateBondLessRequest: { amount: "u128", whenExecutable: "u32", }, - /** Lookup402: pallet_parachain_staking::types::CollatorStatus */ + /** Lookup404: pallet_parachain_staking::types::CollatorStatus */ PalletParachainStakingCollatorStatus: { _enum: { Active: "Null", @@ -4190,44 +4264,50 @@ export default { Leaving: "u32", }, }, - /** Lookup404: pallet_parachain_staking::delegation_requests::ScheduledRequest */ + /** Lookup406: pallet_parachain_staking::delegation_requests::ScheduledRequest */ PalletParachainStakingDelegationRequestsScheduledRequest: { delegator: "AccountId20", whenExecutable: "u32", action: "PalletParachainStakingDelegationRequestsDelegationAction", }, /** - * Lookup407: + * Lookup409: * pallet_parachain_staking::auto_compound::AutoCompoundConfig[account::AccountId20](account::AccountId20) */ PalletParachainStakingAutoCompoundAutoCompoundConfig: { delegator: "AccountId20", value: "Percent", }, - /** Lookup409: pallet_parachain_staking::types::Delegations */ + /** Lookup411: pallet_parachain_staking::types::Delegations */ PalletParachainStakingDelegations: { delegations: "Vec", total: "u128", }, - /** Lookup411: pallet_parachain_staking::types::CollatorSnapshot */ + /** + * Lookup413: + * pallet_parachain_staking::set::BoundedOrderedSet, S> + */ + PalletParachainStakingSetBoundedOrderedSet: "Vec", + /** Lookup416: pallet_parachain_staking::types::CollatorSnapshot */ PalletParachainStakingCollatorSnapshot: { bond: "u128", delegations: "Vec", total: "u128", }, - /** Lookup413: pallet_parachain_staking::types::BondWithAutoCompound */ + /** Lookup418: pallet_parachain_staking::types::BondWithAutoCompound */ PalletParachainStakingBondWithAutoCompound: { owner: "AccountId20", amount: "u128", autoCompound: "Percent", }, - /** Lookup414: pallet_parachain_staking::types::DelayedPayout */ + /** Lookup419: pallet_parachain_staking::types::DelayedPayout */ PalletParachainStakingDelayedPayout: { roundIssuance: "u128", totalStakingReward: "u128", collatorCommission: "Perbill", }, - /** Lookup415: pallet_parachain_staking::inflation::InflationInfo */ + /** Lookup420: pallet_parachain_staking::inflation::InflationInfo */ PalletParachainStakingInflationInflationInfo: { expect: { min: "u128", @@ -4245,7 +4325,7 @@ export default { max: "Perbill", }, }, - /** Lookup416: pallet_parachain_staking::pallet::Error */ + /** Lookup421: pallet_parachain_staking::pallet::Error */ PalletParachainStakingError: { _enum: [ "DelegatorDNE", @@ -4296,15 +4376,16 @@ export default { "TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates", "TooLowCandidateCountWeightHint", "TooLowCandidateCountWeightHintGoOffline", - "TooLowCandidateCountWeightHintGoOnline", - "TooLowCandidateCountWeightHintCandidateBondMore", + "CandidateLimitReached", + "CannotSetAboveMaxCandidates", + "RemovedCall", ], }, - /** Lookup417: pallet_author_inherent::pallet::Error */ + /** Lookup422: pallet_author_inherent::pallet::Error */ PalletAuthorInherentError: { _enum: ["AuthorAlreadySet", "NoAccountId", "CannotBeAuthor"], }, - /** Lookup418: pallet_author_mapping::pallet::RegistrationInfo */ + /** Lookup423: pallet_author_mapping::pallet::RegistrationInfo */ PalletAuthorMappingRegistrationInfo: { _alias: { keys_: "keys", @@ -4313,7 +4394,7 @@ export default { deposit: "u128", keys_: "SessionKeysPrimitivesVrfVrfCryptoPublic", }, - /** Lookup419: pallet_author_mapping::pallet::Error */ + /** Lookup424: pallet_author_mapping::pallet::Error */ PalletAuthorMappingError: { _enum: [ "AssociationNotFound", @@ -4326,18 +4407,18 @@ export default { "DecodeKeysFailed", ], }, - /** Lookup420: pallet_moonbeam_orbiters::types::CollatorPoolInfo[account::AccountId20](account::AccountId20) */ + /** Lookup425: pallet_moonbeam_orbiters::types::CollatorPoolInfo[account::AccountId20](account::AccountId20) */ PalletMoonbeamOrbitersCollatorPoolInfo: { orbiters: "Vec", maybeCurrentOrbiter: "Option", nextOrbiter: "u32", }, - /** Lookup422: pallet_moonbeam_orbiters::types::CurrentOrbiter[account::AccountId20](account::AccountId20) */ + /** Lookup427: pallet_moonbeam_orbiters::types::CurrentOrbiter[account::AccountId20](account::AccountId20) */ PalletMoonbeamOrbitersCurrentOrbiter: { accountId: "AccountId20", removed: "bool", }, - /** Lookup423: pallet_moonbeam_orbiters::pallet::Error */ + /** Lookup428: pallet_moonbeam_orbiters::pallet::Error */ PalletMoonbeamOrbitersError: { _enum: [ "CollatorAlreadyAdded", @@ -4351,23 +4432,23 @@ export default { "OrbiterStillInAPool", ], }, - /** Lookup424: pallet_utility::pallet::Error */ + /** Lookup429: pallet_utility::pallet::Error */ PalletUtilityError: { _enum: ["TooManyCalls"], }, - /** Lookup427: pallet_proxy::ProxyDefinition */ + /** Lookup432: pallet_proxy::ProxyDefinition */ PalletProxyProxyDefinition: { delegate: "AccountId20", proxyType: "MoonriverRuntimeProxyType", delay: "u32", }, - /** Lookup431: pallet_proxy::Announcement */ + /** Lookup436: pallet_proxy::Announcement */ PalletProxyAnnouncement: { real: "AccountId20", callHash: "H256", height: "u32", }, - /** Lookup433: pallet_proxy::pallet::Error */ + /** Lookup438: pallet_proxy::pallet::Error */ PalletProxyError: { _enum: [ "TooMany", @@ -4380,23 +4461,23 @@ export default { "NoSelfProxy", ], }, - /** Lookup434: pallet_maintenance_mode::pallet::Error */ + /** Lookup439: pallet_maintenance_mode::pallet::Error */ PalletMaintenanceModeError: { _enum: ["AlreadyInMaintenanceMode", "NotInMaintenanceMode"], }, - /** Lookup435: pallet_identity::types::Registration */ + /** Lookup440: pallet_identity::types::Registration */ PalletIdentityRegistration: { judgements: "Vec<(u32,PalletIdentityJudgement)>", deposit: "u128", info: "PalletIdentityIdentityInfo", }, - /** Lookup443: pallet_identity::types::RegistrarInfo */ + /** Lookup448: pallet_identity::types::RegistrarInfo */ PalletIdentityRegistrarInfo: { account: "AccountId20", fee: "u128", fields: "PalletIdentityBitFlags", }, - /** Lookup445: pallet_identity::pallet::Error */ + /** Lookup450: pallet_identity::pallet::Error */ PalletIdentityError: { _enum: [ "TooManySubAccounts", @@ -4419,18 +4500,18 @@ export default { "JudgementPaymentFailed", ], }, - /** Lookup446: pallet_migrations::pallet::Error */ + /** Lookup451: pallet_migrations::pallet::Error */ PalletMigrationsError: { _enum: ["PreimageMissing", "WrongUpperBound", "PreimageIsTooBig", "PreimageAlreadyExists"], }, - /** Lookup448: pallet_multisig::Multisig */ + /** Lookup453: pallet_multisig::Multisig */ PalletMultisigMultisig: { when: "PalletMultisigTimepoint", deposit: "u128", depositor: "AccountId20", approvals: "Vec", }, - /** Lookup450: pallet_multisig::pallet::Error */ + /** Lookup455: pallet_multisig::pallet::Error */ PalletMultisigError: { _enum: [ "MinimumThreshold", @@ -4449,7 +4530,7 @@ export default { "AlreadyStored", ], }, - /** Lookup451: pallet_evm::CodeMetadata */ + /** Lookup456: pallet_evm::CodeMetadata */ PalletEvmCodeMetadata: { _alias: { size_: "size", @@ -4458,7 +4539,7 @@ export default { size_: "u64", hash_: "H256", }, - /** Lookup453: pallet_evm::pallet::Error */ + /** Lookup458: pallet_evm::pallet::Error */ PalletEvmError: { _enum: [ "BalanceLow", @@ -4474,7 +4555,7 @@ export default { "TransactionMustComeFromEOA", ], }, - /** Lookup456: fp_rpc::TransactionStatus */ + /** Lookup461: fp_rpc::TransactionStatus */ FpRpcTransactionStatus: { transactionHash: "H256", transactionIndex: "u32", @@ -4484,9 +4565,9 @@ export default { logs: "Vec", logsBloom: "EthbloomBloom", }, - /** Lookup459: ethbloom::Bloom */ + /** Lookup464: ethbloom::Bloom */ EthbloomBloom: "[u8;256]", - /** Lookup461: ethereum::receipt::ReceiptV3 */ + /** Lookup466: ethereum::receipt::ReceiptV3 */ EthereumReceiptReceiptV3: { _enum: { Legacy: "EthereumReceiptEip658ReceiptData", @@ -4494,7 +4575,7 @@ export default { EIP1559: "EthereumReceiptEip658ReceiptData", }, }, - /** Lookup462: ethereum::receipt::EIP658ReceiptData */ + /** Lookup467: ethereum::receipt::EIP658ReceiptData */ EthereumReceiptEip658ReceiptData: { statusCode: "u8", usedGas: "U256", @@ -4502,7 +4583,7 @@ export default { logs: "Vec", }, /** - * Lookup463: + * Lookup468: * ethereum::block::Block[ethereum::transaction::TransactionV2](ethereum::transaction::TransactionV2) */ EthereumBlock: { @@ -4510,7 +4591,7 @@ export default { transactions: "Vec", ommers: "Vec", }, - /** Lookup464: ethereum::header::Header */ + /** Lookup469: ethereum::header::Header */ EthereumHeader: { parentHash: "H256", ommersHash: "H256", @@ -4528,14 +4609,14 @@ export default { mixHash: "H256", nonce: "EthereumTypesHashH64", }, - /** Lookup465: ethereum_types::hash::H64 */ + /** Lookup470: ethereum_types::hash::H64 */ EthereumTypesHashH64: "[u8;8]", - /** Lookup470: pallet_ethereum::pallet::Error */ + /** Lookup475: pallet_ethereum::pallet::Error */ PalletEthereumError: { _enum: ["InvalidSignature", "PreLogExists"], }, /** - * Lookup473: pallet_scheduler::Scheduled, BlockNumber, * moonriver_runtime::OriginCaller, account::AccountId20> */ @@ -4546,7 +4627,7 @@ export default { maybePeriodic: "Option<(u32,u32)>", origin: "MoonriverRuntimeOriginCaller", }, - /** Lookup475: pallet_scheduler::pallet::Error */ + /** Lookup480: pallet_scheduler::pallet::Error */ PalletSchedulerError: { _enum: [ "FailedToSchedule", @@ -4557,7 +4638,7 @@ export default { ], }, /** - * Lookup480: pallet_democracy::types::ReferendumInfo, Balance> */ PalletDemocracyReferendumInfo: { @@ -4570,7 +4651,7 @@ export default { }, }, /** - * Lookup481: pallet_democracy::types::ReferendumStatus, Balance> */ PalletDemocracyReferendumStatus: { @@ -4580,13 +4661,13 @@ export default { delay: "u32", tally: "PalletDemocracyTally", }, - /** Lookup482: pallet_democracy::types::Tally */ + /** Lookup487: pallet_democracy::types::Tally */ PalletDemocracyTally: { ayes: "u128", nays: "u128", turnout: "u128", }, - /** Lookup483: pallet_democracy::vote::Voting */ + /** Lookup488: pallet_democracy::vote::Voting */ PalletDemocracyVoteVoting: { _enum: { Direct: { @@ -4603,14 +4684,14 @@ export default { }, }, }, - /** Lookup487: pallet_democracy::types::Delegations */ + /** Lookup492: pallet_democracy::types::Delegations */ PalletDemocracyDelegations: { votes: "u128", capital: "u128", }, - /** Lookup488: pallet_democracy::vote::PriorLock */ + /** Lookup493: pallet_democracy::vote::PriorLock */ PalletDemocracyVotePriorLock: "(u32,u128)", - /** Lookup491: pallet_democracy::pallet::Error */ + /** Lookup496: pallet_democracy::pallet::Error */ PalletDemocracyError: { _enum: [ "ValueLow", @@ -4639,7 +4720,7 @@ export default { "PreimageNotExist", ], }, - /** Lookup492: pallet_preimage::RequestStatus */ + /** Lookup497: pallet_preimage::RequestStatus */ PalletPreimageRequestStatus: { _enum: { Unrequested: { @@ -4653,12 +4734,12 @@ export default { }, }, }, - /** Lookup497: pallet_preimage::pallet::Error */ + /** Lookup502: pallet_preimage::pallet::Error */ PalletPreimageError: { _enum: ["TooBig", "AlreadyNoted", "NotAuthorized", "NotNoted", "Requested", "NotRequested"], }, /** - * Lookup499: pallet_conviction_voting::vote::Voting */ PalletConvictionVotingVoteVoting: { @@ -4667,20 +4748,20 @@ export default { Delegating: "PalletConvictionVotingVoteDelegating", }, }, - /** Lookup500: pallet_conviction_voting::vote::Casting */ + /** Lookup505: pallet_conviction_voting::vote::Casting */ PalletConvictionVotingVoteCasting: { votes: "Vec<(u32,PalletConvictionVotingVoteAccountVote)>", delegations: "PalletConvictionVotingDelegations", prior: "PalletConvictionVotingVotePriorLock", }, - /** Lookup504: pallet_conviction_voting::types::Delegations */ + /** Lookup509: pallet_conviction_voting::types::Delegations */ PalletConvictionVotingDelegations: { votes: "u128", capital: "u128", }, - /** Lookup505: pallet_conviction_voting::vote::PriorLock */ + /** Lookup510: pallet_conviction_voting::vote::PriorLock */ PalletConvictionVotingVotePriorLock: "(u32,u128)", - /** Lookup506: pallet_conviction_voting::vote::Delegating */ + /** Lookup511: pallet_conviction_voting::vote::Delegating */ PalletConvictionVotingVoteDelegating: { balance: "u128", target: "AccountId20", @@ -4688,7 +4769,7 @@ export default { delegations: "PalletConvictionVotingDelegations", prior: "PalletConvictionVotingVotePriorLock", }, - /** Lookup510: pallet_conviction_voting::pallet::Error */ + /** Lookup515: pallet_conviction_voting::pallet::Error */ PalletConvictionVotingError: { _enum: [ "NotOngoing", @@ -4706,7 +4787,7 @@ export default { ], }, /** - * Lookup511: pallet_referenda::types::ReferendumInfo, Balance, * pallet_conviction_voting::types::Tally, account::AccountId20, ScheduleAddress> */ @@ -4721,7 +4802,7 @@ export default { }, }, /** - * Lookup512: pallet_referenda::types::ReferendumStatus, Balance, * pallet_conviction_voting::types::Tally, account::AccountId20, ScheduleAddress> */ @@ -4738,17 +4819,17 @@ export default { inQueue: "bool", alarm: "Option<(u32,(u32,u32))>", }, - /** Lookup513: pallet_referenda::types::Deposit */ + /** Lookup518: pallet_referenda::types::Deposit */ PalletReferendaDeposit: { who: "AccountId20", amount: "u128", }, - /** Lookup516: pallet_referenda::types::DecidingStatus */ + /** Lookup521: pallet_referenda::types::DecidingStatus */ PalletReferendaDecidingStatus: { since: "u32", confirming: "Option", }, - /** Lookup524: pallet_referenda::types::TrackInfo */ + /** Lookup529: pallet_referenda::types::TrackInfo */ PalletReferendaTrackInfo: { name: "Text", maxDeciding: "u32", @@ -4760,7 +4841,7 @@ export default { minApproval: "PalletReferendaCurve", minSupport: "PalletReferendaCurve", }, - /** Lookup525: pallet_referenda::types::Curve */ + /** Lookup530: pallet_referenda::types::Curve */ PalletReferendaCurve: { _enum: { LinearDecreasing: { @@ -4781,7 +4862,7 @@ export default { }, }, }, - /** Lookup528: pallet_referenda::pallet::Error */ + /** Lookup533: pallet_referenda::pallet::Error */ PalletReferendaError: { _enum: [ "NotOngoing", @@ -4799,7 +4880,7 @@ export default { "PreimageNotExist", ], }, - /** Lookup529: pallet_whitelist::pallet::Error */ + /** Lookup534: pallet_whitelist::pallet::Error */ PalletWhitelistError: { _enum: [ "UnavailablePreImage", @@ -4809,7 +4890,7 @@ export default { "CallAlreadyWhitelisted", ], }, - /** Lookup531: pallet_collective::Votes */ + /** Lookup536: pallet_collective::Votes */ PalletCollectiveVotes: { index: "u32", threshold: "u32", @@ -4817,7 +4898,7 @@ export default { nays: "Vec", end: "u32", }, - /** Lookup532: pallet_collective::pallet::Error */ + /** Lookup537: pallet_collective::pallet::Error */ PalletCollectiveError: { _enum: [ "NotMember", @@ -4832,16 +4913,16 @@ export default { "WrongProposalLength", ], }, - /** Lookup537: pallet_treasury::Proposal */ + /** Lookup542: pallet_treasury::Proposal */ PalletTreasuryProposal: { proposer: "AccountId20", value: "u128", beneficiary: "AccountId20", bond: "u128", }, - /** Lookup541: frame_support::PalletId */ + /** Lookup546: frame_support::PalletId */ FrameSupportPalletId: "[u8;8]", - /** Lookup542: pallet_treasury::pallet::Error */ + /** Lookup547: pallet_treasury::pallet::Error */ PalletTreasuryError: { _enum: [ "InsufficientProposersBalance", @@ -4851,13 +4932,13 @@ export default { "ProposalNotApproved", ], }, - /** Lookup543: pallet_crowdloan_rewards::pallet::RewardInfo */ + /** Lookup548: pallet_crowdloan_rewards::pallet::RewardInfo */ PalletCrowdloanRewardsRewardInfo: { totalReward: "u128", claimedReward: "u128", contributedRelayAddresses: "Vec<[u8;32]>", }, - /** Lookup545: pallet_crowdloan_rewards::pallet::Error */ + /** Lookup550: pallet_crowdloan_rewards::pallet::Error */ PalletCrowdloanRewardsError: { _enum: [ "AlreadyAssociated", @@ -4877,21 +4958,21 @@ export default { "InsufficientNumberOfValidProofs", ], }, - /** Lookup547: cumulus_pallet_xcmp_queue::InboundChannelDetails */ + /** Lookup552: cumulus_pallet_xcmp_queue::InboundChannelDetails */ CumulusPalletXcmpQueueInboundChannelDetails: { sender: "u32", state: "CumulusPalletXcmpQueueInboundState", messageMetadata: "Vec<(u32,PolkadotParachainPrimitivesXcmpMessageFormat)>", }, - /** Lookup548: cumulus_pallet_xcmp_queue::InboundState */ + /** Lookup553: cumulus_pallet_xcmp_queue::InboundState */ CumulusPalletXcmpQueueInboundState: { _enum: ["Ok", "Suspended"], }, - /** Lookup551: polkadot_parachain::primitives::XcmpMessageFormat */ + /** Lookup556: polkadot_parachain::primitives::XcmpMessageFormat */ PolkadotParachainPrimitivesXcmpMessageFormat: { _enum: ["ConcatenatedVersionedXcm", "ConcatenatedEncodedBlob", "Signals"], }, - /** Lookup554: cumulus_pallet_xcmp_queue::OutboundChannelDetails */ + /** Lookup559: cumulus_pallet_xcmp_queue::OutboundChannelDetails */ CumulusPalletXcmpQueueOutboundChannelDetails: { recipient: "u32", state: "CumulusPalletXcmpQueueOutboundState", @@ -4899,11 +4980,11 @@ export default { firstIndex: "u16", lastIndex: "u16", }, - /** Lookup555: cumulus_pallet_xcmp_queue::OutboundState */ + /** Lookup560: cumulus_pallet_xcmp_queue::OutboundState */ CumulusPalletXcmpQueueOutboundState: { _enum: ["Ok", "Suspended"], }, - /** Lookup557: cumulus_pallet_xcmp_queue::QueueConfigData */ + /** Lookup562: cumulus_pallet_xcmp_queue::QueueConfigData */ CumulusPalletXcmpQueueQueueConfigData: { suspendThreshold: "u32", dropThreshold: "u32", @@ -4912,27 +4993,27 @@ export default { weightRestrictDecay: "SpWeightsWeightV2Weight", xcmpMaxIndividualWeight: "SpWeightsWeightV2Weight", }, - /** Lookup559: cumulus_pallet_xcmp_queue::pallet::Error */ + /** Lookup564: cumulus_pallet_xcmp_queue::pallet::Error */ CumulusPalletXcmpQueueError: { _enum: ["FailedToSend", "BadXcmOrigin", "BadXcm", "BadOverweightIndex", "WeightOverLimit"], }, - /** Lookup560: cumulus_pallet_xcm::pallet::Error */ + /** Lookup565: cumulus_pallet_xcm::pallet::Error */ CumulusPalletXcmError: "Null", - /** Lookup561: cumulus_pallet_dmp_queue::ConfigData */ + /** Lookup566: cumulus_pallet_dmp_queue::ConfigData */ CumulusPalletDmpQueueConfigData: { maxIndividual: "SpWeightsWeightV2Weight", }, - /** Lookup562: cumulus_pallet_dmp_queue::PageIndexData */ + /** Lookup567: cumulus_pallet_dmp_queue::PageIndexData */ CumulusPalletDmpQueuePageIndexData: { beginUsed: "u32", endUsed: "u32", overweightCount: "u64", }, - /** Lookup565: cumulus_pallet_dmp_queue::pallet::Error */ + /** Lookup570: cumulus_pallet_dmp_queue::pallet::Error */ CumulusPalletDmpQueueError: { _enum: ["Unknown", "OverLimit"], }, - /** Lookup566: pallet_xcm::pallet::QueryStatus */ + /** Lookup571: pallet_xcm::pallet::QueryStatus */ PalletXcmQueryStatus: { _enum: { Pending: { @@ -4951,7 +5032,7 @@ export default { }, }, }, - /** Lookup570: xcm::VersionedResponse */ + /** Lookup575: xcm::VersionedResponse */ XcmVersionedResponse: { _enum: { __Unused0: "Null", @@ -4960,7 +5041,7 @@ export default { V3: "XcmV3Response", }, }, - /** Lookup576: pallet_xcm::pallet::VersionMigrationStage */ + /** Lookup581: pallet_xcm::pallet::VersionMigrationStage */ PalletXcmVersionMigrationStage: { _enum: { MigrateSupportedVersion: "Null", @@ -4969,7 +5050,7 @@ export default { MigrateAndNotifyOldTargets: "Null", }, }, - /** Lookup579: xcm::VersionedAssetId */ + /** Lookup584: xcm::VersionedAssetId */ XcmVersionedAssetId: { _enum: { __Unused0: "Null", @@ -4978,14 +5059,14 @@ export default { V3: "XcmV3MultiassetAssetId", }, }, - /** Lookup580: pallet_xcm::pallet::RemoteLockedFungibleRecord */ + /** Lookup585: pallet_xcm::pallet::RemoteLockedFungibleRecord */ PalletXcmRemoteLockedFungibleRecord: { amount: "u128", owner: "XcmVersionedMultiLocation", locker: "XcmVersionedMultiLocation", - users: "u32", + consumers: "Vec<(Null,u128)>", }, - /** Lookup584: pallet_xcm::pallet::Error */ + /** Lookup592: pallet_xcm::pallet::Error */ PalletXcmError: { _enum: [ "Unreachable", @@ -5010,7 +5091,7 @@ export default { "InUse", ], }, - /** Lookup585: pallet_assets::types::AssetDetails */ + /** Lookup593: pallet_assets::types::AssetDetails */ PalletAssetsAssetDetails: { owner: "AccountId20", issuer: "AccountId20", @@ -5025,33 +5106,38 @@ export default { approvals: "u32", status: "PalletAssetsAssetStatus", }, - /** Lookup586: pallet_assets::types::AssetStatus */ + /** Lookup594: pallet_assets::types::AssetStatus */ PalletAssetsAssetStatus: { _enum: ["Live", "Frozen", "Destroying"], }, - /** Lookup588: pallet_assets::types::AssetAccount */ + /** Lookup596: pallet_assets::types::AssetAccount */ PalletAssetsAssetAccount: { balance: "u128", - isFrozen: "bool", + status: "PalletAssetsAccountStatus", reason: "PalletAssetsExistenceReason", extra: "Null", }, - /** Lookup589: pallet_assets::types::ExistenceReason */ + /** Lookup597: pallet_assets::types::AccountStatus */ + PalletAssetsAccountStatus: { + _enum: ["Liquid", "Frozen", "Blocked"], + }, + /** Lookup598: pallet_assets::types::ExistenceReason */ PalletAssetsExistenceReason: { _enum: { Consumer: "Null", Sufficient: "Null", DepositHeld: "u128", DepositRefunded: "Null", + DepositFrom: "(AccountId20,u128)", }, }, - /** Lookup591: pallet_assets::types::Approval */ + /** Lookup600: pallet_assets::types::Approval */ PalletAssetsApproval: { amount: "u128", deposit: "u128", }, /** - * Lookup592: pallet_assets::types::AssetMetadata> */ PalletAssetsAssetMetadata: { @@ -5061,7 +5147,7 @@ export default { decimals: "u8", isFrozen: "bool", }, - /** Lookup594: pallet_assets::pallet::Error */ + /** Lookup603: pallet_assets::pallet::Error */ PalletAssetsError: { _enum: [ "BalanceLow", @@ -5072,7 +5158,7 @@ export default { "InUse", "BadWitness", "MinBalanceZero", - "NoProvider", + "UnavailableConsumer", "BadMetadata", "Unapproved", "WouldDie", @@ -5086,12 +5172,12 @@ export default { "CallbackFailed", ], }, - /** Lookup595: pallet_asset_manager::pallet::AssetInfo */ + /** Lookup604: pallet_asset_manager::pallet::AssetInfo */ PalletAssetManagerAssetInfo: { creator: "AccountId20", deposit: "u128", }, - /** Lookup597: pallet_asset_manager::pallet::Error */ + /** Lookup606: pallet_asset_manager::pallet::Error */ PalletAssetManagerError: { _enum: [ "ErrorCreatingAsset", @@ -5104,7 +5190,7 @@ export default { "NonExistentLocalAsset", ], }, - /** Lookup598: orml_xtokens::module::Error */ + /** Lookup607: orml_xtokens::module::Error */ OrmlXtokensModuleError: { _enum: [ "AssetHasNoReserve", @@ -5128,7 +5214,7 @@ export default { "MinXcmFeeNotDefined", ], }, - /** Lookup599: pallet_xcm_transactor::pallet::Error */ + /** Lookup608: pallet_xcm_transactor::pallet::Error */ PalletXcmTransactorError: { _enum: [ "IndexAlreadyClaimed", @@ -5157,18 +5243,19 @@ export default { "HrmpHandlerNotImplemented", "TooMuchFeeUsed", "ErrorValidating", + "RefundNotSupportedWithTransactInfo", ], }, - /** Lookup601: pallet_ethereum_xcm::pallet::Error */ + /** Lookup610: pallet_ethereum_xcm::pallet::Error */ PalletEthereumXcmError: { _enum: ["EthereumXcmExecutionSuspended"], }, - /** Lookup602: pallet_randomness::types::RequestState */ + /** Lookup611: pallet_randomness::types::RequestState */ PalletRandomnessRequestState: { request: "PalletRandomnessRequest", deposit: "u128", }, - /** Lookup603: pallet_randomness::types::Request> */ + /** Lookup612: pallet_randomness::types::Request> */ PalletRandomnessRequest: { refundAddress: "H160", contractAddress: "H160", @@ -5178,26 +5265,26 @@ export default { salt: "H256", info: "PalletRandomnessRequestInfo", }, - /** Lookup604: pallet_randomness::types::RequestInfo */ + /** Lookup613: pallet_randomness::types::RequestInfo */ PalletRandomnessRequestInfo: { _enum: { BabeEpoch: "(u64,u64)", Local: "(u32,u32)", }, }, - /** Lookup605: pallet_randomness::types::RequestType */ + /** Lookup614: pallet_randomness::types::RequestType */ PalletRandomnessRequestType: { _enum: { BabeEpoch: "u64", Local: "u32", }, }, - /** Lookup606: pallet_randomness::types::RandomnessResult */ + /** Lookup615: pallet_randomness::types::RandomnessResult */ PalletRandomnessRandomnessResult: { randomness: "Option", requestCount: "u64", }, - /** Lookup607: pallet_randomness::pallet::Error */ + /** Lookup616: pallet_randomness::pallet::Error */ PalletRandomnessError: { _enum: [ "RequestCounterOverflowed", @@ -5214,22 +5301,22 @@ export default { "RandomnessResultNotFilled", ], }, - /** Lookup609: account::EthereumSignature */ + /** Lookup618: account::EthereumSignature */ AccountEthereumSignature: "SpCoreEcdsaSignature", - /** Lookup611: frame_system::extensions::check_non_zero_sender::CheckNonZeroSender */ + /** Lookup620: frame_system::extensions::check_non_zero_sender::CheckNonZeroSender */ FrameSystemExtensionsCheckNonZeroSender: "Null", - /** Lookup612: frame_system::extensions::check_spec_version::CheckSpecVersion */ + /** Lookup621: frame_system::extensions::check_spec_version::CheckSpecVersion */ FrameSystemExtensionsCheckSpecVersion: "Null", - /** Lookup613: frame_system::extensions::check_tx_version::CheckTxVersion */ + /** Lookup622: frame_system::extensions::check_tx_version::CheckTxVersion */ FrameSystemExtensionsCheckTxVersion: "Null", - /** Lookup614: frame_system::extensions::check_genesis::CheckGenesis */ + /** Lookup623: frame_system::extensions::check_genesis::CheckGenesis */ FrameSystemExtensionsCheckGenesis: "Null", - /** Lookup617: frame_system::extensions::check_nonce::CheckNonce */ + /** Lookup626: frame_system::extensions::check_nonce::CheckNonce */ FrameSystemExtensionsCheckNonce: "Compact", - /** Lookup618: frame_system::extensions::check_weight::CheckWeight */ + /** Lookup627: frame_system::extensions::check_weight::CheckWeight */ FrameSystemExtensionsCheckWeight: "Null", - /** Lookup619: pallet_transaction_payment::ChargeTransactionPayment */ + /** Lookup628: pallet_transaction_payment::ChargeTransactionPayment */ PalletTransactionPaymentChargeTransactionPayment: "Compact", - /** Lookup621: moonriver_runtime::Runtime */ + /** Lookup630: moonriver_runtime::Runtime */ MoonriverRuntimeRuntime: "Null", }; diff --git a/typescript-api/src/moonriver/interfaces/registry.ts b/typescript-api/src/moonriver/interfaces/registry.ts index 8357b0955c..c5d10556f7 100644 --- a/typescript-api/src/moonriver/interfaces/registry.ts +++ b/typescript-api/src/moonriver/interfaces/registry.ts @@ -17,6 +17,7 @@ import type { CumulusPalletParachainSystemError, CumulusPalletParachainSystemEvent, CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot, + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize, CumulusPalletXcmError, CumulusPalletXcmEvent, CumulusPalletXcmOrigin, @@ -92,6 +93,7 @@ import type { PalletAssetManagerCall, PalletAssetManagerError, PalletAssetManagerEvent, + PalletAssetsAccountStatus, PalletAssetsApproval, PalletAssetsAssetAccount, PalletAssetsAssetDetails, @@ -114,6 +116,7 @@ import type { PalletBalancesCall, PalletBalancesError, PalletBalancesEvent, + PalletBalancesIdAmount, PalletBalancesReasons, PalletBalancesReserveData, PalletCollectiveCall, @@ -172,7 +175,6 @@ import type { PalletMaintenanceModeCall, PalletMaintenanceModeError, PalletMaintenanceModeEvent, - PalletMigrationsCall, PalletMigrationsError, PalletMigrationsEvent, PalletMoonbeamOrbitersCall, @@ -207,6 +209,7 @@ import type { PalletParachainStakingInflationInflationInfo, PalletParachainStakingParachainBondConfig, PalletParachainStakingRoundInfo, + PalletParachainStakingSetBoundedOrderedSet, PalletParachainStakingSetOrderedSet, PalletPreimageCall, PalletPreimageError, @@ -274,10 +277,10 @@ import type { PolkadotCorePrimitivesOutboundHrmpMessage, PolkadotParachainPrimitivesHrmpChannelId, PolkadotParachainPrimitivesXcmpMessageFormat, - PolkadotPrimitivesV2AbridgedHostConfiguration, - PolkadotPrimitivesV2AbridgedHrmpChannel, - PolkadotPrimitivesV2PersistedValidationData, - PolkadotPrimitivesV2UpgradeRestriction, + PolkadotPrimitivesV4AbridgedHostConfiguration, + PolkadotPrimitivesV4AbridgedHrmpChannel, + PolkadotPrimitivesV4PersistedValidationData, + PolkadotPrimitivesV4UpgradeRestriction, SessionKeysPrimitivesVrfVrfCryptoPublic, SpArithmeticArithmeticError, SpCoreEcdsaSignature, @@ -367,6 +370,7 @@ declare module "@polkadot/types/types/registry" { CumulusPalletParachainSystemError: CumulusPalletParachainSystemError; CumulusPalletParachainSystemEvent: CumulusPalletParachainSystemEvent; CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot: CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot; + CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize: CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize; CumulusPalletXcmError: CumulusPalletXcmError; CumulusPalletXcmEvent: CumulusPalletXcmEvent; CumulusPalletXcmOrigin: CumulusPalletXcmOrigin; @@ -442,6 +446,7 @@ declare module "@polkadot/types/types/registry" { PalletAssetManagerCall: PalletAssetManagerCall; PalletAssetManagerError: PalletAssetManagerError; PalletAssetManagerEvent: PalletAssetManagerEvent; + PalletAssetsAccountStatus: PalletAssetsAccountStatus; PalletAssetsApproval: PalletAssetsApproval; PalletAssetsAssetAccount: PalletAssetsAssetAccount; PalletAssetsAssetDetails: PalletAssetsAssetDetails; @@ -464,6 +469,7 @@ declare module "@polkadot/types/types/registry" { PalletBalancesCall: PalletBalancesCall; PalletBalancesError: PalletBalancesError; PalletBalancesEvent: PalletBalancesEvent; + PalletBalancesIdAmount: PalletBalancesIdAmount; PalletBalancesReasons: PalletBalancesReasons; PalletBalancesReserveData: PalletBalancesReserveData; PalletCollectiveCall: PalletCollectiveCall; @@ -522,7 +528,6 @@ declare module "@polkadot/types/types/registry" { PalletMaintenanceModeCall: PalletMaintenanceModeCall; PalletMaintenanceModeError: PalletMaintenanceModeError; PalletMaintenanceModeEvent: PalletMaintenanceModeEvent; - PalletMigrationsCall: PalletMigrationsCall; PalletMigrationsError: PalletMigrationsError; PalletMigrationsEvent: PalletMigrationsEvent; PalletMoonbeamOrbitersCall: PalletMoonbeamOrbitersCall; @@ -557,6 +562,7 @@ declare module "@polkadot/types/types/registry" { PalletParachainStakingInflationInflationInfo: PalletParachainStakingInflationInflationInfo; PalletParachainStakingParachainBondConfig: PalletParachainStakingParachainBondConfig; PalletParachainStakingRoundInfo: PalletParachainStakingRoundInfo; + PalletParachainStakingSetBoundedOrderedSet: PalletParachainStakingSetBoundedOrderedSet; PalletParachainStakingSetOrderedSet: PalletParachainStakingSetOrderedSet; PalletPreimageCall: PalletPreimageCall; PalletPreimageError: PalletPreimageError; @@ -624,10 +630,10 @@ declare module "@polkadot/types/types/registry" { PolkadotCorePrimitivesOutboundHrmpMessage: PolkadotCorePrimitivesOutboundHrmpMessage; PolkadotParachainPrimitivesHrmpChannelId: PolkadotParachainPrimitivesHrmpChannelId; PolkadotParachainPrimitivesXcmpMessageFormat: PolkadotParachainPrimitivesXcmpMessageFormat; - PolkadotPrimitivesV2AbridgedHostConfiguration: PolkadotPrimitivesV2AbridgedHostConfiguration; - PolkadotPrimitivesV2AbridgedHrmpChannel: PolkadotPrimitivesV2AbridgedHrmpChannel; - PolkadotPrimitivesV2PersistedValidationData: PolkadotPrimitivesV2PersistedValidationData; - PolkadotPrimitivesV2UpgradeRestriction: PolkadotPrimitivesV2UpgradeRestriction; + PolkadotPrimitivesV4AbridgedHostConfiguration: PolkadotPrimitivesV4AbridgedHostConfiguration; + PolkadotPrimitivesV4AbridgedHrmpChannel: PolkadotPrimitivesV4AbridgedHrmpChannel; + PolkadotPrimitivesV4PersistedValidationData: PolkadotPrimitivesV4PersistedValidationData; + PolkadotPrimitivesV4UpgradeRestriction: PolkadotPrimitivesV4UpgradeRestriction; SessionKeysPrimitivesVrfVrfCryptoPublic: SessionKeysPrimitivesVrfVrfCryptoPublic; SpArithmeticArithmeticError: SpArithmeticArithmeticError; SpCoreEcdsaSignature: SpCoreEcdsaSignature; diff --git a/typescript-api/src/moonriver/interfaces/types-lookup.ts b/typescript-api/src/moonriver/interfaces/types-lookup.ts index 0abda69cb6..d9b9cea16b 100644 --- a/typescript-api/src/moonriver/interfaces/types-lookup.ts +++ b/typescript-api/src/moonriver/interfaces/types-lookup.ts @@ -55,29 +55,29 @@ declare module "@polkadot/types/lookup" { interface PalletBalancesAccountData extends Struct { readonly free: u128; readonly reserved: u128; - readonly miscFrozen: u128; - readonly feeFrozen: u128; + readonly frozen: u128; + readonly flags: u128; } - /** @name FrameSupportDispatchPerDispatchClassWeight (7) */ + /** @name FrameSupportDispatchPerDispatchClassWeight (8) */ interface FrameSupportDispatchPerDispatchClassWeight extends Struct { readonly normal: SpWeightsWeightV2Weight; readonly operational: SpWeightsWeightV2Weight; readonly mandatory: SpWeightsWeightV2Weight; } - /** @name SpWeightsWeightV2Weight (8) */ + /** @name SpWeightsWeightV2Weight (9) */ interface SpWeightsWeightV2Weight extends Struct { readonly refTime: Compact; readonly proofSize: Compact; } - /** @name SpRuntimeDigest (14) */ + /** @name SpRuntimeDigest (15) */ interface SpRuntimeDigest extends Struct { readonly logs: Vec; } - /** @name SpRuntimeDigestDigestItem (16) */ + /** @name SpRuntimeDigestDigestItem (17) */ interface SpRuntimeDigestDigestItem extends Enum { readonly isOther: boolean; readonly asOther: Bytes; @@ -91,14 +91,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Other" | "Consensus" | "Seal" | "PreRuntime" | "RuntimeEnvironmentUpdated"; } - /** @name FrameSystemEventRecord (19) */ + /** @name FrameSystemEventRecord (20) */ interface FrameSystemEventRecord extends Struct { readonly phase: FrameSystemPhase; readonly event: Event; readonly topics: Vec; } - /** @name FrameSystemEvent (21) */ + /** @name FrameSystemEvent (22) */ interface FrameSystemEvent extends Enum { readonly isExtrinsicSuccess: boolean; readonly asExtrinsicSuccess: { @@ -132,14 +132,14 @@ declare module "@polkadot/types/lookup" { | "Remarked"; } - /** @name FrameSupportDispatchDispatchInfo (22) */ + /** @name FrameSupportDispatchDispatchInfo (23) */ interface FrameSupportDispatchDispatchInfo extends Struct { readonly weight: SpWeightsWeightV2Weight; readonly class: FrameSupportDispatchDispatchClass; readonly paysFee: FrameSupportDispatchPays; } - /** @name FrameSupportDispatchDispatchClass (23) */ + /** @name FrameSupportDispatchDispatchClass (24) */ interface FrameSupportDispatchDispatchClass extends Enum { readonly isNormal: boolean; readonly isOperational: boolean; @@ -147,14 +147,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Normal" | "Operational" | "Mandatory"; } - /** @name FrameSupportDispatchPays (24) */ + /** @name FrameSupportDispatchPays (25) */ interface FrameSupportDispatchPays extends Enum { readonly isYes: boolean; readonly isNo: boolean; readonly type: "Yes" | "No"; } - /** @name SpRuntimeDispatchError (25) */ + /** @name SpRuntimeDispatchError (26) */ interface SpRuntimeDispatchError extends Enum { readonly isOther: boolean; readonly isCannotLookup: boolean; @@ -173,6 +173,7 @@ declare module "@polkadot/types/lookup" { readonly isExhausted: boolean; readonly isCorruption: boolean; readonly isUnavailable: boolean; + readonly isRootNotAllowed: boolean; readonly type: | "Other" | "CannotLookup" @@ -186,35 +187,42 @@ declare module "@polkadot/types/lookup" { | "Transactional" | "Exhausted" | "Corruption" - | "Unavailable"; + | "Unavailable" + | "RootNotAllowed"; } - /** @name SpRuntimeModuleError (26) */ + /** @name SpRuntimeModuleError (27) */ interface SpRuntimeModuleError extends Struct { readonly index: u8; readonly error: U8aFixed; } - /** @name SpRuntimeTokenError (27) */ + /** @name SpRuntimeTokenError (28) */ interface SpRuntimeTokenError extends Enum { - readonly isNoFunds: boolean; - readonly isWouldDie: boolean; + readonly isFundsUnavailable: boolean; + readonly isOnlyProvider: boolean; readonly isBelowMinimum: boolean; readonly isCannotCreate: boolean; readonly isUnknownAsset: boolean; readonly isFrozen: boolean; readonly isUnsupported: boolean; + readonly isCannotCreateHold: boolean; + readonly isNotExpendable: boolean; + readonly isBlocked: boolean; readonly type: - | "NoFunds" - | "WouldDie" + | "FundsUnavailable" + | "OnlyProvider" | "BelowMinimum" | "CannotCreate" | "UnknownAsset" | "Frozen" - | "Unsupported"; + | "Unsupported" + | "CannotCreateHold" + | "NotExpendable" + | "Blocked"; } - /** @name SpArithmeticArithmeticError (28) */ + /** @name SpArithmeticArithmeticError (29) */ interface SpArithmeticArithmeticError extends Enum { readonly isUnderflow: boolean; readonly isOverflow: boolean; @@ -222,14 +230,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Underflow" | "Overflow" | "DivisionByZero"; } - /** @name SpRuntimeTransactionalError (29) */ + /** @name SpRuntimeTransactionalError (30) */ interface SpRuntimeTransactionalError extends Enum { readonly isLimitReached: boolean; readonly isNoLayer: boolean; readonly type: "LimitReached" | "NoLayer"; } - /** @name CumulusPalletParachainSystemEvent (30) */ + /** @name CumulusPalletParachainSystemEvent (31) */ interface CumulusPalletParachainSystemEvent extends Enum { readonly isValidationFunctionStored: boolean; readonly isValidationFunctionApplied: boolean; @@ -264,7 +272,7 @@ declare module "@polkadot/types/lookup" { | "UpwardMessageSent"; } - /** @name PalletBalancesEvent (32) */ + /** @name PalletBalancesEvent (33) */ interface PalletBalancesEvent extends Enum { readonly isEndowed: boolean; readonly asEndowed: { @@ -286,7 +294,6 @@ declare module "@polkadot/types/lookup" { readonly asBalanceSet: { readonly who: AccountId20; readonly free: u128; - readonly reserved: u128; } & Struct; readonly isReserved: boolean; readonly asReserved: { @@ -320,6 +327,58 @@ declare module "@polkadot/types/lookup" { readonly who: AccountId20; readonly amount: u128; } & Struct; + readonly isMinted: boolean; + readonly asMinted: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isBurned: boolean; + readonly asBurned: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isSuspended: boolean; + readonly asSuspended: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isRestored: boolean; + readonly asRestored: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isUpgraded: boolean; + readonly asUpgraded: { + readonly who: AccountId20; + } & Struct; + readonly isIssued: boolean; + readonly asIssued: { + readonly amount: u128; + } & Struct; + readonly isRescinded: boolean; + readonly asRescinded: { + readonly amount: u128; + } & Struct; + readonly isLocked: boolean; + readonly asLocked: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isUnlocked: boolean; + readonly asUnlocked: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isFrozen: boolean; + readonly asFrozen: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; + readonly isThawed: boolean; + readonly asThawed: { + readonly who: AccountId20; + readonly amount: u128; + } & Struct; readonly type: | "Endowed" | "DustLost" @@ -330,17 +389,28 @@ declare module "@polkadot/types/lookup" { | "ReserveRepatriated" | "Deposit" | "Withdraw" - | "Slashed"; + | "Slashed" + | "Minted" + | "Burned" + | "Suspended" + | "Restored" + | "Upgraded" + | "Issued" + | "Rescinded" + | "Locked" + | "Unlocked" + | "Frozen" + | "Thawed"; } - /** @name FrameSupportTokensMiscBalanceStatus (33) */ + /** @name FrameSupportTokensMiscBalanceStatus (34) */ interface FrameSupportTokensMiscBalanceStatus extends Enum { readonly isFree: boolean; readonly isReserved: boolean; readonly type: "Free" | "Reserved"; } - /** @name PalletTransactionPaymentEvent (34) */ + /** @name PalletTransactionPaymentEvent (35) */ interface PalletTransactionPaymentEvent extends Enum { readonly isTransactionFeePaid: boolean; readonly asTransactionFeePaid: { @@ -351,7 +421,7 @@ declare module "@polkadot/types/lookup" { readonly type: "TransactionFeePaid"; } - /** @name PalletParachainStakingEvent (35) */ + /** @name PalletParachainStakingEvent (36) */ interface PalletParachainStakingEvent extends Enum { readonly isNewRound: boolean; readonly asNewRound: { @@ -601,13 +671,13 @@ declare module "@polkadot/types/lookup" { | "Compounded"; } - /** @name PalletParachainStakingDelegationRequestsCancelledScheduledRequest (37) */ + /** @name PalletParachainStakingDelegationRequestsCancelledScheduledRequest (38) */ interface PalletParachainStakingDelegationRequestsCancelledScheduledRequest extends Struct { readonly whenExecutable: u32; readonly action: PalletParachainStakingDelegationRequestsDelegationAction; } - /** @name PalletParachainStakingDelegationRequestsDelegationAction (38) */ + /** @name PalletParachainStakingDelegationRequestsDelegationAction (39) */ interface PalletParachainStakingDelegationRequestsDelegationAction extends Enum { readonly isRevoke: boolean; readonly asRevoke: u128; @@ -616,7 +686,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Revoke" | "Decrease"; } - /** @name PalletParachainStakingDelegatorAdded (39) */ + /** @name PalletParachainStakingDelegatorAdded (40) */ interface PalletParachainStakingDelegatorAdded extends Enum { readonly isAddedToTop: boolean; readonly asAddedToTop: { @@ -626,14 +696,14 @@ declare module "@polkadot/types/lookup" { readonly type: "AddedToTop" | "AddedToBottom"; } - /** @name PalletAuthorSlotFilterEvent (42) */ + /** @name PalletAuthorSlotFilterEvent (43) */ interface PalletAuthorSlotFilterEvent extends Enum { readonly isEligibleUpdated: boolean; readonly asEligibleUpdated: u32; readonly type: "EligibleUpdated"; } - /** @name PalletAuthorMappingEvent (44) */ + /** @name PalletAuthorMappingEvent (45) */ interface PalletAuthorMappingEvent extends Enum { readonly isKeysRegistered: boolean; readonly asKeysRegistered: { @@ -656,16 +726,16 @@ declare module "@polkadot/types/lookup" { readonly type: "KeysRegistered" | "KeysRemoved" | "KeysRotated"; } - /** @name NimbusPrimitivesNimbusCryptoPublic (45) */ + /** @name NimbusPrimitivesNimbusCryptoPublic (46) */ interface NimbusPrimitivesNimbusCryptoPublic extends SpCoreSr25519Public {} - /** @name SpCoreSr25519Public (46) */ + /** @name SpCoreSr25519Public (47) */ interface SpCoreSr25519Public extends U8aFixed {} - /** @name SessionKeysPrimitivesVrfVrfCryptoPublic (47) */ + /** @name SessionKeysPrimitivesVrfVrfCryptoPublic (48) */ interface SessionKeysPrimitivesVrfVrfCryptoPublic extends SpCoreSr25519Public {} - /** @name PalletMoonbeamOrbitersEvent (48) */ + /** @name PalletMoonbeamOrbitersEvent (49) */ interface PalletMoonbeamOrbitersEvent extends Enum { readonly isOrbiterJoinCollatorPool: boolean; readonly asOrbiterJoinCollatorPool: { @@ -706,7 +776,7 @@ declare module "@polkadot/types/lookup" { | "OrbiterUnregistered"; } - /** @name PalletUtilityEvent (50) */ + /** @name PalletUtilityEvent (51) */ interface PalletUtilityEvent extends Enum { readonly isBatchInterrupted: boolean; readonly asBatchInterrupted: { @@ -733,7 +803,7 @@ declare module "@polkadot/types/lookup" { | "DispatchedAs"; } - /** @name PalletProxyEvent (53) */ + /** @name PalletProxyEvent (54) */ interface PalletProxyEvent extends Enum { readonly isProxyExecuted: boolean; readonly asProxyExecuted: { @@ -769,7 +839,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ProxyExecuted" | "PureCreated" | "Announced" | "ProxyAdded" | "ProxyRemoved"; } - /** @name MoonriverRuntimeProxyType (54) */ + /** @name MoonriverRuntimeProxyType (55) */ interface MoonriverRuntimeProxyType extends Enum { readonly isAny: boolean; readonly isNonTransfer: boolean; @@ -790,7 +860,7 @@ declare module "@polkadot/types/lookup" { | "IdentityJudgement"; } - /** @name PalletMaintenanceModeEvent (56) */ + /** @name PalletMaintenanceModeEvent (57) */ interface PalletMaintenanceModeEvent extends Enum { readonly isEnteredMaintenanceMode: boolean; readonly isNormalOperationResumed: boolean; @@ -809,7 +879,7 @@ declare module "@polkadot/types/lookup" { | "FailedToResumeIdleXcmExecution"; } - /** @name PalletIdentityEvent (57) */ + /** @name PalletIdentityEvent (58) */ interface PalletIdentityEvent extends Enum { readonly isIdentitySet: boolean; readonly asIdentitySet: { @@ -875,7 +945,7 @@ declare module "@polkadot/types/lookup" { | "SubIdentityRevoked"; } - /** @name PalletMigrationsEvent (58) */ + /** @name PalletMigrationsEvent (59) */ interface PalletMigrationsEvent extends Enum { readonly isRuntimeUpgradeStarted: boolean; readonly isRuntimeUpgradeCompleted: boolean; @@ -908,7 +978,7 @@ declare module "@polkadot/types/lookup" { | "FailedToResumeIdleXcmExecution"; } - /** @name PalletMultisigEvent (59) */ + /** @name PalletMultisigEvent (60) */ interface PalletMultisigEvent extends Enum { readonly isNewMultisig: boolean; readonly asNewMultisig: { @@ -941,13 +1011,13 @@ declare module "@polkadot/types/lookup" { readonly type: "NewMultisig" | "MultisigApproval" | "MultisigExecuted" | "MultisigCancelled"; } - /** @name PalletMultisigTimepoint (60) */ + /** @name PalletMultisigTimepoint (61) */ interface PalletMultisigTimepoint extends Struct { readonly height: u32; readonly index: u32; } - /** @name PalletEvmEvent (61) */ + /** @name PalletEvmEvent (62) */ interface PalletEvmEvent extends Enum { readonly isLog: boolean; readonly asLog: { @@ -972,14 +1042,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Log" | "Created" | "CreatedFailed" | "Executed" | "ExecutedFailed"; } - /** @name EthereumLog (62) */ + /** @name EthereumLog (63) */ interface EthereumLog extends Struct { readonly address: H160; readonly topics: Vec; readonly data: Bytes; } - /** @name PalletEthereumEvent (65) */ + /** @name PalletEthereumEvent (66) */ interface PalletEthereumEvent extends Enum { readonly isExecuted: boolean; readonly asExecuted: { @@ -992,7 +1062,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Executed"; } - /** @name EvmCoreErrorExitReason (66) */ + /** @name EvmCoreErrorExitReason (67) */ interface EvmCoreErrorExitReason extends Enum { readonly isSucceed: boolean; readonly asSucceed: EvmCoreErrorExitSucceed; @@ -1005,7 +1075,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Succeed" | "Error" | "Revert" | "Fatal"; } - /** @name EvmCoreErrorExitSucceed (67) */ + /** @name EvmCoreErrorExitSucceed (68) */ interface EvmCoreErrorExitSucceed extends Enum { readonly isStopped: boolean; readonly isReturned: boolean; @@ -1013,7 +1083,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Stopped" | "Returned" | "Suicided"; } - /** @name EvmCoreErrorExitError (68) */ + /** @name EvmCoreErrorExitError (69) */ interface EvmCoreErrorExitError extends Enum { readonly isStackUnderflow: boolean; readonly isStackOverflow: boolean; @@ -1052,13 +1122,13 @@ declare module "@polkadot/types/lookup" { | "InvalidCode"; } - /** @name EvmCoreErrorExitRevert (72) */ + /** @name EvmCoreErrorExitRevert (73) */ interface EvmCoreErrorExitRevert extends Enum { readonly isReverted: boolean; readonly type: "Reverted"; } - /** @name EvmCoreErrorExitFatal (73) */ + /** @name EvmCoreErrorExitFatal (74) */ interface EvmCoreErrorExitFatal extends Enum { readonly isNotSupported: boolean; readonly isUnhandledInterrupt: boolean; @@ -1069,7 +1139,7 @@ declare module "@polkadot/types/lookup" { readonly type: "NotSupported" | "UnhandledInterrupt" | "CallErrorAsFatal" | "Other"; } - /** @name PalletSchedulerEvent (74) */ + /** @name PalletSchedulerEvent (75) */ interface PalletSchedulerEvent extends Enum { readonly isScheduled: boolean; readonly asScheduled: { @@ -1111,7 +1181,7 @@ declare module "@polkadot/types/lookup" { | "PermanentlyOverweight"; } - /** @name PalletDemocracyEvent (76) */ + /** @name PalletDemocracyEvent (77) */ interface PalletDemocracyEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -1211,7 +1281,7 @@ declare module "@polkadot/types/lookup" { | "MetadataTransferred"; } - /** @name PalletDemocracyVoteThreshold (77) */ + /** @name PalletDemocracyVoteThreshold (78) */ interface PalletDemocracyVoteThreshold extends Enum { readonly isSuperMajorityApprove: boolean; readonly isSuperMajorityAgainst: boolean; @@ -1219,7 +1289,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SuperMajorityApprove" | "SuperMajorityAgainst" | "SimpleMajority"; } - /** @name PalletDemocracyVoteAccountVote (78) */ + /** @name PalletDemocracyVoteAccountVote (79) */ interface PalletDemocracyVoteAccountVote extends Enum { readonly isStandard: boolean; readonly asStandard: { @@ -1234,7 +1304,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Standard" | "Split"; } - /** @name PalletDemocracyMetadataOwner (80) */ + /** @name PalletDemocracyMetadataOwner (81) */ interface PalletDemocracyMetadataOwner extends Enum { readonly isExternal: boolean; readonly isProposal: boolean; @@ -1244,7 +1314,7 @@ declare module "@polkadot/types/lookup" { readonly type: "External" | "Proposal" | "Referendum"; } - /** @name PalletPreimageEvent (81) */ + /** @name PalletPreimageEvent (82) */ interface PalletPreimageEvent extends Enum { readonly isNoted: boolean; readonly asNoted: { @@ -1261,7 +1331,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Noted" | "Requested" | "Cleared"; } - /** @name PalletConvictionVotingEvent (82) */ + /** @name PalletConvictionVotingEvent (83) */ interface PalletConvictionVotingEvent extends Enum { readonly isDelegated: boolean; readonly asDelegated: ITuple<[AccountId20, AccountId20]>; @@ -1270,7 +1340,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Delegated" | "Undelegated"; } - /** @name PalletReferendaEvent (83) */ + /** @name PalletReferendaEvent (84) */ interface PalletReferendaEvent extends Enum { readonly isSubmitted: boolean; readonly asSubmitted: { @@ -1374,7 +1444,7 @@ declare module "@polkadot/types/lookup" { | "MetadataCleared"; } - /** @name FrameSupportPreimagesBounded (84) */ + /** @name FrameSupportPreimagesBounded (85) */ interface FrameSupportPreimagesBounded extends Enum { readonly isLegacy: boolean; readonly asLegacy: { @@ -1390,7 +1460,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Legacy" | "Inline" | "Lookup"; } - /** @name FrameSystemCall (86) */ + /** @name FrameSystemCall (87) */ interface FrameSystemCall extends Enum { readonly isRemark: boolean; readonly asRemark: { @@ -1436,7 +1506,7 @@ declare module "@polkadot/types/lookup" { | "RemarkWithEvent"; } - /** @name CumulusPalletParachainSystemCall (90) */ + /** @name CumulusPalletParachainSystemCall (91) */ interface CumulusPalletParachainSystemCall extends Enum { readonly isSetValidationData: boolean; readonly asSetValidationData: { @@ -1462,40 +1532,40 @@ declare module "@polkadot/types/lookup" { | "EnactAuthorizedUpgrade"; } - /** @name CumulusPrimitivesParachainInherentParachainInherentData (91) */ + /** @name CumulusPrimitivesParachainInherentParachainInherentData (92) */ interface CumulusPrimitivesParachainInherentParachainInherentData extends Struct { - readonly validationData: PolkadotPrimitivesV2PersistedValidationData; + readonly validationData: PolkadotPrimitivesV4PersistedValidationData; readonly relayChainState: SpTrieStorageProof; readonly downwardMessages: Vec; readonly horizontalMessages: BTreeMap>; } - /** @name PolkadotPrimitivesV2PersistedValidationData (92) */ - interface PolkadotPrimitivesV2PersistedValidationData extends Struct { + /** @name PolkadotPrimitivesV4PersistedValidationData (93) */ + interface PolkadotPrimitivesV4PersistedValidationData extends Struct { readonly parentHead: Bytes; readonly relayParentNumber: u32; readonly relayParentStorageRoot: H256; readonly maxPovSize: u32; } - /** @name SpTrieStorageProof (94) */ + /** @name SpTrieStorageProof (95) */ interface SpTrieStorageProof extends Struct { readonly trieNodes: BTreeSet; } - /** @name PolkadotCorePrimitivesInboundDownwardMessage (97) */ + /** @name PolkadotCorePrimitivesInboundDownwardMessage (98) */ interface PolkadotCorePrimitivesInboundDownwardMessage extends Struct { readonly sentAt: u32; readonly msg: Bytes; } - /** @name PolkadotCorePrimitivesInboundHrmpMessage (101) */ + /** @name PolkadotCorePrimitivesInboundHrmpMessage (102) */ interface PolkadotCorePrimitivesInboundHrmpMessage extends Struct { readonly sentAt: u32; readonly data: Bytes; } - /** @name PalletTimestampCall (104) */ + /** @name PalletTimestampCall (105) */ interface PalletTimestampCall extends Enum { readonly isSet: boolean; readonly asSet: { @@ -1504,7 +1574,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Set"; } - /** @name PalletRootTestingCall (105) */ + /** @name PalletRootTestingCall (106) */ interface PalletRootTestingCall extends Enum { readonly isFillBlock: boolean; readonly asFillBlock: { @@ -1513,18 +1583,18 @@ declare module "@polkadot/types/lookup" { readonly type: "FillBlock"; } - /** @name PalletBalancesCall (106) */ + /** @name PalletBalancesCall (107) */ interface PalletBalancesCall extends Enum { - readonly isTransfer: boolean; - readonly asTransfer: { + readonly isTransferAllowDeath: boolean; + readonly asTransferAllowDeath: { readonly dest: AccountId20; readonly value: Compact; } & Struct; - readonly isSetBalance: boolean; - readonly asSetBalance: { + readonly isSetBalanceDeprecated: boolean; + readonly asSetBalanceDeprecated: { readonly who: AccountId20; readonly newFree: Compact; - readonly newReserved: Compact; + readonly oldReserved: Compact; } & Struct; readonly isForceTransfer: boolean; readonly asForceTransfer: { @@ -1547,16 +1617,33 @@ declare module "@polkadot/types/lookup" { readonly who: AccountId20; readonly amount: u128; } & Struct; + readonly isUpgradeAccounts: boolean; + readonly asUpgradeAccounts: { + readonly who: Vec; + } & Struct; + readonly isTransfer: boolean; + readonly asTransfer: { + readonly dest: AccountId20; + readonly value: Compact; + } & Struct; + readonly isForceSetBalance: boolean; + readonly asForceSetBalance: { + readonly who: AccountId20; + readonly newFree: Compact; + } & Struct; readonly type: - | "Transfer" - | "SetBalance" + | "TransferAllowDeath" + | "SetBalanceDeprecated" | "ForceTransfer" | "TransferKeepAlive" | "TransferAll" - | "ForceUnreserve"; + | "ForceUnreserve" + | "UpgradeAccounts" + | "Transfer" + | "ForceSetBalance"; } - /** @name PalletParachainStakingCall (108) */ + /** @name PalletParachainStakingCall (110) */ interface PalletParachainStakingCall extends Enum { readonly isSetStakingExpectations: boolean; readonly asSetStakingExpectations: { @@ -1643,13 +1730,9 @@ declare module "@polkadot/types/lookup" { readonly candidateAutoCompoundingDelegationCount: u32; readonly delegationCount: u32; } & Struct; - readonly isScheduleLeaveDelegators: boolean; - readonly isExecuteLeaveDelegators: boolean; - readonly asExecuteLeaveDelegators: { - readonly delegator: AccountId20; - readonly delegationCount: u32; - } & Struct; - readonly isCancelLeaveDelegators: boolean; + readonly isRemovedCall19: boolean; + readonly isRemovedCall20: boolean; + readonly isRemovedCall21: boolean; readonly isScheduleRevokeDelegation: boolean; readonly asScheduleRevokeDelegation: { readonly collator: AccountId20; @@ -1704,9 +1787,9 @@ declare module "@polkadot/types/lookup" { | "CancelCandidateBondLess" | "Delegate" | "DelegateWithAutoCompound" - | "ScheduleLeaveDelegators" - | "ExecuteLeaveDelegators" - | "CancelLeaveDelegators" + | "RemovedCall19" + | "RemovedCall20" + | "RemovedCall21" | "ScheduleRevokeDelegation" | "DelegatorBondMore" | "ScheduleDelegatorBondLess" @@ -1716,13 +1799,13 @@ declare module "@polkadot/types/lookup" { | "HotfixRemoveDelegationRequestsExitedCandidates"; } - /** @name PalletAuthorInherentCall (112) */ + /** @name PalletAuthorInherentCall (113) */ interface PalletAuthorInherentCall extends Enum { readonly isKickOffAuthorshipValidation: boolean; readonly type: "KickOffAuthorshipValidation"; } - /** @name PalletAuthorSlotFilterCall (113) */ + /** @name PalletAuthorSlotFilterCall (114) */ interface PalletAuthorSlotFilterCall extends Enum { readonly isSetEligible: boolean; readonly asSetEligible: { @@ -1731,7 +1814,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SetEligible"; } - /** @name PalletAuthorMappingCall (114) */ + /** @name PalletAuthorMappingCall (115) */ interface PalletAuthorMappingCall extends Enum { readonly isAddAssociation: boolean; readonly asAddAssociation: { @@ -1759,7 +1842,7 @@ declare module "@polkadot/types/lookup" { | "SetKeys"; } - /** @name PalletMoonbeamOrbitersCall (115) */ + /** @name PalletMoonbeamOrbitersCall (116) */ interface PalletMoonbeamOrbitersCall extends Enum { readonly isCollatorAddOrbiter: boolean; readonly asCollatorAddOrbiter: { @@ -1796,7 +1879,7 @@ declare module "@polkadot/types/lookup" { | "RemoveCollator"; } - /** @name PalletUtilityCall (116) */ + /** @name PalletUtilityCall (117) */ interface PalletUtilityCall extends Enum { readonly isBatch: boolean; readonly asBatch: { @@ -1834,7 +1917,7 @@ declare module "@polkadot/types/lookup" { | "WithWeight"; } - /** @name MoonriverRuntimeOriginCaller (118) */ + /** @name MoonriverRuntimeOriginCaller (119) */ interface MoonriverRuntimeOriginCaller extends Enum { readonly isSystem: boolean; readonly asSystem: FrameSupportDispatchRawOrigin; @@ -1871,7 +1954,7 @@ declare module "@polkadot/types/lookup" { | "EthereumXcm"; } - /** @name FrameSupportDispatchRawOrigin (119) */ + /** @name FrameSupportDispatchRawOrigin (120) */ interface FrameSupportDispatchRawOrigin extends Enum { readonly isRoot: boolean; readonly isSigned: boolean; @@ -1880,14 +1963,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Root" | "Signed" | "None"; } - /** @name PalletEthereumRawOrigin (120) */ + /** @name PalletEthereumRawOrigin (121) */ interface PalletEthereumRawOrigin extends Enum { readonly isEthereumTransaction: boolean; readonly asEthereumTransaction: H160; readonly type: "EthereumTransaction"; } - /** @name MoonriverRuntimeGovernanceOriginsCustomOriginsOrigin (121) */ + /** @name MoonriverRuntimeGovernanceOriginsCustomOriginsOrigin (122) */ interface MoonriverRuntimeGovernanceOriginsCustomOriginsOrigin extends Enum { readonly isWhitelistedCaller: boolean; readonly isGeneralAdmin: boolean; @@ -1900,7 +1983,7 @@ declare module "@polkadot/types/lookup" { | "ReferendumKiller"; } - /** @name PalletCollectiveRawOrigin (122) */ + /** @name PalletCollectiveRawOrigin (123) */ interface PalletCollectiveRawOrigin extends Enum { readonly isMembers: boolean; readonly asMembers: ITuple<[u32, u32]>; @@ -1910,7 +1993,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Members" | "Member" | "Phantom"; } - /** @name CumulusPalletXcmOrigin (126) */ + /** @name CumulusPalletXcmOrigin (127) */ interface CumulusPalletXcmOrigin extends Enum { readonly isRelay: boolean; readonly isSiblingParachain: boolean; @@ -1918,7 +2001,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Relay" | "SiblingParachain"; } - /** @name PalletXcmOrigin (127) */ + /** @name PalletXcmOrigin (128) */ interface PalletXcmOrigin extends Enum { readonly isXcm: boolean; readonly asXcm: XcmV3MultiLocation; @@ -1927,13 +2010,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Xcm" | "Response"; } - /** @name XcmV3MultiLocation (128) */ + /** @name XcmV3MultiLocation (129) */ interface XcmV3MultiLocation extends Struct { readonly parents: u8; readonly interior: XcmV3Junctions; } - /** @name XcmV3Junctions (129) */ + /** @name XcmV3Junctions (130) */ interface XcmV3Junctions extends Enum { readonly isHere: boolean; readonly isX1: boolean; @@ -1980,7 +2063,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Here" | "X1" | "X2" | "X3" | "X4" | "X5" | "X6" | "X7" | "X8"; } - /** @name XcmV3Junction (130) */ + /** @name XcmV3Junction (131) */ interface XcmV3Junction extends Enum { readonly isParachain: boolean; readonly asParachain: Compact; @@ -2029,7 +2112,7 @@ declare module "@polkadot/types/lookup" { | "GlobalConsensus"; } - /** @name XcmV3JunctionNetworkId (133) */ + /** @name XcmV3JunctionNetworkId (134) */ interface XcmV3JunctionNetworkId extends Enum { readonly isByGenesis: boolean; readonly asByGenesis: U8aFixed; @@ -2062,7 +2145,7 @@ declare module "@polkadot/types/lookup" { | "BitcoinCash"; } - /** @name XcmV3JunctionBodyId (134) */ + /** @name XcmV3JunctionBodyId (135) */ interface XcmV3JunctionBodyId extends Enum { readonly isUnit: boolean; readonly isMoniker: boolean; @@ -2089,7 +2172,7 @@ declare module "@polkadot/types/lookup" { | "Treasury"; } - /** @name XcmV3JunctionBodyPart (135) */ + /** @name XcmV3JunctionBodyPart (136) */ interface XcmV3JunctionBodyPart extends Enum { readonly isVoice: boolean; readonly isMembers: boolean; @@ -2114,17 +2197,17 @@ declare module "@polkadot/types/lookup" { readonly type: "Voice" | "Members" | "Fraction" | "AtLeastProportion" | "MoreThanProportion"; } - /** @name PalletEthereumXcmRawOrigin (136) */ + /** @name PalletEthereumXcmRawOrigin (137) */ interface PalletEthereumXcmRawOrigin extends Enum { readonly isXcmEthereumTransaction: boolean; readonly asXcmEthereumTransaction: H160; readonly type: "XcmEthereumTransaction"; } - /** @name SpCoreVoid (137) */ + /** @name SpCoreVoid (138) */ type SpCoreVoid = Null; - /** @name PalletProxyCall (138) */ + /** @name PalletProxyCall (139) */ interface PalletProxyCall extends Enum { readonly isProxy: boolean; readonly asProxy: { @@ -2194,14 +2277,14 @@ declare module "@polkadot/types/lookup" { | "ProxyAnnounced"; } - /** @name PalletMaintenanceModeCall (140) */ + /** @name PalletMaintenanceModeCall (141) */ interface PalletMaintenanceModeCall extends Enum { readonly isEnterMaintenanceMode: boolean; readonly isResumeNormalOperation: boolean; readonly type: "EnterMaintenanceMode" | "ResumeNormalOperation"; } - /** @name PalletIdentityCall (141) */ + /** @name PalletIdentityCall (142) */ interface PalletIdentityCall extends Enum { readonly isAddRegistrar: boolean; readonly asAddRegistrar: { @@ -2284,7 +2367,7 @@ declare module "@polkadot/types/lookup" { | "QuitSub"; } - /** @name PalletIdentityIdentityInfo (142) */ + /** @name PalletIdentityIdentityInfo (143) */ interface PalletIdentityIdentityInfo extends Struct { readonly additional: Vec>; readonly display: Data; @@ -2297,7 +2380,7 @@ declare module "@polkadot/types/lookup" { readonly twitter: Data; } - /** @name PalletIdentityBitFlags (180) */ + /** @name PalletIdentityBitFlags (181) */ interface PalletIdentityBitFlags extends Set { readonly isDisplay: boolean; readonly isLegal: boolean; @@ -2309,7 +2392,7 @@ declare module "@polkadot/types/lookup" { readonly isTwitter: boolean; } - /** @name PalletIdentityIdentityField (181) */ + /** @name PalletIdentityIdentityField (182) */ interface PalletIdentityIdentityField extends Enum { readonly isDisplay: boolean; readonly isLegal: boolean; @@ -2330,7 +2413,7 @@ declare module "@polkadot/types/lookup" { | "Twitter"; } - /** @name PalletIdentityJudgement (182) */ + /** @name PalletIdentityJudgement (183) */ interface PalletIdentityJudgement extends Enum { readonly isUnknown: boolean; readonly isFeePaid: boolean; @@ -2350,16 +2433,6 @@ declare module "@polkadot/types/lookup" { | "Erroneous"; } - /** @name PalletMigrationsCall (183) */ - interface PalletMigrationsCall extends Enum { - readonly isMigrateDemocracyPreimage: boolean; - readonly asMigrateDemocracyPreimage: { - readonly proposalHash: H256; - readonly proposalLenUpperBound: Compact; - } & Struct; - readonly type: "MigrateDemocracyPreimage"; - } - /** @name PalletMultisigCall (184) */ interface PalletMultisigCall extends Enum { readonly isAsMultiThreshold1: boolean; @@ -2905,13 +2978,6 @@ declare module "@polkadot/types/lookup" { readonly index: Compact; readonly approve: bool; } & Struct; - readonly isCloseOldWeight: boolean; - readonly asCloseOldWeight: { - readonly proposalHash: H256; - readonly index: Compact; - readonly proposalWeightBound: Compact; - readonly lengthBound: Compact; - } & Struct; readonly isDisapproveProposal: boolean; readonly asDisapproveProposal: { readonly proposalHash: H256; @@ -2923,17 +2989,10 @@ declare module "@polkadot/types/lookup" { readonly proposalWeightBound: SpWeightsWeightV2Weight; readonly lengthBound: Compact; } & Struct; - readonly type: - | "SetMembers" - | "Execute" - | "Propose" - | "Vote" - | "CloseOldWeight" - | "DisapproveProposal" - | "Close"; + readonly type: "SetMembers" | "Execute" | "Propose" | "Vote" | "DisapproveProposal" | "Close"; } - /** @name PalletTreasuryCall (223) */ + /** @name PalletTreasuryCall (221) */ interface PalletTreasuryCall extends Enum { readonly isProposeSpend: boolean; readonly asProposeSpend: { @@ -2965,7 +3024,7 @@ declare module "@polkadot/types/lookup" { | "RemoveApproval"; } - /** @name PalletCrowdloanRewardsCall (224) */ + /** @name PalletCrowdloanRewardsCall (222) */ interface PalletCrowdloanRewardsCall extends Enum { readonly isAssociateNativeIdentity: boolean; readonly asAssociateNativeIdentity: { @@ -3001,7 +3060,7 @@ declare module "@polkadot/types/lookup" { | "InitializeRewardVec"; } - /** @name SpRuntimeMultiSignature (225) */ + /** @name SpRuntimeMultiSignature (223) */ interface SpRuntimeMultiSignature extends Enum { readonly isEd25519: boolean; readonly asEd25519: SpCoreEd25519Signature; @@ -3012,16 +3071,16 @@ declare module "@polkadot/types/lookup" { readonly type: "Ed25519" | "Sr25519" | "Ecdsa"; } - /** @name SpCoreEd25519Signature (226) */ + /** @name SpCoreEd25519Signature (224) */ interface SpCoreEd25519Signature extends U8aFixed {} - /** @name SpCoreSr25519Signature (228) */ + /** @name SpCoreSr25519Signature (226) */ interface SpCoreSr25519Signature extends U8aFixed {} - /** @name SpCoreEcdsaSignature (229) */ + /** @name SpCoreEcdsaSignature (227) */ interface SpCoreEcdsaSignature extends U8aFixed {} - /** @name CumulusPalletDmpQueueCall (235) */ + /** @name CumulusPalletDmpQueueCall (233) */ interface CumulusPalletDmpQueueCall extends Enum { readonly isServiceOverweight: boolean; readonly asServiceOverweight: { @@ -3031,7 +3090,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ServiceOverweight"; } - /** @name PalletXcmCall (236) */ + /** @name PalletXcmCall (234) */ interface PalletXcmCall extends Enum { readonly isSend: boolean; readonly asSend: { @@ -3108,7 +3167,7 @@ declare module "@polkadot/types/lookup" { | "ForceSuspension"; } - /** @name XcmVersionedMultiLocation (237) */ + /** @name XcmVersionedMultiLocation (235) */ interface XcmVersionedMultiLocation extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiLocation; @@ -3117,13 +3176,13 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name XcmV2MultiLocation (238) */ + /** @name XcmV2MultiLocation (236) */ interface XcmV2MultiLocation extends Struct { readonly parents: u8; readonly interior: XcmV2MultilocationJunctions; } - /** @name XcmV2MultilocationJunctions (239) */ + /** @name XcmV2MultilocationJunctions (237) */ interface XcmV2MultilocationJunctions extends Enum { readonly isHere: boolean; readonly isX1: boolean; @@ -3170,7 +3229,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Here" | "X1" | "X2" | "X3" | "X4" | "X5" | "X6" | "X7" | "X8"; } - /** @name XcmV2Junction (240) */ + /** @name XcmV2Junction (238) */ interface XcmV2Junction extends Enum { readonly isParachain: boolean; readonly asParachain: Compact; @@ -3213,7 +3272,7 @@ declare module "@polkadot/types/lookup" { | "Plurality"; } - /** @name XcmV2NetworkId (241) */ + /** @name XcmV2NetworkId (239) */ interface XcmV2NetworkId extends Enum { readonly isAny: boolean; readonly isNamed: boolean; @@ -3223,7 +3282,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Any" | "Named" | "Polkadot" | "Kusama"; } - /** @name XcmV2BodyId (243) */ + /** @name XcmV2BodyId (241) */ interface XcmV2BodyId extends Enum { readonly isUnit: boolean; readonly isNamed: boolean; @@ -3250,7 +3309,7 @@ declare module "@polkadot/types/lookup" { | "Treasury"; } - /** @name XcmV2BodyPart (244) */ + /** @name XcmV2BodyPart (242) */ interface XcmV2BodyPart extends Enum { readonly isVoice: boolean; readonly isMembers: boolean; @@ -3275,7 +3334,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Voice" | "Members" | "Fraction" | "AtLeastProportion" | "MoreThanProportion"; } - /** @name XcmVersionedXcm (245) */ + /** @name XcmVersionedXcm (243) */ interface XcmVersionedXcm extends Enum { readonly isV2: boolean; readonly asV2: XcmV2Xcm; @@ -3284,10 +3343,10 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name XcmV2Xcm (246) */ + /** @name XcmV2Xcm (244) */ interface XcmV2Xcm extends Vec {} - /** @name XcmV2Instruction (248) */ + /** @name XcmV2Instruction (246) */ interface XcmV2Instruction extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: XcmV2MultiassetMultiAssets; @@ -3435,16 +3494,16 @@ declare module "@polkadot/types/lookup" { | "UnsubscribeVersion"; } - /** @name XcmV2MultiassetMultiAssets (249) */ + /** @name XcmV2MultiassetMultiAssets (247) */ interface XcmV2MultiassetMultiAssets extends Vec {} - /** @name XcmV2MultiAsset (251) */ + /** @name XcmV2MultiAsset (249) */ interface XcmV2MultiAsset extends Struct { readonly id: XcmV2MultiassetAssetId; readonly fun: XcmV2MultiassetFungibility; } - /** @name XcmV2MultiassetAssetId (252) */ + /** @name XcmV2MultiassetAssetId (250) */ interface XcmV2MultiassetAssetId extends Enum { readonly isConcrete: boolean; readonly asConcrete: XcmV2MultiLocation; @@ -3453,7 +3512,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Concrete" | "Abstract"; } - /** @name XcmV2MultiassetFungibility (253) */ + /** @name XcmV2MultiassetFungibility (251) */ interface XcmV2MultiassetFungibility extends Enum { readonly isFungible: boolean; readonly asFungible: Compact; @@ -3462,7 +3521,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV2MultiassetAssetInstance (254) */ + /** @name XcmV2MultiassetAssetInstance (252) */ interface XcmV2MultiassetAssetInstance extends Enum { readonly isUndefined: boolean; readonly isIndex: boolean; @@ -3480,7 +3539,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Undefined" | "Index" | "Array4" | "Array8" | "Array16" | "Array32" | "Blob"; } - /** @name XcmV2Response (255) */ + /** @name XcmV2Response (253) */ interface XcmV2Response extends Enum { readonly isNull: boolean; readonly isAssets: boolean; @@ -3492,7 +3551,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Null" | "Assets" | "ExecutionResult" | "Version"; } - /** @name XcmV2TraitsError (258) */ + /** @name XcmV2TraitsError (256) */ interface XcmV2TraitsError extends Enum { readonly isOverflow: boolean; readonly isUnimplemented: boolean; @@ -3551,7 +3610,7 @@ declare module "@polkadot/types/lookup" { | "WeightNotComputable"; } - /** @name XcmV2OriginKind (259) */ + /** @name XcmV2OriginKind (257) */ interface XcmV2OriginKind extends Enum { readonly isNative: boolean; readonly isSovereignAccount: boolean; @@ -3560,12 +3619,12 @@ declare module "@polkadot/types/lookup" { readonly type: "Native" | "SovereignAccount" | "Superuser" | "Xcm"; } - /** @name XcmDoubleEncoded (260) */ + /** @name XcmDoubleEncoded (258) */ interface XcmDoubleEncoded extends Struct { readonly encoded: Bytes; } - /** @name XcmV2MultiassetMultiAssetFilter (261) */ + /** @name XcmV2MultiassetMultiAssetFilter (259) */ interface XcmV2MultiassetMultiAssetFilter extends Enum { readonly isDefinite: boolean; readonly asDefinite: XcmV2MultiassetMultiAssets; @@ -3574,7 +3633,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Definite" | "Wild"; } - /** @name XcmV2MultiassetWildMultiAsset (262) */ + /** @name XcmV2MultiassetWildMultiAsset (260) */ interface XcmV2MultiassetWildMultiAsset extends Enum { readonly isAll: boolean; readonly isAllOf: boolean; @@ -3585,14 +3644,14 @@ declare module "@polkadot/types/lookup" { readonly type: "All" | "AllOf"; } - /** @name XcmV2MultiassetWildFungibility (263) */ + /** @name XcmV2MultiassetWildFungibility (261) */ interface XcmV2MultiassetWildFungibility extends Enum { readonly isFungible: boolean; readonly isNonFungible: boolean; readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV2WeightLimit (264) */ + /** @name XcmV2WeightLimit (262) */ interface XcmV2WeightLimit extends Enum { readonly isUnlimited: boolean; readonly isLimited: boolean; @@ -3600,10 +3659,10 @@ declare module "@polkadot/types/lookup" { readonly type: "Unlimited" | "Limited"; } - /** @name XcmV3Xcm (265) */ + /** @name XcmV3Xcm (263) */ interface XcmV3Xcm extends Vec {} - /** @name XcmV3Instruction (267) */ + /** @name XcmV3Instruction (265) */ interface XcmV3Instruction extends Enum { readonly isWithdrawAsset: boolean; readonly asWithdrawAsset: XcmV3MultiassetMultiAssets; @@ -3833,16 +3892,16 @@ declare module "@polkadot/types/lookup" { | "UnpaidExecution"; } - /** @name XcmV3MultiassetMultiAssets (268) */ + /** @name XcmV3MultiassetMultiAssets (266) */ interface XcmV3MultiassetMultiAssets extends Vec {} - /** @name XcmV3MultiAsset (270) */ + /** @name XcmV3MultiAsset (268) */ interface XcmV3MultiAsset extends Struct { readonly id: XcmV3MultiassetAssetId; readonly fun: XcmV3MultiassetFungibility; } - /** @name XcmV3MultiassetAssetId (271) */ + /** @name XcmV3MultiassetAssetId (269) */ interface XcmV3MultiassetAssetId extends Enum { readonly isConcrete: boolean; readonly asConcrete: XcmV3MultiLocation; @@ -3851,7 +3910,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Concrete" | "Abstract"; } - /** @name XcmV3MultiassetFungibility (272) */ + /** @name XcmV3MultiassetFungibility (270) */ interface XcmV3MultiassetFungibility extends Enum { readonly isFungible: boolean; readonly asFungible: Compact; @@ -3860,7 +3919,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV3MultiassetAssetInstance (273) */ + /** @name XcmV3MultiassetAssetInstance (271) */ interface XcmV3MultiassetAssetInstance extends Enum { readonly isUndefined: boolean; readonly isIndex: boolean; @@ -3876,7 +3935,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Undefined" | "Index" | "Array4" | "Array8" | "Array16" | "Array32"; } - /** @name XcmV3Response (274) */ + /** @name XcmV3Response (272) */ interface XcmV3Response extends Enum { readonly isNull: boolean; readonly isAssets: boolean; @@ -3898,7 +3957,7 @@ declare module "@polkadot/types/lookup" { | "DispatchResult"; } - /** @name XcmV3TraitsError (277) */ + /** @name XcmV3TraitsError (275) */ interface XcmV3TraitsError extends Enum { readonly isOverflow: boolean; readonly isUnimplemented: boolean; @@ -3985,7 +4044,7 @@ declare module "@polkadot/types/lookup" { | "ExceedsStackLimit"; } - /** @name XcmV3PalletInfo (279) */ + /** @name XcmV3PalletInfo (277) */ interface XcmV3PalletInfo extends Struct { readonly index: Compact; readonly name: Bytes; @@ -3995,7 +4054,7 @@ declare module "@polkadot/types/lookup" { readonly patch: Compact; } - /** @name XcmV3MaybeErrorCode (282) */ + /** @name XcmV3MaybeErrorCode (280) */ interface XcmV3MaybeErrorCode extends Enum { readonly isSuccess: boolean; readonly isError: boolean; @@ -4005,14 +4064,14 @@ declare module "@polkadot/types/lookup" { readonly type: "Success" | "Error" | "TruncatedError"; } - /** @name XcmV3QueryResponseInfo (285) */ + /** @name XcmV3QueryResponseInfo (283) */ interface XcmV3QueryResponseInfo extends Struct { readonly destination: XcmV3MultiLocation; readonly queryId: Compact; readonly maxWeight: SpWeightsWeightV2Weight; } - /** @name XcmV3MultiassetMultiAssetFilter (286) */ + /** @name XcmV3MultiassetMultiAssetFilter (284) */ interface XcmV3MultiassetMultiAssetFilter extends Enum { readonly isDefinite: boolean; readonly asDefinite: XcmV3MultiassetMultiAssets; @@ -4021,7 +4080,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Definite" | "Wild"; } - /** @name XcmV3MultiassetWildMultiAsset (287) */ + /** @name XcmV3MultiassetWildMultiAsset (285) */ interface XcmV3MultiassetWildMultiAsset extends Enum { readonly isAll: boolean; readonly isAllOf: boolean; @@ -4040,14 +4099,14 @@ declare module "@polkadot/types/lookup" { readonly type: "All" | "AllOf" | "AllCounted" | "AllOfCounted"; } - /** @name XcmV3MultiassetWildFungibility (288) */ + /** @name XcmV3MultiassetWildFungibility (286) */ interface XcmV3MultiassetWildFungibility extends Enum { readonly isFungible: boolean; readonly isNonFungible: boolean; readonly type: "Fungible" | "NonFungible"; } - /** @name XcmV3WeightLimit (289) */ + /** @name XcmV3WeightLimit (287) */ interface XcmV3WeightLimit extends Enum { readonly isUnlimited: boolean; readonly isLimited: boolean; @@ -4055,7 +4114,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Unlimited" | "Limited"; } - /** @name XcmVersionedMultiAssets (290) */ + /** @name XcmVersionedMultiAssets (288) */ interface XcmVersionedMultiAssets extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiassetMultiAssets; @@ -4064,7 +4123,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletAssetsCall (299) */ + /** @name PalletAssetsCall (297) */ interface PalletAssetsCall extends Enum { readonly isCreate: boolean; readonly asCreate: { @@ -4228,6 +4287,21 @@ declare module "@polkadot/types/lookup" { readonly id: Compact; readonly minBalance: u128; } & Struct; + readonly isTouchOther: boolean; + readonly asTouchOther: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; + readonly isRefundOther: boolean; + readonly asRefundOther: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; + readonly isBlock: boolean; + readonly asBlock: { + readonly id: Compact; + readonly who: AccountId20; + } & Struct; readonly type: | "Create" | "ForceCreate" @@ -4257,10 +4331,13 @@ declare module "@polkadot/types/lookup" { | "TransferApproved" | "Touch" | "Refund" - | "SetMinBalance"; + | "SetMinBalance" + | "TouchOther" + | "RefundOther" + | "Block"; } - /** @name PalletAssetManagerCall (300) */ + /** @name PalletAssetManagerCall (298) */ interface PalletAssetManagerCall extends Enum { readonly isRegisterForeignAsset: boolean; readonly asRegisterForeignAsset: { @@ -4318,14 +4395,14 @@ declare module "@polkadot/types/lookup" { | "DestroyLocalAsset"; } - /** @name MoonriverRuntimeXcmConfigAssetType (301) */ + /** @name MoonriverRuntimeXcmConfigAssetType (299) */ interface MoonriverRuntimeXcmConfigAssetType extends Enum { readonly isXcm: boolean; readonly asXcm: XcmV3MultiLocation; readonly type: "Xcm"; } - /** @name MoonriverRuntimeAssetConfigAssetRegistrarMetadata (302) */ + /** @name MoonriverRuntimeAssetConfigAssetRegistrarMetadata (300) */ interface MoonriverRuntimeAssetConfigAssetRegistrarMetadata extends Struct { readonly name: Bytes; readonly symbol: Bytes; @@ -4333,7 +4410,7 @@ declare module "@polkadot/types/lookup" { readonly isFrozen: bool; } - /** @name OrmlXtokensModuleCall (303) */ + /** @name OrmlXtokensModuleCall (301) */ interface OrmlXtokensModuleCall extends Enum { readonly isTransfer: boolean; readonly asTransfer: { @@ -4386,7 +4463,7 @@ declare module "@polkadot/types/lookup" { | "TransferMultiassets"; } - /** @name MoonriverRuntimeXcmConfigCurrencyId (304) */ + /** @name MoonriverRuntimeXcmConfigCurrencyId (302) */ interface MoonriverRuntimeXcmConfigCurrencyId extends Enum { readonly isSelfReserve: boolean; readonly isForeignAsset: boolean; @@ -4400,7 +4477,7 @@ declare module "@polkadot/types/lookup" { readonly type: "SelfReserve" | "ForeignAsset" | "LocalAssetReserve" | "Erc20"; } - /** @name XcmVersionedMultiAsset (305) */ + /** @name XcmVersionedMultiAsset (303) */ interface XcmVersionedMultiAsset extends Enum { readonly isV2: boolean; readonly asV2: XcmV2MultiAsset; @@ -4409,7 +4486,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletXcmTransactorCall (308) */ + /** @name PalletXcmTransactorCall (306) */ interface PalletXcmTransactorCall extends Enum { readonly isRegister: boolean; readonly asRegister: { @@ -4427,6 +4504,7 @@ declare module "@polkadot/types/lookup" { readonly fee: PalletXcmTransactorCurrencyPayment; readonly innerCall: Bytes; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isTransactThroughSovereign: boolean; readonly asTransactThroughSovereign: { @@ -4436,6 +4514,7 @@ declare module "@polkadot/types/lookup" { readonly call: Bytes; readonly originKind: XcmV2OriginKind; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isSetTransactInfo: boolean; readonly asSetTransactInfo: { @@ -4454,6 +4533,7 @@ declare module "@polkadot/types/lookup" { readonly fee: PalletXcmTransactorCurrencyPayment; readonly call: Bytes; readonly weightInfo: PalletXcmTransactorTransactWeights; + readonly refund: bool; } & Struct; readonly isSetFeePerSecond: boolean; readonly asSetFeePerSecond: { @@ -4483,19 +4563,19 @@ declare module "@polkadot/types/lookup" { | "HrmpManage"; } - /** @name MoonriverRuntimeXcmConfigTransactors (309) */ + /** @name MoonriverRuntimeXcmConfigTransactors (307) */ interface MoonriverRuntimeXcmConfigTransactors extends Enum { readonly isRelay: boolean; readonly type: "Relay"; } - /** @name PalletXcmTransactorCurrencyPayment (310) */ + /** @name PalletXcmTransactorCurrencyPayment (308) */ interface PalletXcmTransactorCurrencyPayment extends Struct { readonly currency: PalletXcmTransactorCurrency; readonly feeAmount: Option; } - /** @name PalletXcmTransactorCurrency (311) */ + /** @name PalletXcmTransactorCurrency (309) */ interface PalletXcmTransactorCurrency extends Enum { readonly isAsCurrencyId: boolean; readonly asAsCurrencyId: MoonriverRuntimeXcmConfigCurrencyId; @@ -4504,13 +4584,13 @@ declare module "@polkadot/types/lookup" { readonly type: "AsCurrencyId" | "AsMultiLocation"; } - /** @name PalletXcmTransactorTransactWeights (313) */ + /** @name PalletXcmTransactorTransactWeights (311) */ interface PalletXcmTransactorTransactWeights extends Struct { readonly transactRequiredWeightAtMost: SpWeightsWeightV2Weight; readonly overallWeight: Option; } - /** @name PalletXcmTransactorHrmpOperation (315) */ + /** @name PalletXcmTransactorHrmpOperation (313) */ interface PalletXcmTransactorHrmpOperation extends Enum { readonly isInitOpen: boolean; readonly asInitOpen: PalletXcmTransactorHrmpInitParams; @@ -4528,20 +4608,20 @@ declare module "@polkadot/types/lookup" { readonly type: "InitOpen" | "Accept" | "Close" | "Cancel"; } - /** @name PalletXcmTransactorHrmpInitParams (316) */ + /** @name PalletXcmTransactorHrmpInitParams (314) */ interface PalletXcmTransactorHrmpInitParams extends Struct { readonly paraId: u32; readonly proposedMaxCapacity: u32; readonly proposedMaxMessageSize: u32; } - /** @name PolkadotParachainPrimitivesHrmpChannelId (317) */ + /** @name PolkadotParachainPrimitivesHrmpChannelId (315) */ interface PolkadotParachainPrimitivesHrmpChannelId extends Struct { readonly sender: u32; readonly recipient: u32; } - /** @name PalletEthereumXcmCall (319) */ + /** @name PalletEthereumXcmCall (317) */ interface PalletEthereumXcmCall extends Enum { readonly isTransact: boolean; readonly asTransact: { @@ -4561,7 +4641,7 @@ declare module "@polkadot/types/lookup" { | "ResumeEthereumXcmExecution"; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransaction (320) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransaction (318) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransaction extends Enum { readonly isV1: boolean; readonly asV1: XcmPrimitivesEthereumXcmEthereumXcmTransactionV1; @@ -4570,7 +4650,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V1" | "V2"; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 (321) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 (319) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransactionV1 extends Struct { readonly gasLimit: U256; readonly feePayment: XcmPrimitivesEthereumXcmEthereumXcmFee; @@ -4580,7 +4660,7 @@ declare module "@polkadot/types/lookup" { readonly accessList: Option]>>>; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmFee (322) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmFee (320) */ interface XcmPrimitivesEthereumXcmEthereumXcmFee extends Enum { readonly isManual: boolean; readonly asManual: XcmPrimitivesEthereumXcmManualEthereumXcmFee; @@ -4588,13 +4668,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Manual" | "Auto"; } - /** @name XcmPrimitivesEthereumXcmManualEthereumXcmFee (323) */ + /** @name XcmPrimitivesEthereumXcmManualEthereumXcmFee (321) */ interface XcmPrimitivesEthereumXcmManualEthereumXcmFee extends Struct { readonly gasPrice: Option; readonly maxFeePerGas: Option; } - /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 (326) */ + /** @name XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 (324) */ interface XcmPrimitivesEthereumXcmEthereumXcmTransactionV2 extends Struct { readonly gasLimit: U256; readonly action: EthereumTransactionTransactionAction; @@ -4603,20 +4683,20 @@ declare module "@polkadot/types/lookup" { readonly accessList: Option]>>>; } - /** @name PalletRandomnessCall (327) */ + /** @name PalletRandomnessCall (325) */ interface PalletRandomnessCall extends Enum { readonly isSetBabeRandomnessResults: boolean; readonly type: "SetBabeRandomnessResults"; } - /** @name PalletConvictionVotingTally (329) */ + /** @name PalletConvictionVotingTally (327) */ interface PalletConvictionVotingTally extends Struct { readonly ayes: u128; readonly nays: u128; readonly support: u128; } - /** @name PalletWhitelistEvent (330) */ + /** @name PalletWhitelistEvent (328) */ interface PalletWhitelistEvent extends Enum { readonly isCallWhitelisted: boolean; readonly asCallWhitelisted: { @@ -4637,19 +4717,19 @@ declare module "@polkadot/types/lookup" { readonly type: "CallWhitelisted" | "WhitelistedCallRemoved" | "WhitelistedCallDispatched"; } - /** @name FrameSupportDispatchPostDispatchInfo (332) */ + /** @name FrameSupportDispatchPostDispatchInfo (330) */ interface FrameSupportDispatchPostDispatchInfo extends Struct { readonly actualWeight: Option; readonly paysFee: FrameSupportDispatchPays; } - /** @name SpRuntimeDispatchErrorWithPostInfo (333) */ + /** @name SpRuntimeDispatchErrorWithPostInfo (331) */ interface SpRuntimeDispatchErrorWithPostInfo extends Struct { readonly postInfo: FrameSupportDispatchPostDispatchInfo; readonly error: SpRuntimeDispatchError; } - /** @name PalletCollectiveEvent (334) */ + /** @name PalletCollectiveEvent (332) */ interface PalletCollectiveEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -4700,7 +4780,7 @@ declare module "@polkadot/types/lookup" { | "Closed"; } - /** @name PalletTreasuryEvent (338) */ + /** @name PalletTreasuryEvent (336) */ interface PalletTreasuryEvent extends Enum { readonly isProposed: boolean; readonly asProposed: { @@ -4756,7 +4836,7 @@ declare module "@polkadot/types/lookup" { | "UpdatedInactive"; } - /** @name PalletCrowdloanRewardsEvent (339) */ + /** @name PalletCrowdloanRewardsEvent (337) */ interface PalletCrowdloanRewardsEvent extends Enum { readonly isInitialPaymentMade: boolean; readonly asInitialPaymentMade: ITuple<[AccountId20, u128]>; @@ -4781,7 +4861,7 @@ declare module "@polkadot/types/lookup" { | "InitializedAccountWithNotEnoughContribution"; } - /** @name CumulusPalletXcmpQueueEvent (340) */ + /** @name CumulusPalletXcmpQueueEvent (338) */ interface CumulusPalletXcmpQueueEvent extends Enum { readonly isSuccess: boolean; readonly asSuccess: { @@ -4828,7 +4908,7 @@ declare module "@polkadot/types/lookup" { | "OverweightServiced"; } - /** @name CumulusPalletXcmEvent (341) */ + /** @name CumulusPalletXcmEvent (339) */ interface CumulusPalletXcmEvent extends Enum { readonly isInvalidFormat: boolean; readonly asInvalidFormat: U8aFixed; @@ -4839,7 +4919,7 @@ declare module "@polkadot/types/lookup" { readonly type: "InvalidFormat" | "UnsupportedVersion" | "ExecutedDownward"; } - /** @name XcmV3TraitsOutcome (342) */ + /** @name XcmV3TraitsOutcome (340) */ interface XcmV3TraitsOutcome extends Enum { readonly isComplete: boolean; readonly asComplete: SpWeightsWeightV2Weight; @@ -4850,7 +4930,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Complete" | "Incomplete" | "Error"; } - /** @name CumulusPalletDmpQueueEvent (343) */ + /** @name CumulusPalletDmpQueueEvent (341) */ interface CumulusPalletDmpQueueEvent extends Enum { readonly isInvalidFormat: boolean; readonly asInvalidFormat: { @@ -4896,7 +4976,7 @@ declare module "@polkadot/types/lookup" { | "MaxMessagesExhausted"; } - /** @name PalletXcmEvent (344) */ + /** @name PalletXcmEvent (342) */ interface PalletXcmEvent extends Enum { readonly isAttempted: boolean; readonly asAttempted: XcmV3TraitsOutcome; @@ -4974,7 +5054,7 @@ declare module "@polkadot/types/lookup" { | "AssetsClaimed"; } - /** @name PalletAssetsEvent (345) */ + /** @name PalletAssetsEvent (343) */ interface PalletAssetsEvent extends Enum { readonly isCreated: boolean; readonly asCreated: { @@ -5098,6 +5178,17 @@ declare module "@polkadot/types/lookup" { readonly assetId: u128; readonly newMinBalance: u128; } & Struct; + readonly isTouched: boolean; + readonly asTouched: { + readonly assetId: u128; + readonly who: AccountId20; + readonly depositor: AccountId20; + } & Struct; + readonly isBlocked: boolean; + readonly asBlocked: { + readonly assetId: u128; + readonly who: AccountId20; + } & Struct; readonly type: | "Created" | "Issued" @@ -5120,10 +5211,12 @@ declare module "@polkadot/types/lookup" { | "ApprovalCancelled" | "TransferredApproved" | "AssetStatusChanged" - | "AssetMinBalanceChanged"; + | "AssetMinBalanceChanged" + | "Touched" + | "Blocked"; } - /** @name PalletAssetManagerEvent (346) */ + /** @name PalletAssetManagerEvent (344) */ interface PalletAssetManagerEvent extends Enum { readonly isForeignAssetRegistered: boolean; readonly asForeignAssetRegistered: { @@ -5176,7 +5269,7 @@ declare module "@polkadot/types/lookup" { | "LocalAssetDestroyed"; } - /** @name OrmlXtokensModuleEvent (347) */ + /** @name OrmlXtokensModuleEvent (345) */ interface OrmlXtokensModuleEvent extends Enum { readonly isTransferredMultiAssets: boolean; readonly asTransferredMultiAssets: { @@ -5188,7 +5281,7 @@ declare module "@polkadot/types/lookup" { readonly type: "TransferredMultiAssets"; } - /** @name PalletXcmTransactorEvent (348) */ + /** @name PalletXcmTransactorEvent (346) */ interface PalletXcmTransactorEvent extends Enum { readonly isTransactedDerivative: boolean; readonly asTransactedDerivative: { @@ -5258,14 +5351,14 @@ declare module "@polkadot/types/lookup" { | "HrmpManagementSent"; } - /** @name PalletXcmTransactorRemoteTransactInfoWithMaxWeight (349) */ + /** @name PalletXcmTransactorRemoteTransactInfoWithMaxWeight (347) */ interface PalletXcmTransactorRemoteTransactInfoWithMaxWeight extends Struct { readonly transactExtraWeight: SpWeightsWeightV2Weight; readonly maxWeight: SpWeightsWeightV2Weight; readonly transactExtraWeightSigned: Option; } - /** @name PalletRandomnessEvent (351) */ + /** @name PalletRandomnessEvent (349) */ interface PalletRandomnessEvent extends Enum { readonly isRandomnessRequestedBabeEpoch: boolean; readonly asRandomnessRequestedBabeEpoch: { @@ -5310,7 +5403,7 @@ declare module "@polkadot/types/lookup" { | "RequestExpirationExecuted"; } - /** @name FrameSystemPhase (352) */ + /** @name FrameSystemPhase (350) */ interface FrameSystemPhase extends Enum { readonly isApplyExtrinsic: boolean; readonly asApplyExtrinsic: u32; @@ -5319,27 +5412,27 @@ declare module "@polkadot/types/lookup" { readonly type: "ApplyExtrinsic" | "Finalization" | "Initialization"; } - /** @name FrameSystemLastRuntimeUpgradeInfo (354) */ + /** @name FrameSystemLastRuntimeUpgradeInfo (352) */ interface FrameSystemLastRuntimeUpgradeInfo extends Struct { readonly specVersion: Compact; readonly specName: Text; } - /** @name FrameSystemLimitsBlockWeights (355) */ + /** @name FrameSystemLimitsBlockWeights (353) */ interface FrameSystemLimitsBlockWeights extends Struct { readonly baseBlock: SpWeightsWeightV2Weight; readonly maxBlock: SpWeightsWeightV2Weight; readonly perClass: FrameSupportDispatchPerDispatchClassWeightsPerClass; } - /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (356) */ + /** @name FrameSupportDispatchPerDispatchClassWeightsPerClass (354) */ interface FrameSupportDispatchPerDispatchClassWeightsPerClass extends Struct { readonly normal: FrameSystemLimitsWeightsPerClass; readonly operational: FrameSystemLimitsWeightsPerClass; readonly mandatory: FrameSystemLimitsWeightsPerClass; } - /** @name FrameSystemLimitsWeightsPerClass (357) */ + /** @name FrameSystemLimitsWeightsPerClass (355) */ interface FrameSystemLimitsWeightsPerClass extends Struct { readonly baseExtrinsic: SpWeightsWeightV2Weight; readonly maxExtrinsic: Option; @@ -5347,25 +5440,25 @@ declare module "@polkadot/types/lookup" { readonly reserved: Option; } - /** @name FrameSystemLimitsBlockLength (358) */ + /** @name FrameSystemLimitsBlockLength (356) */ interface FrameSystemLimitsBlockLength extends Struct { readonly max: FrameSupportDispatchPerDispatchClassU32; } - /** @name FrameSupportDispatchPerDispatchClassU32 (359) */ + /** @name FrameSupportDispatchPerDispatchClassU32 (357) */ interface FrameSupportDispatchPerDispatchClassU32 extends Struct { readonly normal: u32; readonly operational: u32; readonly mandatory: u32; } - /** @name SpWeightsRuntimeDbWeight (360) */ + /** @name SpWeightsRuntimeDbWeight (358) */ interface SpWeightsRuntimeDbWeight extends Struct { readonly read: u64; readonly write: u64; } - /** @name SpVersionRuntimeVersion (361) */ + /** @name SpVersionRuntimeVersion (359) */ interface SpVersionRuntimeVersion extends Struct { readonly specName: Text; readonly implName: Text; @@ -5377,7 +5470,7 @@ declare module "@polkadot/types/lookup" { readonly stateVersion: u8; } - /** @name FrameSystemError (365) */ + /** @name FrameSystemError (363) */ interface FrameSystemError extends Enum { readonly isInvalidSpecName: boolean; readonly isSpecVersionNeedsToIncrease: boolean; @@ -5394,22 +5487,28 @@ declare module "@polkadot/types/lookup" { | "CallFiltered"; } - /** @name PolkadotPrimitivesV2UpgradeRestriction (367) */ - interface PolkadotPrimitivesV2UpgradeRestriction extends Enum { + /** @name PolkadotPrimitivesV4UpgradeRestriction (365) */ + interface PolkadotPrimitivesV4UpgradeRestriction extends Enum { readonly isPresent: boolean; readonly type: "Present"; } - /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (368) */ + /** @name CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot (366) */ interface CumulusPalletParachainSystemRelayStateSnapshotMessagingStateSnapshot extends Struct { readonly dmqMqcHead: H256; - readonly relayDispatchQueueSize: ITuple<[u32, u32]>; - readonly ingressChannels: Vec>; - readonly egressChannels: Vec>; + readonly relayDispatchQueueSize: CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize; + readonly ingressChannels: Vec>; + readonly egressChannels: Vec>; + } + + /** @name CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize (367) */ + interface CumulusPalletParachainSystemRelayStateSnapshotRelayDispachQueueSize extends Struct { + readonly remainingCount: u32; + readonly remainingSize: u32; } - /** @name PolkadotPrimitivesV2AbridgedHrmpChannel (371) */ - interface PolkadotPrimitivesV2AbridgedHrmpChannel extends Struct { + /** @name PolkadotPrimitivesV4AbridgedHrmpChannel (370) */ + interface PolkadotPrimitivesV4AbridgedHrmpChannel extends Struct { readonly maxCapacity: u32; readonly maxTotalSize: u32; readonly maxMessageSize: u32; @@ -5418,8 +5517,8 @@ declare module "@polkadot/types/lookup" { readonly mqcHead: Option; } - /** @name PolkadotPrimitivesV2AbridgedHostConfiguration (372) */ - interface PolkadotPrimitivesV2AbridgedHostConfiguration extends Struct { + /** @name PolkadotPrimitivesV4AbridgedHostConfiguration (371) */ + interface PolkadotPrimitivesV4AbridgedHostConfiguration extends Struct { readonly maxCodeSize: u32; readonly maxHeadDataSize: u32; readonly maxUpwardQueueCount: u32; @@ -5431,19 +5530,19 @@ declare module "@polkadot/types/lookup" { readonly validationUpgradeDelay: u32; } - /** @name PolkadotCorePrimitivesOutboundHrmpMessage (378) */ + /** @name PolkadotCorePrimitivesOutboundHrmpMessage (377) */ interface PolkadotCorePrimitivesOutboundHrmpMessage extends Struct { readonly recipient: u32; readonly data: Bytes; } - /** @name CumulusPalletParachainSystemCodeUpgradeAuthorization (379) */ + /** @name CumulusPalletParachainSystemCodeUpgradeAuthorization (378) */ interface CumulusPalletParachainSystemCodeUpgradeAuthorization extends Struct { readonly codeHash: H256; readonly checkVersion: bool; } - /** @name CumulusPalletParachainSystemError (380) */ + /** @name CumulusPalletParachainSystemError (379) */ interface CumulusPalletParachainSystemError extends Enum { readonly isOverlappingUpgrades: boolean; readonly isProhibitedByPolkadot: boolean; @@ -5464,14 +5563,14 @@ declare module "@polkadot/types/lookup" { | "Unauthorized"; } - /** @name PalletBalancesBalanceLock (382) */ + /** @name PalletBalancesBalanceLock (381) */ interface PalletBalancesBalanceLock extends Struct { readonly id: U8aFixed; readonly amount: u128; readonly reasons: PalletBalancesReasons; } - /** @name PalletBalancesReasons (383) */ + /** @name PalletBalancesReasons (382) */ interface PalletBalancesReasons extends Enum { readonly isFee: boolean; readonly isMisc: boolean; @@ -5479,54 +5578,64 @@ declare module "@polkadot/types/lookup" { readonly type: "Fee" | "Misc" | "All"; } - /** @name PalletBalancesReserveData (386) */ + /** @name PalletBalancesReserveData (385) */ interface PalletBalancesReserveData extends Struct { readonly id: U8aFixed; readonly amount: u128; } - /** @name PalletBalancesError (388) */ + /** @name PalletBalancesIdAmount (388) */ + interface PalletBalancesIdAmount extends Struct { + readonly id: Null; + readonly amount: u128; + } + + /** @name PalletBalancesError (390) */ interface PalletBalancesError extends Enum { readonly isVestingBalance: boolean; readonly isLiquidityRestrictions: boolean; readonly isInsufficientBalance: boolean; readonly isExistentialDeposit: boolean; - readonly isKeepAlive: boolean; + readonly isExpendability: boolean; readonly isExistingVestingSchedule: boolean; readonly isDeadAccount: boolean; readonly isTooManyReserves: boolean; + readonly isTooManyHolds: boolean; + readonly isTooManyFreezes: boolean; readonly type: | "VestingBalance" | "LiquidityRestrictions" | "InsufficientBalance" | "ExistentialDeposit" - | "KeepAlive" + | "Expendability" | "ExistingVestingSchedule" | "DeadAccount" - | "TooManyReserves"; + | "TooManyReserves" + | "TooManyHolds" + | "TooManyFreezes"; } - /** @name PalletTransactionPaymentReleases (390) */ + /** @name PalletTransactionPaymentReleases (392) */ interface PalletTransactionPaymentReleases extends Enum { readonly isV1Ancient: boolean; readonly isV2: boolean; readonly type: "V1Ancient" | "V2"; } - /** @name PalletParachainStakingParachainBondConfig (391) */ + /** @name PalletParachainStakingParachainBondConfig (393) */ interface PalletParachainStakingParachainBondConfig extends Struct { readonly account: AccountId20; readonly percent: Percent; } - /** @name PalletParachainStakingRoundInfo (392) */ + /** @name PalletParachainStakingRoundInfo (394) */ interface PalletParachainStakingRoundInfo extends Struct { readonly current: u32; readonly first: u32; readonly length: u32; } - /** @name PalletParachainStakingDelegator (393) */ + /** @name PalletParachainStakingDelegator (395) */ interface PalletParachainStakingDelegator extends Struct { readonly id: AccountId20; readonly delegations: PalletParachainStakingSetOrderedSet; @@ -5535,16 +5644,16 @@ declare module "@polkadot/types/lookup" { readonly status: PalletParachainStakingDelegatorStatus; } - /** @name PalletParachainStakingSetOrderedSet (394) */ + /** @name PalletParachainStakingSetOrderedSet (396) */ interface PalletParachainStakingSetOrderedSet extends Vec {} - /** @name PalletParachainStakingBond (395) */ + /** @name PalletParachainStakingBond (397) */ interface PalletParachainStakingBond extends Struct { readonly owner: AccountId20; readonly amount: u128; } - /** @name PalletParachainStakingDelegatorStatus (397) */ + /** @name PalletParachainStakingDelegatorStatus (399) */ interface PalletParachainStakingDelegatorStatus extends Enum { readonly isActive: boolean; readonly isLeaving: boolean; @@ -5552,7 +5661,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Active" | "Leaving"; } - /** @name PalletParachainStakingCandidateMetadata (398) */ + /** @name PalletParachainStakingCandidateMetadata (400) */ interface PalletParachainStakingCandidateMetadata extends Struct { readonly bond: u128; readonly delegationCount: u32; @@ -5566,7 +5675,7 @@ declare module "@polkadot/types/lookup" { readonly status: PalletParachainStakingCollatorStatus; } - /** @name PalletParachainStakingCapacityStatus (399) */ + /** @name PalletParachainStakingCapacityStatus (401) */ interface PalletParachainStakingCapacityStatus extends Enum { readonly isFull: boolean; readonly isEmpty: boolean; @@ -5574,13 +5683,13 @@ declare module "@polkadot/types/lookup" { readonly type: "Full" | "Empty" | "Partial"; } - /** @name PalletParachainStakingCandidateBondLessRequest (401) */ + /** @name PalletParachainStakingCandidateBondLessRequest (403) */ interface PalletParachainStakingCandidateBondLessRequest extends Struct { readonly amount: u128; readonly whenExecutable: u32; } - /** @name PalletParachainStakingCollatorStatus (402) */ + /** @name PalletParachainStakingCollatorStatus (404) */ interface PalletParachainStakingCollatorStatus extends Enum { readonly isActive: boolean; readonly isIdle: boolean; @@ -5589,47 +5698,50 @@ declare module "@polkadot/types/lookup" { readonly type: "Active" | "Idle" | "Leaving"; } - /** @name PalletParachainStakingDelegationRequestsScheduledRequest (404) */ + /** @name PalletParachainStakingDelegationRequestsScheduledRequest (406) */ interface PalletParachainStakingDelegationRequestsScheduledRequest extends Struct { readonly delegator: AccountId20; readonly whenExecutable: u32; readonly action: PalletParachainStakingDelegationRequestsDelegationAction; } - /** @name PalletParachainStakingAutoCompoundAutoCompoundConfig (407) */ + /** @name PalletParachainStakingAutoCompoundAutoCompoundConfig (409) */ interface PalletParachainStakingAutoCompoundAutoCompoundConfig extends Struct { readonly delegator: AccountId20; readonly value: Percent; } - /** @name PalletParachainStakingDelegations (409) */ + /** @name PalletParachainStakingDelegations (411) */ interface PalletParachainStakingDelegations extends Struct { readonly delegations: Vec; readonly total: u128; } - /** @name PalletParachainStakingCollatorSnapshot (411) */ + /** @name PalletParachainStakingSetBoundedOrderedSet (413) */ + interface PalletParachainStakingSetBoundedOrderedSet extends Vec {} + + /** @name PalletParachainStakingCollatorSnapshot (416) */ interface PalletParachainStakingCollatorSnapshot extends Struct { readonly bond: u128; readonly delegations: Vec; readonly total: u128; } - /** @name PalletParachainStakingBondWithAutoCompound (413) */ + /** @name PalletParachainStakingBondWithAutoCompound (418) */ interface PalletParachainStakingBondWithAutoCompound extends Struct { readonly owner: AccountId20; readonly amount: u128; readonly autoCompound: Percent; } - /** @name PalletParachainStakingDelayedPayout (414) */ + /** @name PalletParachainStakingDelayedPayout (419) */ interface PalletParachainStakingDelayedPayout extends Struct { readonly roundIssuance: u128; readonly totalStakingReward: u128; readonly collatorCommission: Perbill; } - /** @name PalletParachainStakingInflationInflationInfo (415) */ + /** @name PalletParachainStakingInflationInflationInfo (420) */ interface PalletParachainStakingInflationInflationInfo extends Struct { readonly expect: { readonly min: u128; @@ -5648,7 +5760,7 @@ declare module "@polkadot/types/lookup" { } & Struct; } - /** @name PalletParachainStakingError (416) */ + /** @name PalletParachainStakingError (421) */ interface PalletParachainStakingError extends Enum { readonly isDelegatorDNE: boolean; readonly isDelegatorDNEinTopNorBottom: boolean; @@ -5698,8 +5810,9 @@ declare module "@polkadot/types/lookup" { readonly isTooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates: boolean; readonly isTooLowCandidateCountWeightHint: boolean; readonly isTooLowCandidateCountWeightHintGoOffline: boolean; - readonly isTooLowCandidateCountWeightHintGoOnline: boolean; - readonly isTooLowCandidateCountWeightHintCandidateBondMore: boolean; + readonly isCandidateLimitReached: boolean; + readonly isCannotSetAboveMaxCandidates: boolean; + readonly isRemovedCall: boolean; readonly type: | "DelegatorDNE" | "DelegatorDNEinTopNorBottom" @@ -5749,11 +5862,12 @@ declare module "@polkadot/types/lookup" { | "TooLowCandidateAutoCompoundingDelegationCountToLeaveCandidates" | "TooLowCandidateCountWeightHint" | "TooLowCandidateCountWeightHintGoOffline" - | "TooLowCandidateCountWeightHintGoOnline" - | "TooLowCandidateCountWeightHintCandidateBondMore"; + | "CandidateLimitReached" + | "CannotSetAboveMaxCandidates" + | "RemovedCall"; } - /** @name PalletAuthorInherentError (417) */ + /** @name PalletAuthorInherentError (422) */ interface PalletAuthorInherentError extends Enum { readonly isAuthorAlreadySet: boolean; readonly isNoAccountId: boolean; @@ -5761,14 +5875,14 @@ declare module "@polkadot/types/lookup" { readonly type: "AuthorAlreadySet" | "NoAccountId" | "CannotBeAuthor"; } - /** @name PalletAuthorMappingRegistrationInfo (418) */ + /** @name PalletAuthorMappingRegistrationInfo (423) */ interface PalletAuthorMappingRegistrationInfo extends Struct { readonly account: AccountId20; readonly deposit: u128; readonly keys_: SessionKeysPrimitivesVrfVrfCryptoPublic; } - /** @name PalletAuthorMappingError (419) */ + /** @name PalletAuthorMappingError (424) */ interface PalletAuthorMappingError extends Enum { readonly isAssociationNotFound: boolean; readonly isNotYourAssociation: boolean; @@ -5789,20 +5903,20 @@ declare module "@polkadot/types/lookup" { | "DecodeKeysFailed"; } - /** @name PalletMoonbeamOrbitersCollatorPoolInfo (420) */ + /** @name PalletMoonbeamOrbitersCollatorPoolInfo (425) */ interface PalletMoonbeamOrbitersCollatorPoolInfo extends Struct { readonly orbiters: Vec; readonly maybeCurrentOrbiter: Option; readonly nextOrbiter: u32; } - /** @name PalletMoonbeamOrbitersCurrentOrbiter (422) */ + /** @name PalletMoonbeamOrbitersCurrentOrbiter (427) */ interface PalletMoonbeamOrbitersCurrentOrbiter extends Struct { readonly accountId: AccountId20; readonly removed: bool; } - /** @name PalletMoonbeamOrbitersError (423) */ + /** @name PalletMoonbeamOrbitersError (428) */ interface PalletMoonbeamOrbitersError extends Enum { readonly isCollatorAlreadyAdded: boolean; readonly isCollatorNotFound: boolean; @@ -5825,27 +5939,27 @@ declare module "@polkadot/types/lookup" { | "OrbiterStillInAPool"; } - /** @name PalletUtilityError (424) */ + /** @name PalletUtilityError (429) */ interface PalletUtilityError extends Enum { readonly isTooManyCalls: boolean; readonly type: "TooManyCalls"; } - /** @name PalletProxyProxyDefinition (427) */ + /** @name PalletProxyProxyDefinition (432) */ interface PalletProxyProxyDefinition extends Struct { readonly delegate: AccountId20; readonly proxyType: MoonriverRuntimeProxyType; readonly delay: u32; } - /** @name PalletProxyAnnouncement (431) */ + /** @name PalletProxyAnnouncement (436) */ interface PalletProxyAnnouncement extends Struct { readonly real: AccountId20; readonly callHash: H256; readonly height: u32; } - /** @name PalletProxyError (433) */ + /** @name PalletProxyError (438) */ interface PalletProxyError extends Enum { readonly isTooMany: boolean; readonly isNotFound: boolean; @@ -5866,28 +5980,28 @@ declare module "@polkadot/types/lookup" { | "NoSelfProxy"; } - /** @name PalletMaintenanceModeError (434) */ + /** @name PalletMaintenanceModeError (439) */ interface PalletMaintenanceModeError extends Enum { readonly isAlreadyInMaintenanceMode: boolean; readonly isNotInMaintenanceMode: boolean; readonly type: "AlreadyInMaintenanceMode" | "NotInMaintenanceMode"; } - /** @name PalletIdentityRegistration (435) */ + /** @name PalletIdentityRegistration (440) */ interface PalletIdentityRegistration extends Struct { readonly judgements: Vec>; readonly deposit: u128; readonly info: PalletIdentityIdentityInfo; } - /** @name PalletIdentityRegistrarInfo (443) */ + /** @name PalletIdentityRegistrarInfo (448) */ interface PalletIdentityRegistrarInfo extends Struct { readonly account: AccountId20; readonly fee: u128; readonly fields: PalletIdentityBitFlags; } - /** @name PalletIdentityError (445) */ + /** @name PalletIdentityError (450) */ interface PalletIdentityError extends Enum { readonly isTooManySubAccounts: boolean; readonly isNotFound: boolean; @@ -5928,7 +6042,7 @@ declare module "@polkadot/types/lookup" { | "JudgementPaymentFailed"; } - /** @name PalletMigrationsError (446) */ + /** @name PalletMigrationsError (451) */ interface PalletMigrationsError extends Enum { readonly isPreimageMissing: boolean; readonly isWrongUpperBound: boolean; @@ -5941,7 +6055,7 @@ declare module "@polkadot/types/lookup" { | "PreimageAlreadyExists"; } - /** @name PalletMultisigMultisig (448) */ + /** @name PalletMultisigMultisig (453) */ interface PalletMultisigMultisig extends Struct { readonly when: PalletMultisigTimepoint; readonly deposit: u128; @@ -5949,7 +6063,7 @@ declare module "@polkadot/types/lookup" { readonly approvals: Vec; } - /** @name PalletMultisigError (450) */ + /** @name PalletMultisigError (455) */ interface PalletMultisigError extends Enum { readonly isMinimumThreshold: boolean; readonly isAlreadyApproved: boolean; @@ -5982,13 +6096,13 @@ declare module "@polkadot/types/lookup" { | "AlreadyStored"; } - /** @name PalletEvmCodeMetadata (451) */ + /** @name PalletEvmCodeMetadata (456) */ interface PalletEvmCodeMetadata extends Struct { readonly size_: u64; readonly hash_: H256; } - /** @name PalletEvmError (453) */ + /** @name PalletEvmError (458) */ interface PalletEvmError extends Enum { readonly isBalanceLow: boolean; readonly isFeeOverflow: boolean; @@ -6015,7 +6129,7 @@ declare module "@polkadot/types/lookup" { | "TransactionMustComeFromEOA"; } - /** @name FpRpcTransactionStatus (456) */ + /** @name FpRpcTransactionStatus (461) */ interface FpRpcTransactionStatus extends Struct { readonly transactionHash: H256; readonly transactionIndex: u32; @@ -6026,10 +6140,10 @@ declare module "@polkadot/types/lookup" { readonly logsBloom: EthbloomBloom; } - /** @name EthbloomBloom (459) */ + /** @name EthbloomBloom (464) */ interface EthbloomBloom extends U8aFixed {} - /** @name EthereumReceiptReceiptV3 (461) */ + /** @name EthereumReceiptReceiptV3 (466) */ interface EthereumReceiptReceiptV3 extends Enum { readonly isLegacy: boolean; readonly asLegacy: EthereumReceiptEip658ReceiptData; @@ -6040,7 +6154,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Legacy" | "Eip2930" | "Eip1559"; } - /** @name EthereumReceiptEip658ReceiptData (462) */ + /** @name EthereumReceiptEip658ReceiptData (467) */ interface EthereumReceiptEip658ReceiptData extends Struct { readonly statusCode: u8; readonly usedGas: U256; @@ -6048,14 +6162,14 @@ declare module "@polkadot/types/lookup" { readonly logs: Vec; } - /** @name EthereumBlock (463) */ + /** @name EthereumBlock (468) */ interface EthereumBlock extends Struct { readonly header: EthereumHeader; readonly transactions: Vec; readonly ommers: Vec; } - /** @name EthereumHeader (464) */ + /** @name EthereumHeader (469) */ interface EthereumHeader extends Struct { readonly parentHash: H256; readonly ommersHash: H256; @@ -6074,17 +6188,17 @@ declare module "@polkadot/types/lookup" { readonly nonce: EthereumTypesHashH64; } - /** @name EthereumTypesHashH64 (465) */ + /** @name EthereumTypesHashH64 (470) */ interface EthereumTypesHashH64 extends U8aFixed {} - /** @name PalletEthereumError (470) */ + /** @name PalletEthereumError (475) */ interface PalletEthereumError extends Enum { readonly isInvalidSignature: boolean; readonly isPreLogExists: boolean; readonly type: "InvalidSignature" | "PreLogExists"; } - /** @name PalletSchedulerScheduled (473) */ + /** @name PalletSchedulerScheduled (478) */ interface PalletSchedulerScheduled extends Struct { readonly maybeId: Option; readonly priority: u8; @@ -6093,7 +6207,7 @@ declare module "@polkadot/types/lookup" { readonly origin: MoonriverRuntimeOriginCaller; } - /** @name PalletSchedulerError (475) */ + /** @name PalletSchedulerError (480) */ interface PalletSchedulerError extends Enum { readonly isFailedToSchedule: boolean; readonly isNotFound: boolean; @@ -6108,7 +6222,7 @@ declare module "@polkadot/types/lookup" { | "Named"; } - /** @name PalletDemocracyReferendumInfo (480) */ + /** @name PalletDemocracyReferendumInfo (485) */ interface PalletDemocracyReferendumInfo extends Enum { readonly isOngoing: boolean; readonly asOngoing: PalletDemocracyReferendumStatus; @@ -6120,7 +6234,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Ongoing" | "Finished"; } - /** @name PalletDemocracyReferendumStatus (481) */ + /** @name PalletDemocracyReferendumStatus (486) */ interface PalletDemocracyReferendumStatus extends Struct { readonly end: u32; readonly proposal: FrameSupportPreimagesBounded; @@ -6129,14 +6243,14 @@ declare module "@polkadot/types/lookup" { readonly tally: PalletDemocracyTally; } - /** @name PalletDemocracyTally (482) */ + /** @name PalletDemocracyTally (487) */ interface PalletDemocracyTally extends Struct { readonly ayes: u128; readonly nays: u128; readonly turnout: u128; } - /** @name PalletDemocracyVoteVoting (483) */ + /** @name PalletDemocracyVoteVoting (488) */ interface PalletDemocracyVoteVoting extends Enum { readonly isDirect: boolean; readonly asDirect: { @@ -6155,16 +6269,16 @@ declare module "@polkadot/types/lookup" { readonly type: "Direct" | "Delegating"; } - /** @name PalletDemocracyDelegations (487) */ + /** @name PalletDemocracyDelegations (492) */ interface PalletDemocracyDelegations extends Struct { readonly votes: u128; readonly capital: u128; } - /** @name PalletDemocracyVotePriorLock (488) */ + /** @name PalletDemocracyVotePriorLock (493) */ interface PalletDemocracyVotePriorLock extends ITuple<[u32, u128]> {} - /** @name PalletDemocracyError (491) */ + /** @name PalletDemocracyError (496) */ interface PalletDemocracyError extends Enum { readonly isValueLow: boolean; readonly isProposalMissing: boolean; @@ -6217,7 +6331,7 @@ declare module "@polkadot/types/lookup" { | "PreimageNotExist"; } - /** @name PalletPreimageRequestStatus (492) */ + /** @name PalletPreimageRequestStatus (497) */ interface PalletPreimageRequestStatus extends Enum { readonly isUnrequested: boolean; readonly asUnrequested: { @@ -6233,7 +6347,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Unrequested" | "Requested"; } - /** @name PalletPreimageError (497) */ + /** @name PalletPreimageError (502) */ interface PalletPreimageError extends Enum { readonly isTooBig: boolean; readonly isAlreadyNoted: boolean; @@ -6250,7 +6364,7 @@ declare module "@polkadot/types/lookup" { | "NotRequested"; } - /** @name PalletConvictionVotingVoteVoting (499) */ + /** @name PalletConvictionVotingVoteVoting (504) */ interface PalletConvictionVotingVoteVoting extends Enum { readonly isCasting: boolean; readonly asCasting: PalletConvictionVotingVoteCasting; @@ -6259,23 +6373,23 @@ declare module "@polkadot/types/lookup" { readonly type: "Casting" | "Delegating"; } - /** @name PalletConvictionVotingVoteCasting (500) */ + /** @name PalletConvictionVotingVoteCasting (505) */ interface PalletConvictionVotingVoteCasting extends Struct { readonly votes: Vec>; readonly delegations: PalletConvictionVotingDelegations; readonly prior: PalletConvictionVotingVotePriorLock; } - /** @name PalletConvictionVotingDelegations (504) */ + /** @name PalletConvictionVotingDelegations (509) */ interface PalletConvictionVotingDelegations extends Struct { readonly votes: u128; readonly capital: u128; } - /** @name PalletConvictionVotingVotePriorLock (505) */ + /** @name PalletConvictionVotingVotePriorLock (510) */ interface PalletConvictionVotingVotePriorLock extends ITuple<[u32, u128]> {} - /** @name PalletConvictionVotingVoteDelegating (506) */ + /** @name PalletConvictionVotingVoteDelegating (511) */ interface PalletConvictionVotingVoteDelegating extends Struct { readonly balance: u128; readonly target: AccountId20; @@ -6284,7 +6398,7 @@ declare module "@polkadot/types/lookup" { readonly prior: PalletConvictionVotingVotePriorLock; } - /** @name PalletConvictionVotingError (510) */ + /** @name PalletConvictionVotingError (515) */ interface PalletConvictionVotingError extends Enum { readonly isNotOngoing: boolean; readonly isNotVoter: boolean; @@ -6313,7 +6427,7 @@ declare module "@polkadot/types/lookup" { | "BadClass"; } - /** @name PalletReferendaReferendumInfo (511) */ + /** @name PalletReferendaReferendumInfo (516) */ interface PalletReferendaReferendumInfo extends Enum { readonly isOngoing: boolean; readonly asOngoing: PalletReferendaReferendumStatus; @@ -6338,7 +6452,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Ongoing" | "Approved" | "Rejected" | "Cancelled" | "TimedOut" | "Killed"; } - /** @name PalletReferendaReferendumStatus (512) */ + /** @name PalletReferendaReferendumStatus (517) */ interface PalletReferendaReferendumStatus extends Struct { readonly track: u16; readonly origin: MoonriverRuntimeOriginCaller; @@ -6353,19 +6467,19 @@ declare module "@polkadot/types/lookup" { readonly alarm: Option]>>; } - /** @name PalletReferendaDeposit (513) */ + /** @name PalletReferendaDeposit (518) */ interface PalletReferendaDeposit extends Struct { readonly who: AccountId20; readonly amount: u128; } - /** @name PalletReferendaDecidingStatus (516) */ + /** @name PalletReferendaDecidingStatus (521) */ interface PalletReferendaDecidingStatus extends Struct { readonly since: u32; readonly confirming: Option; } - /** @name PalletReferendaTrackInfo (524) */ + /** @name PalletReferendaTrackInfo (529) */ interface PalletReferendaTrackInfo extends Struct { readonly name: Text; readonly maxDeciding: u32; @@ -6378,7 +6492,7 @@ declare module "@polkadot/types/lookup" { readonly minSupport: PalletReferendaCurve; } - /** @name PalletReferendaCurve (525) */ + /** @name PalletReferendaCurve (530) */ interface PalletReferendaCurve extends Enum { readonly isLinearDecreasing: boolean; readonly asLinearDecreasing: { @@ -6402,7 +6516,7 @@ declare module "@polkadot/types/lookup" { readonly type: "LinearDecreasing" | "SteppedDecreasing" | "Reciprocal"; } - /** @name PalletReferendaError (528) */ + /** @name PalletReferendaError (533) */ interface PalletReferendaError extends Enum { readonly isNotOngoing: boolean; readonly isHasDeposit: boolean; @@ -6433,7 +6547,7 @@ declare module "@polkadot/types/lookup" { | "PreimageNotExist"; } - /** @name PalletWhitelistError (529) */ + /** @name PalletWhitelistError (534) */ interface PalletWhitelistError extends Enum { readonly isUnavailablePreImage: boolean; readonly isUndecodableCall: boolean; @@ -6448,7 +6562,7 @@ declare module "@polkadot/types/lookup" { | "CallAlreadyWhitelisted"; } - /** @name PalletCollectiveVotes (531) */ + /** @name PalletCollectiveVotes (536) */ interface PalletCollectiveVotes extends Struct { readonly index: u32; readonly threshold: u32; @@ -6457,7 +6571,7 @@ declare module "@polkadot/types/lookup" { readonly end: u32; } - /** @name PalletCollectiveError (532) */ + /** @name PalletCollectiveError (537) */ interface PalletCollectiveError extends Enum { readonly isNotMember: boolean; readonly isDuplicateProposal: boolean; @@ -6482,7 +6596,7 @@ declare module "@polkadot/types/lookup" { | "WrongProposalLength"; } - /** @name PalletTreasuryProposal (537) */ + /** @name PalletTreasuryProposal (542) */ interface PalletTreasuryProposal extends Struct { readonly proposer: AccountId20; readonly value: u128; @@ -6490,10 +6604,10 @@ declare module "@polkadot/types/lookup" { readonly bond: u128; } - /** @name FrameSupportPalletId (541) */ + /** @name FrameSupportPalletId (546) */ interface FrameSupportPalletId extends U8aFixed {} - /** @name PalletTreasuryError (542) */ + /** @name PalletTreasuryError (547) */ interface PalletTreasuryError extends Enum { readonly isInsufficientProposersBalance: boolean; readonly isInvalidIndex: boolean; @@ -6508,14 +6622,14 @@ declare module "@polkadot/types/lookup" { | "ProposalNotApproved"; } - /** @name PalletCrowdloanRewardsRewardInfo (543) */ + /** @name PalletCrowdloanRewardsRewardInfo (548) */ interface PalletCrowdloanRewardsRewardInfo extends Struct { readonly totalReward: u128; readonly claimedReward: u128; readonly contributedRelayAddresses: Vec; } - /** @name PalletCrowdloanRewardsError (545) */ + /** @name PalletCrowdloanRewardsError (550) */ interface PalletCrowdloanRewardsError extends Enum { readonly isAlreadyAssociated: boolean; readonly isBatchBeyondFundPot: boolean; @@ -6550,21 +6664,21 @@ declare module "@polkadot/types/lookup" { | "InsufficientNumberOfValidProofs"; } - /** @name CumulusPalletXcmpQueueInboundChannelDetails (547) */ + /** @name CumulusPalletXcmpQueueInboundChannelDetails (552) */ interface CumulusPalletXcmpQueueInboundChannelDetails extends Struct { readonly sender: u32; readonly state: CumulusPalletXcmpQueueInboundState; readonly messageMetadata: Vec>; } - /** @name CumulusPalletXcmpQueueInboundState (548) */ + /** @name CumulusPalletXcmpQueueInboundState (553) */ interface CumulusPalletXcmpQueueInboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: "Ok" | "Suspended"; } - /** @name PolkadotParachainPrimitivesXcmpMessageFormat (551) */ + /** @name PolkadotParachainPrimitivesXcmpMessageFormat (556) */ interface PolkadotParachainPrimitivesXcmpMessageFormat extends Enum { readonly isConcatenatedVersionedXcm: boolean; readonly isConcatenatedEncodedBlob: boolean; @@ -6572,7 +6686,7 @@ declare module "@polkadot/types/lookup" { readonly type: "ConcatenatedVersionedXcm" | "ConcatenatedEncodedBlob" | "Signals"; } - /** @name CumulusPalletXcmpQueueOutboundChannelDetails (554) */ + /** @name CumulusPalletXcmpQueueOutboundChannelDetails (559) */ interface CumulusPalletXcmpQueueOutboundChannelDetails extends Struct { readonly recipient: u32; readonly state: CumulusPalletXcmpQueueOutboundState; @@ -6581,14 +6695,14 @@ declare module "@polkadot/types/lookup" { readonly lastIndex: u16; } - /** @name CumulusPalletXcmpQueueOutboundState (555) */ + /** @name CumulusPalletXcmpQueueOutboundState (560) */ interface CumulusPalletXcmpQueueOutboundState extends Enum { readonly isOk: boolean; readonly isSuspended: boolean; readonly type: "Ok" | "Suspended"; } - /** @name CumulusPalletXcmpQueueQueueConfigData (557) */ + /** @name CumulusPalletXcmpQueueQueueConfigData (562) */ interface CumulusPalletXcmpQueueQueueConfigData extends Struct { readonly suspendThreshold: u32; readonly dropThreshold: u32; @@ -6598,7 +6712,7 @@ declare module "@polkadot/types/lookup" { readonly xcmpMaxIndividualWeight: SpWeightsWeightV2Weight; } - /** @name CumulusPalletXcmpQueueError (559) */ + /** @name CumulusPalletXcmpQueueError (564) */ interface CumulusPalletXcmpQueueError extends Enum { readonly isFailedToSend: boolean; readonly isBadXcmOrigin: boolean; @@ -6613,29 +6727,29 @@ declare module "@polkadot/types/lookup" { | "WeightOverLimit"; } - /** @name CumulusPalletXcmError (560) */ + /** @name CumulusPalletXcmError (565) */ type CumulusPalletXcmError = Null; - /** @name CumulusPalletDmpQueueConfigData (561) */ + /** @name CumulusPalletDmpQueueConfigData (566) */ interface CumulusPalletDmpQueueConfigData extends Struct { readonly maxIndividual: SpWeightsWeightV2Weight; } - /** @name CumulusPalletDmpQueuePageIndexData (562) */ + /** @name CumulusPalletDmpQueuePageIndexData (567) */ interface CumulusPalletDmpQueuePageIndexData extends Struct { readonly beginUsed: u32; readonly endUsed: u32; readonly overweightCount: u64; } - /** @name CumulusPalletDmpQueueError (565) */ + /** @name CumulusPalletDmpQueueError (570) */ interface CumulusPalletDmpQueueError extends Enum { readonly isUnknown: boolean; readonly isOverLimit: boolean; readonly type: "Unknown" | "OverLimit"; } - /** @name PalletXcmQueryStatus (566) */ + /** @name PalletXcmQueryStatus (571) */ interface PalletXcmQueryStatus extends Enum { readonly isPending: boolean; readonly asPending: { @@ -6657,7 +6771,7 @@ declare module "@polkadot/types/lookup" { readonly type: "Pending" | "VersionNotifier" | "Ready"; } - /** @name XcmVersionedResponse (570) */ + /** @name XcmVersionedResponse (575) */ interface XcmVersionedResponse extends Enum { readonly isV2: boolean; readonly asV2: XcmV2Response; @@ -6666,7 +6780,7 @@ declare module "@polkadot/types/lookup" { readonly type: "V2" | "V3"; } - /** @name PalletXcmVersionMigrationStage (576) */ + /** @name PalletXcmVersionMigrationStage (581) */ interface PalletXcmVersionMigrationStage extends Enum { readonly isMigrateSupportedVersion: boolean; readonly isMigrateVersionNotifiers: boolean; @@ -6680,22 +6794,22 @@ declare module "@polkadot/types/lookup" { | "MigrateAndNotifyOldTargets"; } - /** @name XcmVersionedAssetId (579) */ + /** @name XcmVersionedAssetId (584) */ interface XcmVersionedAssetId extends Enum { readonly isV3: boolean; readonly asV3: XcmV3MultiassetAssetId; readonly type: "V3"; } - /** @name PalletXcmRemoteLockedFungibleRecord (580) */ + /** @name PalletXcmRemoteLockedFungibleRecord (585) */ interface PalletXcmRemoteLockedFungibleRecord extends Struct { readonly amount: u128; readonly owner: XcmVersionedMultiLocation; readonly locker: XcmVersionedMultiLocation; - readonly users: u32; + readonly consumers: Vec>; } - /** @name PalletXcmError (584) */ + /** @name PalletXcmError (592) */ interface PalletXcmError extends Enum { readonly isUnreachable: boolean; readonly isSendFailure: boolean; @@ -6740,7 +6854,7 @@ declare module "@polkadot/types/lookup" { | "InUse"; } - /** @name PalletAssetsAssetDetails (585) */ + /** @name PalletAssetsAssetDetails (593) */ interface PalletAssetsAssetDetails extends Struct { readonly owner: AccountId20; readonly issuer: AccountId20; @@ -6756,7 +6870,7 @@ declare module "@polkadot/types/lookup" { readonly status: PalletAssetsAssetStatus; } - /** @name PalletAssetsAssetStatus (586) */ + /** @name PalletAssetsAssetStatus (594) */ interface PalletAssetsAssetStatus extends Enum { readonly isLive: boolean; readonly isFrozen: boolean; @@ -6764,31 +6878,41 @@ declare module "@polkadot/types/lookup" { readonly type: "Live" | "Frozen" | "Destroying"; } - /** @name PalletAssetsAssetAccount (588) */ + /** @name PalletAssetsAssetAccount (596) */ interface PalletAssetsAssetAccount extends Struct { readonly balance: u128; - readonly isFrozen: bool; + readonly status: PalletAssetsAccountStatus; readonly reason: PalletAssetsExistenceReason; readonly extra: Null; } - /** @name PalletAssetsExistenceReason (589) */ + /** @name PalletAssetsAccountStatus (597) */ + interface PalletAssetsAccountStatus extends Enum { + readonly isLiquid: boolean; + readonly isFrozen: boolean; + readonly isBlocked: boolean; + readonly type: "Liquid" | "Frozen" | "Blocked"; + } + + /** @name PalletAssetsExistenceReason (598) */ interface PalletAssetsExistenceReason extends Enum { readonly isConsumer: boolean; readonly isSufficient: boolean; readonly isDepositHeld: boolean; readonly asDepositHeld: u128; readonly isDepositRefunded: boolean; - readonly type: "Consumer" | "Sufficient" | "DepositHeld" | "DepositRefunded"; + readonly isDepositFrom: boolean; + readonly asDepositFrom: ITuple<[AccountId20, u128]>; + readonly type: "Consumer" | "Sufficient" | "DepositHeld" | "DepositRefunded" | "DepositFrom"; } - /** @name PalletAssetsApproval (591) */ + /** @name PalletAssetsApproval (600) */ interface PalletAssetsApproval extends Struct { readonly amount: u128; readonly deposit: u128; } - /** @name PalletAssetsAssetMetadata (592) */ + /** @name PalletAssetsAssetMetadata (601) */ interface PalletAssetsAssetMetadata extends Struct { readonly deposit: u128; readonly name: Bytes; @@ -6797,7 +6921,7 @@ declare module "@polkadot/types/lookup" { readonly isFrozen: bool; } - /** @name PalletAssetsError (594) */ + /** @name PalletAssetsError (603) */ interface PalletAssetsError extends Enum { readonly isBalanceLow: boolean; readonly isNoAccount: boolean; @@ -6807,7 +6931,7 @@ declare module "@polkadot/types/lookup" { readonly isInUse: boolean; readonly isBadWitness: boolean; readonly isMinBalanceZero: boolean; - readonly isNoProvider: boolean; + readonly isUnavailableConsumer: boolean; readonly isBadMetadata: boolean; readonly isUnapproved: boolean; readonly isWouldDie: boolean; @@ -6828,7 +6952,7 @@ declare module "@polkadot/types/lookup" { | "InUse" | "BadWitness" | "MinBalanceZero" - | "NoProvider" + | "UnavailableConsumer" | "BadMetadata" | "Unapproved" | "WouldDie" @@ -6842,13 +6966,13 @@ declare module "@polkadot/types/lookup" { | "CallbackFailed"; } - /** @name PalletAssetManagerAssetInfo (595) */ + /** @name PalletAssetManagerAssetInfo (604) */ interface PalletAssetManagerAssetInfo extends Struct { readonly creator: AccountId20; readonly deposit: u128; } - /** @name PalletAssetManagerError (597) */ + /** @name PalletAssetManagerError (606) */ interface PalletAssetManagerError extends Enum { readonly isErrorCreatingAsset: boolean; readonly isAssetAlreadyExists: boolean; @@ -6869,7 +6993,7 @@ declare module "@polkadot/types/lookup" { | "NonExistentLocalAsset"; } - /** @name OrmlXtokensModuleError (598) */ + /** @name OrmlXtokensModuleError (607) */ interface OrmlXtokensModuleError extends Enum { readonly isAssetHasNoReserve: boolean; readonly isNotCrossChainTransfer: boolean; @@ -6912,7 +7036,7 @@ declare module "@polkadot/types/lookup" { | "MinXcmFeeNotDefined"; } - /** @name PalletXcmTransactorError (599) */ + /** @name PalletXcmTransactorError (608) */ interface PalletXcmTransactorError extends Enum { readonly isIndexAlreadyClaimed: boolean; readonly isUnclaimedIndex: boolean; @@ -6940,6 +7064,7 @@ declare module "@polkadot/types/lookup" { readonly isHrmpHandlerNotImplemented: boolean; readonly isTooMuchFeeUsed: boolean; readonly isErrorValidating: boolean; + readonly isRefundNotSupportedWithTransactInfo: boolean; readonly type: | "IndexAlreadyClaimed" | "UnclaimedIndex" @@ -6966,22 +7091,23 @@ declare module "@polkadot/types/lookup" { | "FailedMultiLocationToJunction" | "HrmpHandlerNotImplemented" | "TooMuchFeeUsed" - | "ErrorValidating"; + | "ErrorValidating" + | "RefundNotSupportedWithTransactInfo"; } - /** @name PalletEthereumXcmError (601) */ + /** @name PalletEthereumXcmError (610) */ interface PalletEthereumXcmError extends Enum { readonly isEthereumXcmExecutionSuspended: boolean; readonly type: "EthereumXcmExecutionSuspended"; } - /** @name PalletRandomnessRequestState (602) */ + /** @name PalletRandomnessRequestState (611) */ interface PalletRandomnessRequestState extends Struct { readonly request: PalletRandomnessRequest; readonly deposit: u128; } - /** @name PalletRandomnessRequest (603) */ + /** @name PalletRandomnessRequest (612) */ interface PalletRandomnessRequest extends Struct { readonly refundAddress: H160; readonly contractAddress: H160; @@ -6992,7 +7118,7 @@ declare module "@polkadot/types/lookup" { readonly info: PalletRandomnessRequestInfo; } - /** @name PalletRandomnessRequestInfo (604) */ + /** @name PalletRandomnessRequestInfo (613) */ interface PalletRandomnessRequestInfo extends Enum { readonly isBabeEpoch: boolean; readonly asBabeEpoch: ITuple<[u64, u64]>; @@ -7001,7 +7127,7 @@ declare module "@polkadot/types/lookup" { readonly type: "BabeEpoch" | "Local"; } - /** @name PalletRandomnessRequestType (605) */ + /** @name PalletRandomnessRequestType (614) */ interface PalletRandomnessRequestType extends Enum { readonly isBabeEpoch: boolean; readonly asBabeEpoch: u64; @@ -7010,13 +7136,13 @@ declare module "@polkadot/types/lookup" { readonly type: "BabeEpoch" | "Local"; } - /** @name PalletRandomnessRandomnessResult (606) */ + /** @name PalletRandomnessRandomnessResult (615) */ interface PalletRandomnessRandomnessResult extends Struct { readonly randomness: Option; readonly requestCount: u64; } - /** @name PalletRandomnessError (607) */ + /** @name PalletRandomnessError (616) */ interface PalletRandomnessError extends Enum { readonly isRequestCounterOverflowed: boolean; readonly isRequestFeeOverflowed: boolean; @@ -7045,30 +7171,30 @@ declare module "@polkadot/types/lookup" { | "RandomnessResultNotFilled"; } - /** @name AccountEthereumSignature (609) */ + /** @name AccountEthereumSignature (618) */ interface AccountEthereumSignature extends SpCoreEcdsaSignature {} - /** @name FrameSystemExtensionsCheckNonZeroSender (611) */ + /** @name FrameSystemExtensionsCheckNonZeroSender (620) */ type FrameSystemExtensionsCheckNonZeroSender = Null; - /** @name FrameSystemExtensionsCheckSpecVersion (612) */ + /** @name FrameSystemExtensionsCheckSpecVersion (621) */ type FrameSystemExtensionsCheckSpecVersion = Null; - /** @name FrameSystemExtensionsCheckTxVersion (613) */ + /** @name FrameSystemExtensionsCheckTxVersion (622) */ type FrameSystemExtensionsCheckTxVersion = Null; - /** @name FrameSystemExtensionsCheckGenesis (614) */ + /** @name FrameSystemExtensionsCheckGenesis (623) */ type FrameSystemExtensionsCheckGenesis = Null; - /** @name FrameSystemExtensionsCheckNonce (617) */ + /** @name FrameSystemExtensionsCheckNonce (626) */ interface FrameSystemExtensionsCheckNonce extends Compact {} - /** @name FrameSystemExtensionsCheckWeight (618) */ + /** @name FrameSystemExtensionsCheckWeight (627) */ type FrameSystemExtensionsCheckWeight = Null; - /** @name PalletTransactionPaymentChargeTransactionPayment (619) */ + /** @name PalletTransactionPaymentChargeTransactionPayment (628) */ interface PalletTransactionPaymentChargeTransactionPayment extends Compact {} - /** @name MoonriverRuntimeRuntime (621) */ + /** @name MoonriverRuntimeRuntime (630) */ type MoonriverRuntimeRuntime = Null; } // declare module