diff --git a/Cargo.lock b/Cargo.lock index 5682503b30..fb502215d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -181,6 +181,7 @@ dependencies = [ "pallet-democracy", "pallet-membership", "pallet-multisig", + "pallet-preimage", "pallet-proxy", "pallet-scheduler", "pallet-session", @@ -237,6 +238,8 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-local", "cumulus-test-relay-sproof-builder", "ecosystem-renvm-bridge", "ethers", @@ -299,22 +302,13 @@ dependencies = [ "substrate-prometheus-endpoint", ] -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli 0.25.0", -] - [[package]] name = "addr2line" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli 0.26.1", + "gimli", ] [[package]] @@ -395,15 +389,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "approx" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] @@ -512,7 +506,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.2", + "socket2 0.4.3", "waker-fn", "winapi 0.3.9", ] @@ -699,7 +693,7 @@ version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ - "addr2line 0.17.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", @@ -778,7 +772,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "beefy-primitives", "fnv", @@ -786,6 +780,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.11.2", + "sc-chain-spec", "sc-client-api", "sc-keystore", "sc-network", @@ -806,10 +801,11 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "beefy-gadget", "beefy-primitives", + "derive_more", "futures 0.3.19", "jsonrpc-core", "jsonrpc-core-client", @@ -817,21 +813,24 @@ dependencies = [ "jsonrpc-pubsub", "log", "parity-scale-codec", + "parking_lot 0.11.2", "sc-rpc", + "sc-utils", "serde", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "parity-scale-codec", "scale-info", @@ -853,9 +852,9 @@ dependencies = [ [[package]] name = "bimap" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07" +checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" [[package]] name = "bincode" @@ -993,6 +992,15 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -1024,9 +1032,9 @@ dependencies = [ [[package]] name = "bounded-vec" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdd1dffefe5fc66262a524b91087c43b16e478b2e3dc49eb11b0e2fd6b6ec90" +checksum = "b47cca82fca99417fe405f09d93bb8fff90bdd03d13c631f18096ee123b4281c" dependencies = [ "thiserror", ] @@ -1034,7 +1042,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "finality-grandpa", "frame-support", @@ -1050,7 +1058,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-runtime", "frame-support", @@ -1062,7 +1070,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "bp-runtime", @@ -1078,7 +1086,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-messages", "bp-runtime", @@ -1093,25 +1101,10 @@ dependencies = [ "sp-version", ] -[[package]] -name = "bp-rialto" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" -dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1128,7 +1121,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-support", "hash-db", @@ -1146,7 +1139,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -1161,7 +1154,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1176,7 +1169,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -1208,7 +1201,10 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ + "lazy_static", "memchr", + "regex-automata", + "serde", ] [[package]] @@ -1306,6 +1302,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "cast" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version 0.4.0", +] + [[package]] name = "cc" version = "1.0.72" @@ -1589,24 +1594,24 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" +checksum = "9516ba6b2ba47b4cbf63b713f75b432fafa0a0e0464ec8381ec76e6efe931ab3" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" +checksum = "489e5d0081f7edff6be12d71282a8bf387b5df64d5592454b75d662397f2d642" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.25.0", + "gimli", "log", "regalloc", "smallvec", @@ -1615,34 +1620,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" +checksum = "d36ee1140371bb0f69100e734b30400157a4adf7b86148dee8b0a438763ead48" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" +checksum = "981da52d8f746af1feb96290c83977ff8d41071a7499e991d8abae0d4869f564" [[package]] name = "cranelift-entity" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a" +checksum = "a2906740053dd3bcf95ce53df0fd9b5649c68ae4bd9adada92b406f059eae461" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" +checksum = "b7cb156de1097f567d46bf57a0cd720a72c3e15e1a2bd8b1041ba2fc894471b7" dependencies = [ "cranelift-codegen", "log", @@ -1652,9 +1656,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" +checksum = "166028ca0343a6ee7bddac0e70084e142b23f99c701bd6f6ea9123afac1a7a46" dependencies = [ "cranelift-codegen", "libc", @@ -1663,9 +1667,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.78.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" +checksum = "5012a1cde0c8b3898770b711490d803018ae9bec2d60674ba0e5b2058a874f80" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1679,13 +1683,51 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3" dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "criterion" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", + "futures 0.3.19", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +dependencies = [ + "cast", + "itertools", +] + [[package]] name = "crossbeam-channel" version = "0.5.2" @@ -1760,6 +1802,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -1780,6 +1831,28 @@ dependencies = [ "subtle", ] +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa 0.4.8", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + [[package]] name = "ct-logs" version = "0.8.0" @@ -1831,7 +1904,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "sc-cli", "sc-service", @@ -1841,11 +1914,12 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "futures 0.3.19", "parity-scale-codec", "parking_lot 0.10.2", @@ -1864,14 +1938,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "futures 0.3.19", "parity-scale-codec", - "polkadot-client", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1894,9 +1967,10 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "async-trait", + "cumulus-relay-chain-interface", "dyn-clone", "futures 0.3.19", "parity-scale-codec", @@ -1914,14 +1988,14 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "futures 0.3.19", "parking_lot 0.10.2", - "polkadot-client", "sc-client-api", "sc-consensus", "sp-api", @@ -1938,14 +2012,15 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ + "async-trait", + "cumulus-relay-chain-interface", "derive_more", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "parity-scale-codec", - "parking_lot 0.10.2", - "polkadot-client", + "parking_lot 0.11.2", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1955,17 +2030,19 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", + "sp-state-machine", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", + "cumulus-relay-chain-interface", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -1984,17 +2061,17 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "parity-scale-codec", "parking_lot 0.10.2", "polkadot-overseer", "polkadot-primitives", - "polkadot-service", "sc-chain-spec", "sc-client-api", "sc-consensus", @@ -2013,7 +2090,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "frame-executive", "frame-support", @@ -2031,7 +2108,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2049,7 +2126,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -2057,6 +2134,7 @@ dependencies = [ "environmental", "frame-support", "frame-system", + "impl-trait-for-tuples 0.2.1", "log", "pallet-balances", "parity-scale-codec", @@ -2078,7 +2156,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -2089,7 +2167,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2106,7 +2184,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2124,10 +2202,9 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "frame-support", - "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -2141,13 +2218,13 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "async-trait", "cumulus-primitives-core", + "cumulus-relay-chain-interface", "cumulus-test-relay-sproof-builder", "parity-scale-codec", - "polkadot-client", "sc-client-api", "scale-info", "sp-api", @@ -2156,6 +2233,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-storage", "sp-trie", "tracing", ] @@ -2163,7 +2241,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "sp-inherents", @@ -2174,7 +2252,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2188,10 +2266,59 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "derive_more", + "futures 0.3.19", + "parking_lot 0.11.2", + "polkadot-overseer", + "sc-client-api", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-local" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.19", + "futures-timer", + "parking_lot 0.11.2", + "polkadot-client", + "polkadot-service", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2201,6 +2328,14 @@ dependencies = [ "sp-std", ] +[[package]] +name = "cumulus-test-relay-validation-worker-provider" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.16#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" +dependencies = [ + "polkadot-node-core-pvf", +] + [[package]] name = "curve25519-dalek" version = "2.1.3" @@ -2313,6 +2448,17 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array 0.14.5", +] + [[package]] name = "directories" version = "4.0.1" @@ -2403,6 +2549,13 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +[[package]] +name = "e2e-tests" +version = "2.2.3" +dependencies = [ + "test-service", +] + [[package]] name = "ecdsa" version = "0.12.4" @@ -2877,7 +3030,7 @@ dependencies = [ "ethers-core", "futures-channel", "futures-core", - "futures-timer 3.0.2", + "futures-timer", "futures-util", "hex", "parking_lot 0.11.2", @@ -2943,9 +3096,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "evm" @@ -3047,9 +3200,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] @@ -3091,7 +3244,7 @@ checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "num-traits", "parity-scale-codec", @@ -3154,7 +3307,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", ] @@ -3172,7 +3325,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -3182,6 +3335,7 @@ dependencies = [ "paste", "scale-info", "sp-api", + "sp-application-crypto", "sp-io", "sp-runtime", "sp-runtime-interface", @@ -3192,7 +3346,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "Inflector", "chrono", @@ -3218,7 +3372,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -3232,7 +3386,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -3260,7 +3414,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "bitflags", "frame-metadata", @@ -3289,7 +3443,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3301,7 +3455,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -3313,7 +3467,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro2", "quote", @@ -3323,7 +3477,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "log", @@ -3340,7 +3494,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -3355,7 +3509,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "sp-api", @@ -3364,7 +3518,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "sp-api", @@ -3532,12 +3686,6 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" -[[package]] -name = "futures-timer" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" - [[package]] name = "futures-timer" version = "3.0.2" @@ -3620,21 +3768,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - [[package]] name = "glob" version = "0.3.0" @@ -3697,6 +3839,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + [[package]] name = "handlebars" version = "4.2.1" @@ -3888,7 +4036,7 @@ dependencies = [ "httpdate", "itoa 0.4.8", "pin-project-lite 0.2.8", - "socket2 0.4.2", + "socket2 0.4.3", "tokio", "tower-service", "tracing", @@ -4084,23 +4232,12 @@ dependencies = [ "num-traits", ] -[[package]] -name = "intervalier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" -dependencies = [ - "futures 0.3.19", - "futures-timer 2.0.2", -] - [[package]] name = "io-lifetimes" -version = "0.3.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e90d6f8a6c76a8334b336e306efa3c5f2b604048cbfd486d6f49878e3af14" +checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" dependencies = [ - "rustc_version 0.4.0", "winapi 0.3.9", ] @@ -4169,9 +4306,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -4469,6 +4606,7 @@ dependencies = [ "pallet-democracy", "pallet-membership", "pallet-multisig", + "pallet-preimage", "pallet-proxy", "pallet-scheduler", "pallet-session", @@ -4527,8 +4665,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -4541,6 +4679,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex-literal", + "kusama-runtime-constants", "log", "pallet-authority-discovery", "pallet-authorship", @@ -4563,6 +4702,7 @@ dependencies = [ "pallet-nicks", "pallet-offences", "pallet-offences-benchmarking", + "pallet-preimage", "pallet-proxy", "pallet-recovery", "pallet-scheduler", @@ -4611,6 +4751,18 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "kusama-runtime-constants" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -4673,9 +4825,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.112" +version = "0.2.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9" [[package]] name = "libloading" @@ -4756,7 +4908,7 @@ dependencies = [ "either", "fnv", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "lazy_static", "libsecp256k1 0.7.0", "log", @@ -4907,7 +5059,7 @@ dependencies = [ "log", "rand 0.8.4", "smallvec", - "socket2 0.4.2", + "socket2 0.4.3", "void", ] @@ -5020,7 +5172,7 @@ dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", @@ -5109,13 +5261,13 @@ checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "async-io", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "if-watch", "ipnet", "libc", "libp2p-core", "log", - "socket2 0.4.2", + "socket2 0.4.3", ] [[package]] @@ -5321,9 +5473,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.28" +version = "0.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687387ff42ec7ea4f2149035a5675fedb675d26f98db90a1846ac63d3addb5f5" +checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" [[package]] name = "lock_api" @@ -5491,6 +5643,7 @@ dependencies = [ "pallet-membership", "pallet-multisig", "pallet-offences", + "pallet-preimage", "pallet-proxy", "pallet-recovery", "pallet-scheduler", @@ -5614,9 +5767,9 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" +checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" dependencies = [ "hash-db", "hashbrown", @@ -5652,12 +5805,12 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "thiserror", "tracing", ] @@ -6618,7 +6771,7 @@ dependencies = [ [[package]] name = "node-executor" version = "3.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-benchmarking", "node-primitives", @@ -6629,13 +6782,14 @@ dependencies = [ "sp-core", "sp-keystore", "sp-state-machine", + "sp-tracing", "sp-trie", ] [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-system", "parity-scale-codec", @@ -6648,7 +6802,7 @@ dependencies = [ [[package]] name = "node-runtime" version = "3.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6667,6 +6821,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-contracts", "pallet-contracts-primitives", @@ -6684,6 +6839,7 @@ dependencies = [ "pallet-mmr", "pallet-multisig", "pallet-offences", + "pallet-preimage", "pallet-proxy", "pallet-randomness-collective-flip", "pallet-recovery", @@ -6884,6 +7040,12 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + [[package]] name = "opaque-debug" version = "0.2.3" @@ -7331,7 +7493,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-support", "frame-system", @@ -7347,7 +7509,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-benchmarking", "frame-support", @@ -7361,7 +7523,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7377,7 +7539,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7393,7 +7555,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7408,7 +7570,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7432,7 +7594,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7452,7 +7614,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7467,7 +7629,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "beefy-primitives", "frame-support", @@ -7483,7 +7645,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -7508,7 +7670,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7526,7 +7688,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -7543,7 +7705,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bp-header-chain", "bp-runtime", @@ -7565,12 +7727,11 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "bp-message-dispatch", "bp-messages", - "bp-rialto", "bp-runtime", "frame-support", "frame-system", @@ -7584,10 +7745,28 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-child-bounties" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-bounties", + "pallet-treasury", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7604,7 +7783,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "bitflags", "frame-benchmarking", @@ -7615,7 +7794,6 @@ dependencies = [ "pallet-contracts-primitives", "pallet-contracts-proc-macro", "parity-scale-codec", - "pwasm-utils", "rand 0.8.4", "scale-info", "serde", @@ -7625,19 +7803,21 @@ dependencies = [ "sp-runtime", "sp-sandbox", "sp-std", + "wasm-instrument", "wasmi-validation", ] [[package]] name = "pallet-contracts-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "bitflags", "parity-scale-codec", "scale-info", "serde", "sp-core", + "sp-rpc", "sp-runtime", "sp-std", ] @@ -7645,7 +7825,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "proc-macro2", "quote", @@ -7655,7 +7835,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -7668,7 +7848,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7684,7 +7864,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7701,14 +7881,14 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", - "strum", - "strum_macros", + "strum 0.22.0", + "strum_macros 0.23.1", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7726,7 +7906,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7741,7 +7921,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7764,7 +7944,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7780,7 +7960,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7800,7 +7980,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7817,7 +7997,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-support", "frame-system", @@ -7830,7 +8010,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7847,7 +8027,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -7865,7 +8045,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7881,7 +8061,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7898,7 +8078,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7913,7 +8093,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7927,7 +8107,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -7944,7 +8124,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7964,10 +8144,26 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-preimage" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -7982,7 +8178,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-support", "frame-system", @@ -7996,7 +8192,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -8010,7 +8206,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8026,7 +8222,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -8047,7 +8243,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8063,7 +8259,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -8077,7 +8273,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8100,7 +8296,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -8111,7 +8307,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "sp-arithmetic", @@ -8120,7 +8316,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -8134,7 +8330,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8152,7 +8348,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8171,7 +8367,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-support", "frame-system", @@ -8188,7 +8384,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8205,7 +8401,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8216,7 +8412,7 @@ dependencies = [ [[package]] name = "pallet-transaction-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-support", "frame-system", @@ -8228,13 +8424,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15)", + "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16)", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8251,11 +8447,12 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-runtime", @@ -8265,7 +8462,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8281,7 +8478,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-benchmarking", "frame-support", @@ -8295,8 +8492,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-support", "frame-system", @@ -8313,8 +8510,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.8" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-benchmarking", "frame-support", @@ -8331,7 +8528,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=d1c06ce0bda73898bcb685212e7740f5afc0c2dd#d1c06ce0bda73898bcb685212e7740f5afc0c2dd" +source = "git+https://github.com/paritytech//cumulus?rev=867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790#867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8732,14 +8929,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] -name = "polkadot-approval-distribution" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +name = "plotters" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" dependencies = [ - "futures 0.3.19", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem", + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" + +[[package]] +name = "plotters-svg" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "polkadot-approval-distribution" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "futures 0.3.19", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "tracing", @@ -8747,8 +8972,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "polkadot-node-network-protocol", @@ -8760,8 +8985,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", "futures 0.3.19", @@ -8782,8 +9007,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "lru 0.7.2", @@ -8802,16 +9027,19 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-benchmarking-cli", "futures 0.3.19", "log", "polkadot-node-core-pvf", + "polkadot-node-metrics", + "polkadot-performance-test", "polkadot-service", "sc-cli", "sc-service", + "sc-tracing", "sp-core", "sp-trie", "structopt", @@ -8822,8 +9050,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -8853,13 +9081,13 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "always-assert", "derive_more", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8874,8 +9102,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -8887,8 +9115,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", "futures 0.3.19", @@ -8909,8 +9137,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8923,11 +9151,11 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8943,8 +9171,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "futures 0.3.19", @@ -8962,8 +9190,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "parity-scale-codec", @@ -8980,13 +9208,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "derive_more", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "kvdb", "lru 0.7.2", "merlin", @@ -9008,12 +9236,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-erasure-coding", @@ -9028,8 +9256,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "futures 0.3.19", @@ -9046,8 +9274,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "polkadot-node-subsystem", @@ -9061,8 +9289,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "futures 0.3.19", @@ -9079,8 +9307,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "polkadot-node-subsystem", @@ -9094,11 +9322,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-node-primitives", @@ -9111,13 +9339,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ - "bitvec 0.20.4", - "derive_more", "futures 0.3.19", "kvdb", + "lru 0.7.2", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9128,27 +9355,14 @@ dependencies = [ "tracing", ] -[[package]] -name = "polkadot-node-core-dispute-participation" -version = "0.9.14" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" -dependencies = [ - "futures 0.3.19", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-primitives", - "thiserror", - "tracing", -] - [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", @@ -9160,31 +9374,32 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "rand 0.8.4", "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", "futures 0.3.19", - "futures-timer 3.0.2", - "libc", + "futures-timer", "parity-scale-codec", "pin-project 1.0.10", "polkadot-core-primitives", @@ -9204,10 +9419,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "polkadot-node-core-pvf-checker" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "futures 0.3.19", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sp-keystore", + "thiserror", + "tracing", +] + [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", "memory-lru", @@ -9224,8 +9455,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-std", "lazy_static", @@ -9242,19 +9473,27 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ + "bs58", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", + "log", "metered-channel", + "parity-scale-codec", + "polkadot-primitives", + "sc-cli", + "sc-service", + "sc-tracing", "substrate-prometheus-endpoint", + "tracing", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "derive_more", @@ -9265,14 +9504,14 @@ dependencies = [ "polkadot-primitives", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.23.0", "thiserror", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bounded-vec", "futures 0.3.19", @@ -9293,8 +9532,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9303,8 +9542,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", "futures 0.3.19", @@ -9322,8 +9561,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "derive_more", @@ -9336,6 +9575,7 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", @@ -9349,11 +9589,11 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "lru 0.7.2", "parity-util-mem", "parking_lot 0.11.2", @@ -9370,12 +9610,12 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "metered-channel", "pin-project 1.0.10", "polkadot-node-network-protocol", @@ -9387,8 +9627,8 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -9398,8 +9638,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derive_more", "frame-support", @@ -9413,10 +9653,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-performance-test" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "env_logger 0.9.0", + "kusama-runtime", + "log", + "polkadot-erasure-coding", + "polkadot-node-core-pvf", + "polkadot-node-primitives", + "quote", + "thiserror", +] + [[package]] name = "polkadot-primitives" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitvec 0.20.4", "frame-system", @@ -9445,8 +9700,39 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#192586a2c8e7a742f38522c7f2425badc73d5966" +dependencies = [ + "beefy-gadget", + "beefy-gadget-rpc", + "jsonrpc-core", + "pallet-mmr-rpc", + "pallet-transaction-payment-rpc", + "polkadot-primitives", + "sc-chain-spec", + "sc-client-api", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-epochs", + "sc-finality-grandpa", + "sc-finality-grandpa-rpc", + "sc-rpc", + "sc-sync-state-rpc", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-keystore", + "sp-runtime", + "substrate-frame-rpc-system", +] + +[[package]] +name = "polkadot-rpc" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -9476,8 +9762,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -9511,6 +9797,7 @@ dependencies = [ "pallet-nicks", "pallet-offences", "pallet-offences-benchmarking", + "pallet-preimage", "pallet-proxy", "pallet-scheduler", "pallet-session", @@ -9528,6 +9815,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", "scale-info", @@ -9558,8 +9846,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -9603,10 +9891,34 @@ dependencies = [ "xcm", ] +[[package]] +name = "polkadot-runtime-constants" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + +[[package]] +name = "polkadot-runtime-metrics" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "bs58", + "parity-scale-codec", + "polkadot-primitives", + "sp-std", + "sp-tracing", +] + [[package]] name = "polkadot-runtime-parachains" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "bitflags", "bitvec 0.20.4", @@ -9625,6 +9937,7 @@ dependencies = [ "pallet-vesting", "parity-scale-codec", "polkadot-primitives", + "polkadot-runtime-metrics", "rand 0.8.4", "rand_chacha 0.3.1", "rustc-hex", @@ -9645,8 +9958,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "async-trait", "beefy-gadget", @@ -9681,9 +9994,9 @@ dependencies = [ "polkadot-node-core-chain-api", "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-dispute-participation", "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -9692,11 +10005,13 @@ dependencies = [ "polkadot-overseer", "polkadot-parachain", "polkadot-primitives", - "polkadot-rpc", + "polkadot-rpc 0.9.16 (git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350)", "polkadot-runtime", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", + "rococo-runtime-constants", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", @@ -9744,8 +10059,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -9765,12 +10080,128 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "parity-scale-codec", + "polkadot-primitives", + "sp-core", +] + +[[package]] +name = "polkadot-test-runtime" +version = "0.9.16" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#192586a2c8e7a742f38522c7f2425badc73d5966" dependencies = [ + "beefy-primitives", + "bitvec 0.20.4", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-grandpa", + "pallet-indices", + "pallet-mmr-primitives", + "pallet-nicks", + "pallet-offences", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-vesting", + "pallet-xcm", "parity-scale-codec", + "polkadot-parachain", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", + "test-runtime-constants", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +name = "polkadot-test-service" +version = "0.9.16" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#192586a2c8e7a742f38522c7f2425badc73d5966" +dependencies = [ + "frame-benchmarking", + "frame-system", + "futures 0.1.31", + "futures 0.3.19", + "hex", + "pallet-balances", + "pallet-staking", + "pallet-transaction-payment", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-parachain", "polkadot-primitives", + "polkadot-rpc 0.9.16 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.16)", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "polkadot-service", + "polkadot-test-runtime", + "rand 0.8.4", + "sc-authority-discovery", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "sc-executor", + "sc-finality-grandpa", + "sc-network", + "sc-service", + "sc-tracing", + "sc-transaction-pool", + "sp-arithmetic", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", "sp-core", + "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "substrate-test-client", + "tempfile", + "test-runtime-constants", + "tokio", + "tracing", ] [[package]] @@ -9957,17 +10388,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pwasm-utils" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" -dependencies = [ - "byteorder", - "log", - "parity-wasm 0.42.2", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -9993,9 +10413,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -10078,9 +10498,9 @@ dependencies = [ [[package]] name = "rand_distr" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", "rand 0.8.4", @@ -10204,9 +10624,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.32" +version = "0.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" +checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" dependencies = [ "log", "rustc-hash", @@ -10254,7 +10674,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -10393,8 +10813,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "bp-messages", @@ -10441,6 +10861,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", + "rococo-runtime-constants", "scale-info", "serde", "serde_derive", @@ -10466,30 +10887,25 @@ dependencies = [ ] [[package]] -name = "rpassword" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +name = "rococo-runtime-constants" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ - "libc", - "winapi 0.3.9", + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", ] [[package]] -name = "rsix" -version = "0.23.9" +name = "rpassword" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f64c5788d5aab8b75441499d99576a24eb09f76fb267b36fec7e3d970c66431" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ - "bitflags", - "cc", - "errno", - "io-lifetimes", - "itoa 0.4.8", "libc", - "linux-raw-sys", - "once_cell", - "rustc_version 0.4.0", + "winapi 0.3.9", ] [[package]] @@ -10650,6 +11066,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keyring", "sp-offchain", "sp-runtime", "sp-session", @@ -10709,6 +11126,20 @@ dependencies = [ "semver 1.0.4", ] +[[package]] +name = "rustix" +version = "0.31.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "winapi 0.3.9", +] + [[package]] name = "rustls" version = "0.19.1" @@ -10755,6 +11186,12 @@ dependencies = [ "base64 0.13.0", ] +[[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" + [[package]] name = "rw-stream-sink" version = "0.2.1" @@ -10811,7 +11248,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "sp-core", @@ -10822,12 +11259,12 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "ip_network", "libp2p", "log", @@ -10849,10 +11286,10 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sc-block-builder", @@ -10872,7 +11309,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10888,7 +11325,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "impl-trait-for-tuples 0.2.1", "memmap2 0.5.2", @@ -10905,7 +11342,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -10916,7 +11353,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "chrono", "fdlimit", @@ -10954,7 +11391,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "fnv", "futures 0.3.19", @@ -10982,7 +11419,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "hash-db", "kvdb", @@ -11007,11 +11444,11 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p", "log", "parking_lot 0.11.2", @@ -11031,7 +11468,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", @@ -11060,7 +11497,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", @@ -11103,7 +11540,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "derive_more", "futures 0.3.19", @@ -11127,7 +11564,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11140,7 +11577,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "assert_matches", "async-trait", @@ -11153,6 +11590,7 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-consensus", + "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-epochs", "sc-transaction-pool", @@ -11161,6 +11599,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-slots", "sp-core", @@ -11174,17 +11613,16 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-api", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -11200,7 +11638,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "sc-client-api", "sp-authorship", @@ -11211,11 +11649,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "lazy_static", "libsecp256k1 0.7.0", "log", + "lru 0.6.6", "parity-scale-codec", "parking_lot 0.11.2", "sc-executor-common", @@ -11238,25 +11677,25 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "derive_more", "environmental", "parity-scale-codec", - "pwasm-utils", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", + "wasm-instrument", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "parity-scale-codec", @@ -11272,7 +11711,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "cfg-if 1.0.0", "libc", @@ -11290,7 +11729,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", @@ -11298,12 +11737,13 @@ dependencies = [ "finality-grandpa", "fork-tree", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "parking_lot 0.11.2", "rand 0.8.4", "sc-block-builder", + "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-keystore", @@ -11327,7 +11767,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "derive_more", "finality-grandpa", @@ -11351,11 +11791,11 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "ansi_term", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-util-mem", "sc-client-api", @@ -11368,7 +11808,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", @@ -11383,7 +11823,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-std", "async-trait", @@ -11396,7 +11836,7 @@ dependencies = [ "fnv", "fork-tree", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hex", "ip_network", "libp2p", @@ -11434,10 +11874,10 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "libp2p", "log", "lru 0.7.2", @@ -11450,12 +11890,12 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "bytes 1.1.0", "fnv", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hex", "hyper", "hyper-rustls 0.22.1", @@ -11478,7 +11918,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "libp2p", @@ -11491,7 +11931,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11500,7 +11940,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "hash-db", @@ -11531,7 +11971,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -11556,7 +11996,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -11573,13 +12013,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "directories", "exit-future", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -11623,7 +12063,7 @@ dependencies = [ "sp-storage", "sp-tracing", "sp-transaction-pool", - "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1)", + "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5)", "sp-trie", "sp-version", "substrate-prometheus-endpoint", @@ -11637,7 +12077,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "parity-scale-codec", @@ -11651,7 +12091,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -11673,7 +12113,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "chrono", "futures 0.3.19", @@ -11691,7 +12131,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "ansi_term", "atty", @@ -11722,7 +12162,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -11733,10 +12173,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", - "intervalier", + "futures-timer", "linked-hash-map", "log", "parity-scale-codec", @@ -11760,7 +12200,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "derive_more", "futures 0.3.19", @@ -11774,11 +12214,12 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "lazy_static", + "parking_lot 0.11.2", "prometheus", ] @@ -11973,9 +12414,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7" [[package]] name = "serde" -version = "1.0.133" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" +checksum = "2cf9235533494ea2ddcdb794665461814781c53f19d87b76e571a1c35acbad2b" dependencies = [ "serde_derive", ] @@ -11990,11 +12431,21 @@ dependencies = [ "serde_json", ] +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.133" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" +checksum = "8dcde03d87d4c973c04be249e7d8f0b35db1c848c487bd43032808e59dd8328d" dependencies = [ "proc-macro2", "quote", @@ -12003,9 +12454,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ "itoa 1.0.1", "ryu", @@ -12075,6 +12526,17 @@ dependencies = [ "sha2-asm", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.1", + "digest 0.10.1", +] + [[package]] name = "sha2-asm" version = "0.6.2" @@ -12173,8 +12635,8 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "slot-range-helper" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "enumn", "parity-scale-codec", @@ -12235,9 +12697,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b" dependencies = [ "libc", "winapi 0.3.9", @@ -12262,7 +12724,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "hash-db", "log", @@ -12279,7 +12741,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -12290,8 +12752,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12303,8 +12765,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "integer-sqrt", "num-traits", @@ -12319,7 +12781,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12332,7 +12794,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "parity-scale-codec", @@ -12344,7 +12806,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "sp-api", @@ -12356,7 +12818,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "log", @@ -12374,11 +12836,11 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "futures 0.3.19", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -12393,7 +12855,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "parity-scale-codec", @@ -12411,7 +12873,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "merlin", @@ -12434,7 +12896,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12446,7 +12908,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -12457,8 +12919,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "base58 0.2.0", "bitflags", @@ -12486,7 +12948,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.9", + "sha2 0.10.1", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -12505,12 +12967,12 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "blake2-rfc", "byteorder", - "sha2 0.9.9", + "sha2 0.10.1", "sp-std", "tiny-keccak", "twox-hash", @@ -12519,7 +12981,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro2", "quote", @@ -12530,7 +12992,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -12538,8 +13000,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro2", "quote", @@ -12548,8 +13010,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "0.10.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "environmental", "parity-scale-codec", @@ -12560,7 +13022,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "finality-grandpa", "log", @@ -12578,7 +13040,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "impl-trait-for-tuples 0.2.1", @@ -12591,8 +13053,8 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "futures 0.3.19", "hash-db", @@ -12615,19 +13077,19 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.22.0", ] [[package]] name = "sp-keystore" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "0.10.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "derive_more", @@ -12644,7 +13106,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "zstd", ] @@ -12652,7 +13114,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12667,7 +13129,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -12678,7 +13140,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "sp-api", "sp-core", @@ -12687,8 +13149,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "backtrace", "lazy_static", @@ -12698,7 +13160,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "rustc-hash", "serde", @@ -12707,8 +13169,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "either", "hash256-std-hasher", @@ -12729,8 +13191,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "impl-trait-for-tuples 0.2.1", "parity-scale-codec", @@ -12746,8 +13208,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -12759,7 +13221,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "log", "parity-scale-codec", @@ -12773,7 +13235,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "serde", "serde_json", @@ -12782,7 +13244,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12796,7 +13258,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "scale-info", @@ -12806,8 +13268,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "0.10.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "hash-db", "log", @@ -12829,13 +13291,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" [[package]] name = "sp-storage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12848,7 +13310,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "log", "sp-core", @@ -12861,10 +13323,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-api", @@ -12876,8 +13338,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "sp-std", @@ -12889,7 +13351,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "sp-api", "sp-runtime", @@ -12898,7 +13360,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.15#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" dependencies = [ "parity-scale-codec", "scale-info", @@ -12910,7 +13372,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-trait", "log", @@ -12925,8 +13387,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "hash-db", "memory-db", @@ -12941,13 +13403,14 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", + "sp-core-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -12957,7 +13420,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12967,13 +13430,15 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "impl-trait-for-tuples 0.2.1", + "log", "parity-scale-codec", "sp-std", "wasmi", + "wasmtime", ] [[package]] @@ -12993,9 +13458,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1230685dc82f8699110640244d361a7099c602f08bddc5c90765a5153b4881dc" +checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" dependencies = [ "Inflector", "proc-macro2", @@ -13063,9 +13528,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ "clap", "lazy_static", @@ -13091,7 +13556,16 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" dependencies = [ - "strum_macros", + "strum_macros 0.22.0", +] + +[[package]] +name = "strum" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +dependencies = [ + "strum_macros 0.23.1", ] [[package]] @@ -13106,6 +13580,19 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -13122,7 +13609,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "platforms 2.0.0", ] @@ -13130,7 +13617,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.19", @@ -13152,7 +13639,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "async-std", "derive_more", @@ -13163,10 +13650,57 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-test-client" +version = "2.0.1" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" +dependencies = [ + "async-trait", + "futures 0.3.19", + "hex", + "parity-scale-codec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-offchain", + "sc-service", + "serde", + "serde_json", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", +] + +[[package]] +name = "substrate-test-utils" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" +dependencies = [ + "futures 0.3.19", + "substrate-test-utils-derive", + "tokio", +] + +[[package]] +name = "substrate-test-utils-derive" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.16#1c2332db8b6784d10bba55db794c5476aa49732a" +dependencies = [ + "proc-macro-crate 1.1.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "ansi_term", "build-helper", @@ -13186,9 +13720,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -13242,6 +13776,93 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-runtime-constants" +version = "0.9.16" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.16#192586a2c8e7a742f38522c7f2425badc73d5966" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + +[[package]] +name = "test-service" +version = "2.2.1" +dependencies = [ + "acala-cli", + "acala-primitives", + "acala-service", + "async-trait", + "criterion", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-local", + "cumulus-test-relay-validation-worker-provider", + "ecosystem-renvm-bridge", + "frame-system", + "frame-system-rpc-runtime-api", + "futures 0.3.19", + "hex-literal", + "jsonrpc-core", + "log", + "mandala-runtime", + "module-emergency-shutdown", + "module-evm", + "module-transaction-payment", + "pallet-balances", + "pallet-sudo", + "pallet-transaction-payment", + "parity-scale-codec", + "parking_lot 0.11.2", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-service", + "rand 0.7.3", + "runtime-common", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-manual-seal", + "sc-executor", + "sc-network", + "sc-rpc", + "sc-rpc-server", + "sc-service", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-core", + "sp-externalities", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "substrate-test-client", + "substrate-test-utils", + "tokio", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -13273,9 +13894,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -13373,6 +13994,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.5.1" @@ -13578,9 +14209,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" +checksum = "e3ddae50680c12ef75bfbf58416ca6622fa43d879553f6cb2ed1a817346e1ffe" dependencies = [ "hash-db", "hashbrown", @@ -13591,9 +14222,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ "hash-db", ] @@ -13660,7 +14291,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=d36550a8da62fc968fac415c3379ad95d85105d1#d36550a8da62fc968fac415c3379ad95d85105d1" +source = "git+https://github.com/paritytech//substrate?rev=4aeb95f7f38fcd519e2628f32f79044a8fef99d5#4aeb95f7f38fcd519e2628f32f79044a8fef99d5" dependencies = [ "jsonrpsee", "log", @@ -13679,6 +14310,7 @@ dependencies = [ "sp-state-machine", "sp-version", "structopt", + "zstd", ] [[package]] @@ -13918,9 +14550,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -13928,9 +14560,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -13943,9 +14575,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -13955,9 +14587,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13965,9 +14597,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -13978,9 +14610,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "wasm-gc-api" @@ -13993,6 +14625,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "wasm-instrument" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +dependencies = [ + "parity-wasm 0.42.2", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -14041,9 +14682,9 @@ checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" [[package]] name = "wasmtime" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311d06b0c49346d1fbf48a17052e844036b95a7753c1afb34e8c0af3f6b5bb13" +checksum = "414be1bc5ca12e755ffd3ff7acc3a6d1979922f8237fc34068b2156cebcc3270" dependencies = [ "anyhow", "backtrace", @@ -14073,9 +14714,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147930a4995137dc096e5b17a573b446799be2bbaea433e821ce6a80abe2c5" +checksum = "8b9b4cd1949206fda9241faf8c460a7d797aa1692594d3dd6bc1cbfa57ee20d0" dependencies = [ "anyhow", "base64 0.13.0", @@ -14083,7 +14724,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rsix", + "rustix", "serde", "sha2 0.9.9", "toml", @@ -14093,9 +14734,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" +checksum = "a4693d33725773615a4c9957e4aa731af57b27dca579702d1d8ed5750760f1a9" dependencies = [ "anyhow", "cranelift-codegen", @@ -14103,7 +14744,7 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.25.0", + "gimli", "log", "more-asserts", "object", @@ -14115,14 +14756,13 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" +checksum = "5b17e47116a078b9770e6fb86cff8b9a660826623cebcfff251b047c8d8993ef" dependencies = [ "anyhow", - "cfg-if 1.0.0", "cranelift-entity", - "gimli 0.25.0", + "gimli", "indexmap", "log", "more-asserts", @@ -14136,24 +14776,21 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864ac8dfe4ce310ac59f16fdbd560c257389cb009ee5d030ac6e30523b023d11" +checksum = "60ea5b380bdf92e32911400375aeefb900ac9d3f8e350bb6ba555a39315f2ee7" dependencies = [ - "addr2line 0.16.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", - "gimli 0.25.0", - "log", - "more-asserts", + "gimli", "object", "region", - "rsix", + "rustix", "serde", "target-lexicon", "thiserror", - "wasmparser", "wasmtime-environ", "wasmtime-runtime", "winapi 0.3.9", @@ -14161,9 +14798,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab97da813a26b98c9abfd3b0c2d99e42f6b78b749c0646344e2e262d212d8c8b" +checksum = "abc7cd79937edd6e238b337608ebbcaf9c086a8457f01dfd598324f7fa56d81a" dependencies = [ "anyhow", "backtrace", @@ -14178,7 +14815,7 @@ dependencies = [ "more-asserts", "rand 0.8.4", "region", - "rsix", + "rustix", "thiserror", "wasmtime-environ", "winapi 0.3.9", @@ -14186,9 +14823,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff94409cc3557bfbbcce6b14520ccd6bd3727e965c0fe68d63ef2c185bf379c6" +checksum = "d9e5e51a461a2cf2b69e1fc48f325b17d78a8582816e18479e8ead58844b23f8" dependencies = [ "cranelift-entity", "serde", @@ -14198,9 +14835,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", @@ -14274,8 +14911,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "beefy-primitives", "bitvec 0.20.4", @@ -14308,6 +14945,7 @@ dependencies = [ "pallet-nicks", "pallet-offences", "pallet-offences-benchmarking", + "pallet-preimage", "pallet-proxy", "pallet-recovery", "pallet-scheduler", @@ -14351,16 +14989,29 @@ dependencies = [ "sp-transaction-pool", "sp-version", "substrate-wasm-builder", + "westend-runtime-constants", "xcm", "xcm-builder", "xcm-executor", ] +[[package]] +name = "westend-runtime-constants" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + [[package]] name = "which" -version = "4.2.2" +version = "4.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "75e5f7c2e6841432c7050224ab593a7e20566f6cb4031b28bbc3c58f8aaab499" dependencies = [ "either", "lazy_static", @@ -14481,8 +15132,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "derivative", "impl-trait-for-tuples 0.2.1", @@ -14494,8 +15145,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-support", "frame-system", @@ -14515,7 +15166,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=4d3bb9dd4fa2cd554a9970ffff816d9346269eaa#4d3bb9dd4fa2cd554a9970ffff816d9346269eaa" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=a250ffc998bac4831c5692c591dee7bc13f3aead#a250ffc998bac4831c5692c591dee7bc13f3aead" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -14538,8 +15189,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-benchmarking", "frame-support", @@ -14557,8 +15208,9 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ + "Inflector", "proc-macro2", "quote", "syn", @@ -14566,8 +15218,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.15" -source = "git+https://github.com/paritytech//polkadot?rev=4d94aea03300b85ddbfaa5b28e1078545e0545a2#4d94aea03300b85ddbfaa5b28e1078545e0545a2" +version = "0.9.16" +source = "git+https://github.com/paritytech//polkadot?rev=41ab002d7451766324a9f314fee11c9c53314350#41ab002d7451766324a9f314fee11c9c53314350" dependencies = [ "frame-support", "parity-scale-codec", diff --git a/Cargo.toml b/Cargo.toml index 26afe0aeab..e2a4f84c02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ members = [ "node", "node/cli", "node/service", + "node/e2e-tests", "modules/*", "modules/evm-utiltity/macro", @@ -120,180 +121,182 @@ yamux = { opt-level = 3 } zeroize = { opt-level = 3 } [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "d36550a8da62fc968fac415c3379ad95d85105d1" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-consensus-uncles = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "4d94aea03300b85ddbfaa5b28e1078545e0545a2" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "41ab002d7451766324a9f314fee11c9c53314350" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "d1c06ce0bda73898bcb685212e7740f5afc0c2dd" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech//cumulus", rev = "867bfcd8f87cc986d1a3e9eeaf16c8b4e9a27790" } diff --git a/ecosystem-modules/compound-cash/Cargo.toml b/ecosystem-modules/compound-cash/Cargo.toml index 200e13ba49..b5b8a51e9e 100644 --- a/ecosystem-modules/compound-cash/Cargo.toml +++ b/ecosystem-modules/compound-cash/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } module-support = { path = "../../modules/support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/ecosystem-modules/compound-cash/src/lib.rs b/ecosystem-modules/compound-cash/src/lib.rs index fb664064c5..a5db630a18 100644 --- a/ecosystem-modules/compound-cash/src/lib.rs +++ b/ecosystem-modules/compound-cash/src/lib.rs @@ -79,6 +79,7 @@ pub mod module { pub type CurrentYield = StorageValue<_, (CashYieldIndex, Balance, Moment), ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/ecosystem-modules/compound-cash/src/mock.rs b/ecosystem-modules/compound-cash/src/mock.rs index 45a8d67c72..309055eb60 100644 --- a/ecosystem-modules/compound-cash/src/mock.rs +++ b/ecosystem-modules/compound-cash/src/mock.rs @@ -53,6 +53,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } impl CompoundCash::Config for Runtime { diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml index e386b1bc97..090639311b 100644 --- a/ecosystem-modules/ren/renvm-bridge/Cargo.toml +++ b/ecosystem-modules/ren/renvm-bridge/Cargo.toml @@ -8,12 +8,12 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } support = { package = "module-support", path = "../../../modules/support", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../../primitives", default-features = false } @@ -22,7 +22,7 @@ primitives = { package = "acala-primitives", path = "../../../primitives", defau hex-literal = "0.3.1" orml-currencies = { path = "../../../orml/currencies" } orml-tokens = { path = "../../../orml/tokens" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/src/lib.rs b/ecosystem-modules/ren/renvm-bridge/src/lib.rs index df504051e2..1cd8e5ce43 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/lib.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/lib.rs @@ -136,6 +136,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/ecosystem-modules/ren/renvm-bridge/src/mock.rs b/ecosystem-modules/ren/renvm-bridge/src/mock.rs index 56d5bf8842..f4362781f0 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/mock.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/mock.rs @@ -69,6 +69,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index 694da2c2d7..7102b776a0 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit 694da2c2d786d6550ff256098af0cde129ab39a5 +Subproject commit 7102b776a0e5edf2e32d5ffa6423e2a29413e846 diff --git a/ecosystem-modules/starport/Cargo.toml b/ecosystem-modules/starport/Cargo.toml index 03e04a6b8a..515c4652f6 100644 --- a/ecosystem-modules/starport/Cargo.toml +++ b/ecosystem-modules/starport/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens"} diff --git a/ecosystem-modules/starport/src/lib.rs b/ecosystem-modules/starport/src/lib.rs index 28ee079b99..483da9f433 100644 --- a/ecosystem-modules/starport/src/lib.rs +++ b/ecosystem-modules/starport/src/lib.rs @@ -60,6 +60,7 @@ pub type CompoundAuthoritySignature = AccountId32; #[frame_support::pallet] pub mod module { use super::*; + use primitives::AccountId; #[pallet::config] pub trait Config: frame_system::Config { @@ -204,7 +205,7 @@ pub mod module { impl Default for GenesisConfig { fn default() -> Self { GenesisConfig { - initial_authorities: vec![AccountId32::default()], + initial_authorities: vec![AccountId::new([0; 32])], } } } @@ -227,6 +228,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::call] diff --git a/ecosystem-modules/starport/src/mock.rs b/ecosystem-modules/starport/src/mock.rs index 50ec65045b..33d43ce3cd 100644 --- a/ecosystem-modules/starport/src/mock.rs +++ b/ecosystem-modules/starport/src/mock.rs @@ -76,6 +76,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/evm-tests b/evm-tests index e9b97b5df1..755a4a52ca 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit e9b97b5df1b7b7e05777702c3ab3d19566c6bee0 +Subproject commit 755a4a52cadecba211f15bb8cffd6a2b9fbdc165 diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index 9016a8ddf2..da7d5b7bc1 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "2.3.1" } derive_more = "0.99" log = "0.4.8" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } structopt = "0.3.25" diff --git a/inspect/src/lib.rs b/inspect/src/lib.rs index c541e10f7f..69febc4642 100644 --- a/inspect/src/lib.rs +++ b/inspect/src/lib.rs @@ -16,6 +16,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#![allow(clippy::large_enum_variant)] + pub mod cli; pub mod command; diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index a31f7ae79d..cd88e31ab4 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -9,23 +9,23 @@ log = { version = "0.4.14", default-features = false } serde = { version = "1.0.124", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/asset-registry/src/lib.rs b/modules/asset-registry/src/lib.rs index 86921ff0b7..d8cd9e160f 100644 --- a/modules/asset-registry/src/lib.rs +++ b/modules/asset-registry/src/lib.rs @@ -189,6 +189,7 @@ pub mod module { StorageMap<_, Twox64Concat, AssetIds, AssetMetadata>, OptionQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::call] diff --git a/modules/asset-registry/src/mock.rs b/modules/asset-registry/src/mock.rs index b78dba0b59..aa1dad852a 100644 --- a/modules/asset-registry/src/mock.rs +++ b/modules/asset-registry/src/mock.rs @@ -62,6 +62,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index 723dff950d..3e64d35d06 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-auction = { path = "../../orml/auction" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } module-dex = { path = "../dex" } diff --git a/modules/auction-manager/src/lib.rs b/modules/auction-manager/src/lib.rs index b9c7e69745..26a33426dd 100644 --- a/modules/auction-manager/src/lib.rs +++ b/modules/auction-manager/src/lib.rs @@ -244,6 +244,7 @@ pub mod module { pub type TotalTargetInAuction = StorageValue<_, Balance, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/auction-manager/src/mock.rs b/modules/auction-manager/src/mock.rs index a9cf85990f..8d3653f124 100644 --- a/modules/auction-manager/src/mock.rs +++ b/modules/auction-manager/src/mock.rs @@ -81,6 +81,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index edf5d39702..dddc02c970 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -8,23 +8,23 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } rand_chacha = { version = "0.2", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } dex = { package = "module-dex", path = "../dex"} cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/cdp-engine/src/lib.rs b/modules/cdp-engine/src/lib.rs index 46bb088ecf..f46a39c667 100644 --- a/modules/cdp-engine/src/lib.rs +++ b/modules/cdp-engine/src/lib.rs @@ -347,6 +347,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/cdp-engine/src/mock.rs b/modules/cdp-engine/src/mock.rs index 06d428c155..4ebd21d08a 100644 --- a/modules/cdp-engine/src/mock.rs +++ b/modules/cdp-engine/src/mock.rs @@ -82,6 +82,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index c5aba04d34..f4005a0d11 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-auction = { path = "../../orml/auction" } module-dex = { path = "../dex" } diff --git a/modules/cdp-treasury/src/lib.rs b/modules/cdp-treasury/src/lib.rs index 673801db2a..8b7cefbc24 100644 --- a/modules/cdp-treasury/src/lib.rs +++ b/modules/cdp-treasury/src/lib.rs @@ -152,6 +152,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/cdp-treasury/src/mock.rs b/modules/cdp-treasury/src/mock.rs index 2f30e7141d..2038e2ab63 100644 --- a/modules/cdp-treasury/src/mock.rs +++ b/modules/cdp-treasury/src/mock.rs @@ -23,9 +23,9 @@ use super::*; use frame_support::{ construct_runtime, ord_parameter_types, parameter_types, - traits::{Everything, Nothing}, + traits::{EnsureOneOf, Everything, Nothing}, }; -use frame_system::{EnsureOneOf, EnsureRoot, EnsureSignedBy}; +use frame_system::{EnsureRoot, EnsureSignedBy}; use orml_traits::parameter_type_with_key; use primitives::{TokenSymbol, TradingPair}; use sp_core::H256; @@ -77,6 +77,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { @@ -208,7 +209,7 @@ impl Config for Runtime { type Currency = Currencies; type GetStableCurrencyId = GetStableCurrencyId; type AuctionManagerHandler = MockAuctionManager; - type UpdateOrigin = EnsureOneOf, EnsureSignedBy>; + type UpdateOrigin = EnsureOneOf, EnsureSignedBy>; type DEX = DEXModule; type MaxAuctionsCount = MaxAuctionsCount; type PalletId = CDPTreasuryPalletId; diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index 18d8e2db5d..269f681730 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -13,26 +13,26 @@ codec = { package = 'parity-scale-codec', version = '2.0.0', default-features = scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.119", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ['std'] diff --git a/modules/collator-selection/src/mock.rs b/modules/collator-selection/src/mock.rs index ce9554dbfe..e3ad725d01 100644 --- a/modules/collator-selection/src/mock.rs +++ b/modules/collator-selection/src/mock.rs @@ -23,7 +23,6 @@ use frame_support::{ traits::{Everything, FindAuthor, GenesisBuild}, PalletId, }; -use frame_system as system; use frame_system::EnsureSignedBy; use primitives::ReserveIdentifier; use sp_core::H256; @@ -58,7 +57,7 @@ parameter_types! { pub const SS58Prefix: u8 = 42; } -impl system::Config for Test { +impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); @@ -82,6 +81,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/collator-selection/src/tests.rs b/modules/collator-selection/src/tests.rs index b7bd4f3544..b2d8e6e87d 100644 --- a/modules/collator-selection/src/tests.rs +++ b/modules/collator-selection/src/tests.rs @@ -21,11 +21,13 @@ use crate::{mock::*, Error, NonCandidates, RESERVE_ID}; use frame_support::{ assert_noop, assert_ok, storage::bounded_btree_set::BoundedBTreeSet, - traits::{Currency, GenesisBuild, NamedReservableCurrency, OnInitialize}, + traits::{ConstU32, Currency, GenesisBuild, NamedReservableCurrency, OnInitialize}, }; use pallet_balances::Error as BalancesError; use sp_runtime::{testing::UintAuthorityId, traits::BadOrigin}; +type Collators = BoundedBTreeSet>; + #[test] fn basic_setup_works() { new_test_ext().execute_with(|| { @@ -150,7 +152,7 @@ fn cannot_register_dupe_candidate() { )); // can add 3 as candidate assert_ok!(CollatorSelection::register_as_candidate(Origin::signed(3))); - let mut collators = BoundedBTreeSet::new(); + let mut collators = Collators::new(); assert_ok!(collators.try_insert(3)); assert_eq!(CollatorSelection::candidates(), collators); assert_eq!(Balances::free_balance(3), 90); @@ -206,7 +208,7 @@ fn register_as_candidate_works() { // given assert_eq!(CollatorSelection::desired_candidates(), 2); assert_eq!(CollatorSelection::candidacy_bond(), 10); - assert_eq!(CollatorSelection::candidates(), BoundedBTreeSet::new()); + assert_eq!(CollatorSelection::candidates(), Collators::new()); assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]); // take two endowed, non-invulnerables accounts. @@ -243,7 +245,7 @@ fn register_candidate_works() { // given assert_eq!(CollatorSelection::desired_candidates(), 2); assert_eq!(CollatorSelection::candidacy_bond(), 10); - assert_eq!(CollatorSelection::candidates(), BoundedBTreeSet::new()); + assert_eq!(CollatorSelection::candidates(), Collators::new()); assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]); // take two endowed, non-invulnerables accounts. @@ -405,7 +407,7 @@ fn fees_edgecases() { // triggers `note_author` Authorship::on_initialize(1); - let mut collators = BoundedBTreeSet::new(); + let mut collators = Collators::new(); assert_ok!(collators.try_insert(4)); assert_eq!(CollatorSelection::candidates(), collators); assert_eq!(Balances::reserved_balance_named(&RESERVE_ID, &4), 10); @@ -526,7 +528,7 @@ fn kick_mechanism() { assert_eq!(SessionChangeBlock::get(), 20); assert_eq!(CollatorSelection::candidates().len(), 2); assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]); - let mut collators = BoundedBTreeSet::new(); + let mut collators = Collators::new(); assert_ok!(collators.try_insert(3)); assert_ok!(collators.try_insert(4)); assert_eq!(CollatorSelection::candidates(), collators); @@ -538,7 +540,7 @@ fn kick_mechanism() { assert_eq!(SessionChangeBlock::get(), 30); assert_eq!(CollatorSelection::candidates().len(), 1); assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]); - let mut collators = BoundedBTreeSet::new(); + let mut collators = Collators::new(); assert_ok!(collators.try_insert(4)); assert_eq!(CollatorSelection::candidates(), collators); // kicked collator without funds back diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index 8eb837fa37..298c2834d9 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } @@ -23,9 +23,9 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } tokens = { package = "orml-tokens", path = "../../orml/tokens" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/currencies/src/lib.rs b/modules/currencies/src/lib.rs index 4f90e19700..fbd98bbba0 100644 --- a/modules/currencies/src/lib.rs +++ b/modules/currencies/src/lib.rs @@ -838,7 +838,8 @@ where + Copy + MaybeSerializeDeserialize + Debug - + Default, + + Default + + MaxEncodedLen, Currency: PalletCurrency, T: Config, { diff --git a/modules/currencies/src/mock.rs b/modules/currencies/src/mock.rs index b9b0b4b87c..a88aa1b333 100644 --- a/modules/currencies/src/mock.rs +++ b/modules/currencies/src/mock.rs @@ -74,6 +74,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } type Balance = u128; diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml index cd561e1a9e..55292eb05a 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/dex-oracle/src/lib.rs b/modules/dex-oracle/src/lib.rs index 562beb55c6..09fb14a65a 100644 --- a/modules/dex-oracle/src/lib.rs +++ b/modules/dex-oracle/src/lib.rs @@ -98,6 +98,7 @@ pub mod module { >; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/dex-oracle/src/mock.rs b/modules/dex-oracle/src/mock.rs index de37665637..11a4ce25d1 100644 --- a/modules/dex-oracle/src/mock.rs +++ b/modules/dex-oracle/src/mock.rs @@ -76,6 +76,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index d4446d271f..b07651c8dc 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs index 732ddc858b..db06285839 100644 --- a/modules/dex/src/lib.rs +++ b/modules/dex/src/lib.rs @@ -322,6 +322,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/dex/src/mock.rs b/modules/dex/src/mock.rs index a9dda22c5a..06c92cc7af 100644 --- a/modules/dex/src/mock.rs +++ b/modules/dex/src/mock.rs @@ -81,6 +81,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index cec120e001..7b05b44613 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/emergency-shutdown/src/mock.rs b/modules/emergency-shutdown/src/mock.rs index 2d2ea60316..0ffa4fd81b 100644 --- a/modules/emergency-shutdown/src/mock.rs +++ b/modules/emergency-shutdown/src/mock.rs @@ -80,6 +80,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 7b358ab861..686349187c 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "2.3.1", default-features = libsecp256k1 = { version = "0.6", default-features = false, features = ["hmac", "static-context"], optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -24,7 +24,7 @@ module-support = { path = "../support", default-features = false } module-evm-utiltity-macro = { path = "../evm-utiltity/macro" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/src/mock.rs b/modules/evm-accounts/src/mock.rs index dacb73dd53..94a06b8257 100644 --- a/modules/evm-accounts/src/mock.rs +++ b/modules/evm-accounts/src/mock.rs @@ -69,6 +69,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml index 40c8429ebc..18c66d40e4 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -11,12 +11,12 @@ targets = ["x86_64-unknown-linux-gnu"] serde = { version = "1.0.124", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitive-types = { version = "0.10.1", default-features = false, features = ["rlp", "byteorder"] } impl-trait-for-tuples = "0.2.1" ethereum-types = { version = "0.12.0", default-features = false } @@ -27,8 +27,8 @@ module-evm-utiltity-macro = { path = "../evm-utiltity/macro" } num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/evm-bridge/src/lib.rs b/modules/evm-bridge/src/lib.rs index 8544181c22..d92db24181 100644 --- a/modules/evm-bridge/src/lib.rs +++ b/modules/evm-bridge/src/lib.rs @@ -77,6 +77,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/evm-bridge/src/mock.rs b/modules/evm-bridge/src/mock.rs index 4163db94c5..9a4b906180 100644 --- a/modules/evm-bridge/src/mock.rs +++ b/modules/evm-bridge/src/mock.rs @@ -65,6 +65,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/evm-utiltity/Cargo.toml b/modules/evm-utiltity/Cargo.toml index 3c99a50763..c9817ebb4d 100644 --- a/modules/evm-utiltity/Cargo.toml +++ b/modules/evm-utiltity/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] sha3 = { version = "0.9.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } evm = { git = "https://github.com/rust-blockchain/evm", rev = "966cf3abe4143451e408c3f586d51c6513d9a48e", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "966cf3abe4143451e408c3f586d51c6513d9a48e", default-features = false } diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index f9b4bd16ce..5ed74c7115 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -23,15 +23,15 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"] serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true } hex = { version = "0.4", default-features = false, features = ["alloc"], optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml index 518a952b67..8c415f714d 100644 --- a/modules/evm/rpc/Cargo.toml +++ b/modules/evm/rpc/Cargo.toml @@ -11,16 +11,16 @@ ethereum-types = "0.12.0" rustc-hex = "2.1.0" serde = { version = "1.0.124", features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } module-evm-rpc-runtime-api = { path = "runtime_api" } module-evm = { path = ".." } diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index 10eaff3730..7afb2b74a3 100644 --- a/modules/evm/rpc/runtime_api/Cargo.toml +++ b/modules/evm/rpc/runtime_api/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } ethereum-types = { version = "0.12", default-features = false } primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false } diff --git a/modules/evm/src/bench/mock.rs b/modules/evm/src/bench/mock.rs index 7654fbb116..4ea3c91e60 100644 --- a/modules/evm/src/bench/mock.rs +++ b/modules/evm/src/bench/mock.rs @@ -72,6 +72,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/evm/src/lib.rs b/modules/evm/src/lib.rs index a9f3269ded..170c7d00bf 100644 --- a/modules/evm/src/lib.rs +++ b/modules/evm/src/lib.rs @@ -40,14 +40,14 @@ use frame_support::{ pallet_prelude::*, parameter_types, traits::{ - BalanceStatus, Currency, EnsureOrigin, ExistenceRequirement, FindAuthor, Get, NamedReservableCurrency, - OnKilledAccount, + BalanceStatus, Currency, EnsureOneOf, EnsureOrigin, ExistenceRequirement, FindAuthor, Get, + NamedReservableCurrency, OnKilledAccount, }, transactional, weights::{Pays, PostDispatchInfo, Weight}, BoundedVec, RuntimeDebug, }; -use frame_system::{ensure_root, ensure_signed, pallet_prelude::*, EnsureOneOf, EnsureRoot, EnsureSigned}; +use frame_system::{ensure_root, ensure_signed, pallet_prelude::*, EnsureRoot, EnsureSigned}; use hex_literal::hex; pub use module_evm_utiltity::{ ethereum::{Log, TransactionAction}, @@ -558,6 +558,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] @@ -1329,8 +1330,11 @@ impl Pallet { let digest = >::digest(); let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime()); - let author = T::FindAuthor::find_author(pre_runtime_digests).unwrap_or_default(); - T::AddressMapping::get_default_evm_address(&author) + if let Some(author) = T::FindAuthor::find_author(pre_runtime_digests) { + T::AddressMapping::get_default_evm_address(&author) + } else { + H160::default() + } } /// Get code hash at given address. @@ -1533,8 +1537,7 @@ impl Pallet { } fn ensure_root_or_signed(o: T::Origin) -> Result, BadOrigin> { - EnsureOneOf::, EnsureSigned>::try_origin(o) - .map_or(Err(BadOrigin), Ok) + EnsureOneOf::, EnsureSigned>::try_origin(o).map_or(Err(BadOrigin), Ok) } fn can_call_contract(address: &H160, caller: &H160) -> bool { @@ -1868,7 +1871,7 @@ impl SignedExtension for SetEvmOrigin { } fn post_dispatch( - _pre: Self::Pre, + _pre: Option, _info: &DispatchInfoOf, _post_info: &PostDispatchInfoOf, _len: usize, diff --git a/modules/evm/src/mock.rs b/modules/evm/src/mock.rs index 154ebb6fcd..bd008128e2 100644 --- a/modules/evm/src/mock.rs +++ b/modules/evm/src/mock.rs @@ -71,6 +71,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml index aa231066f8..2e20e293c1 100644 --- a/modules/example/Cargo.toml +++ b/modules/example/Cargo.toml @@ -8,13 +8,13 @@ edition = "2021" serde = { version = "1.0.124", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/example/src/lib.rs b/modules/example/src/lib.rs index c732898c8b..061baa4348 100644 --- a/modules/example/src/lib.rs +++ b/modules/example/src/lib.rs @@ -108,6 +108,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/example/src/mock.rs b/modules/example/src/mock.rs index f3eb0d7e0e..71be6d5f27 100644 --- a/modules/example/src/mock.rs +++ b/modules/example/src/mock.rs @@ -52,6 +52,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } impl example::Config for Runtime { diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml index fc2ef21866..0706098a69 100644 --- a/modules/homa-lite/Cargo.toml +++ b/modules/homa-lite/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/modules/homa-lite/src/lib.rs b/modules/homa-lite/src/lib.rs index 6da97891df..a060ad73d4 100644 --- a/modules/homa-lite/src/lib.rs +++ b/modules/homa-lite/src/lib.rs @@ -283,6 +283,7 @@ pub mod module { pub type LastRedeemRequestKeyIterated = StorageValue<_, Vec, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/homa-lite/src/mock.rs b/modules/homa-lite/src/mock.rs index 31b19528ca..d806c35ffd 100644 --- a/modules/homa-lite/src/mock.rs +++ b/modules/homa-lite/src/mock.rs @@ -105,6 +105,10 @@ impl XcmTransfer for MockXcm { } } impl InvertLocation for MockXcm { + fn ancestry() -> MultiLocation { + Parachain(2000).into() + } + fn invert_location(l: &MultiLocation) -> Result { Ok(l.clone()) } @@ -198,6 +202,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/homa-lite/src/mock_no_fees.rs b/modules/homa-lite/src/mock_no_fees.rs index 53f7e6d426..65708cee2a 100644 --- a/modules/homa-lite/src/mock_no_fees.rs +++ b/modules/homa-lite/src/mock_no_fees.rs @@ -53,6 +53,10 @@ impl XcmTransfer for MockXcm { } } impl InvertLocation for MockXcm { + fn ancestry() -> MultiLocation { + Parachain(2000).into() + } + fn invert_location(l: &MultiLocation) -> Result { Ok(l.clone()) } @@ -146,6 +150,7 @@ impl frame_system::Config for NoFeeRuntime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/homa-lite/src/tests_no_fees.rs b/modules/homa-lite/src/tests_no_fees.rs index ca3c69b0af..117f3eddb5 100644 --- a/modules/homa-lite/src/tests_no_fees.rs +++ b/modules/homa-lite/src/tests_no_fees.rs @@ -572,7 +572,7 @@ fn test_increase_staking_match_from_previous_redeem_requests( // Ensure `LastRedeemRequestKeyIterated` is setup correctly. assert_eq!( HomaLite::last_redeem_request_key_iterated(), - RedeemRequests::::hashed_key_for(AccountId::default().clone()) + RedeemRequests::::hashed_key_for(AccountId::new([0u8; 32])) ); assert_eq!(HomaLite::total_staking_currency(), dollar(901)); diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index bba10a4078..1b45fce0f7 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.111", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa-validator-list/src/lib.rs b/modules/homa-validator-list/src/lib.rs index a66dd8585a..c7a5da6f57 100644 --- a/modules/homa-validator-list/src/lib.rs +++ b/modules/homa-validator-list/src/lib.rs @@ -268,6 +268,7 @@ pub mod module { StorageMap<_, Blake2_128Concat, T::RelaychainAccountId, ValidatorBacking, OptionQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/homa-validator-list/src/mock.rs b/modules/homa-validator-list/src/mock.rs index 400ae04dc3..a8083ddf8f 100644 --- a/modules/homa-validator-list/src/mock.rs +++ b/modules/homa-validator-list/src/mock.rs @@ -77,6 +77,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index dca55b94b6..3ea69e15b5 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["derive"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/homa/src/lib.rs b/modules/homa/src/lib.rs index 78c698a65b..99d8afb4b0 100644 --- a/modules/homa/src/lib.rs +++ b/modules/homa/src/lib.rs @@ -318,6 +318,7 @@ pub mod module { pub type BumpEraFrequency = StorageValue<_, T::BlockNumber, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/homa/src/mock.rs b/modules/homa/src/mock.rs index 14ca68412a..c4befab6c9 100644 --- a/modules/homa/src/mock.rs +++ b/modules/homa/src/mock.rs @@ -100,6 +100,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index a9e8d827b2..6799def08e 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -8,20 +8,20 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs index 97e60c7225..7a1bfede13 100644 --- a/modules/honzon/src/lib.rs +++ b/modules/honzon/src/lib.rs @@ -118,6 +118,7 @@ pub mod module { >; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs index aaf0c55646..84a0370343 100644 --- a/modules/honzon/src/mock.rs +++ b/modules/honzon/src/mock.rs @@ -82,6 +82,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index 7622598cb2..9199a0dc9d 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" serde = { version = "1.0.124", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } acala-primitives = { path = "../../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/idle-scheduler/src/lib.rs b/modules/idle-scheduler/src/lib.rs index a6efd52fbe..47dc40553b 100644 --- a/modules/idle-scheduler/src/lib.rs +++ b/modules/idle-scheduler/src/lib.rs @@ -77,6 +77,7 @@ pub mod module { pub type NextTaskId = StorageValue<_, Nonce, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/idle-scheduler/src/mock.rs b/modules/idle-scheduler/src/mock.rs index c3758a059b..16045fc7d4 100644 --- a/modules/idle-scheduler/src/mock.rs +++ b/modules/idle-scheduler/src/mock.rs @@ -60,6 +60,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types!( diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml index 4c09aa6135..f7df55ea39 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-rewards = { path = "../../orml/rewards", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } orml-rewards = { path = "../../orml/rewards" } diff --git a/modules/incentives/src/lib.rs b/modules/incentives/src/lib.rs index 82c9da548d..447a99e0b0 100644 --- a/modules/incentives/src/lib.rs +++ b/modules/incentives/src/lib.rs @@ -202,6 +202,7 @@ pub mod module { >; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/incentives/src/mock.rs b/modules/incentives/src/mock.rs index 3d07115ceb..3efc3f8ca3 100644 --- a/modules/incentives/src/mock.rs +++ b/modules/incentives/src/mock.rs @@ -89,6 +89,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index a5559ec2bb..ebb0ac02d1 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/loans/src/lib.rs b/modules/loans/src/lib.rs index 71c1d20d6f..2f97e0e100 100644 --- a/modules/loans/src/lib.rs +++ b/modules/loans/src/lib.rs @@ -136,6 +136,7 @@ pub mod module { pub type TotalPositions = StorageMap<_, Twox64Concat, CurrencyId, Position, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/loans/src/mock.rs b/modules/loans/src/mock.rs index 4c0acf827b..502fbf60d3 100644 --- a/modules/loans/src/mock.rs +++ b/modules/loans/src/mock.rs @@ -81,6 +81,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 1ecbadc246..61e1a7fe23 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -9,22 +9,22 @@ serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-nft = { path = "../../orml/nft", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } diff --git a/modules/nft/src/benchmarking.rs b/modules/nft/src/benchmarking.rs index 93e52b7da8..faac5a1365 100644 --- a/modules/nft/src/benchmarking.rs +++ b/modules/nft/src/benchmarking.rs @@ -201,6 +201,7 @@ mod mock { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { pub const ExistentialDeposit: u64 = 1; diff --git a/modules/nft/src/lib.rs b/modules/nft/src/lib.rs index 207bb0cd87..0378642cd3 100644 --- a/modules/nft/src/lib.rs +++ b/modules/nft/src/lib.rs @@ -33,7 +33,7 @@ use frame_support::{ transactional, PalletId, }; use frame_system::pallet_prelude::*; -use orml_traits::NFT; +use orml_traits::InspectExtended; use primitives::{ nft::{Attributes, ClassProperty, NFTBalance, Properties, CID}, ReserveIdentifier, @@ -196,6 +196,7 @@ pub mod module { } #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] @@ -506,16 +507,14 @@ impl Pallet { } } -impl NFT for Pallet { - type ClassId = ClassIdOf; - type TokenId = TokenIdOf; +impl InspectExtended for Pallet { type Balance = NFTBalance; fn balance(who: &T::AccountId) -> Self::Balance { orml_nft::TokensByOwner::::iter_prefix((who,)).count() as u128 } - fn next_token_id(class: Self::ClassId) -> Self::TokenId { + fn next_token_id(class: Self::ClassId) -> Self::InstanceId { orml_nft::Pallet::::next_token_id(class) } } diff --git a/modules/nft/src/mock.rs b/modules/nft/src/mock.rs index d2405be479..60c28026b6 100644 --- a/modules/nft/src/mock.rs +++ b/modules/nft/src/mock.rs @@ -67,6 +67,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { pub const ExistentialDeposit: u64 = 1; diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index 0b22c5a545..761d2d907c 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -8,18 +8,18 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/nominees-election/src/lib.rs b/modules/nominees-election/src/lib.rs index ae6f5f5b31..26a1c695c2 100644 --- a/modules/nominees-election/src/lib.rs +++ b/modules/nominees-election/src/lib.rs @@ -141,7 +141,7 @@ pub mod module { pub trait Config: frame_system::Config { type Event: From> + IsType<::Event>; type Currency: BasicLockableCurrency; - type NomineeId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord + Default; + type NomineeId: Parameter + Member + MaybeSerializeDeserialize + Debug + MaybeDisplay + Ord; #[pallet::constant] type PalletId: Get; #[pallet::constant] @@ -219,6 +219,7 @@ pub mod module { pub type CurrentEra, I: 'static = ()> = StorageValue<_, EraIndex, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(PhantomData<(T, I)>); #[pallet::hooks] diff --git a/modules/nominees-election/src/mock.rs b/modules/nominees-election/src/mock.rs index f0edabca1c..f75ea48267 100644 --- a/modules/nominees-election/src/mock.rs +++ b/modules/nominees-election/src/mock.rs @@ -68,6 +68,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index c50c178db2..a82ccbedc8 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/prices/src/lib.rs b/modules/prices/src/lib.rs index 5d9fccba41..8ba1920e3b 100644 --- a/modules/prices/src/lib.rs +++ b/modules/prices/src/lib.rs @@ -134,6 +134,7 @@ pub mod module { pub type LockedPrice = StorageMap<_, Twox64Concat, CurrencyId, Price, OptionQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/prices/src/mock.rs b/modules/prices/src/mock.rs index bc2a6ecded..a5b6d866d0 100644 --- a/modules/prices/src/mock.rs +++ b/modules/prices/src/mock.rs @@ -84,6 +84,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } thread_local! { diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 5ef181e4e5..d24bff7e0e 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } module-support = { path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index 05b55f8d0a..130c99f4d2 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -9,15 +9,15 @@ log = { version = "0.4.14", default-features = false } serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] diff --git a/modules/session-manager/src/mock.rs b/modules/session-manager/src/mock.rs index 3cc7e9bbd6..f0686374b6 100644 --- a/modules/session-manager/src/mock.rs +++ b/modules/session-manager/src/mock.rs @@ -52,6 +52,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } sp_runtime::impl_opaque_keys! { diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index 609584c4e8..ee85faa179 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" [dependencies] impl-trait-for-tuples = "0.1.3" codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } [features] default = ["std"] diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index d624818ec8..a1afbafa4f 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -7,15 +7,15 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs index 854a49b6d5..6a9d93c3c2 100644 --- a/modules/transaction-pause/src/lib.rs +++ b/modules/transaction-pause/src/lib.rs @@ -82,6 +82,7 @@ pub mod module { pub type PausedTransactions = StorageMap<_, Twox64Concat, (Vec, Vec), (), OptionQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/modules/transaction-pause/src/mock.rs b/modules/transaction-pause/src/mock.rs index a97130db42..71b6f0104b 100644 --- a/modules/transaction-pause/src/mock.rs +++ b/modules/transaction-pause/src/mock.rs @@ -67,6 +67,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index 448a53914e..bb826d6b0b 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -8,24 +8,24 @@ edition = "2021" serde = { version = "1.0.124", optional = true } codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } module-dex = { path = "../dex" } diff --git a/modules/transaction-payment/src/lib.rs b/modules/transaction-payment/src/lib.rs index adcac37485..360f303ec2 100644 --- a/modules/transaction-payment/src/lib.rs +++ b/modules/transaction-payment/src/lib.rs @@ -410,6 +410,7 @@ pub mod module { pub type SwapBalanceThreshold = StorageMap<_, Twox64Concat, CurrencyId, Balance, ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] @@ -1163,14 +1164,13 @@ where } fn post_dispatch( - pre: Self::Pre, + pre: Option, info: &DispatchInfoOf, post_info: &PostDispatchInfoOf, len: usize, _result: &DispatchResult, ) -> Result<(), TransactionValidityError> { - let (tip, who, imbalance, fee) = pre; - if let Some(payed) = imbalance { + if let Some((tip, who, Some(payed), fee)) = pre { let actual_fee = Pallet::::compute_actual_fee(len as u32, info, post_info, tip); let refund_fee = fee.saturating_sub(actual_fee); let mut refund = refund_fee; diff --git a/modules/transaction-payment/src/mock.rs b/modules/transaction-payment/src/mock.rs index 3d16ce91b5..1979ad5326 100644 --- a/modules/transaction-payment/src/mock.rs +++ b/modules/transaction-payment/src/mock.rs @@ -95,6 +95,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_type_with_key! { diff --git a/modules/transaction-payment/src/tests.rs b/modules/transaction-payment/src/tests.rs index 6c193d845c..645738f6fe 100644 --- a/modules/transaction-payment/src/tests.rs +++ b/modules/transaction-payment/src/tests.rs @@ -213,7 +213,7 @@ fn signed_extension_transaction_payment_work() { .unwrap(); assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee); assert_ok!(ChargeTransactionPayment::::post_dispatch( - pre, + Some(pre), &INFO, &POST_INFO, 23, @@ -232,7 +232,7 @@ fn signed_extension_transaction_payment_work() { .unwrap(); assert_eq!(Currencies::free_balance(ACA, &CHARLIE), 100000 - fee - 5); assert_ok!(ChargeTransactionPayment::::post_dispatch( - pre, + Some(pre), &INFO, &POST_INFO, 23, @@ -265,7 +265,7 @@ fn refund_fee_according_to_actual_when_post_dispatch_and_native_currency_is_enou assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee); let refund = 200; // 1000 - 800 - assert!(ChargeTransactionPayment::::post_dispatch(pre, &INFO, &POST_INFO, 23, &Ok(())).is_ok()); + assert!(ChargeTransactionPayment::::post_dispatch(Some(pre), &INFO, &POST_INFO, 23, &Ok(())).is_ok()); assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee + refund); }); } @@ -281,7 +281,7 @@ fn refund_tip_according_to_actual_when_post_dispatch_and_native_currency_is_enou assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee); let refund = 200; // 1000 - 800 - assert!(ChargeTransactionPayment::::post_dispatch(pre, &INFO, &POST_INFO, 23, &Ok(())).is_ok()); + assert!(ChargeTransactionPayment::::post_dispatch(Some(pre), &INFO, &POST_INFO, 23, &Ok(())).is_ok()); assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee + refund); // tip = 1000 @@ -294,7 +294,7 @@ fn refund_tip_according_to_actual_when_post_dispatch_and_native_currency_is_enou let refund_fee = 200; // 1000 - 800 let refund_tip = 200; // 1000 - 800 - assert!(ChargeTransactionPayment::::post_dispatch(pre, &INFO, &POST_INFO, 23, &Ok(())).is_ok()); + assert!(ChargeTransactionPayment::::post_dispatch(Some(pre), &INFO, &POST_INFO, 23, &Ok(())).is_ok()); assert_eq!( Currencies::free_balance(ACA, &CHARLIE), 100000 - fee - tip + refund_fee + refund_tip @@ -318,7 +318,7 @@ fn refund_should_not_works() { pays_fee: Pays::Yes, }; - assert!(ChargeTransactionPayment::::post_dispatch(pre, &INFO, &POST_INFO, 23, &Ok(())).is_ok()); + assert!(ChargeTransactionPayment::::post_dispatch(Some(pre), &INFO, &POST_INFO, 23, &Ok(())).is_ok()); assert_eq!(Currencies::free_balance(ACA, &ALICE), 100000 - fee - tip); }); } diff --git a/modules/xcm-interface/src/lib.rs b/modules/xcm-interface/src/lib.rs index 50d0f5e085..d162b30c9e 100644 --- a/modules/xcm-interface/src/lib.rs +++ b/modules/xcm-interface/src/lib.rs @@ -108,6 +108,7 @@ pub mod module { StorageMap<_, Twox64Concat, XcmInterfaceOperation, (Weight, Balance), ValueQuery>; #[pallet::pallet] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::hooks] diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index 64661c531c..b338be56e8 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -9,22 +9,22 @@ log = "0.4.8" structopt = "0.3.25" codec = { package = "parity-scale-codec", version = "2.3.1" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index cd5d4ebbca..450f5f0d70 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -392,9 +392,11 @@ pub fn run() -> sc_cli::Result<()> { let _ = builder.init(); let chain_spec = cli.load_spec(¶ms.chain.clone().unwrap_or_default())?; + let state_version = Cli::native_runtime_version(&chain_spec).state_version(); let output_buf = with_runtime_or_err!(chain_spec, { { - let block: Block = generate_genesis_block(&chain_spec).map_err(|e| format!("{:?}", e))?; + let block: Block = + generate_genesis_block(&chain_spec, state_version).map_err(|e| format!("{:?}", e))?; let raw_header = block.header().encode(); let buf = if params.raw { raw_header @@ -560,11 +562,24 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws(default_listen_port) } - fn prometheus_config(&self, default_listen_port: u16) -> Result> { - self.base.base.prometheus_config(default_listen_port) - } - - fn init(&self) -> Result<()> { + fn prometheus_config( + &self, + default_listen_port: u16, + chain_spec: &Box, + ) -> Result> { + self.base.base.prometheus_config(default_listen_port, chain_spec) + } + + fn init( + &self, + _support_url: &String, + _impl_version: &String, + _logger_hook: F, + _config: &sc_service::Configuration, + ) -> Result<()> + where + F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration), + { unreachable!("PolkadotCli is never initialized; qed"); } diff --git a/node/e2e-tests/Cargo.toml b/node/e2e-tests/Cargo.toml index 3ed8422ba8..5565ebd5e6 100644 --- a/node/e2e-tests/Cargo.toml +++ b/node/e2e-tests/Cargo.toml @@ -5,47 +5,4 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -log = "0.4.14" -hex-literal = "0.3.1" -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-babe= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-babe= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -test-runner = { path = "./test-runner" } - -module-evm = { path = "../../modules/evm" } -module-transaction-payment = { path = "../../modules/transaction-payment" } -module-emergency-shutdown = { path = "../../modules/emergency-shutdown" } -module-cdp-engine = { path = "../../modules/cdp-engine" } -ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } -node-runtime = { package = "mandala-runtime", path = "../../runtime/mandala" } -node-primitives = { package = "acala-primitives", path = "../../primitives" } -node-cli = { package = "acala-cli", path = "../cli", features = ["with-mandala-runtime"] } -node-service = { package = "acala-service", path = "../service", features = ["with-mandala-runtime"] } -runtime-common = { path = "../../runtime/common" } +test-service = { path = "./test-service" } \ No newline at end of file diff --git a/node/e2e-tests/src/lib.rs b/node/e2e-tests/src/lib.rs index 74053423d1..d7ce6abc1c 100644 --- a/node/e2e-tests/src/lib.rs +++ b/node/e2e-tests/src/lib.rs @@ -17,216 +17,3 @@ // along with this program. If not, see . //! End to end runtime tests. - -#![allow(clippy::type_complexity)] - -use node_runtime::Runtime; -use sc_executor::NativeElseWasmExecutor; -use sc_service::{TFullBackend, TFullClient}; -use sp_runtime::generic::Era; -use std::sync::Arc; -use test_runner::{ChainInfo, SignatureVerificationOverride}; - -/// A unit struct which implements `NativeExecutionDispatch` feeding in the -/// hard-coded runtime. -pub struct ExecutorDispatch; - -impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { - type ExtendHostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - SignatureVerificationOverride, - ); - - fn dispatch(method: &str, data: &[u8]) -> Option> { - node_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - node_runtime::native_version() - } -} - -/// ChainInfo implementation. -struct NodeTemplateChainInfo; - -impl ChainInfo for NodeTemplateChainInfo { - type Block = node_primitives::Block; - type ExecutorDispatch = ExecutorDispatch; - type Runtime = Runtime; - type RuntimeApi = node_runtime::RuntimeApi; - type SelectChain = sc_consensus::LongestChain, Self::Block>; - type BlockImport = Arc>>; - type SignedExtras = node_runtime::SignedExtra; - type InherentDataProviders = ( - sp_timestamp::InherentDataProvider, - cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider, - ); - - fn signed_extras(from: ::AccountId) -> Self::SignedExtras { - ( - frame_system::CheckSpecVersion::::new(), - frame_system::CheckTxVersion::::new(), - frame_system::CheckGenesis::::new(), - frame_system::CheckMortality::::from(Era::Immortal), - runtime_common::CheckNonce::::from(frame_system::Pallet::::account_nonce( - from, - )), - frame_system::CheckWeight::::new(), - module_transaction_payment::ChargeTransactionPayment::::from(0), - module_evm::SetEvmOrigin::::new(), - ) - } -} - -#[cfg(test)] -mod tests { - use super::*; - use ecosystem_renvm_bridge::EcdsaSignature; - use hex_literal::hex; - use node_service::chain_spec::mandala::dev_testnet_config; - use sp_keyring::sr25519::Keyring::{Alice, Bob}; - use sp_runtime::{traits::IdentifyAccount, AccountId32, MultiAddress, MultiSigner}; - use test_runner::*; - - #[test] - #[ignore] // TODO: fix this after https://github.com/paritytech/substrate/issues/10039 - fn test_runner() { - let tokio_runtime = build_runtime().unwrap(); - let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::( - ConfigOrChainSpec::ChainSpec(Box::new(dev_testnet_config().unwrap()), tokio_runtime.handle().clone()), - ) - .unwrap(); - let node = Node::::new(rpc, task_manager, client, pool, command_sink, backend); - - tokio_runtime.block_on(async { - // seals blocks - node.seal_blocks(1).await; - // submit extrinsics - let alice = MultiSigner::from(Alice.public()).into_account(); - let _hash = node - .submit_extrinsic( - frame_system::Call::remark { - remark: (b"hello world").to_vec(), - }, - Some(alice), - ) - .await - .unwrap(); - - // look ma, I can read state. - let _events = node.with_state(|| frame_system::Pallet::::events()); - // get access to the underlying client. - let _client = node.client(); - }) - } - - #[test] - #[ignore] // TODO: fix this after https://github.com/paritytech/substrate/issues/10039 - fn simple_balances_test() { - let tokio_runtime = build_runtime().unwrap(); - let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::( - ConfigOrChainSpec::ChainSpec(Box::new(dev_testnet_config().unwrap()), tokio_runtime.handle().clone()), - ) - .unwrap(); - let node = Node::::new(rpc, task_manager, client, pool, command_sink, backend); - - tokio_runtime.block_on(async { - // submit extrinsics - let alice = MultiSigner::from(Alice.public()).into_account(); - let _hash = node - .submit_extrinsic( - frame_system::Call::remark { - remark: (b"hello world").to_vec(), - }, - Some(alice), - ) - .await - .unwrap(); - - type Balances = pallet_balances::Pallet; - - let (alice, bob) = (MultiSigner::from(Alice.public()), MultiSigner::from(Bob.public())); - let (alice_account_id, bob_account_id) = (alice.into_account(), bob.into_account()); - - // the function with_state allows us to read state, pretty cool right? :D - let old_balance = node.with_state(|| Balances::free_balance(bob_account_id.clone())); - - let amount = 70_000_000_000_000; - - // Send extrinsic in action. - let tx = pallet_balances::Call::transfer { - dest: MultiAddress::from(bob_account_id.clone()), - value: amount, - }; - node.submit_extrinsic(tx, Some(alice_account_id)).await.unwrap(); - - // Produce blocks in action, Powered by manual-seal™. - node.seal_blocks(1).await; - - // we can check the new state :D - let new_balance = node.with_state(|| Balances::free_balance(bob_account_id.clone())); - - // we can now make assertions on how state has changed. - assert_eq!(old_balance + amount, new_balance); - }) - } - - #[test] - #[ignore] // TODO: fix this after https://github.com/paritytech/substrate/issues/10039 - fn transaction_pool_priority_order_test() { - let tokio_runtime = build_runtime().unwrap(); - let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::( - ConfigOrChainSpec::ChainSpec(Box::new(dev_testnet_config().unwrap()), tokio_runtime.handle().clone()), - ) - .unwrap(); - let node = Node::::new(rpc, task_manager, client, pool, command_sink, backend); - - tokio_runtime.block_on(async { - let (alice, bob) = (MultiSigner::from(Alice.public()), MultiSigner::from(Bob.public())); - let (alice_account_id, bob_account_id) = (alice.into_account(), bob.into_account()); - - // send operational extrinsic - let operational_tx_hash = node.submit_extrinsic( - pallet_sudo::Call::sudo { call: Box::new(module_emergency_shutdown::Call::emergency_shutdown { }.into()) }, - Some(alice_account_id), - ).await.unwrap(); - - // send normal extrinsic - let normal_tx_hash = node.submit_extrinsic( - pallet_balances::Call::transfer { dest: MultiAddress::from(bob_account_id.clone()), value: 80_000 }, - Some(bob_account_id), - ).await.unwrap(); - - // send unsigned extrinsic - let to: AccountId32 = hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(); - let unsigned_tx_hash = node.submit_extrinsic( - ecosystem_renvm_bridge::Call::mint { - who: to, - p_hash: hex!["67028f26328144de6ef80b8cd3b05e0cefb488762c340d1574c0542f752996cb"], - amount: 93963, - n_hash: hex!["f6a75cc370a2dda6dfc8d016529766bb6099d7fa0d787d9fe5d3a7e60c9ac2a0"], - sig: EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]), - }, - None, - ).await.unwrap(); - - assert_eq!(node.pool().ready().count(), 3); - - // Ensure tx priority order: - // Inherent -> Operational tx -> Unsigned tx -> Signed normal tx - let mut txs = node.pool().ready(); - let tx1 = txs.next().unwrap(); - let tx2 = txs.next().unwrap(); - let tx3 = txs.next().unwrap(); - - assert_eq!(tx1.hash, operational_tx_hash); - assert_eq!(tx1.priority, 13835064928601523711); - - assert_eq!(tx2.hash, unsigned_tx_hash); - assert_eq!(tx2.priority, 1844674407370965161); - - assert_eq!(tx3.hash, normal_tx_hash); - assert_eq!(tx3.priority, 42785501349000); - }) - } -} diff --git a/node/e2e-tests/test-runner/Cargo.toml b/node/e2e-tests/test-runner/Cargo.toml deleted file mode 100644 index a2bd0f5eda..0000000000 --- a/node/e2e-tests/test-runner/Cargo.toml +++ /dev/null @@ -1,61 +0,0 @@ -[package] -name = "test-runner" -version = "2.2.3" -authors = ["Acala Developers"] -edition = "2021" - -[dependencies] -# client deps -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -# primitive deps -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-wasm-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -# pallets -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } - -env_logger = "0.7.1" -log = "0.4.8" -futures = { package = "futures", version = "0.3", features = ["compat"] } -tokio = { version = "1.10", features = ["signal"] } - -# Calling RPC -jsonrpc-core = "18.0.0" -num-traits = "0.2.14" - -node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } -node-primitives = { package = "acala-primitives", path = "../../../primitives" } -node-cli = { package = "acala-cli", path = "../../cli", features = ["with-mandala-runtime"] } -node-service = { package = "acala-service", path = "../../service", features = ["with-mandala-runtime"] } diff --git a/node/e2e-tests/test-runner/src/client.rs b/node/e2e-tests/test-runner/src/client.rs deleted file mode 100644 index a8f7d13392..0000000000 --- a/node/e2e-tests/test-runner/src/client.rs +++ /dev/null @@ -1,195 +0,0 @@ -// This file is part of Acala. - -// Copyright (C) 2020-2022 Acala Foundation. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program 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. - -// This program 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 this program. If not, see . - -//! Client parts - -use crate::{default_config, ChainInfo}; -use futures::channel::mpsc; -use jsonrpc_core::MetaIoHandler; -use node_primitives::Block; -use node_runtime::RuntimeApi; -use node_service::{default_mock_parachain_inherent_data_provider, RuntimeApiCollection}; -use sc_consensus_manual_seal::{ - rpc::{ManualSeal, ManualSealApi}, - run_manual_seal, EngineCommand, ManualSealParams, -}; -use sc_executor::NativeElseWasmExecutor; -use sc_service::{ - build_network, spawn_tasks, BuildNetworkParams, ChainSpec, Configuration, SpawnTasksParams, TFullBackend, - TFullClient, TaskManager, -}; -use sc_transaction_pool::BasicPool; -use sc_transaction_pool_api::TransactionPool; -use sp_api::ConstructRuntimeApi; -use sp_consensus::SlotData; -use sp_runtime::traits::Block as BlockT; -use std::sync::Arc; - -type ClientParts = ( - Arc>, - TaskManager, - Arc::RuntimeApi, NativeElseWasmExecutor<::ExecutorDispatch>>>, - Arc< - dyn TransactionPool< - Block = Block, - Hash = ::Hash, - Error = sc_transaction_pool::error::Error, - InPoolTransaction = sc_transaction_pool::Transaction<::Hash, ::Extrinsic>, - >, - >, - mpsc::Sender::Hash>>, - Arc>, -); - -/// Provide the config or chain spec for a given chain -pub enum ConfigOrChainSpec { - /// Configuration object - Config(Configuration), - /// Chain spec object - ChainSpec(Box, tokio::runtime::Handle), -} -/// Creates all the client parts you need for [`Node`](crate::node::Node) -pub fn client_parts(config_or_chain_spec: ConfigOrChainSpec) -> Result, sc_service::Error> -where - T: ChainInfo + 'static, - >, - >>::RuntimeApi: RuntimeApiCollection, Block>>, - ::Call: From>, -{ - let config = match config_or_chain_spec { - ConfigOrChainSpec::Config(config) => config, - ConfigOrChainSpec::ChainSpec(chain_spec, tokio_handle) => default_config(tokio_handle, chain_spec), - }; - - let executor = NativeElseWasmExecutor::::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - ); - - let (client, backend, keystore, mut task_manager) = - sc_service::new_full_parts::>( - &config, None, executor, - )?; - let client = Arc::new(client); - - let select_chain = sc_consensus::LongestChain::new(backend.clone()); - - let import_queue = - sc_consensus_manual_seal::import_queue(Box::new(client.clone()), &task_manager.spawn_essential_handle(), None); - - let transaction_pool = BasicPool::new_full( - config.transaction_pool.clone(), - true.into(), - config.prometheus_registry(), - task_manager.spawn_essential_handle(), - client.clone(), - ); - - let (network, system_rpc_tx, network_starter) = { - let params = BuildNetworkParams { - config: &config, - client: client.clone(), - transaction_pool: transaction_pool.clone(), - spawn_handle: task_manager.spawn_handle(), - import_queue, - block_announce_validator_builder: None, - warp_sync: None, - }; - build_network(params)? - }; - - // offchain workers - sc_service::build_offchain_workers(&config, task_manager.spawn_handle(), client.clone(), network.clone()); - - // Proposer object for block authorship. - let env = sc_basic_authorship::ProposerFactory::new( - task_manager.spawn_handle(), - client.clone(), - transaction_pool.clone(), - config.prometheus_registry(), - None, - ); - - // Channel for the rpc handler to communicate with the authorship task. - let (command_sink, commands_stream) = mpsc::channel(10); - - let rpc_sink = command_sink.clone(); - - let rpc_handlers = { - let params = SpawnTasksParams { - config, - client: client.clone(), - backend: backend.clone(), - task_manager: &mut task_manager, - keystore: keystore.sync_keystore(), - transaction_pool: transaction_pool.clone(), - rpc_extensions_builder: Box::new(move |_, _| { - let mut io = jsonrpc_core::IoHandler::default(); - io.extend_with(ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone()))); - Ok(io) - }), - network, - system_rpc_tx, - telemetry: None, - }; - spawn_tasks(params)? - }; - - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); - - let create_inherent_data_providers = Box::new(move |_, _| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = - sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(*timestamp, slot_duration); - - Ok((timestamp, slot, default_mock_parachain_inherent_data_provider())) - }); - - // Background authorship future. - let authorship_future = run_manual_seal(ManualSealParams { - block_import: client.clone(), - env, - client: client.clone(), - pool: transaction_pool.clone(), - commands_stream, - select_chain, - consensus_data_provider: None, - create_inherent_data_providers, - }); - - // spawn the authorship task as an essential task. - task_manager - .spawn_essential_handle() - .spawn("manual-seal", None, authorship_future); - - network_starter.start_network(); - let rpc_handler = rpc_handlers.io_handler(); - - Ok(( - rpc_handler, - task_manager, - client, - transaction_pool, - command_sink, - backend, - )) -} diff --git a/node/e2e-tests/test-runner/src/host_functions.rs b/node/e2e-tests/test-runner/src/host_functions.rs deleted file mode 100644 index ce3edb2033..0000000000 --- a/node/e2e-tests/test-runner/src/host_functions.rs +++ /dev/null @@ -1,76 +0,0 @@ -// This file is part of Acala. - -// Copyright (C) 2020-2022 Acala Foundation. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program 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. - -// This program 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 this program. If not, see . - -#![allow(clippy::all)] - -#[macro_export] -macro_rules! override_host_functions { - ($($fn_name:expr, $name:ident,)*) => {{ - let mut host_functions = vec![]; - $( - struct $name; - impl sp_wasm_interface::Function for $name { - fn name(&self) -> &str { - &$fn_name - } - - fn signature(&self) -> sp_wasm_interface::Signature { - sp_wasm_interface::Signature { - args: std::borrow::Cow::Owned(vec![ - sp_wasm_interface::ValueType::I32, - sp_wasm_interface::ValueType::I64, - sp_wasm_interface::ValueType::I32, - ]), - return_value: Some(sp_wasm_interface::ValueType::I32), - } - } - - fn execute( - &self, - context: &mut dyn sp_wasm_interface::FunctionContext, - _args: &mut dyn Iterator, - ) -> Result, String> { - ::into_ffi_value(true, context) - .map(sp_wasm_interface::IntoValue::into_value) - .map(Some) - } - } - host_functions.push(&$name as &'static dyn sp_wasm_interface::Function); - )* - host_functions - }}; -} - -/// Provides host functions that overrides runtime signature verification -/// to always return true. -pub struct SignatureVerificationOverride; - -impl sp_wasm_interface::HostFunctions for SignatureVerificationOverride { - fn host_functions() -> Vec<&'static dyn sp_wasm_interface::Function> { - override_host_functions!( - "ext_crypto_ecdsa_verify_version_1", - EcdsaVerify, - "ext_crypto_ed25519_verify_version_1", - Ed25519Verify, - "ext_crypto_sr25519_verify_version_1", - Sr25519Verify, - "ext_crypto_sr25519_verify_version_2", - Sr25519VerifyV2, - ) - } -} diff --git a/node/e2e-tests/test-runner/src/lib.rs b/node/e2e-tests/test-runner/src/lib.rs deleted file mode 100644 index 0437a2c7c4..0000000000 --- a/node/e2e-tests/test-runner/src/lib.rs +++ /dev/null @@ -1,83 +0,0 @@ -// This file is part of Acala. - -// Copyright (C) 2020-2022 Acala Foundation. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program 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. - -// This program 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 this program. If not, see . - -#![allow(clippy::all)] - -use sc_consensus::BlockImport; -use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; -use sc_service::TFullClient; -use sp_api::{ConstructRuntimeApi, TransactionFor}; -use sp_consensus::SelectChain; -use sp_inherents::InherentDataProvider; -use sp_runtime::traits::{Block as BlockT, SignedExtension}; - -mod client; -mod host_functions; -mod node; -mod utils; - -pub use client::*; -pub use host_functions::*; -pub use node::*; -pub use utils::*; - -/// Wrapper trait for concrete type required by this testing framework. -pub trait ChainInfo: Sized { - /// Opaque block type - type Block: BlockT; - - /// ExecutorDispatch dispatch type - type ExecutorDispatch: NativeExecutionDispatch + 'static; - - /// Runtime - type Runtime: frame_system::Config; - - /// RuntimeApi - type RuntimeApi: Send - + Sync - + 'static - + ConstructRuntimeApi< - Self::Block, - TFullClient>, - >; - - /// select chain type. - type SelectChain: SelectChain + 'static; - - /// Block import type. - type BlockImport: Send - + Sync - + Clone - + BlockImport< - Self::Block, - Error = sp_consensus::Error, - Transaction = TransactionFor< - TFullClient>, - Self::Block, - >, - > + 'static; - - /// The signed extras required by the runtime - type SignedExtras: SignedExtension; - - /// The inherent data providers. - type InherentDataProviders: InherentDataProvider + 'static; - - /// Signed extras, this function is caled in an externalities provided environment. - fn signed_extras(from: ::AccountId) -> Self::SignedExtras; -} diff --git a/node/e2e-tests/test-runner/src/node.rs b/node/e2e-tests/test-runner/src/node.rs deleted file mode 100644 index 997b67911a..0000000000 --- a/node/e2e-tests/test-runner/src/node.rs +++ /dev/null @@ -1,262 +0,0 @@ -// This file is part of Acala. - -// Copyright (C) 2020-2022 Acala Foundation. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program 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. - -// This program 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 this program. If not, see . - -#![allow(clippy::all)] - -use std::sync::Arc; - -use futures::{ - channel::{mpsc, oneshot}, - FutureExt, SinkExt, -}; -use jsonrpc_core::MetaIoHandler; -use sc_client_api::{backend::Backend, CallExecutor, ExecutorProvider}; -use sc_consensus_manual_seal::EngineCommand; -use sc_executor::NativeElseWasmExecutor; -use sc_service::{TFullBackend, TFullCallExecutor, TFullClient, TaskManager}; -use sc_transaction_pool_api::TransactionPool; -use sp_api::{OverlayedChanges, StorageTransactionCache}; -use sp_blockchain::HeaderBackend; -use sp_core::ExecutionContext; -use sp_runtime::{ - generic::{BlockId, UncheckedExtrinsic}, - traits::{Block as BlockT, Extrinsic, NumberFor}, - transaction_validity::TransactionSource, - MultiAddress, MultiSignature, -}; -use sp_state_machine::Ext; - -use crate::ChainInfo; - -/// This holds a reference to a running node on another thread, -/// the node process is dropped when this struct is dropped -/// also holds logs from the process. -pub struct Node> { - /// rpc handler for communicating with the node over rpc. - rpc_handler: Arc>, - /// handle to the running node. - task_manager: Option, - /// client instance - client: Arc>>, - /// transaction pool - pool: Arc< - dyn TransactionPool< - Block = ::Block, - Hash = <::Block as BlockT>::Hash, - Error = sc_transaction_pool::error::Error, - InPoolTransaction = sc_transaction_pool::Transaction< - <::Block as BlockT>::Hash, - <::Block as BlockT>::Extrinsic, - >, - >, - >, - /// channel to communicate with manual seal on. - manual_seal_command_sink: mpsc::Sender::Hash>>, - /// backend type. - backend: Arc>, - /// Block number at initialization of this Node. - initial_block_number: NumberFor, -} - -type EventRecord = frame_system::EventRecord<::Event, ::Hash>; - -impl Node -where - T: ChainInfo, -{ - /// Creates a new node. - pub fn new( - rpc_handler: Arc>, - task_manager: TaskManager, - client: Arc>>, - pool: Arc< - dyn TransactionPool< - Block = ::Block, - Hash = <::Block as BlockT>::Hash, - Error = sc_transaction_pool::error::Error, - InPoolTransaction = sc_transaction_pool::Transaction< - <::Block as BlockT>::Hash, - <::Block as BlockT>::Extrinsic, - >, - >, - >, - command_sink: mpsc::Sender::Hash>>, - backend: Arc>, - ) -> Self { - Self { - rpc_handler, - task_manager: Some(task_manager), - client: client.clone(), - pool, - backend, - manual_seal_command_sink: command_sink, - initial_block_number: client.info().best_number, - } - } - - /// Returns a reference to the rpc handlers, use this to send rpc requests. - /// eg - /// ```ignore - /// let request = r#"{"jsonrpc":"2.0","method":"engine_createBlock","params": [true, true],"id":1}"#; - /// let response = node.rpc_handler() - /// .handle_request_sync(request, Default::default()); - /// ``` - pub fn rpc_handler(&self) -> Arc> { - self.rpc_handler.clone() - } - - /// Return a reference to the Client - pub fn client(&self) -> Arc>> { - self.client.clone() - } - - /// Return a reference to the pool. - pub fn pool( - &self, - ) -> Arc< - dyn TransactionPool< - Block = ::Block, - Hash = <::Block as BlockT>::Hash, - Error = sc_transaction_pool::error::Error, - InPoolTransaction = sc_transaction_pool::Transaction< - <::Block as BlockT>::Hash, - <::Block as BlockT>::Extrinsic, - >, - >, - > { - self.pool.clone() - } - - /// Executes closure in an externalities provided environment. - pub fn with_state(&self, closure: impl FnOnce() -> R) -> R - where - > as CallExecutor>::Error: - std::fmt::Debug, - { - let id = BlockId::Hash(self.client.info().best_hash); - let mut overlay = OverlayedChanges::default(); - let mut cache = - StorageTransactionCache:: as Backend>::State>::default(); - let mut extensions = self - .client - .execution_extensions() - .extensions(&id, ExecutionContext::BlockConstruction); - let state_backend = self - .backend - .state_at(id.clone()) - .expect(&format!("State at block {} not found", id)); - - let mut ext = Ext::new(&mut overlay, &mut cache, &state_backend, Some(&mut extensions)); - sp_externalities::set_and_run_with_externalities(&mut ext, closure) - } - - /// submit some extrinsic to the node. if signer is None, will submit unsigned_extrinsic. - pub async fn submit_extrinsic( - &self, - call: impl Into<::Call>, - signer: Option<::AccountId>, - ) -> Result<::Hash, sc_transaction_pool::error::Error> - where - ::Extrinsic: From< - UncheckedExtrinsic< - MultiAddress< - ::AccountId, - ::Index, - >, - ::Call, - MultiSignature, - T::SignedExtras, - >, - >, - { - let signed_data = if let Some(signer) = signer { - let extra = self.with_state(|| T::signed_extras(signer.clone())); - Some((signer.into(), MultiSignature::Sr25519(Default::default()), extra)) - } else { - None - }; - let ext = UncheckedExtrinsic::< - MultiAddress<::AccountId, ::Index>, - ::Call, - MultiSignature, - T::SignedExtras, - >::new(call.into(), signed_data) - .expect("UncheckedExtrinsic::new() always returns Some"); - let at = self.client.info().best_hash; - - self.pool - .submit_one(&BlockId::Hash(at), TransactionSource::Local, ext.into()) - .await - } - - /// Get the events of the most recently produced block - pub fn events(&self) -> Vec> { - self.with_state(|| frame_system::Pallet::::events()) - } - - /// Instructs manual seal to seal new, possibly empty blocks. - pub async fn seal_blocks(&self, num: usize) { - let mut sink = self.manual_seal_command_sink.clone(); - - for count in 0..num { - let (sender, future_block) = oneshot::channel(); - let future = sink.send(EngineCommand::SealNewBlock { - create_empty: true, - finalize: false, - parent_hash: None, - sender: Some(sender), - }); - - const ERROR: &'static str = "manual-seal authorship task is shutting down"; - future.await.expect(ERROR); - - match future_block.await.expect(ERROR) { - Ok(block) => { - log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num) - } - Err(err) => { - log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err) - } - } - } - } - - /// Revert count number of blocks from the chain. - pub fn revert_blocks(&self, count: NumberFor) { - self.backend.revert(count, true).expect("Failed to revert blocks: "); - } - - /// so you've decided to run the test runner as a binary, use this to shutdown gracefully. - pub async fn until_shutdown(mut self) { - let manager = self.task_manager.take(); - if let Some(mut task_manager) = manager { - let task = task_manager.future().fuse(); - let signal = tokio::signal::ctrl_c(); - futures::pin_mut!(signal); - futures::future::select(task, signal).await; - } - } -} - -impl> Drop for Node { - fn drop(&mut self) { - // Revert all blocks added since creation of the node. - let diff = self.client.info().best_number - self.initial_block_number; - self.revert_blocks(diff); - } -} diff --git a/node/e2e-tests/test-runner/src/utils.rs b/node/e2e-tests/test-runner/src/utils.rs deleted file mode 100644 index 9dbbaa7930..0000000000 --- a/node/e2e-tests/test-runner/src/utils.rs +++ /dev/null @@ -1,125 +0,0 @@ -// This file is part of Acala. - -// Copyright (C) 2020-2022 Acala Foundation. -// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 - -// This program 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. - -// This program 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 this program. If not, see . - -#![allow(clippy::all)] - -pub use sc_cli::build_runtime; -use sc_client_api::execution_extensions::ExecutionStrategies; -use sc_executor::WasmExecutionMethod; -use sc_informant::OutputFormat; -use sc_network::{ - config::{NetworkConfiguration, Role, TransportConfig}, - multiaddr, -}; -use sc_service::{ - config::KeystoreConfig, BasePath, ChainSpec, Configuration, DatabaseSource, KeepBlocks, TransactionStorageMode, -}; -use sp_keyring::sr25519::Keyring::Alice; -use tokio::runtime::Handle; - -/// Base db path gotten from env -pub fn base_path() -> BasePath { - if let Some(base) = std::env::var("DB_BASE_PATH").ok() { - BasePath::new(base) - } else { - BasePath::new_temp_dir().expect("couldn't create a temp dir") - } -} - -/// Produces a default configuration object, suitable for use with most set ups. -pub fn default_config(tokio_handle: Handle, mut chain_spec: Box) -> Configuration { - let base_path = base_path(); - let root_path = base_path.path().to_path_buf().join("chains").join(chain_spec.id()); - - let storage = chain_spec - .as_storage_builder() - .build_storage() - .expect("could not build storage"); - - chain_spec.set_storage(storage); - let key_seed = Alice.to_seed(); - - let mut network_config = NetworkConfiguration::new( - format!("Test Node for: {}", key_seed), - "network/test/0.1", - Default::default(), - None, - ); - let informant_output_format = OutputFormat { enable_color: false }; - network_config.allow_non_globals_in_dht = true; - - network_config - .listen_addresses - .push(multiaddr::Protocol::Memory(0).into()); - - network_config.transport = TransportConfig::MemoryOnly; - - Configuration { - impl_name: "test-node".to_string(), - impl_version: "0.1".to_string(), - role: Role::Authority, - tokio_handle, - transaction_pool: Default::default(), - network: network_config, - keystore: KeystoreConfig::Path { - path: root_path.join("key"), - password: None, - }, - database: DatabaseSource::RocksDb { - path: root_path.join("db"), - cache_size: 128, - }, - state_cache_size: 16777216, - state_cache_child_ratio: None, - chain_spec, - wasm_method: WasmExecutionMethod::Interpreted, - execution_strategies: ExecutionStrategies { - syncing: sc_client_api::ExecutionStrategy::AlwaysWasm, - importing: sc_client_api::ExecutionStrategy::AlwaysWasm, - block_construction: sc_client_api::ExecutionStrategy::AlwaysWasm, - offchain_worker: sc_client_api::ExecutionStrategy::AlwaysWasm, - other: sc_client_api::ExecutionStrategy::AlwaysWasm, - }, - rpc_http: None, - rpc_ws: None, - rpc_ipc: None, - rpc_ws_max_connections: None, - rpc_cors: None, - rpc_methods: Default::default(), - rpc_max_payload: None, - prometheus_config: None, - telemetry_endpoints: None, - default_heap_pages: None, - offchain_worker: Default::default(), - force_authoring: false, - disable_grandpa: false, - dev_key_seed: Some(key_seed), - tracing_targets: None, - tracing_receiver: Default::default(), - max_runtime_instances: 8, - announce_block: true, - base_path: Some(base_path), - wasm_runtime_overrides: None, - informant_output_format, - ws_max_out_buffer_capacity: None, - keystore_remote: None, - keep_blocks: KeepBlocks::All, - state_pruning: Default::default(), - transaction_storage: TransactionStorageMode::BlockBody, - } -} diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml new file mode 100644 index 0000000000..3d8e620a83 --- /dev/null +++ b/node/e2e-tests/test-service/Cargo.toml @@ -0,0 +1,89 @@ +[package] +name = "test-service" +version = "2.2.1" +authors = ["Acala Developers"] +edition = "2021" + +[dependencies] +codec = { package = "parity-scale-codec", version = "2.3.0" } +rand = "0.7.3" +serde = { version = "1.0.132", features = ["derive"] } +async-trait = "0.1.42" +tokio = { version = "1.10", features = ["macros"] } +criterion = { version = "0.3.5", features = [ "async_tokio" ] } +parking_lot = "0.11.1" +jsonrpc-core = "18.0.0" +log = "0.4.14" +futures = { package = "futures", version = "0.3", features = ["compat"] } +hex-literal = "0.3.1" + +# Substrate dependencies +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", features = [ "wasmtime" ] } +sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } + +# Polkadot dependencies +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } + +# Cumulus dependencies +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } + +runtime-common = { path = "../../../runtime/common" } +node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } +node-primitives = { package = "acala-primitives", path = "../../../primitives" } +node-cli = { package = "acala-cli", path = "../../cli", features = ["with-mandala-runtime"] } +node-service = { package = "acala-service", path = "../../service", features = ["with-mandala-runtime"] } + +# module deps +module-transaction-payment = { path = "../../../modules/transaction-payment" } +module-evm = { path = "../../../modules/evm" } +module-emergency-shutdown = { path = "../../../modules/emergency-shutdown" } +ecosystem-renvm-bridge = { path = "../../../ecosystem-modules/ren/renvm-bridge" } + +[dev-dependencies] + +# Substrate dependencies +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs new file mode 100644 index 0000000000..de881d7352 --- /dev/null +++ b/node/e2e-tests/test-service/src/builder.rs @@ -0,0 +1,324 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +use super::*; + +/// A builder to create a [`TestNode`]. +pub struct TestNodeBuilder { + para_id: ParaId, + tokio_handle: tokio::runtime::Handle, + key: Sr25519Keyring, + collator_key: Option, + parachain_nodes: Vec, + parachain_nodes_exclusive: bool, + relay_chain_nodes: Vec, + wrap_announce_block: Option AnnounceBlockFn>>, + storage_update_func_parachain: Option>, + storage_update_func_relay_chain: Option>, + consensus: Consensus, + seal_mode: SealMode, +} + +impl TestNodeBuilder { + /// Create a new instance of `Self`. + /// + /// `para_id` - The parachain id this node is running for. + /// `tokio_handle` - The tokio handler to use. + /// `key` - The key that will be used to generate the name and that will be passed as + /// `dev_seed`. + pub fn new(para_id: ParaId, tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring) -> Self { + TestNodeBuilder { + key, + para_id, + tokio_handle, + collator_key: None, + parachain_nodes: Vec::new(), + parachain_nodes_exclusive: false, + relay_chain_nodes: Vec::new(), + wrap_announce_block: None, + storage_update_func_parachain: None, + storage_update_func_relay_chain: None, + consensus: Consensus::Aura, + seal_mode: SealMode::ParaSeal, + } + } + + /// Enable collator for this node. + pub fn enable_collator(mut self) -> Self { + let collator_key = CollatorPair::generate().0; + self.collator_key = Some(collator_key); + self + } + + /// Instruct the node to exclusively connect to registered parachain nodes. + /// + /// Parachain nodes can be registered using [`Self::connect_to_parachain_node`] and + /// [`Self::connect_to_parachain_nodes`]. + pub fn exclusively_connect_to_registered_parachain_nodes(mut self) -> Self { + self.parachain_nodes_exclusive = true; + self + } + + /// Make the node connect to the given parachain node. + /// + /// By default the node will not be connected to any node or will be able to discover any other + /// node. + pub fn connect_to_parachain_node(mut self, node: &TestNode) -> Self { + self.parachain_nodes.push(node.addr.clone()); + self + } + + /// Make the node connect to the given parachain nodes. + /// + /// By default the node will not be connected to any node or will be able to discover any other + /// node. + pub fn connect_to_parachain_nodes<'a>(mut self, nodes: impl Iterator) -> Self { + self.parachain_nodes.extend(nodes.map(|n| n.addr.clone())); + self + } + + /// Make the node connect to the given relay chain node. + /// + /// By default the node will not be connected to any node or will be able to discover any other + /// node. + pub fn connect_to_relay_chain_node(mut self, node: &polkadot_test_service::PolkadotTestNode) -> Self { + self.relay_chain_nodes.push(node.addr.clone()); + self + } + + /// Make the node connect to the given relay chain nodes. + /// + /// By default the node will not be connected to any node or will be able to discover any other + /// node. + pub fn connect_to_relay_chain_nodes<'a>( + mut self, + nodes: impl IntoIterator, + ) -> Self { + self.relay_chain_nodes.extend(nodes.into_iter().map(|n| n.addr.clone())); + self + } + + /// Wrap the announce block function of this node. + pub fn wrap_announce_block(mut self, wrap: impl FnOnce(AnnounceBlockFn) -> AnnounceBlockFn + 'static) -> Self { + self.wrap_announce_block = Some(Box::new(wrap)); + self + } + + /// Allows accessing the parachain storage before the test node is built. + pub fn update_storage_parachain(mut self, updater: impl Fn() + 'static) -> Self { + self.storage_update_func_parachain = Some(Box::new(updater)); + self + } + + /// Allows accessing the relay chain storage before the test node is built. + pub fn update_storage_relay_chain(mut self, updater: impl Fn() + 'static) -> Self { + self.storage_update_func_relay_chain = Some(Box::new(updater)); + self + } + + /// Use the null consensus that will never author any block. + pub fn use_null_consensus(mut self) -> Self { + self.consensus = Consensus::Null; + self + } + + /// Use the relay-chain consensus. + pub fn use_relay_consensus(mut self) -> Self { + self.consensus = Consensus::RelayChain; + self + } + + /// Enable collator for this node. + pub fn with_seal_mode(mut self, seal_mode: SealMode) -> Self { + self.seal_mode = seal_mode; + self + } + + /// Build the [`TestNode`]. + pub async fn build(self) -> TestNode { + let parachain_config = node_config( + self.storage_update_func_parachain.unwrap_or_else(|| Box::new(|| ())), + self.tokio_handle.clone(), + self.key, + self.parachain_nodes, + self.parachain_nodes_exclusive, + self.collator_key.is_some(), + ) + .expect("could not generate Configuration"); + + // start relay-chain full node inside para-chain + let mut relay_chain_config = polkadot_test_service::node_config( + self.storage_update_func_relay_chain.unwrap_or_else(|| Box::new(|| ())), + self.tokio_handle, + self.key, + self.relay_chain_nodes, + false, + ); + + relay_chain_config.network.node_name = format!("{} (relay chain)", relay_chain_config.network.node_name); + + let multiaddr = parachain_config.network.listen_addresses[0].clone(); + let (task_manager, client, network, rpc_handlers, transaction_pool, backend, seal_sink) = match self.seal_mode { + SealMode::DevInstantSeal | SealMode::DevAuraSeal => { + log::info!("start as standalone dev node."); + start_dev_node(parachain_config, self.seal_mode) + .await + .expect("could not start dev node!") + } + SealMode::ParaSeal => { + log::info!("start as parachain node."); + start_node_impl( + parachain_config, + self.collator_key, + relay_chain_config, + self.para_id, + self.wrap_announce_block, + |_| Ok(Default::default()), + self.consensus, + self.seal_mode, + ) + .await + .expect("could not create collator!") + } + }; + + let peer_id = network.local_peer_id(); + let addr = MultiaddrWithPeerId { + multiaddr, + peer_id: *peer_id, + }; + + TestNode { + task_manager, + client, + network, + addr, + rpc_handlers, + transaction_pool, + backend, + seal_sink, + } + } +} + +/// Create a Cumulus `Configuration`. +/// +/// By default an in-memory socket will be used, therefore you need to provide nodes if you want the +/// node to be connected to other nodes. If `nodes_exclusive` is `true`, the node will only connect +/// to the given `nodes` and not to any other node. The `storage_update_func` can be used to make +/// adjustments to the runtime genesis. +pub fn node_config( + storage_update_func: impl Fn(), + tokio_handle: tokio::runtime::Handle, + key: Sr25519Keyring, + nodes: Vec, + nodes_exlusive: bool, + is_collator: bool, +) -> Result { + let base_path = BasePath::new_temp_dir()?; + let root = base_path.path().to_path_buf(); + let role = if is_collator { Role::Authority } else { Role::Full }; + let key_seed = key.to_seed(); + let mut spec = Box::new(dev_testnet_config(None).unwrap()); + + let mut storage = spec + .as_storage_builder() + .build_storage() + .expect("could not build storage"); + + BasicExternalities::execute_with_storage(&mut storage, storage_update_func); + spec.set_storage(storage); + + let mut network_config = NetworkConfiguration::new( + format!("{} (parachain)", key_seed), + "network/test/0.1", + Default::default(), + None, + ); + + if nodes_exlusive { + network_config.default_peers_set.reserved_nodes = nodes; + network_config.default_peers_set.non_reserved_mode = sc_network::config::NonReservedPeerMode::Deny; + } else { + network_config.boot_nodes = nodes; + } + + network_config.allow_non_globals_in_dht = true; + + network_config + .listen_addresses + .push(multiaddr::Protocol::Memory(rand::random()).into()); + + network_config.transport = TransportConfig::MemoryOnly; + + Ok(Configuration { + impl_name: "cumulus-test-node".to_string(), + impl_version: "0.1".to_string(), + role, + tokio_handle, + transaction_pool: Default::default(), + network: network_config, + keystore: KeystoreConfig::InMemory, + keystore_remote: Default::default(), + database: DatabaseSource::RocksDb { + path: root.join("db"), + cache_size: 128, + }, + state_cache_size: 67108864, + state_cache_child_ratio: None, + state_pruning: PruningMode::ArchiveAll, + keep_blocks: KeepBlocks::All, + transaction_storage: TransactionStorageMode::BlockBody, + chain_spec: spec, + wasm_method: WasmExecutionMethod::Interpreted, + // NOTE: we enforce the use of the native runtime to make the errors more debuggable + execution_strategies: ExecutionStrategies { + syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + importing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible, + offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible, + other: sc_client_api::ExecutionStrategy::NativeWhenPossible, + }, + rpc_http: None, + rpc_ws: None, + rpc_ipc: None, + rpc_ws_max_connections: None, + rpc_cors: None, + rpc_methods: Default::default(), + rpc_max_payload: None, + ws_max_out_buffer_capacity: None, + prometheus_config: None, + telemetry_endpoints: None, + default_heap_pages: None, + offchain_worker: OffchainWorkerConfig { + enabled: true, + indexing_enabled: false, + }, + force_authoring: false, + disable_grandpa: false, + dev_key_seed: Some(key_seed), + tracing_targets: None, + tracing_receiver: Default::default(), + max_runtime_instances: 8, + announce_block: true, + base_path: Some(base_path), + informant_output_format: Default::default(), + wasm_runtime_overrides: None, + runtime_cache_size: 2, + }) +} diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs new file mode 100644 index 0000000000..4db4b20c9e --- /dev/null +++ b/node/e2e-tests/test-service/src/lib.rs @@ -0,0 +1,235 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +//! Crate used for testing with acala. +mod builder; +mod node; +mod service; + +use futures::channel::{mpsc, oneshot}; +use std::{future::Future, sync::Arc, time::Duration}; + +use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; +use cumulus_client_consensus_common::{ParachainCandidate, ParachainConsensus}; +use cumulus_client_network::BlockAnnounceValidator; +use cumulus_client_service::{ + genesis::generate_genesis_block, prepare_node_config, start_collator, start_full_node, StartCollatorParams, + StartFullNodeParams, +}; +use cumulus_primitives_core::ParaId; +use cumulus_relay_chain_local::RelayChainLocal; + +use frame_system_rpc_runtime_api::AccountNonceApi; +use futures::{channel::mpsc::Sender, SinkExt}; +use parking_lot::Mutex; +use polkadot_primitives::v0::HeadData; +use polkadot_primitives::v1::{CollatorPair, Hash as PHash, PersistedValidationData}; +use polkadot_service::ProvideRuntimeApi; +use sc_client_api::{execution_extensions::ExecutionStrategies, Backend, CallExecutor, ExecutorProvider}; +use sc_consensus::LongestChain; +use sc_consensus_aura::{ImportQueueParams, StartAuraParams}; +use sc_consensus_manual_seal::{ + rpc::{ManualSeal, ManualSealApi}, + EngineCommand, +}; +use sc_executor::NativeElseWasmExecutor; +use sc_network::{config::TransportConfig, multiaddr, NetworkService}; +use sc_service::{ + config::{ + DatabaseSource, KeepBlocks, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration, OffchainWorkerConfig, + PruningMode, TransactionStorageMode, WasmExecutionMethod, + }, + BasePath, ChainSpec, Configuration, PartialComponents, Role, RpcHandlers, SpawnTasksParams, TFullBackend, + TFullCallExecutor, TFullClient, TaskManager, +}; +use sc_transaction_pool_api::TransactionPool; +use sp_api::{OverlayedChanges, StorageTransactionCache}; +use sp_arithmetic::traits::SaturatedConversion; +use sp_blockchain::HeaderBackend; +use sp_core::{ExecutionContext, Pair, H256}; +use sp_keyring::Sr25519Keyring; +use sp_runtime::{ + codec::Encode, + generic, + generic::Era, + traits::{BlakeTwo256, Block as BlockT, Extrinsic, IdentifyAccount}, + transaction_validity::TransactionSource, + MultiAddress, +}; +use sp_state_machine::{BasicExternalities, Ext}; +use sp_trie::PrefixedMemoryDB; +use substrate_test_client::{ + sp_consensus::SlotData, BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput, +}; + +use node_primitives::{signature::AcalaMultiSignature, AccountId, Address, Balance, Signature}; +use node_runtime::{Block, BlockId, Hash, Header, Runtime, RuntimeApi, SignedExtra}; +use node_service::chain_spec::mandala::dev_testnet_config; + +pub use builder::TestNodeBuilder; +pub use node::TestNode; +pub use node_runtime as runtime; +pub use service::{new_partial, start_dev_node, start_node_impl}; + +/// A consensus that will never produce any block. +#[derive(Clone)] +struct NullConsensus; + +#[async_trait::async_trait] +impl ParachainConsensus for NullConsensus { + async fn produce_candidate( + &mut self, + _: &Header, + _: PHash, + _: &PersistedValidationData, + ) -> Option> { + None + } +} + +/// The signature of the announce block fn. +pub type AnnounceBlockFn = Arc>) + Send + Sync>; + +/// Native executor instance. +pub struct RuntimeExecutor; + +impl sc_executor::NativeExecutionDispatch for RuntimeExecutor { + type ExtendHostFunctions = (); + + fn dispatch(method: &str, data: &[u8]) -> Option> { + node_runtime::api::dispatch(method, data) + } + + fn native_version() -> sc_executor::NativeVersion { + node_runtime::native_version() + } +} + +/// The client type being used by the test service. +pub type Client = TFullClient>; + +/// Transaction pool type used by the test service +pub type TxPool = Arc>; + +/// Maybe Mandala Dev full select chain. +type MaybeFullSelectChain = Option, Block>>; + +pub enum Consensus { + /// Use the relay-chain provided consensus. + RelayChain, + /// Use the null consensus that will never produce any block. + Null, + /// Use Aura consensus + Aura, +} + +#[derive(Clone, Copy)] +pub enum SealMode { + /// Dev instant seal + DevInstantSeal, + /// Dev aura seal + DevAuraSeal, + /// Parachain aura seal + ParaSeal, +} + +/// Fetch account nonce for key pair +pub fn fetch_nonce(client: &Client, account: sp_core::sr25519::Public) -> u32 { + let best_hash = client.chain_info().best_hash; + client + .runtime_api() + .account_nonce(&generic::BlockId::Hash(best_hash), account.into()) + .expect("Fetching account nonce works; qed") +} + +/// Construct an extrinsic that can be applied to the test runtime. +pub fn construct_extrinsic( + client: &Client, + function: impl Into, + caller: sp_core::sr25519::Pair, + nonce: Option, +) -> runtime::UncheckedExtrinsic { + let function = function.into(); + let current_block = client.info().best_number.saturated_into(); + let genesis_block = client.hash(0).unwrap().unwrap(); + let current_block_hash = client.info().best_hash; + let nonce = nonce.unwrap_or_else(|| fetch_nonce(client, caller.public())); + let period = runtime::BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let tip = 0; + let extra: runtime::SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(Era::mortal(period, current_block)), + runtime_common::CheckNonce::::from(nonce), + frame_system::CheckWeight::::new(), + module_transaction_payment::ChargeTransactionPayment::::from(tip), + module_evm::SetEvmOrigin::::new(), + ); + let raw_payload = runtime::SignedPayload::from_raw( + function, + extra, + ( + (), + runtime::VERSION.spec_version, + runtime::VERSION.transaction_version, + genesis_block, + current_block_hash, + (), + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|e| caller.sign(e)); + let account: AccountId = caller.public().into(); + let address: Address = account.into(); + let (call, extra, _) = raw_payload.deconstruct(); + let signed_data: (Address, AcalaMultiSignature, SignedExtra) = (address, Signature::Sr25519(signature), extra); + runtime::UncheckedExtrinsic::new(call, Some(signed_data)).unwrap() +} + +/// Run a relay-chain validator node. +/// +/// This is essentially a wrapper around +/// [`run_validator_node`](polkadot_test_service::run_validator_node). +pub fn run_relay_chain_validator_node( + tokio_handle: tokio::runtime::Handle, + key: Sr25519Keyring, + storage_update_func: impl Fn(), + boot_nodes: Vec, +) -> polkadot_test_service::PolkadotTestNode { + let config = polkadot_test_service::node_config(storage_update_func, tokio_handle, key, boot_nodes, true); + + polkadot_test_service::run_validator_node( + config, + Some(cumulus_test_relay_validation_worker_provider::VALIDATION_WORKER.into()), + ) +} + +/// Returns the initial head data for a parachain ID. +pub fn initial_head_data() -> HeadData { + let spec = Box::new(dev_testnet_config(None).unwrap()); + let block: Block = generate_genesis_block(&(spec as Box<_>), sp_runtime::StateVersion::V1).unwrap(); + let genesis_state = block.header().encode(); + genesis_state.into() +} diff --git a/node/e2e-tests/test-service/src/node.rs b/node/e2e-tests/test-service/src/node.rs new file mode 100644 index 0000000000..37fecea101 --- /dev/null +++ b/node/e2e-tests/test-service/src/node.rs @@ -0,0 +1,155 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . +use super::*; + +/// A Cumulus test node instance used for testing. +pub struct TestNode { + /// TaskManager's instance. + pub task_manager: TaskManager, + /// Client's instance. + pub client: Arc, + /// Node's network. + pub network: Arc>, + /// The `MultiaddrWithPeerId` to this node. This is useful if you want to pass it as "boot node" + /// to other nodes. + pub addr: MultiaddrWithPeerId, + /// RPCHandlers to make RPC queries. + pub rpc_handlers: RpcHandlers, + /// Node's transaction pool + pub transaction_pool: TxPool, + /// Nodes' backend + pub backend: Arc>, + /// manual instant seal sink command + pub seal_sink: Sender>, +} + +impl TestNode { + /// Wait for `count` blocks to be imported in the node and then exit. This function will not + /// return if no blocks are ever created, thus you should restrict the maximum amount of time of + /// the test execution. + pub fn wait_for_blocks(&self, count: usize) -> impl Future { + self.client.wait_for_blocks(count) + } + + /// Instructs manual seal to seal new, possibly empty blocks. + pub async fn seal_blocks(&self, num: usize) { + let mut sink = self.seal_sink.clone(); + + for count in 0..num { + let (sender, future_block) = oneshot::channel(); + let future = sink.send(EngineCommand::SealNewBlock { + create_empty: true, + finalize: false, + parent_hash: None, + sender: Some(sender), + }); + + const ERROR: &str = "manual-seal authorship task is shutting down"; + future.await.expect(ERROR); + + match future_block.await.expect(ERROR) { + Ok(block) => { + log::info!("sealed {} (hash: {}) of {} blocks", count + 1, block.hash, num) + } + Err(err) => { + log::error!("failed to seal block {} of {}, error: {:?}", count + 1, num, err) + } + } + } + } + + /// Submit an extrinsic to transaction pool. + pub async fn submit_extrinsic( + &self, + function: impl Into, + caller: Option, + ) -> Result { + let extrinsic = match caller { + Some(caller) => construct_extrinsic(&*self.client, function, caller.pair(), Some(0)), + None => runtime::UncheckedExtrinsic::new(function.into(), None).unwrap(), + }; + let at = self.client.info().best_hash; + + self.transaction_pool + .submit_one(&BlockId::Hash(at), TransactionSource::Local, extrinsic) + .await + } + + /// Executes closure in an externalities provided environment. + pub fn with_state(&self, closure: impl FnOnce() -> R) -> R + where + > as CallExecutor>::Error: + std::fmt::Debug, + { + let id = BlockId::Hash(self.client.info().best_hash); + let mut overlay = OverlayedChanges::default(); + let mut cache = StorageTransactionCache:: as Backend>::State>::default(); + let mut extensions = self + .client + .execution_extensions() + .extensions(&id, ExecutionContext::BlockConstruction); + let state_backend = self + .backend + .state_at(id) + .unwrap_or_else(|_| panic!("State at block {} not found", id)); + + let mut ext = Ext::new(&mut overlay, &mut cache, &state_backend, Some(&mut extensions)); + sp_externalities::set_and_run_with_externalities(&mut ext, closure) + } + + /// Send an extrinsic to this node. + pub async fn send_extrinsic( + &self, + function: impl Into, + caller: Sr25519Keyring, + ) -> Result { + let extrinsic = construct_extrinsic(&*self.client, function, caller.pair(), Some(0)); + + self.rpc_handlers.send_transaction(extrinsic.0.into()).await + } + + /// Register a parachain at this relay chain. + pub async fn schedule_upgrade(&self, validation: Vec) -> Result<(), RpcTransactionError> { + let call = frame_system::Call::set_code { code: validation }; + + self.send_extrinsic( + pallet_sudo::Call::sudo_unchecked_weight { + call: Box::new(call.into()), + weight: 1_000, + }, + Sr25519Keyring::Alice, + ) + .await + .map(drop) + } + + /// Transfer some token from one account to another using a provided test [`Client`]. + pub async fn transfer( + &self, + origin: sp_keyring::AccountKeyring, + dest: sp_keyring::AccountKeyring, + value: Balance, + ) -> Result<(), RpcTransactionError> { + let function = node_runtime::Call::Balances(pallet_balances::Call::transfer_keep_alive { + dest: MultiAddress::Id(dest.public().into_account().into()), + value, + }); + + self.send_extrinsic(function, origin).await.map(drop) + } +} diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs new file mode 100644 index 0000000000..fe7a4b065b --- /dev/null +++ b/node/e2e-tests/test-service/src/service.rs @@ -0,0 +1,587 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +#![allow(clippy::type_complexity)] +#![allow(clippy::too_many_arguments)] + +use super::*; + +/// Starts a `ServiceBuilder` for a full service. +/// +/// Use this macro if you don't actually need the full service, but just the builder in order to +/// be able to perform chain operations. +pub fn new_partial( + config: &Configuration, + seal_mode: SealMode, +) -> Result< + PartialComponents< + Client, + TFullBackend, + MaybeFullSelectChain, + sc_consensus::import_queue::BasicQueue>, + sc_transaction_pool::FullPool, + (), + >, + sc_service::Error, +> { + let executor = NativeElseWasmExecutor::::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + config.runtime_cache_size, + ); + + let (client, backend, keystore_container, task_manager) = + sc_service::new_full_parts::(config, None, executor)?; + let client = Arc::new(client); + + let registry = config.prometheus_registry(); + + let transaction_pool = sc_transaction_pool::BasicPool::new_full( + config.transaction_pool.clone(), + config.role.is_authority().into(), + config.prometheus_registry(), + task_manager.spawn_essential_handle(), + client.clone(), + ); + + let (import_queue, select_chain) = match seal_mode { + SealMode::DevInstantSeal => { + // instance sealing + ( + sc_consensus_manual_seal::import_queue( + Box::new(client.clone()), + &task_manager.spawn_essential_handle(), + registry, + ), + Some(LongestChain::new(backend.clone())), + ) + } + SealMode::DevAuraSeal => { + // aura import queue + let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + + ( + sc_consensus_aura::import_queue::( + ImportQueueParams { + block_import: client.clone(), + justification_import: None, + client: client.clone(), + create_inherent_data_providers: move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *timestamp, + slot_duration, + ); + + Ok(( + timestamp, + slot, + node_service::default_mock_parachain_inherent_data_provider(), + )) + }, + spawner: &task_manager.spawn_essential_handle(), + registry, + can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + check_for_equivocation: Default::default(), + telemetry: None, + }, + )?, + None, + ) + } + SealMode::ParaSeal => { + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + let create_inherent_data_providers = Box::new(move |_, _| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *timestamp, + slot_duration.slot_duration(), + ); + + Ok((timestamp, slot)) + }); + + ( + cumulus_client_consensus_aura::import_queue::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + >(cumulus_client_consensus_aura::ImportQueueParams { + block_import: client.clone(), + client: client.clone(), + create_inherent_data_providers, + registry, + can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + spawner: &task_manager.spawn_essential_handle(), + telemetry: None, + })?, + None, + ) + } + }; + + let params = PartialComponents { + backend, + client, + import_queue, + keystore_container, + task_manager, + transaction_pool, + select_chain, + other: (), + }; + + Ok(params) +} + +pub async fn start_dev_node( + config: Configuration, + seal_mode: SealMode, +) -> sc_service::error::Result<( + TaskManager, + Arc, + Arc>, + RpcHandlers, + TxPool, + Arc>, + Sender>, +)> { + let sc_service::PartialComponents { + client, + backend, + mut task_manager, + import_queue, + keystore_container, + select_chain: maybe_select_chain, + transaction_pool, + other: (), + } = new_partial(&config, SealMode::DevInstantSeal)?; + + let (network, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { + config: &config, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + spawn_handle: task_manager.spawn_handle(), + import_queue, + block_announce_validator_builder: None, + warp_sync: None, + })?; + + // offchain workers + sc_service::build_offchain_workers(&config, task_manager.spawn_handle(), client.clone(), network.clone()); + + let force_authoring = config.force_authoring; + let backoff_authoring_blocks: Option<()> = None; + let select_chain = + maybe_select_chain.expect("In mandala dev mode, `new_partial` will return some `select_chain`; qed"); + + let proposer_factory = sc_basic_authorship::ProposerFactory::new( + task_manager.spawn_handle(), + client.clone(), + transaction_pool.clone(), + config.prometheus_registry(), + None, + ); + // Channel for the rpc handler to communicate with the authorship task. + let (command_sink, commands_stream) = mpsc::channel(10); + let rpc_sink = command_sink.clone(); + + match seal_mode { + SealMode::DevInstantSeal => { + let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let create_inherent_data_providers = Box::new(move |_, _| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *timestamp, + slot_duration, + ); + + Ok((timestamp, slot)) + // Ok(timestamp) + }); + let authorship_future = + sc_consensus_manual_seal::run_manual_seal(sc_consensus_manual_seal::ManualSealParams { + block_import: client.clone(), + env: proposer_factory, + client: client.clone(), + pool: transaction_pool.clone(), + commands_stream, + select_chain, + consensus_data_provider: None, + create_inherent_data_providers, + }); + // we spawn the future on a background thread managed by service. + task_manager.spawn_essential_handle().spawn_blocking( + "instant-seal", + Some("block-authoring"), + authorship_future, + ); + } + SealMode::DevAuraSeal => { + // aura + let can_author_with = sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let aura = sc_consensus_aura::start_aura::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + _, + _, + _, + _, + _, + >(StartAuraParams { + slot_duration: sc_consensus_aura::slot_duration(&*client)?, + client: client.clone(), + select_chain, + // block_import: instant_finalize::InstantFinalizeBlockImport::new(client.clone()), + block_import: client.clone(), + proposer_factory, + create_inherent_data_providers: move |_, ()| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *timestamp, + slot_duration, + ); + + Ok(( + timestamp, + slot, + node_service::default_mock_parachain_inherent_data_provider(), + )) + }, + force_authoring, + backoff_authoring_blocks, + keystore: keystore_container.sync_keystore(), + can_author_with, + sync_oracle: network.clone(), + justification_sync_link: network.clone(), + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + // And a maximum of 750ms if slots are skipped + max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), + telemetry: None, + })?; + + // the AURA authoring task is considered essential, i.e. if it + // fails we take down the service with it. + task_manager + .spawn_essential_handle() + .spawn_blocking("aura", Some("block-authoring"), aura); + } + _ => { + panic!("dev mode do not support parachain consensus") + } + } + + let rpc_handlers = sc_service::spawn_tasks(SpawnTasksParams { + config, + client: client.clone(), + backend: backend.clone(), + task_manager: &mut task_manager, + keystore: keystore_container.sync_keystore(), + transaction_pool: transaction_pool.clone(), + rpc_extensions_builder: Box::new(move |_, _| { + let mut io = jsonrpc_core::IoHandler::default(); + io.extend_with(ManualSealApi::to_delegate(ManualSeal::new(rpc_sink.clone()))); + Ok(io) + }), + network: network.clone(), + system_rpc_tx, + telemetry: None, + })?; + + network_starter.start_network(); + + Ok(( + task_manager, + client, + network, + rpc_handlers, + transaction_pool, + backend, + command_sink, + )) +} + +/// Start a node with the given parachain `Configuration` and relay chain `Configuration`. +/// +/// This is the actual implementation that is abstract over the executor and the runtime api. +#[sc_tracing::logging::prefix_logs_with(parachain_config.network.node_name.as_str())] +pub async fn start_node_impl( + parachain_config: Configuration, + collator_key: Option, + relay_chain_config: Configuration, + para_id: ParaId, + wrap_announce_block: Option AnnounceBlockFn>>, + rpc_ext_builder: RB, + consensus: Consensus, + seal_mode: SealMode, +) -> sc_service::error::Result<( + TaskManager, + Arc, + Arc>, + RpcHandlers, + TxPool, + Arc>, + Sender>, +)> +where + RB: Fn(Arc) -> Result, sc_service::Error> + Send + 'static, +{ + if matches!(parachain_config.role, Role::Light) { + return Err("Light client not supported!".into()); + } + + let parachain_config = prepare_node_config(parachain_config); + + let params = new_partial(¶chain_config, seal_mode)?; + let keystore = params.keystore_container.sync_keystore(); + let force_authoring = parachain_config.force_authoring; + + let transaction_pool = params.transaction_pool.clone(); + let mut task_manager = params.task_manager; + + let relay_chain_full_node = polkadot_test_service::new_full( + relay_chain_config, + if let Some(ref key) = collator_key { + polkadot_service::IsCollator::Yes(key.clone()) + } else { + polkadot_service::IsCollator::Yes(CollatorPair::generate().0) + }, + None, + ) + .map_err(|e| match e { + polkadot_service::Error::Sub(x) => x, + s => s.to_string().into(), + })?; + + let client = params.client.clone(); + let backend = params.backend.clone(); + let backend_for_node = backend.clone(); + + let relay_chain_interface = Arc::new(RelayChainLocal::new( + relay_chain_full_node.client.clone(), + relay_chain_full_node.backend.clone(), + Arc::new(Mutex::new(Box::new(relay_chain_full_node.network.clone()))), + relay_chain_full_node.overseer_handle.clone(), + )); + task_manager.add_child(relay_chain_full_node.task_manager); + + let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id); + let block_announce_validator_builder = move |_| Box::new(block_announce_validator) as Box<_>; + + let prometheus_registry = parachain_config.prometheus_registry().cloned(); + + let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { + config: ¶chain_config, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + spawn_handle: task_manager.spawn_handle(), + import_queue: import_queue.clone(), + block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)), + warp_sync: None, + })?; + + let rpc_extensions_builder = { + let client = client.clone(); + + Box::new(move |_, _| rpc_ext_builder(client.clone())) + }; + + let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { + rpc_extensions_builder, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + task_manager: &mut task_manager, + config: parachain_config, + keystore: params.keystore_container.sync_keystore(), + backend, + network: network.clone(), + system_rpc_tx, + telemetry: None, + })?; + + let announce_block = { + let network = network.clone(); + Arc::new(move |hash, data| network.announce_block(hash, data)) + }; + + let announce_block = wrap_announce_block + .map(|w| (w)(announce_block.clone())) + .unwrap_or_else(|| announce_block); + + let relay_chain_interface_for_closure = relay_chain_interface.clone(); + + if let Some(collator_key) = collator_key { + let parachain_consensus: Box> = match consensus { + Consensus::RelayChain => { + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( + task_manager.spawn_handle(), + client.clone(), + transaction_pool.clone(), + prometheus_registry.as_ref(), + None, + ); + let relay_chain_interface2 = relay_chain_interface_for_closure.clone(); + Box::new(cumulus_client_consensus_relay_chain::RelayChainConsensus::new( + para_id, + proposer_factory, + move |_, (relay_parent, validation_data)| { + let relay_chain_interface = relay_chain_interface_for_closure.clone(); + async move { + let parachain_inherent = + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( + relay_parent, + &relay_chain_interface, + &validation_data, + para_id, + ) + .await; + + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from(String::from("error")) + })?; + Ok((time, parachain_inherent)) + } + }, + client.clone(), + relay_chain_interface2, + )) + } + Consensus::Null => Box::new(NullConsensus), + Consensus::Aura => { + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( + task_manager.spawn_handle(), + client.clone(), + transaction_pool.clone(), + prometheus_registry.as_ref(), + None, + ); + + AuraConsensus::build::( + BuildAuraConsensusParams { + proposer_factory, + create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + let relay_chain_interface = relay_chain_interface_for_closure.clone(); + async move { + let parachain_inherent = + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( + relay_parent, + &relay_chain_interface, + &validation_data, + para_id, + ) + .await; + + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from( + "Failed to create parachain inherent", + ) + })?; + Ok((time, slot, parachain_inherent)) + } + }, + block_import: client.clone(), + para_client: client.clone(), + backoff_authoring_blocks: Option::<()>::None, + sync_oracle: network.clone(), + keystore, + force_authoring, + slot_duration, + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + // And a maximum of 750ms if slots are skipped + max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), + telemetry: None, + }, + ) + } + }; + + let params = StartCollatorParams { + block_status: client.clone(), + announce_block, + client: client.clone(), + spawner: task_manager.spawn_handle(), + task_manager: &mut task_manager, + para_id, + parachain_consensus, + relay_chain_interface, + collator_key, + import_queue, + relay_chain_slot_duration: Duration::from_secs(6), + }; + + start_collator(params).await?; + } else { + let params = StartFullNodeParams { + client: client.clone(), + announce_block, + task_manager: &mut task_manager, + para_id, + relay_chain_interface, + import_queue, + // The slot duration is currently used internally only to configure + // the recovery delay of pov-recovery. We don't want to wait for too + // long on the full node to recover, so we reduce this time here. + relay_chain_slot_duration: Duration::from_millis(6), + }; + + start_full_node(params)?; + } + + start_network.start_network(); + let (command_sink, _) = mpsc::channel(1); + + Ok(( + task_manager, + client, + network, + rpc_handlers, + transaction_pool, + backend_for_node, + command_sink, + )) +} diff --git a/node/e2e-tests/test-service/tests/parachain.rs b/node/e2e-tests/test-service/tests/parachain.rs new file mode 100644 index 0000000000..efec1554f0 --- /dev/null +++ b/node/e2e-tests/test-service/tests/parachain.rs @@ -0,0 +1,126 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +use cumulus_primitives_core::ParaId; +use sp_keyring::Sr25519Keyring::*; +use sp_runtime::{traits::IdentifyAccount, MultiSigner}; +use test_service::{initial_head_data, run_relay_chain_validator_node}; + +/// this testcase will take too long to running, test with command: +/// cargo test --package test-service -- test_full_node_catching_up --nocapture --include-ignored +#[substrate_test_utils::test] +#[ignore] +async fn test_full_node_catching_up() { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_colors(true); + let _ = builder.init(); + + let para_id = ParaId::from(2000); + + let tokio_handle = tokio::runtime::Handle::current(); + + // start relay chain node: alice + let alice = run_relay_chain_validator_node(tokio_handle.clone(), Alice, || {}, Vec::new()); + + // start relay chain node: bob + let bob = run_relay_chain_validator_node(tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()]); + + // register parachain + alice + .register_parachain( + para_id, + node_runtime::WASM_BINARY + .expect("You need to build the WASM binary to run this test!") + .to_vec(), + initial_head_data(), + ) + .await + .unwrap(); + + // run a parachain collator + let para_collator = test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice) + .enable_collator() + .connect_to_relay_chain_nodes(vec![&alice, &bob]) + .build() + .await; + para_collator.wait_for_blocks(5).await; + + // run a parachain full node and wait for it to sync some blocks + let para_full = test_service::TestNodeBuilder::new(para_id, tokio_handle, Dave) + .connect_to_parachain_node(¶_collator) + .connect_to_relay_chain_nodes(vec![&alice, &bob]) + .build() + .await; + para_full.wait_for_blocks(7).await; +} + +/// this testcase will take too long to running, test with command: +/// cargo test --package test-service -- simple_balances_test --nocapture --include-ignored +#[substrate_test_utils::test] +#[ignore] +async fn simple_balances_test() { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_colors(true); + let _ = builder.init(); + + let para_id = ParaId::from(2000); + + let tokio_handle = tokio::runtime::Handle::current(); + + // start alice + let alice = run_relay_chain_validator_node(tokio_handle.clone(), Alice, || {}, Vec::new()); + + // start bob + let bob = run_relay_chain_validator_node(tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()]); + + // register parachain + alice + .register_parachain( + para_id, + node_runtime::WASM_BINARY + .expect("You need to build the WASM binary to run this test!") + .to_vec(), + initial_head_data(), + ) + .await + .unwrap(); + + // run a parachain collator + let node = test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice) + .enable_collator() + .connect_to_relay_chain_nodes(vec![&alice, &bob]) + .build() + .await; + node.wait_for_blocks(2).await; + + let bob = MultiSigner::from(Bob.public()); + let bob_account_id = bob.into_account(); + let amount = 1_000_000_000_000; + + type Balances = pallet_balances::Pallet; + + // the function with_state allows us to read state, pretty cool right? :D + let old_balance = node.with_state(|| Balances::free_balance(bob_account_id.clone())); + + node.transfer(Alice, Bob, amount).await.unwrap(); + + node.wait_for_blocks(3).await; + // we can check the new state :D + let new_balance = node.with_state(|| Balances::free_balance(bob_account_id)); + assert_eq!(old_balance + amount, new_balance); +} diff --git a/node/e2e-tests/test-service/tests/standalone.rs b/node/e2e-tests/test-service/tests/standalone.rs new file mode 100644 index 0000000000..2b5d17f0f1 --- /dev/null +++ b/node/e2e-tests/test-service/tests/standalone.rs @@ -0,0 +1,132 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +use cumulus_primitives_core::ParaId; +use ecosystem_renvm_bridge::EcdsaSignature; +use hex_literal::hex; +use sc_transaction_pool_api::TransactionPool; +use sp_core::crypto::AccountId32; +use sp_keyring::Sr25519Keyring::*; +use sp_runtime::{traits::IdentifyAccount, MultiAddress, MultiSigner}; +use test_service::SealMode; + +#[substrate_test_utils::test] +#[ignore] // TODO: Wasm binary must be built for testing, polkadot/node/test/service/src/chain_spec.rs:117:40 +async fn simple_balances_dev_test() { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_colors(true); + let _ = builder.init(); + + let para_id = ParaId::from(2000); + let tokio_handle = tokio::runtime::Handle::current(); + + let node = test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice) + .with_seal_mode(SealMode::DevAuraSeal) + .enable_collator() + .build() + .await; + + let bob = MultiSigner::from(Bob.public()); + let bob_account_id = bob.into_account(); + let amount = 1_000_000_000_000; + + type Balances = pallet_balances::Pallet; + + // the function with_state allows us to read state, pretty cool right? :D + let old_balance = node.with_state(|| Balances::free_balance(bob_account_id.clone())); + + node.transfer(Alice, Bob, amount).await.unwrap(); + + node.wait_for_blocks(1).await; + + // we can check the new state :D + let new_balance = node.with_state(|| Balances::free_balance(bob_account_id)); + assert_eq!(old_balance + amount, new_balance); +} + +#[substrate_test_utils::test] +#[ignore] +async fn transaction_pool_priority_order_test() { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_colors(true); + let _ = builder.init(); + + let para_id = ParaId::from(2000); + let tokio_handle = tokio::runtime::Handle::current(); + + let node = test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Alice) + .with_seal_mode(SealMode::DevAuraSeal) + .enable_collator() + .build() + .await; + + let bob = MultiSigner::from(Bob.public()); + let bob_account_id = bob.into_account(); + + // send operational extrinsic + let operational_tx_hash = node + .submit_extrinsic( + pallet_sudo::Call::sudo { + call: Box::new(module_emergency_shutdown::Call::emergency_shutdown {}.into()), + }, + Some(Alice), + ) + .await + .unwrap(); + + // send normal extrinsic + let normal_tx_hash = node + .submit_extrinsic( + pallet_balances::Call::transfer { + dest: MultiAddress::from(bob_account_id.clone()), + value: 80_000, + }, + Some(Bob), + ) + .await + .unwrap(); + + // send unsigned extrinsic + let to: AccountId32 = hex!["d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d"].into(); + let unsigned_tx_hash = node.submit_extrinsic( + ecosystem_renvm_bridge::Call::mint { + who: to, + p_hash: hex!["67028f26328144de6ef80b8cd3b05e0cefb488762c340d1574c0542f752996cb"], + amount: 93963, + n_hash: hex!["f6a75cc370a2dda6dfc8d016529766bb6099d7fa0d787d9fe5d3a7e60c9ac2a0"], + sig: EcdsaSignature::from_slice(&hex!["defda6eef01da2e2a90ce30ba73e90d32204ae84cae782b485f01d16b69061e0381a69cafed3deb6112af044c42ed0f7c73ee0eec7b533334d31a06db50fc40e1b"]), + }, + None, + ).await.unwrap(); + + assert_eq!(node.transaction_pool.ready().count(), 3); + + // Ensure tx priority order: + // Inherent -> Operational tx -> Unsigned tx -> Signed normal tx + let mut txs = node.transaction_pool.ready(); + let tx1 = txs.next().unwrap(); + let tx2 = txs.next().unwrap(); + let tx3 = txs.next().unwrap(); + + assert_eq!(tx1.hash, operational_tx_hash); + assert_eq!(tx2.hash, unsigned_tx_hash); + assert_eq!(tx3.hash, normal_tx_hash); + + assert!(tx1.priority > tx2.priority); + assert!(tx2.priority > tx3.priority); +} diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 50987eb99c..76b3f461b9 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -17,59 +17,61 @@ codec = { package = "parity-scale-codec", version = "2.3.1" } jsonrpc-core = "18.0.0" -node-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15"} -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +node-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16"} +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-relay-chain-local = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } module-collator-selection = { path = "../../modules/collator-selection" } diff --git a/node/service/src/chain_spec/acala.rs b/node/service/src/chain_spec/acala.rs index 1dc7038f6c..fa3d8e451c 100644 --- a/node/service/src/chain_spec/acala.rs +++ b/node/service/src/chain_spec/acala.rs @@ -170,6 +170,7 @@ pub fn latest_acala_config() -> Result { ], TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(), Some("acala"), + None, Some(acala_properties()), Extensions { relay_chain: "polkadot".into(), @@ -208,6 +209,7 @@ pub fn acala_dev_config() -> Result { vec![], None, None, + None, Some(acala_properties()), Extensions { relay_chain: "rococo-local".into(), @@ -233,7 +235,7 @@ fn acala_genesis( balances: BalancesConfig { balances: initial_allocation, }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { members: general_councils, diff --git a/node/service/src/chain_spec/karura.rs b/node/service/src/chain_spec/karura.rs index 1525830677..0b557cb668 100644 --- a/node/service/src/chain_spec/karura.rs +++ b/node/service/src/chain_spec/karura.rs @@ -86,6 +86,7 @@ pub fn karura_dev_config() -> Result { vec![], None, None, + None, Some(karura_properties()), Extensions { relay_chain: "rococo-local".into(), @@ -111,7 +112,7 @@ fn karura_genesis( balances: BalancesConfig { balances: initial_allocation, }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { members: general_councils, diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 3a7b9e4f12..3dae49e08b 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -122,6 +122,7 @@ fn dev_testnet_config_from_chain_id(chain_id: &str, mnemonic: Option<&str>) -> R vec![], None, None, + None, Some(properties), Extensions { relay_chain: "rococo-local".into(), @@ -177,6 +178,7 @@ pub fn local_testnet_config() -> Result { vec![], None, None, + None, Some(properties), Extensions { relay_chain: "rococo-local".into(), @@ -258,6 +260,7 @@ pub fn latest_mandala_testnet_config() -> Result { ], TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(), Some("mandala-dev-tc7"), + None, Some(properties), Extensions { relay_chain: "dev".into(), @@ -328,7 +331,9 @@ fn testnet_genesis( }, indices: IndicesConfig { indices: vec![] }, balances: BalancesConfig { balances }, - sudo: SudoConfig { key: root_key.clone() }, + sudo: SudoConfig { + key: Some(root_key.clone()), + }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { members: vec![root_key.clone()], @@ -518,7 +523,9 @@ fn mandala_genesis( }, indices: IndicesConfig { indices: vec![] }, balances: BalancesConfig { balances }, - sudo: SudoConfig { key: root_key.clone() }, + sudo: SudoConfig { + key: Some(root_key.clone()), + }, general_council: Default::default(), general_council_membership: GeneralCouncilMembershipConfig { members: vec![root_key.clone()], diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 3e014aa31c..49e1c20bc2 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -21,13 +21,15 @@ //! Acala service. Specialized wrapper over substrate service. -use cumulus_client_consensus_aura::{build_aura_consensus, BuildAuraConsensusParams, SlotProportion}; +use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::ParachainConsensus; -use cumulus_client_network::build_block_announce_validator; +use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; +use cumulus_relay_chain_interface::RelayChainInterface; +use cumulus_relay_chain_local::build_relay_chain_interface; use acala_primitives::{Block, Hash}; use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider; @@ -45,7 +47,7 @@ use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; use substrate_prometheus_endpoint::Registry; -use std::sync::Arc; +use std::{sync::Arc, time::Duration}; pub use client::*; @@ -65,6 +67,9 @@ pub fn default_mock_parachain_inherent_data_provider() -> MockValidationDataInhe current_para_block: 0, relay_offset: 1000, relay_blocks_per_para_block: 2, + xcm_config: Default::default(), + raw_downward_messages: vec![], + raw_horizontal_messages: vec![], } } @@ -218,6 +223,7 @@ where config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + config.runtime_cache_size, ); let (client, backend, keystore_container, task_manager) = @@ -349,7 +355,7 @@ where Option<&Registry>, Option, &TaskManager, - &polkadot_service::NewFull, + Arc, Arc>>, Arc>, SyncCryptoStorePtr, @@ -365,28 +371,23 @@ where let params = new_partial(¶chain_config, false, false)?; let (mut telemetry, telemetry_worker_handle) = params.other; - let relay_chain_full_node = - cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle).map_err( + let client = params.client.clone(); + let backend = params.backend.clone(); + let mut task_manager = params.task_manager; + + let (relay_chain_interface, collator_key) = + build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager).map_err( |e| match e { polkadot_service::Error::Sub(x) => x, s => format!("{}", s).into(), }, )?; - - let client = params.client.clone(); - let backend = params.backend.clone(); - let block_announce_validator = build_block_announce_validator( - relay_chain_full_node.client.clone(), - id, - Box::new(relay_chain_full_node.network.clone()), - relay_chain_full_node.backend.clone(), - ); + let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let mut task_manager = params.task_manager; let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, @@ -394,7 +395,7 @@ where transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), import_queue: import_queue.clone(), - block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), + block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))), warp_sync: None, })?; @@ -441,13 +442,15 @@ where Arc::new(move |hash, data| network.announce_block(hash, data)) }; + let relay_chain_slot_duration = Duration::from_secs(6); + if validator { let parachain_consensus = build_consensus( client.clone(), prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, - &relay_chain_full_node, + relay_chain_interface.clone(), transaction_pool, network, params.keystore_container.sync_keystore(), @@ -462,10 +465,12 @@ where announce_block, client: client.clone(), task_manager: &mut task_manager, - relay_chain_full_node, + relay_chain_interface, spawner, parachain_consensus, import_queue, + collator_key, + relay_chain_slot_duration, }; start_collator(params).await?; @@ -475,7 +480,9 @@ where announce_block, task_manager: &mut task_manager, para_id: id, - relay_chain_full_node, + relay_chain_interface, + import_queue, + relay_chain_slot_duration, }; start_full_node(params)?; @@ -507,7 +514,7 @@ where prometheus_registry, telemetry, task_manager, - relay_chain_node, + relay_chain_interface, transaction_pool, sync_oracle, keystore, @@ -522,50 +529,54 @@ where telemetry.clone(), ); - let relay_chain_backend = relay_chain_node.backend.clone(); - let relay_chain_client = relay_chain_node.client.clone(); - Ok(build_aura_consensus::( - BuildAuraConsensusParams { - proposer_factory, - create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + Ok(AuraConsensus::build::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + >(BuildAuraConsensusParams { + proposer_factory, + create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + let relay_chain_interface = relay_chain_interface.clone(); + async move { let parachain_inherent = - cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client( + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( relay_parent, - &relay_chain_client, - &*relay_chain_backend, + &relay_chain_interface, &validation_data, id, - ); - async move { - let time = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *time, - slot_duration.slot_duration(), - ); - - let parachain_inherent = parachain_inherent.ok_or_else(|| { - Box::::from("Failed to create parachain inherent") - })?; - Ok((time, slot, parachain_inherent)) - } - }, - block_import: client.clone(), - relay_chain_client: relay_chain_node.client.clone(), - relay_chain_backend: relay_chain_node.backend.clone(), - para_client: client, - backoff_authoring_blocks: Option::<()>::None, - sync_oracle, - keystore, - force_authoring, - slot_duration, - // We got around 500ms for proposing - block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), - // And a maximum of 750ms if slots are skipped - max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), - telemetry, + ) + .await; + + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from("Failed to create parachain inherent") + })?; + Ok((time, slot, parachain_inherent)) + } }, - )) + block_import: client.clone(), + para_client: client, + backoff_authoring_blocks: Option::<()>::None, + sync_oracle, + keystore, + force_authoring, + slot_duration, + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + // And a maximum of 750ms if slots are skipped + max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)), + telemetry, + })) }, ) .await diff --git a/orml b/orml index 419ac91d7e..e2e4465cfc 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 419ac91d7e116765f747b3acdbf3c49502dc5d6c +Subproject commit e2e4465cfce0f9f181a1fe40e7cc9253e2b8c0bf diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index cc07649630..97dbca1030 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -13,13 +13,13 @@ parity-util-mem = { version = "0.10.0", default-features = false, features = ["p scale-info = { version = "1.0", default-features = false, features = ["derive"] } enumflags2 = { version = "0.6.3" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } module-evm-utiltity = { path = "../modules/evm-utiltity", default-features = false } module-evm-utiltity-macro = { path = "../modules/evm-utiltity/macro" } diff --git a/primitives/src/currency.rs b/primitives/src/currency.rs index 0771d5a9e0..456de4a0ff 100644 --- a/primitives/src/currency.rs +++ b/primitives/src/currency.rs @@ -20,7 +20,7 @@ use crate::{evm::EvmAddress, *}; use bstringify::bstringify; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use num_enum::{IntoPrimitive, TryFromPrimitive}; pub use nutsfinance_stable_asset::StableAssetPoolId; use scale_info::TypeInfo; @@ -176,7 +176,7 @@ create_currency_id! { // 128 - 147: Karura & Kusama native tokens // 148 - 167: External tokens (e.g. bridged) // 168 - 255: Kusama parachain tokens - #[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)] + #[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[repr(u8)] pub enum TokenSymbol { @@ -219,7 +219,7 @@ pub type ForeignAssetId = u16; pub type Erc20Id = u32; pub type Lease = BlockNumber; -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum DexShare { @@ -229,7 +229,7 @@ pub enum DexShare { ForeignAsset(ForeignAssetId), } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum CurrencyId { diff --git a/primitives/src/signature.rs b/primitives/src/signature.rs index 39567f048e..8663520fd2 100644 --- a/primitives/src/signature.rs +++ b/primitives/src/signature.rs @@ -23,7 +23,7 @@ use sp_runtime::{ AccountId32, MultiSigner, RuntimeDebug, }; -use sp_core::{crypto::Public, ecdsa, ed25519, sr25519}; +use sp_core::{crypto::ByteArray, ecdsa, ed25519, sr25519}; use sp_std::prelude::*; @@ -96,7 +96,7 @@ impl TryFrom for ecdsa::Signature { impl Default for AcalaMultiSignature { fn default() -> Self { - Self::Ed25519(Default::default()) + Self::Ed25519(ed25519::Signature([0u8; 64])) } } @@ -104,8 +104,12 @@ impl Verify for AcalaMultiSignature { type Signer = MultiSigner; fn verify>(&self, mut msg: L, signer: &AccountId32) -> bool { match (self, signer) { - (Self::Ed25519(ref sig), who) => sig.verify(msg, &ed25519::Public::from_slice(who.as_ref())), - (Self::Sr25519(ref sig), who) => sig.verify(msg, &sr25519::Public::from_slice(who.as_ref())), + (Self::Ed25519(ref sig), who) => { + ed25519::Public::from_slice(who.as_ref()).map_or(false, |signer| sig.verify(msg, &signer)) + } + (Self::Sr25519(ref sig), who) => { + sr25519::Public::from_slice(who.as_ref()).map_or(false, |signer| sig.verify(msg, &signer)) + } (Self::Ecdsa(ref sig), who) => { let m = sp_io::hashing::blake2_256(msg.get()); match sp_io::crypto::secp256k1_ecdsa_recover_compressed(sig.as_ref(), &m) { diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 4d7cd9b3f5..b7f988c425 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -8,17 +8,17 @@ edition = "2021" jsonrpc-core = "18.0.0" codec = { package = "parity-scale-codec", version = "2.3.1" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } orml-oracle-rpc = { path = "../orml/oracle/rpc" } runtime-common = { path = "../runtime/common" } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 8dccb980fd..1d5e18cfc2 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -12,62 +12,63 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"] serde = { version = "1.0.124", optional = true } hex-literal = { version = "0.3.1" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } @@ -116,13 +117,13 @@ module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", defa # benchmarking deps libsecp256k1 = { version = "0.6", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] @@ -157,6 +158,7 @@ std = [ "pallet-transaction-payment-rpc-runtime-api/std", "pallet-treasury/std", "pallet-utility/std", + "pallet-preimage/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-aura/std", @@ -291,6 +293,7 @@ try-runtime = [ "pallet-utility/try-runtime", "pallet-bounties/try-runtime", "pallet-tips/try-runtime", + "pallet-preimage/try-runtime", "orml-auction/try-runtime", "orml-authority/try-runtime", diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 489dc0cb97..ab07104cb6 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -131,6 +131,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 0, }; /// The version infromation used to identify this runtime when compiled @@ -269,6 +270,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -576,6 +578,7 @@ impl ContainsLengthBound for GeneralCouncilProvider { parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub ProposalBondMinimum: Balance = 10 * dollar(ACA); + pub ProposalBondMaximum: Balance = 50 * dollar(ACA); pub const SpendPeriod: BlockNumber = 14 * DAYS; pub const Burn: Permill = Permill::from_percent(0); @@ -604,6 +607,7 @@ impl pallet_treasury::Config for Runtime { type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; + type ProposalBondMaximum = ProposalBondMaximum; type SpendPeriod = SpendPeriod; type Burn = Burn; type BurnDestination = (); @@ -622,6 +626,7 @@ impl pallet_bounties::Config for Runtime { type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = (); + type ChildBountyManager = (); } impl pallet_tips::Config for Runtime { @@ -643,7 +648,6 @@ parameter_types! { pub const EnactmentPeriod: BlockNumber = 2 * DAYS; pub const VoteLockingPeriod: BlockNumber = 14 * DAYS; pub const CooloffPeriod: BlockNumber = 7 * DAYS; - pub PreimageByteDeposit: Balance = deposit(0, 1); pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; @@ -921,6 +925,8 @@ impl orml_vesting::Config for Runtime { parameter_types! { pub MaximumSchedulerWeight: Weight = Perbill::from_percent(10) * RuntimeBlockWeights::get().max_block; pub const MaxScheduledPerBlock: u32 = 10; + // Retry a scheduled item every 25 blocks (5 minute) until the preimage exists. + pub const NoPreimagePostponement: Option = Some(5 * MINUTES); } impl pallet_scheduler::Config for Runtime { @@ -933,6 +939,25 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = (); type OriginPrivilegeCmp = EqualPrivilegeOnly; + type PreimageProvider = Preimage; + type NoPreimagePostponement = NoPreimagePostponement; +} + +parameter_types! { + /// Max size 4MB allowed for a preimage. + pub const PreimageMaxSize: u32 = 4096 * 1024; + pub PreimageBaseDeposit: Balance = deposit(2, 64); + pub PreimageByteDeposit: Balance = deposit(0, 1); +} + +impl pallet_preimage::Config for Runtime { + type WeightInfo = (); + type Event = Event; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; + type BaseDeposit = PreimageBaseDeposit; + type ByteDeposit = PreimageByteDeposit; } parameter_types! { @@ -991,6 +1016,7 @@ where .saturating_sub(1); let tip = 0; let extra: SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -1393,7 +1419,7 @@ parameter_types! { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = ParachainInfo; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; @@ -1573,6 +1599,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type ExecuteOverweightOrigin = EnsureRoot; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -1705,6 +1732,18 @@ impl Convert> for CurrencyIdConvert { _ => None, } } + // adapt for reanchor canonical location: https://github.com/paritytech/polkadot/pull/4470 + MultiLocation { + parents: 0, + interior: X1(GeneralKey(key)), + } => { + let key = &key[..]; + let currency_id = CurrencyId::decode(&mut &*key).ok()?; + match currency_id { + Token(ACA) | Token(AUSD) | Token(LDOT) => Some(currency_id), + _ => None, + } + } _ => None, } } @@ -1739,6 +1778,7 @@ impl Convert for AccountIdToMultiLocation { parameter_types! { pub const BaseXcmWeight: Weight = 100_000_000; // TODO: recheck this + pub const MaxAssetsForTransfer: usize = 2; } impl orml_xtokens::Config for Runtime { @@ -1752,6 +1792,7 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; } impl orml_unknown_tokens::Config for Runtime { @@ -1797,6 +1838,7 @@ construct_runtime!( Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 5, TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 6, IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event} = 7, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 8, // Tokens & Related Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, @@ -1898,6 +1940,7 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( + frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, @@ -1914,8 +1957,33 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = - frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; +pub type Executive = frame_executive::Executive< + Runtime, + Block, + frame_system::ChainContext, + Runtime, + AllPalletsWithSystem, + SchedulerMigrationV3, +>; + +// Migration for scheduler pallet to move from a plain Call to a CallOrHash. +pub struct SchedulerMigrationV3; +impl frame_support::traits::OnRuntimeUpgrade for SchedulerMigrationV3 { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + Scheduler::migrate_v2_to_v3(); + ::BlockWeights::get().max_block + } + + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result<(), &'static str> { + Scheduler::pre_migrate_to_v3() + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade() -> Result<(), &'static str> { + Scheduler::post_migrate_to_v3() + } +} #[cfg(not(feature = "disable-runtime-api"))] impl_runtime_apis! { @@ -2133,8 +2201,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 51d2405d3b..8367e5692d 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -12,16 +12,16 @@ codec = { package = "parity-scale-codec", version = "2.3.1", default-features = ethabi = { version = "15.0.0", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } orml-oracle = { path = "../../orml/oracle", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -37,19 +37,19 @@ module-transaction-payment = { path = "../../modules/transaction-payment", defau module-nft = { path = "../../modules/nft", default-features = false } module-dex = { path = "../../modules/dex", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex-literal = "0.3.1" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } orml-tokens = { path = "../../orml/tokens" } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 897439e037..98328dfc5c 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -24,14 +24,14 @@ use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::traits::Get; use frame_support::{ parameter_types, - traits::Contains, + traits::{Contains, EnsureOneOf}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_MILLIS}, DispatchClass, Weight, }, RuntimeDebug, }; -use frame_system::{limits, EnsureOneOf, EnsureRoot}; +use frame_system::{limits, EnsureRoot}; pub use module_support::{ExchangeRate, PrecompileCallerFilter, Price, Rate, Ratio}; use primitives::{evm::is_system_contract, Balance, BlockNumber, CurrencyId}; use scale_info::TypeInfo; @@ -207,127 +207,107 @@ pub type OperatorMembershipInstanceAcala = pallet_membership::Instance5; // General Council pub type EnsureRootOrAllGeneralCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, GeneralCouncilInstance>, >; pub type EnsureRootOrHalfGeneralCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, GeneralCouncilInstance>, >; pub type EnsureRootOrOneThirdsGeneralCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, GeneralCouncilInstance>, >; pub type EnsureRootOrTwoThirdsGeneralCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, GeneralCouncilInstance>, >; pub type EnsureRootOrThreeFourthsGeneralCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, GeneralCouncilInstance>, >; pub type EnsureRootOrOneGeneralCouncil = - EnsureOneOf, pallet_collective::EnsureMember>; + EnsureOneOf, pallet_collective::EnsureMember>; // Financial Council pub type EnsureRootOrAllFinancialCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, FinancialCouncilInstance>, >; pub type EnsureRootOrHalfFinancialCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, FinancialCouncilInstance>, >; pub type EnsureRootOrOneThirdsFinancialCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, FinancialCouncilInstance>, >; pub type EnsureRootOrTwoThirdsFinancialCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, FinancialCouncilInstance>, >; pub type EnsureRootOrThreeFourthsFinancialCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, FinancialCouncilInstance>, >; // Homa Council pub type EnsureRootOrAllHomaCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, HomaCouncilInstance>, >; pub type EnsureRootOrHalfHomaCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, HomaCouncilInstance>, >; pub type EnsureRootOrOneThirdsHomaCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, HomaCouncilInstance>, >; pub type EnsureRootOrTwoThirdsHomaCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, HomaCouncilInstance>, >; pub type EnsureRootOrThreeFourthsHomaCouncil = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, HomaCouncilInstance>, >; // Technical Committee Council pub type EnsureRootOrAllTechnicalCommittee = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _1, AccountId, TechnicalCommitteeInstance>, >; pub type EnsureRootOrHalfTechnicalCommittee = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _2, AccountId, TechnicalCommitteeInstance>, >; pub type EnsureRootOrOneThirdsTechnicalCommittee = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_1, _3, AccountId, TechnicalCommitteeInstance>, >; pub type EnsureRootOrTwoThirdsTechnicalCommittee = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_2, _3, AccountId, TechnicalCommitteeInstance>, >; pub type EnsureRootOrThreeFourthsTechnicalCommittee = EnsureOneOf< - AccountId, EnsureRoot, pallet_collective::EnsureProportionAtLeast<_3, _4, AccountId, TechnicalCommitteeInstance>, >; diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs index 42dc9b0c5a..3ce837e857 100644 --- a/runtime/common/src/mock.rs +++ b/runtime/common/src/mock.rs @@ -77,6 +77,7 @@ impl frame_system::Config for TestRuntime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs index 3ab86026c0..70d316768e 100644 --- a/runtime/common/src/precompile/mock.rs +++ b/runtime/common/src/precompile/mock.rs @@ -81,6 +81,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -349,6 +350,8 @@ impl pallet_scheduler::Config for Test { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = (); type OriginPrivilegeCmp = EqualPrivilegeOnly; + type PreimageProvider = (); + type NoPreimagePostponement = (); } pub struct MockDEXIncentives; diff --git a/runtime/common/src/precompile/nft.rs b/runtime/common/src/precompile/nft.rs index 2d597399ff..4fc4149364 100644 --- a/runtime/common/src/precompile/nft.rs +++ b/runtime/common/src/precompile/nft.rs @@ -27,7 +27,7 @@ use sp_core::H160; use sp_runtime::RuntimeDebug; use sp_std::{borrow::Cow, marker::PhantomData, prelude::*, result}; -use orml_traits::NFT as NFTT; +use orml_traits::InspectExtended; use super::input::{Input, InputT, Output}; use num_enum::{IntoPrimitive, TryFromPrimitive}; @@ -55,7 +55,7 @@ pub enum Action { impl Precompile for NFTPrecompile where Runtime: module_evm::Config + module_prices::Config + module_nft::Config, - module_nft::Pallet: NFTT + module_nft::Pallet: InspectExtended + Inspect + Transfer, { diff --git a/runtime/common/src/precompile/tests.rs b/runtime/common/src/precompile/tests.rs index 91c1253aa7..36c8167b59 100644 --- a/runtime/common/src/precompile/tests.rs +++ b/runtime/common/src/precompile/tests.rs @@ -414,7 +414,7 @@ fn schedule_call_precompile_should_work() { let resp = ScheduleCallPrecompile::execute(&input, None, &context).unwrap(); assert_eq!(resp.exit_status, ExitSucceed::Returned); assert_eq!(resp.cost, 0); - let event = TestEvent::Scheduler(pallet_scheduler::Event::::Scheduled(3, 0)); + let event = TestEvent::Scheduler(pallet_scheduler::Event::::Scheduled { when: 3, index: 0 }); assert!(System::events().iter().any(|record| record.event == event)); // cancel schedule @@ -433,7 +433,7 @@ fn schedule_call_precompile_should_work() { let resp = ScheduleCallPrecompile::execute(&cancel_input, None, &context).unwrap(); assert_eq!(resp.exit_status, ExitSucceed::Returned); assert_eq!(resp.cost, 0); - let event = TestEvent::Scheduler(pallet_scheduler::Event::::Canceled(3, 0)); + let event = TestEvent::Scheduler(pallet_scheduler::Event::::Canceled { when: 3, index: 0 }); assert!(System::events().iter().any(|record| record.event == event)); let resp = ScheduleCallPrecompile::execute(&input, None, &context).unwrap(); @@ -460,7 +460,7 @@ fn schedule_call_precompile_should_work() { let resp = ScheduleCallPrecompile::execute(&reschedule_input, None, &context).unwrap(); assert_eq!(resp.exit_status, ExitSucceed::Returned); assert_eq!(resp.cost, 0); - let event = TestEvent::Scheduler(pallet_scheduler::Event::::Scheduled(5, 0)); + let event = TestEvent::Scheduler(pallet_scheduler::Event::::Scheduled { when: 5, index: 0 }); assert!(System::events().iter().any(|record| record.event == event)); let from_account = ::AddressMapping::get_account_id(&alice_evm_addr()); diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index e6f74a0224..2f718a9e5c 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -13,62 +13,63 @@ hex = { version = "0.4" } hex-literal = { version = "0.3.1" } libsecp256k1 = { version = "0.6" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15"} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15"} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16"} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16"} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } orml-auction = { path = "../../orml/auction" } orml-authority = { path = "../../orml/authority" } @@ -113,7 +114,7 @@ primitives = { package = "acala-primitives", path = "../../primitives" } runtime-common = { path = "../common" } mandala-runtime = { path = "../mandala" } -karura-runtime = { path = "../karura" } +karura-runtime = { path = "../karura", features = ["integration-tests"] } acala-runtime = { path = "../acala" } module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", default-features = false } @@ -124,17 +125,17 @@ ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash" } [dev-dependencies] env_logger = "0.9.0" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "4d3bb9dd4fa2cd554a9970ffff816d9346269eaa" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "a250ffc998bac4831c5692c591dee7bc13f3aead" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } @@ -156,4 +157,4 @@ with-ethereum-compatibility = [ "mandala-runtime/with-ethereum-compatibility", "module-evm/with-ethereum-compatibility", ] -std = [] +std = [] \ No newline at end of file diff --git a/runtime/integration-tests/src/authority.rs b/runtime/integration-tests/src/authority.rs index 29b779fbcc..2063cb02ad 100644 --- a/runtime/integration-tests/src/authority.rs +++ b/runtime/integration-tests/src/authority.rs @@ -125,23 +125,23 @@ fn test_authority_module() { // delay < SevenDays #[cfg(feature = "with-mandala-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (OneDay::get() + 1, 1), - Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), - Err(DispatchError::BadOrigin), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (OneDay::get() + 1, 1), + id: Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), + result: Err(DispatchError::BadOrigin), + })); #[cfg(feature = "with-karura-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (OneDay::get() + 1, 1), - Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), - Err(DispatchError::BadOrigin), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (OneDay::get() + 1, 1), + id: Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), + result: Err(DispatchError::BadOrigin), + })); #[cfg(feature = "with-acala-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (OneDay::get() + 1, 1), - Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), - Err(DispatchError::BadOrigin), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (OneDay::get() + 1, 1), + id: Some([AUTHORITY_ORIGIN_ID, 32, 28, 0, 0, 0, 0, 1, 0, 0, 0].to_vec()), + result: Err(DispatchError::BadOrigin), + })); let seven_days_later = one_day_later + SevenDays::get() + 1; @@ -157,25 +157,25 @@ fn test_authority_module() { run_to_block(seven_days_later); #[cfg(feature = "with-mandala-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (seven_days_later, 0), - Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), - Ok(()), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (seven_days_later, 0), + id: Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), + result: Ok(()), + })); #[cfg(feature = "with-karura-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (seven_days_later, 0), - Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), - Ok(()), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (seven_days_later, 0), + id: Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), + result: Ok(()), + })); #[cfg(feature = "with-acala-runtime")] - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (seven_days_later, 0), - Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), - Ok(()), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (seven_days_later, 0), + id: Some([AUTHORITY_ORIGIN_ID, 225, 196, 0, 0, 0, 0, 2, 0, 0, 0].to_vec()), + result: Ok(()), + })); // with_delayed_origin = false assert_ok!(Authority::schedule_dispatch( @@ -191,11 +191,11 @@ fn test_authority_module() { })); run_to_block(seven_days_later + 1); - System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched( - (seven_days_later + 1, 0), - Some([0, 0, 3, 0, 0, 0].to_vec()), - Ok(()), - ))); + System::assert_last_event(Event::Scheduler(pallet_scheduler::Event::::Dispatched { + task: (seven_days_later + 1, 0), + id: Some([0, 0, 3, 0, 0, 0].to_vec()), + result: Ok(()), + })); assert_ok!(Authority::schedule_dispatch( Origin::root(), diff --git a/runtime/integration-tests/src/homa_lite.rs b/runtime/integration-tests/src/homa_lite.rs index 128b081bcf..2420ca27ae 100644 --- a/runtime/integration-tests/src/homa_lite.rs +++ b/runtime/integration-tests/src/homa_lite.rs @@ -558,7 +558,7 @@ mod karura_only_tests { fn homa_lite_xcm_unbonding_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); diff --git a/runtime/integration-tests/src/homa_xcm.rs b/runtime/integration-tests/src/homa_xcm.rs index 56bb102b3e..5feeaf797b 100644 --- a/runtime/integration-tests/src/homa_xcm.rs +++ b/runtime/integration-tests/src/homa_xcm.rs @@ -87,7 +87,7 @@ fn configure_homa_and_xcm_interface() { fn xcm_interface_transfer_staking_to_sub_account_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); @@ -149,7 +149,7 @@ fn xcm_interface_transfer_staking_to_sub_account_works() { fn xcm_interface_withdraw_unbonded_from_sub_account_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); @@ -245,7 +245,7 @@ fn xcm_interface_withdraw_unbonded_from_sub_account_works() { fn xcm_interface_bond_extra_on_sub_account_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); @@ -328,7 +328,7 @@ fn xcm_interface_bond_extra_on_sub_account_works() { fn xcm_interface_unbond_on_sub_account_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); @@ -419,7 +419,7 @@ fn xcm_interface_unbond_on_sub_account_works() { fn homa_mint_and_redeem_works() { let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); let bonding_duration = BondingDuration::get(); Karura::execute_with(|| { diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs index 4654be4f3a..153d272a66 100644 --- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs @@ -22,13 +22,17 @@ use crate::relaychain::kusama_test_net::*; use crate::setup::*; use frame_support::assert_ok; +use sp_runtime::traits::AccountIdConversion; +use xcm_builder::ParentIsDefault; +use karura_runtime::parachains::bifrost::BNC_KEY; use karura_runtime::{AssetRegistry, KaruraTreasuryAccount}; use module_asset_registry::AssetMetadata; use module_relaychain::RelayChainCallBuilder; use module_support::CallBuilder; use orml_traits::MultiCurrency; use xcm_emulator::TestExt; +use xcm_executor::traits::Convert; #[test] fn transfer_from_relay_chain() { @@ -84,11 +88,10 @@ fn transfer_to_relay_chain() { } #[test] -fn transfer_to_sibling() { +fn transfer_sibling_chain_asset() { TestNet::reset(); fn karura_reserve_account() -> AccountId { - use sp_runtime::traits::AccountIdConversion; polkadot_parachain::primitives::Sibling::from(2000).into_account() } @@ -354,7 +357,6 @@ fn test_asset_registry_module() { TestNet::reset(); fn karura_reserve_account() -> AccountId { - use sp_runtime::traits::AccountIdConversion; polkadot_parachain::primitives::Sibling::from(2000).into_account() } @@ -362,7 +364,7 @@ fn test_asset_registry_module() { // register foreign asset assert_ok!(AssetRegistry::register_foreign_asset( Origin::root(), - Box::new(MultiLocation::new(1, X2(Parachain(2001), GeneralKey(KAR.encode()))).into()), + Box::new(MultiLocation::new(1, X2(Parachain(2001), GeneralKey(BNC_KEY.to_vec()))).into()), Box::new(AssetMetadata { name: b"Sibling Token".to_vec(), symbol: b"ST".to_vec(), @@ -378,13 +380,13 @@ fn test_asset_registry_module() { }); Sibling::execute_with(|| { - let _ = Balances::deposit_creating(&AccountId::from(BOB), 100_000_000_000_000); - assert_eq!(Balances::free_balance(&karura_reserve_account()), 0); - assert_eq!(Balances::free_balance(&AccountId::from(BOB)), 100_000_000_000_000); + let _ = Tokens::deposit(BNC, &AccountId::from(BOB), 100_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 0); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 100_000_000_000_000); assert_ok!(XTokens::transfer( Origin::signed(BOB.into()), - KAR, + BNC, 5_000_000_000_000, Box::new( MultiLocation::new( @@ -402,19 +404,19 @@ fn test_asset_registry_module() { 1_000_000_000, )); - assert_eq!(Balances::free_balance(&karura_reserve_account()), 5_000_000_000_000); - assert_eq!(Balances::free_balance(&AccountId::from(BOB)), 95_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 5_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 95_000_000_000_000); }); Karura::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 4_999_360_000_000 + 4_989_760_000_000 ); // ToTreasury assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &TreasuryAccount::get()), - 640_000_000 + 10_240_000_000 ); assert_ok!(XTokens::transfer( @@ -439,13 +441,13 @@ fn test_asset_registry_module() { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 3_999_360_000_000 + 3_989_760_000_000 ); }); Sibling::execute_with(|| { - assert_eq!(Balances::free_balance(&karura_reserve_account()), 4_000_000_000_000); - assert_eq!(Balances::free_balance(&AccountId::from(BOB)), 95_993_600_000_000); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 4_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 95_989_760_000_000); }); // remove it @@ -454,7 +456,7 @@ fn test_asset_registry_module() { assert_ok!(AssetRegistry::update_foreign_asset( Origin::root(), 0, - Box::new(MultiLocation::new(1, X2(Parachain(2001), GeneralKey(KAR.encode()))).into()), + Box::new(MultiLocation::new(1, X2(Parachain(2001), GeneralKey(BNC_KEY.to_vec()))).into()), Box::new(AssetMetadata { name: b"Sibling Token".to_vec(), symbol: b"ST".to_vec(), @@ -465,12 +467,12 @@ fn test_asset_registry_module() { }); Sibling::execute_with(|| { - assert_eq!(Balances::free_balance(&karura_reserve_account()), 4_000_000_000_000); - assert_eq!(Balances::free_balance(&AccountId::from(BOB)), 95_993_600_000_000); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 4_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 95_989_760_000_000); assert_ok!(XTokens::transfer( Origin::signed(BOB.into()), - KAR, + BNC, 5_000_000_000_000, Box::new( MultiLocation::new( @@ -488,27 +490,27 @@ fn test_asset_registry_module() { 1_000_000_000, )); - assert_eq!(Balances::free_balance(&karura_reserve_account()), 9_000_000_000_000); - assert_eq!(Balances::free_balance(&AccountId::from(BOB)), 90_993_600_000_000); + assert_eq!(Tokens::free_balance(BNC, &karura_reserve_account()), 9_000_000_000_000); + assert_eq!(Tokens::free_balance(BNC, &AccountId::from(BOB)), 90_989_760_000_000); }); Karura::execute_with(|| { assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &AccountId::from(ALICE)), - 8_999_360_000_000 + 8_979_520_000_000 ); // ToTreasury assert_eq!( Tokens::free_balance(CurrencyId::ForeignAsset(0), &TreasuryAccount::get()), - 640_000_000 + 20_480_000_000 ); }); } #[test] fn unspent_xcm_fee_is_returned_correctly() { - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); let homa_lite_sub_account: AccountId = hex_literal::hex!["d7b8926b326dd349355a9a7cca6606c1e0eb6fd2b506066b518c7155ff0d8297"].into(); Karura::execute_with(|| { @@ -630,9 +632,11 @@ fn trap_assets_larger_than_ed_works() { let (ksm_asset_amount, kar_asset_amount) = (dollar(KSM), dollar(KAR)); let trader_weight_to_treasury: u128 = 96_000_000; + let parent_account: AccountId = ParentIsDefault::::convert(Parent.into()).unwrap(); + Karura::execute_with(|| { - assert_ok!(Tokens::deposit(KSM, &AccountId::from(DEFAULT), 100 * dollar(KSM))); - let _ = pallet_balances::Pallet::::deposit_creating(&AccountId::from(DEFAULT), 100 * dollar(KAR)); + assert_ok!(Tokens::deposit(KSM, &parent_account, 100 * dollar(KSM))); + let _ = pallet_balances::Pallet::::deposit_creating(&parent_account, 100 * dollar(KAR)); kar_treasury_amount = Currencies::free_balance(KAR, &KaruraTreasuryAccount::get()); }); @@ -647,7 +651,8 @@ fn trap_assets_larger_than_ed_works() { }, WithdrawAsset( ( - (Parent, X2(Parachain(2000), GeneralKey(KAR.encode()))), + // (Parent, X2(Parachain(2000), GeneralKey(KAR.encode()))), + (0, GeneralKey(KAR.encode())), kar_asset_amount, ) .into(), @@ -682,9 +687,11 @@ fn trap_assets_lower_than_ed_works() { let mut kar_treasury_amount = 0; let (ksm_asset_amount, kar_asset_amount) = (cent(KSM) / 100, cent(KAR)); + let parent_account: AccountId = ParentIsDefault::::convert(Parent.into()).unwrap(); + Karura::execute_with(|| { - assert_ok!(Tokens::deposit(KSM, &AccountId::from(DEFAULT), dollar(KSM))); - let _ = pallet_balances::Pallet::::deposit_creating(&AccountId::from(DEFAULT), dollar(KAR)); + assert_ok!(Tokens::deposit(KSM, &parent_account, dollar(KSM))); + let _ = pallet_balances::Pallet::::deposit_creating(&parent_account, dollar(KAR)); kar_treasury_amount = Currencies::free_balance(KAR, &KaruraTreasuryAccount::get()); }); @@ -739,7 +746,6 @@ fn sibling_trap_assets_works() { let (bnc_asset_amount, kar_asset_amount) = (cent(BNC) / 10, cent(KAR)); fn sibling_account() -> AccountId { - use sp_runtime::traits::AccountIdConversion; polkadot_parachain::primitives::Sibling::from(2001).into_account() } diff --git a/runtime/integration-tests/src/relaychain/kusama_test_net.rs b/runtime/integration-tests/src/relaychain/kusama_test_net.rs index 9b640dc392..754cbed651 100644 --- a/runtime/integration-tests/src/relaychain/kusama_test_net.rs +++ b/runtime/integration-tests/src/relaychain/kusama_test_net.rs @@ -31,7 +31,7 @@ use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain decl_test_relay_chain! { pub struct KusamaNet { Runtime = kusama_runtime::Runtime, - XcmConfig = kusama_runtime::XcmConfig, + XcmConfig = kusama_runtime::xcm_config::XcmConfig, new_ext = kusama_ext(), } } @@ -40,6 +40,8 @@ decl_test_parachain! { pub struct Karura { Runtime = Runtime, Origin = Origin, + XcmpMessageHandler = karura_runtime::XcmpQueue, + DmpMessageHandler = karura_runtime::DmpQueue, new_ext = para_ext(2000), } } @@ -48,6 +50,8 @@ decl_test_parachain! { pub struct Sibling { Runtime = Runtime, Origin = Origin, + XcmpMessageHandler = karura_runtime::XcmpQueue, + DmpMessageHandler = karura_runtime::DmpQueue, new_ext = para_ext(2001), } } @@ -64,8 +68,9 @@ decl_test_network! { fn default_parachains_host_configuration() -> HostConfiguration { HostConfiguration { - validation_upgrade_frequency: 1u32, - validation_upgrade_delay: 1, + minimum_validation_upgrade_delay: 5, + validation_upgrade_cooldown: 5u32, + validation_upgrade_delay: 5, code_retention_period: 1200, max_code_size: MAX_CODE_SIZE, max_pov_size: MAX_POV_SIZE, diff --git a/runtime/integration-tests/src/relaychain/relay_chain.rs b/runtime/integration-tests/src/relaychain/relay_chain.rs index e5ec5a5dc1..0a211f57e5 100644 --- a/runtime/integration-tests/src/relaychain/relay_chain.rs +++ b/runtime/integration-tests/src/relaychain/relay_chain.rs @@ -128,7 +128,7 @@ mod karura_tests { #[test] /// Tests transfer_keep_alive call fn relaychain_transfer_keep_alive_works() { - let mut parachain_account: AccountId = AccountId::default(); + let mut parachain_account: AccountId = AccountId::new([0u8; 32]); Karura::execute_with(|| { parachain_account = ParachainAccount::get(); }); diff --git a/runtime/integration-tests/src/setup.rs b/runtime/integration-tests/src/setup.rs index f31209da8f..dece8f6678 100644 --- a/runtime/integration-tests/src/setup.rs +++ b/runtime/integration-tests/src/setup.rs @@ -171,9 +171,6 @@ const ORACLE3: [u8; 32] = [2u8; 32]; const ORACLE4: [u8; 32] = [3u8; 32]; const ORACLE5: [u8; 32] = [4u8; 32]; -#[allow(dead_code)] -pub const DEFAULT: [u8; 32] = [0u8; 32]; - pub const ALICE: [u8; 32] = [4u8; 32]; pub const BOB: [u8; 32] = [5u8; 32]; pub const CHARLIE: [u8; 32] = [6u8; 32]; diff --git a/runtime/integration-tests/src/treasury.rs b/runtime/integration-tests/src/treasury.rs index edb801d223..4faa772db4 100644 --- a/runtime/integration-tests/src/treasury.rs +++ b/runtime/integration-tests/src/treasury.rs @@ -234,7 +234,7 @@ fn treasury_handles_dust_correctly() { mod mandala_only_tests { use super::*; type NegativeImbalance = >::NegativeImbalance; - use frame_support::traits::OnUnbalanced; + use frame_support::{pallet_prelude::Decode, traits::OnUnbalanced}; use pallet_authorship::EventHandler; #[test] @@ -243,11 +243,8 @@ mod mandala_only_tests { .balances(vec![(AccountId::from(ALICE), NATIVE_CURRENCY, dollar(NATIVE_CURRENCY))]) .build() .execute_with(|| { - assert_ok!(Session::set_keys( - Origin::signed(AccountId::from(ALICE)), - SessionKeys::default(), - vec![] - )); + let keys: SessionKeys = Decode::decode(&mut &[0u8; 128][..]).unwrap(); + assert_ok!(Session::set_keys(Origin::signed(AccountId::from(ALICE)), keys, vec![])); assert_ok!(CollatorSelection::set_desired_candidates(Origin::root(), 1)); assert_ok!(CollatorSelection::register_as_candidate(Origin::signed( AccountId::from(ALICE) diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index 29ce0218ac..6897e977ab 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -12,62 +12,63 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"] serde = { version = "1.0.124", optional = true } hex-literal = { version = "0.3.1" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, features = ["historical"] } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, features = ["historical"] } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } @@ -116,13 +117,13 @@ module-evm-rpc-runtime-api = { path = "../../modules/evm/rpc/runtime_api", defa # benchmarking deps libsecp256k1 = { version = "0.6", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [features] default = ["std"] @@ -170,6 +171,7 @@ std = [ "sp-version/std", "pallet-bounties/std", "pallet-tips/std", + "pallet-preimage/std", "cumulus-pallet-aura-ext/std", "cumulus-primitives-core/std", @@ -291,6 +293,7 @@ try-runtime = [ "pallet-utility/try-runtime", "pallet-bounties/try-runtime", "pallet-tips/try-runtime", + "pallet-preimage/try-runtime", "orml-auction/try-runtime", "orml-authority/try-runtime", @@ -323,3 +326,5 @@ try-runtime = [ "module-xcm-interface/try-runtime", "module-session-manager/try-runtime", ] + +integration-tests = [] \ No newline at end of file diff --git a/runtime/karura/src/integration_tests_config.rs b/runtime/karura/src/integration_tests_config.rs new file mode 100644 index 0000000000..83de0845b9 --- /dev/null +++ b/runtime/karura/src/integration_tests_config.rs @@ -0,0 +1,39 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program 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. + +// This program 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 this program. If not, see . + +use super::*; + +parameter_types! { + pub BncPerSecondOfCanonicalLocation: (AssetId, u128) = ( + MultiLocation::new( + 0, + X1(GeneralKey(parachains::bifrost::BNC_KEY.to_vec())), + ).into(), + ksm_per_second() * 80 + ); +} + +pub type Trader = ( + TransactionFeePoolTrader, + FixedRateOfFungible, + FixedRateOfFungible, + FixedRateOfFungible, + FixedRateOfFungible, + FixedRateOfFungible, + FixedRateOfForeignAsset, +); diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index b7f60e3e08..ecfac40b97 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -122,6 +122,11 @@ mod authority; mod benchmarking; pub mod constants; +#[cfg(feature = "integration-tests")] +mod integration_tests_config; +#[cfg(feature = "integration-tests")] +use integration_tests_config::*; + /// This runtime version. #[sp_version::runtime_version] pub const VERSION: RuntimeVersion = RuntimeVersion { @@ -132,6 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 0, }; /// The version infromation used to identify this runtime when compiled @@ -270,6 +276,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -577,6 +584,7 @@ impl ContainsLengthBound for GeneralCouncilProvider { parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub ProposalBondMinimum: Balance = 5 * dollar(KAR); + pub ProposalBondMaximum: Balance = 25 * dollar(KAR); pub const SpendPeriod: BlockNumber = 7 * DAYS; pub const Burn: Permill = Permill::from_percent(0); @@ -605,6 +613,7 @@ impl pallet_treasury::Config for Runtime { type OnSlash = Treasury; type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; + type ProposalBondMaximum = ProposalBondMaximum; type SpendPeriod = SpendPeriod; type Burn = Burn; type BurnDestination = (); @@ -623,6 +632,7 @@ impl pallet_bounties::Config for Runtime { type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = (); + type ChildBountyManager = (); } impl pallet_tips::Config for Runtime { @@ -644,7 +654,6 @@ parameter_types! { pub const EnactmentPeriod: BlockNumber = 2 * DAYS; pub const VoteLockingPeriod: BlockNumber = 7 * DAYS; pub const CooloffPeriod: BlockNumber = 7 * DAYS; - pub PreimageByteDeposit: Balance = deposit(0, 1); pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; @@ -920,6 +929,8 @@ impl orml_vesting::Config for Runtime { parameter_types! { pub MaximumSchedulerWeight: Weight = Perbill::from_percent(10) * RuntimeBlockWeights::get().max_block; pub const MaxScheduledPerBlock: u32 = 10; + // Retry a scheduled item every 25 blocks (5 minute) until the preimage exists. + pub const NoPreimagePostponement: Option = Some(5 * MINUTES); } impl pallet_scheduler::Config for Runtime { @@ -932,6 +943,25 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = (); type OriginPrivilegeCmp = EqualPrivilegeOnly; + type PreimageProvider = Preimage; + type NoPreimagePostponement = NoPreimagePostponement; +} + +parameter_types! { + /// Max size 4MB allowed for a preimage. + pub const PreimageMaxSize: u32 = 4096 * 1024; + pub PreimageBaseDeposit: Balance = deposit(2, 64); + pub PreimageByteDeposit: Balance = deposit(0, 1); +} + +impl pallet_preimage::Config for Runtime { + type WeightInfo = (); + type Event = Event; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; + type BaseDeposit = PreimageBaseDeposit; + type ByteDeposit = PreimageByteDeposit; } parameter_types! { @@ -990,6 +1020,7 @@ where .saturating_sub(1); let tip = 0; let extra: SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -1393,7 +1424,7 @@ parameter_types! { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = ParachainInfo; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; @@ -1486,6 +1517,14 @@ parameter_types! { // kUSD:KSM = 400:1 ksm_per_second() * 400 ); + pub KusdPerSecondOfCanonicalLocation: (AssetId, u128) = ( + MultiLocation::new( + 0, + X1(GeneralKey(KUSD.encode())), + ).into(), + // kUSD:KSM = 400:1 + ksm_per_second() * 400 + ); pub KarPerSecond: (AssetId, u128) = ( MultiLocation::new( 1, @@ -1493,6 +1532,13 @@ parameter_types! { ).into(), kar_per_second() ); + pub KarPerSecondOfCanonicalLocation: (AssetId, u128) = ( + MultiLocation::new( + 0, + X1(GeneralKey(KAR.encode())), + ).into(), + kar_per_second() + ); pub LksmPerSecond: (AssetId, u128) = ( MultiLocation::new( 1, @@ -1501,6 +1547,14 @@ parameter_types! { // LKSM:KSM = 10:1 ksm_per_second() * 10 ); + pub LksmPerSecondOfCanonicalLocation: (AssetId, u128) = ( + MultiLocation::new( + 0, + X1(GeneralKey(LKSM.encode())), + ).into(), + // LKSM:KSM = 10:1 + ksm_per_second() * 10 + ); pub PHAPerSecond: (AssetId, u128) = ( MultiLocation::new( 1, @@ -1546,12 +1600,16 @@ parameter_types! { pub KarPerSecondAsBased: u128 = kar_per_second(); } +#[cfg(not(feature = "integration-tests"))] pub type Trader = ( TransactionFeePoolTrader, FixedRateOfFungible, FixedRateOfFungible, + FixedRateOfFungible, FixedRateOfFungible, + FixedRateOfFungible, FixedRateOfFungible, + FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, @@ -1629,6 +1687,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type ExecuteOverweightOrigin = EnsureRoot; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -1708,12 +1767,12 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< DepositToAlternative, >; -//TODO: use token registry currency type encoding fn native_currency_location(id: CurrencyId) -> MultiLocation { MultiLocation::new(1, X2(Parachain(ParachainInfo::get().into()), GeneralKey(id.encode()))) } pub struct CurrencyIdConvert; + impl Convert> for CurrencyIdConvert { fn convert(id: CurrencyId) -> Option { use CurrencyId::Token; @@ -1760,6 +1819,7 @@ impl Convert> for CurrencyIdConvert { } } } + impl Convert> for CurrencyIdConvert { fn convert(location: MultiLocation) -> Option { use CurrencyId::Token; @@ -1804,10 +1864,26 @@ impl Convert> for CurrencyIdConvert { parents: 1, interior: X1(Parachain(parachains::phala::ID)), } => Some(Token(PHA)), + // adapt for reanchor canonical location: https://github.com/paritytech/polkadot/pull/4470 + MultiLocation { + parents: 0, + interior: X1(GeneralKey(key)), + } => match &key[..] { + #[cfg(feature = "integration-tests")] + parachains::bifrost::BNC_KEY => Some(Token(BNC)), + key => { + let currency_id = CurrencyId::decode(&mut &*key).ok()?; + match currency_id { + Token(KAR) | Token(KUSD) | Token(LKSM) => Some(currency_id), + _ => None, + } + } + }, _ => None, } } } + impl Convert> for CurrencyIdConvert { fn convert(asset: MultiAsset) -> Option { if let MultiAsset { @@ -1838,6 +1914,7 @@ impl Convert for AccountIdToMultiLocation { parameter_types! { pub const BaseXcmWeight: Weight = 100_000_000; + pub const MaxAssetsForTransfer: usize = 2; } impl orml_xtokens::Config for Runtime { @@ -1851,6 +1928,7 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; } impl orml_unknown_tokens::Config for Runtime { @@ -1896,6 +1974,7 @@ construct_runtime!( Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 5, TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 6, IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event} = 7, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 8, // Tokens & Related Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, @@ -1997,6 +2076,7 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( + frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, @@ -2013,8 +2093,33 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = - frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; +pub type Executive = frame_executive::Executive< + Runtime, + Block, + frame_system::ChainContext, + Runtime, + AllPalletsWithSystem, + SchedulerMigrationV3, +>; + +// Migration for scheduler pallet to move from a plain Call to a CallOrHash. +pub struct SchedulerMigrationV3; +impl frame_support::traits::OnRuntimeUpgrade for SchedulerMigrationV3 { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + Scheduler::migrate_v2_to_v3(); + ::BlockWeights::get().max_block + } + + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result<(), &'static str> { + Scheduler::pre_migrate_to_v3() + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade() -> Result<(), &'static str> { + Scheduler::post_migrate_to_v3() + } +} #[cfg(not(feature = "disable-runtime-api"))] impl_runtime_apis! { @@ -2232,8 +2337,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index c5d465ae4f..401abd6730 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -14,67 +14,68 @@ hex = { version = "0.4", default-features = false, optional = true } hex-literal = { version = "0.3.1" } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false } libsecp256k1 = { version = "0.6", default-features = false, optional = true } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.15", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.16", default-features = false } orml-auction = { path = "../../orml/auction", default-features = false } orml-authority = { path = "../../orml/authority", default-features = false } @@ -129,16 +130,16 @@ ecosystem-starport = { path = "../../ecosystem-modules/starport", default-featur ecosystem-compound-cash = { path = "../../ecosystem-modules/compound-cash", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } [dev-dependencies] hex = "0.4.0" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.15" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.15" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.16" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } @@ -323,6 +324,7 @@ try-runtime = [ "pallet-transaction-payment/try-runtime", "pallet-treasury/try-runtime", "pallet-utility/try-runtime", + "pallet-preimage/try-runtime", "orml-auction/try-runtime", "orml-authority/try-runtime", diff --git a/runtime/mandala/src/benchmarking/collator_selection.rs b/runtime/mandala/src/benchmarking/collator_selection.rs index 56bea03769..df82f56485 100644 --- a/runtime/mandala/src/benchmarking/collator_selection.rs +++ b/runtime/mandala/src/benchmarking/collator_selection.rs @@ -111,8 +111,9 @@ runtime_benchmarks! { let caller: AccountId = whitelisted_caller(); let bond: Balance = Balances::minimum_balance().checked_mul(2u32.into()).unwrap(); Balances::make_free_balance_be(&caller, bond.clone()); + let keys: SessionKeys = Decode::decode(&mut &[0u8; 128][..]).unwrap(); - Session::set_keys(RawOrigin::Signed(caller.clone()).into(), SessionKeys::default(), vec![]).unwrap(); + Session::set_keys(RawOrigin::Signed(caller.clone()).into(), keys, vec![]).unwrap(); }: _(RawOrigin::Signed(caller.clone())) verify { assert_last_event(module_collator_selection::Event::CandidateAdded{who: caller, bond: bond.checked_div(2u32.into()).unwrap()}.into()); @@ -128,8 +129,9 @@ runtime_benchmarks! { let caller: AccountId = whitelisted_caller(); let bond: Balance = Balances::minimum_balance().checked_mul(2u32.into()).unwrap(); Balances::make_free_balance_be(&caller, bond.clone()); + let keys: SessionKeys = Decode::decode(&mut &[0u8; 128][..]).unwrap(); - Session::set_keys(RawOrigin::Signed(caller.clone()).into(), SessionKeys::default(), vec![]).unwrap(); + Session::set_keys(RawOrigin::Signed(caller.clone()).into(), keys, vec![]).unwrap(); }: _(RawOrigin::Root, caller.clone()) verify { assert_last_event(module_collator_selection::Event::CandidateAdded{who: caller, bond: 0}.into()); diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index 975b803cdf..cf844bc558 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -143,6 +143,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 0, }; /// The version infromation used to identify this runtime when compiled @@ -244,6 +245,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -552,6 +554,7 @@ impl ContainsLengthBound for GeneralCouncilProvider { parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub ProposalBondMinimum: Balance = dollar(ACA); + pub ProposalBondMaximum: Balance = 5 * dollar(ACA); pub const SpendPeriod: BlockNumber = DAYS; pub const Burn: Permill = Permill::from_percent(0); pub const TipCountdown: BlockNumber = DAYS; @@ -579,6 +582,7 @@ impl pallet_treasury::Config for Runtime { type OnSlash = (); type ProposalBond = ProposalBond; type ProposalBondMinimum = ProposalBondMinimum; + type ProposalBondMaximum = ProposalBondMaximum; type SpendPeriod = SpendPeriod; type Burn = Burn; type BurnDestination = (); @@ -597,6 +601,7 @@ impl pallet_bounties::Config for Runtime { type DataDepositPerByte = DataDepositPerByte; type MaximumReasonLength = MaximumReasonLength; type WeightInfo = (); + type ChildBountyManager = (); } impl pallet_tips::Config for Runtime { @@ -634,7 +639,6 @@ parameter_types! { pub MinimumDeposit: Balance = 100 * cent(ACA); pub const EnactmentPeriod: BlockNumber = MINUTES; pub const CooloffPeriod: BlockNumber = MINUTES; - pub PreimageByteDeposit: Balance = 10 * millicent(ACA); pub const InstantAllowed: bool = true; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; @@ -925,6 +929,8 @@ impl orml_vesting::Config for Runtime { parameter_types! { pub MaximumSchedulerWeight: Weight = Perbill::from_percent(10) * RuntimeBlockWeights::get().max_block; pub const MaxScheduledPerBlock: u32 = 50; + // Retry a scheduled item every 25 blocks (5 minute) until the preimage exists. + pub const NoPreimagePostponement: Option = Some(5 * MINUTES); } impl pallet_scheduler::Config for Runtime { @@ -937,6 +943,25 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type WeightInfo = (); type OriginPrivilegeCmp = EqualPrivilegeOnly; + type PreimageProvider = Preimage; + type NoPreimagePostponement = NoPreimagePostponement; +} + +parameter_types! { + /// Max size 4MB allowed for a preimage. + pub const PreimageMaxSize: u32 = 4096 * 1024; + pub PreimageBaseDeposit: Balance = deposit(2, 64); + pub PreimageByteDeposit: Balance = deposit(0, 1); +} + +impl pallet_preimage::Config for Runtime { + type WeightInfo = (); + type Event = Event; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type MaxSize = PreimageMaxSize; + type BaseDeposit = PreimageBaseDeposit; + type ByteDeposit = PreimageByteDeposit; } parameter_types! { @@ -995,6 +1020,7 @@ where .saturating_sub(1); let tip = 0; let extra: SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -1545,7 +1571,7 @@ parameter_types! { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = ParachainInfo; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; @@ -1716,6 +1742,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = (); + type ExecuteOverweightOrigin = EnsureRoot; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -1747,7 +1774,7 @@ impl Convert> for CurrencyIdConvert { use TokenSymbol::*; match id { Token(DOT) => Some(MultiLocation::parent()), - Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) => Some(native_currency_location(id)), + Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => Some(native_currency_location(id)), CurrencyId::ForeignAsset(foreign_asset_id) => AssetIdMaps::::get_multi_location(foreign_asset_id), _ => None, } @@ -1775,7 +1802,22 @@ impl Convert> for CurrencyIdConvert { if let Ok(currency_id) = CurrencyId::decode(&mut &key[..]) { // check if `currency_id` is cross-chain asset match currency_id { - Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) => Some(currency_id), + Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => Some(currency_id), + _ => None, + } + } else { + None + } + } + // adapt for reanchor canonical location: https://github.com/paritytech/polkadot/pull/4470 + MultiLocation { + parents: 0, + interior: X1(GeneralKey(key)), + } => { + let key = &key[..]; + if let Ok(currency_id) = CurrencyId::decode(&mut &*key) { + match currency_id { + Token(ACA) | Token(AUSD) | Token(LDOT) | Token(RENBTC) | Token(TAI) => Some(currency_id), _ => None, } } else { @@ -1816,6 +1858,7 @@ impl Convert for AccountIdToMultiLocation { parameter_types! { pub const BaseXcmWeight: Weight = 100_000_000; + pub const MaxAssetsForTransfer: usize = 2; } impl orml_xtokens::Config for Runtime { @@ -1829,6 +1872,7 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; } impl orml_unknown_tokens::Config for Runtime { @@ -1957,7 +2001,7 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr return Err(InvalidTransaction::Stale); } - let (_, _, _, mortality, check_nonce, _, charge, ..) = extra.clone(); + let (_, _, _, _, mortality, check_nonce, _, charge, ..) = extra.clone(); if mortality != frame_system::CheckEra::from(sp_runtime::generic::Era::Immortal) { // require immortal @@ -1967,7 +2011,7 @@ impl Convert<(Call, SignedExtra), Result<(EthereumTransactionMessage, SignedExtr let nonce = check_nonce.nonce; let tip = charge.0; - extra.4.mark_as_ethereum_tx(valid_until); + extra.5.mark_as_ethereum_tx(valid_until); Ok(( EthereumTransactionMessage { @@ -2000,6 +2044,7 @@ pub type SignedBlock = generic::SignedBlock; pub type BlockId = generic::BlockId; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( + frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, @@ -2017,8 +2062,33 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = - frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; +pub type Executive = frame_executive::Executive< + Runtime, + Block, + frame_system::ChainContext, + Runtime, + AllPalletsWithSystem, + SchedulerMigrationV3, +>; + +// Migration for scheduler pallet to move from a plain Call to a CallOrHash. +pub struct SchedulerMigrationV3; +impl frame_support::traits::OnRuntimeUpgrade for SchedulerMigrationV3 { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + Scheduler::migrate_v2_to_v3(); + ::BlockWeights::get().max_block + } + + #[cfg(feature = "try-runtime")] + fn pre_upgrade() -> Result<(), &'static str> { + Scheduler::pre_migrate_to_v3() + } + + #[cfg(feature = "try-runtime")] + fn post_upgrade() -> Result<(), &'static str> { + Scheduler::post_migrate_to_v3() + } +} construct_runtime! { pub enum Runtime where @@ -2031,6 +2101,7 @@ construct_runtime! { Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 2, TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 3, + Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 4, // Tokens & Related Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, @@ -2357,8 +2428,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } @@ -2600,6 +2671,7 @@ mod tests { }); let extra: SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -2611,7 +2683,7 @@ mod tests { ); let mut expected_extra = extra.clone(); - expected_extra.4.mark_as_ethereum_tx(30); + expected_extra.5.mark_as_ethereum_tx(30); assert_eq!( ConvertEthereumTx::convert((call.clone(), extra.clone())).unwrap(), @@ -2636,7 +2708,7 @@ mod tests { // valid tx in future assert_eq!( - extra.4.validate(&alice, &call, &info, 0), + extra.5.validate(&alice, &call, &info, 0), Ok(sp_runtime::transaction_validity::ValidTransaction { priority: 0, requires: vec![Encode::encode(&(alice.clone(), 2u32))], @@ -2647,7 +2719,7 @@ mod tests { ); // valid evm tx assert_eq!( - expected_extra.4.validate(&alice, &call, &info, 0), + expected_extra.5.validate(&alice, &call, &info, 0), Ok(sp_runtime::transaction_validity::ValidTransaction { priority: 0, requires: vec![], @@ -2658,9 +2730,9 @@ mod tests { ); // valid evm tx in future - expected_extra.4.nonce = 4; + expected_extra.5.nonce = 4; assert_eq!( - expected_extra.4.validate(&alice, &call, &info, 0), + expected_extra.5.validate(&alice, &call, &info, 0), Ok(sp_runtime::transaction_validity::ValidTransaction { priority: 0, requires: vec![Encode::encode(&(address, 3u32))], diff --git a/ts-tests/tests/test-contract-methods.ts b/ts-tests/tests/test-contract-methods.ts index 1e2433b54d..d1adb11df4 100644 --- a/ts-tests/tests/test-contract-methods.ts +++ b/ts-tests/tests/test-contract-methods.ts @@ -64,7 +64,7 @@ describeWithAcala("Acala RPC (Contract Methods)", (context) => { }); it("should get correct environmental coinbase", async function () { - expect((await contract.coinbase()).toString()).to.not.eq('0x0000000000000000000000000000000000000000'); + expect((await contract.coinbase()).toString()).to.eq('0x0000000000000000000000000000000000000000'); }); it("should get correct environmental block timestamp", async function () {