diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3efd44f..a63fef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,9 +188,11 @@ jobs: - name: Srtool build id: srtool_build - uses: chevdor/srtool-actions@v0.7.0 + uses: chevdor/srtool-actions@v0.9.2 with: chain: ${{ matrix.runtime }} + # todo: remove this again as soon as srtool is released for latest stable + tag: 1.74.0 runtime_dir: polkadot-parachains/${{ matrix.runtime }}-runtime - name: Summary diff --git a/Cargo.lock b/Cargo.lock index 840d4f4..f5f1d41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1965,7 +1965,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1235a0c8b242349a41d84c07774e17acf942e9fee383dda31c021ccaea9eedb" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -2887,7 +2887,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.28", - "hex-literal 0.4.1", + "hex-literal", "jsonrpsee", "launch-runtime", "log", @@ -3015,7 +3015,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.3.4", + "hex-literal", "log", "pallet-asset-tx-payment", "pallet-aura", @@ -3270,7 +3270,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", "indexmap 1.9.3", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3499,7 +3499,7 @@ version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35d1461dc3a49bbd9bdf8955eca27f54cdcc6b38373bbd636e011a8594d23f3f" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -3644,7 +3644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e046ecdc04dd66f17d760525631f553ddcbea6f09423f78fcf52b47c97656cd0" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -4127,12 +4127,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hex-literal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" - [[package]] name = "hex-literal" version = "0.4.1" @@ -4693,7 +4687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -4847,7 +4841,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.3.4", + "hex-literal", "log", "pallet-asset-tx-payment", "pallet-aura", @@ -5884,7 +5878,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -6230,7 +6224,7 @@ dependencies = [ "indexmap 2.1.0", "itertools 0.11.0", "petgraph", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -7323,7 +7317,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d99ab20edb6dec19370dbda0a627739dde9cdfea9b4310e28b8a0a0ea0e83fc" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -7624,9 +7618,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.4" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -7639,11 +7633,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.4" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.2", "proc-macro2", "quote", "syn 1.0.109", @@ -8685,7 +8679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9de3d7ae1191401fe2476a69dece0853011d2c9fdcb7eb194cdead641f395abb" dependencies = [ "bitvec", - "hex-literal 0.4.1", + "hex-literal", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", @@ -8875,7 +8869,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", - "hex-literal 0.4.1", + "hex-literal", "is_executable", "kvdb", "kvdb-rocksdb", @@ -9201,7 +9195,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.10", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -9247,9 +9251,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -9749,7 +9753,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10247,7 +10251,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88a074891d17c03c58b1314c9add361a5a7fb28d4d3addd7a32dca8b119bd877" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -11211,7 +11215,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71bd05d3f24c0c2489c57b90a76db883c23c25577718ca05c9b0181fd427f501" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -11297,7 +11301,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -11514,18 +11518,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -11926,7 +11930,7 @@ dependencies = [ "Inflector", "blake2", "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -12431,7 +12435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b232943ee7ca83a6d56face33b8af12e9fb470a15a53835f4e12a6e452a41c1c" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -13447,14 +13451,14 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.10", ] [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -13469,7 +13473,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.4.6", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow 0.5.37", ] [[package]] @@ -13577,7 +13592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0f4ac73c340c95608556d9a52545c227be6b262ab3f3039a4dc005aad449bff" dependencies = [ "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -14636,7 +14651,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", + "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -15002,6 +15017,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/Cargo.toml b/Cargo.toml index c066078..34621da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,139 @@ members = [ [profile.release] panic = "unwind" +[workspace.dependencies] +assert_cmd = "2.0" +async-trait = "0.1.71" +clap = { version = "4.3.11", features = ["derive"] } +parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] } +futures = { version = "0.3.28", features = ["compat"] } +hex-literal = "0.4.1" +jsonrpsee = { version = "0.16.3", features = ["server"] } +log = { version = "0.4.20", default-features = false } +nix = "0.24" +parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.3.0" } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +serde = { version = "1.0.167", default-features = false, features = ["derive"] } +serde_json = "1.0.100" +smallvec = "1.6.1" +tempfile = "3.3.0" + +# encointer deps +encointer-balances-tx-payment = { default-features = false, version = "2.0.0" } +encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "2.0.0" } +encointer-primitives = { default-features = false, version = "2.0.0" } +pallet-encointer-balances = { default-features = false, version = "2.0.0" } +pallet-encointer-bazaar = { default-features = false, version = "2.0.0" } +pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "2.0.0" } +pallet-encointer-ceremonies = { default-features = false, version = "2.0.0" } +pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "2.0.0" } +pallet-encointer-communities = { default-features = false, version = "2.0.0" } +pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "2.0.0" } +pallet-encointer-faucet = { default-features = false, version = "2.0.0" } +pallet-encointer-reputation-commitments = { default-features = false, version = "2.0.0" } +pallet-encointer-scheduler = { default-features = false, version = "2.0.0" } +# rpc [std] +pallet-encointer-bazaar-rpc = "2.0.0" +pallet-encointer-ceremonies-rpc = "2.0.0" +pallet-encointer-communities-rpc = "2.0.0" + +# polkadot-sdk [no_std] +cumulus-pallet-aura-ext = { default-features = false, version = "0.3.0" } +cumulus-pallet-dmp-queue = { default-features = false, version = "0.3.0" } +cumulus-pallet-parachain-system = { default-features = false, features = ["parameterized-consensus-hook"], version = "0.3.0" } +cumulus-pallet-xcm = { default-features = false, version = "0.3.0" } +cumulus-pallet-xcmp-queue = { default-features = false, version = "0.3.0" } +cumulus-primitives-core = { default-features = false, version = "0.3.0" } +cumulus-primitives-timestamp = { default-features = false, version = "0.3.0" } +cumulus-primitives-utility = { default-features = false, version = "0.3.0" } +frame-benchmarking = { default-features = false, version = "24.0.0" } +frame-executive = { default-features = false, version = "24.0.0" } +frame-rpc-system = { package = "substrate-frame-rpc-system", version = "24.0.0" } +frame-support = { default-features = false, version = "24.0.0" } +frame-system = { default-features = false, version = "24.0.0" } +frame-system-benchmarking = { default-features = false, version = "24.0.0" } +frame-system-rpc-runtime-api = { default-features = false, version = "22.0.0" } +frame-try-runtime = { default-features = false, version = "0.30.0" } +kusama-runtime-constants = { default-features = false, version = "3.0.0" } +pallet-asset-tx-payment = { default-features = false, version = "24.0.0" } +pallet-aura = { default-features = false, version = "23.0.0" } +pallet-balances = { default-features = false, version = "24.0.0" } +pallet-collective = { default-features = false, version = "24.0.0" } +pallet-insecure-randomness-collective-flip = { default-features = false, version = "12.0.0" } +pallet-membership = { default-features = false, version = "24.0.0" } +pallet-proxy = { default-features = false, version = "24.0.0" } +pallet-scheduler = { default-features = false, version = "25.0.0" } +pallet-timestamp = { default-features = false, version = "23.0.0" } +pallet-transaction-payment = { default-features = false, version = "24.0.0" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "24.0.0" } +pallet-treasury = { default-features = false, version = "23.0.0" } +pallet-utility = { default-features = false, version = "24.0.0" } +pallet-xcm = { default-features = false, version = "3.0.0" } +parachains-common = { default-features = false, version = "3.0.0" } +polkadot-core-primitives = { default-features = false, version = "3.0.0" } +polkadot-parachain-primitives = { default-features = false, version = "2.0.0" } +polkadot-runtime-common = { default-features = false, version = "3.0.0" } +sp-api = { default-features = false, version = "22.0.0" } +sp-block-builder = { default-features = false, version = "22.0.0" } +sp-consensus-aura = { default-features = false, version = "0.28.0" } +sp-core = { default-features = false, version = "24.0.0" } +sp-inherents = { default-features = false, version = "22.0.0" } +sp-io = { default-features = false, version = "26.0.0" } +sp-offchain = { default-features = false, version = "22.0.0" } +sp-runtime = { default-features = false, version = "27.0.0" } +sp-session = { default-features = false, version = "23.0.0" } +sp-std = { default-features = false, version = "11.0.0" } +sp-transaction-pool = { default-features = false, version = "22.0.0" } +sp-version = { default-features = false, version = "25.0.0" } +substrate-wasm-builder = { version = "13.0.0" } +try-runtime-cli = { default-features = false, version = "0.34.0" } +xcm = { package = "staging-xcm", default-features = false, version = "3.0.0" } +xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "3.0.0" } +xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "3.0.0" } + +# std stuff +cumulus-client-cli = "0.3.0" +cumulus-client-collator = "0.3.0" +cumulus-client-consensus-aura = "0.3.0" +cumulus-client-consensus-common = "0.3.0" +cumulus-client-consensus-proposer = "0.3.0" +cumulus-client-consensus-relay-chain = "0.3.0" +cumulus-client-network = "0.3.0" +cumulus-client-service = "0.3.0" +cumulus-primitives-parachain-inherent = "0.3.0" +cumulus-relay-chain-inprocess-interface = "0.3.0" +cumulus-relay-chain-interface = "0.3.0" +cumulus-relay-chain-rpc-interface = "0.3.0" +frame-benchmarking-cli = "28.0.0" +pallet-transaction-payment-rpc = "26.0.0" +polkadot-cli = "3.0.0" +polkadot-primitives = "3.0.0" +polkadot-service = "3.0.0" +sc-basic-authorship = "0.30.0" +sc-chain-spec = "23.0.0" +sc-cli = "0.32.0" +sc-client-api = "24.0.0" +sc-consensus = "0.29.0" +sc-executor = "0.28.0" +sc-network = "0.30.0" +sc-network-common = "0.29.0" +sc-network-sync = "0.29.0" +sc-rpc = "25.0.0" +sc-service = "0.31.0" +sc-sysinfo = "23.0.0" +sc-telemetry = "11.0.0" +sc-tracing = "24.0.0" +sc-transaction-pool = "24.0.0" +sc-transaction-pool-api = "24.0.0" +sp-blockchain = "24.0.0" +sp-consensus = "0.28.0" +sp-keyring = "27.0.0" +sp-keystore = "0.30.0" +sp-timestamp = "22.0.0" +substrate-build-script-utils = "8.0.0" +substrate-prometheus-endpoint = "0.15.0" + + #only while debugging/developping #[patch."https://github.com/encointer/pallets"] #encointer-balances-tx-payment = { path = "../pallets/balances-tx-payment" } diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index a3ff0a4..2b46952 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -11,103 +11,103 @@ name = "encointer-collator" path = "src/main.rs" [dependencies] -async-trait = "0.1.71" -clap = { version = "4.3.11", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.0.0" } -futures = { version = "0.3.28", features = ["compat"] } -hex-literal = "0.4.1" -jsonrpsee = { version = "0.16.3", features = ["server"] } -log = "0.4.20" -serde = { version = "1.0.167", features = ["derive"] } +async-trait = { workspace = true } +clap = { workspace = true } +futures = { workspace = true } +hex-literal = { workspace = true } +jsonrpsee = { workspace = true } +log = { workspace = true, features = ["std"] } +parity-scale-codec = { workspace = true } +serde = { workspace = true, features = ["std"] } # added by encointer -parachains-common = "3.0.0" -serde_json = "1.0.100" +parachains-common = { workspace = true, features = ["std"] } +serde_json = { workspace = true } # Parachain runtimes launch-runtime = { package = "launch-runtime", path = "launch-runtime" } parachain-runtime = { package = "encointer-runtime", path = "encointer-runtime" } +#parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/brenzi/runtimes.git", branch = "main" } # encointer dependencies -encointer-balances-tx-payment-rpc-runtime-api = "2.0.0" -pallet-encointer-bazaar-rpc = "2.0.0" -pallet-encointer-bazaar-rpc-runtime-api = "2.0.0" -pallet-encointer-ceremonies-rpc = "2.0.0" -pallet-encointer-ceremonies-rpc-runtime-api = "2.0.0" -pallet-encointer-communities-rpc = "2.0.0" -pallet-encointer-communities-rpc-runtime-api = "2.0.0" +encointer-balances-tx-payment-rpc-runtime-api = { workspace = true, features = ["std"] } +pallet-encointer-bazaar-rpc = { workspace = true } +pallet-encointer-bazaar-rpc-runtime-api = { workspace = true, features = ["std"] } +pallet-encointer-ceremonies-rpc = { workspace = true } +pallet-encointer-ceremonies-rpc-runtime-api = { workspace = true, features = ["std"] } +pallet-encointer-communities-rpc = { workspace = true } +pallet-encointer-communities-rpc-runtime-api = { workspace = true, features = ["std"] } # Substrate dependencies -frame-benchmarking = "24.0.0" -frame-benchmarking-cli = "28.0.0" -sc-basic-authorship = "0.30.0" -sc-chain-spec = "23.0.0" -sc-cli = "0.32.0" -sc-client-api = "24.0.0" -sc-consensus = "0.29.0" -sc-executor = "0.28.0" -sc-network = "0.30.0" -sc-network-common = "0.29.0" -sc-network-sync = "0.29.0" -sc-rpc = "25.0.0" -sc-service = "0.31.0" -sc-sysinfo = "23.0.0" -sc-telemetry = "11.0.0" -sc-tracing = "24.0.0" -sc-transaction-pool = "24.0.0" -sp-api = "22.0.0" -sp-block-builder = "22.0.0" -sp-blockchain = "24.0.0" -sp-consensus = "0.28.0" -sp-consensus-aura = "0.28.0" -sp-core = "24.0.0" -sp-inherents = "22.0.0" -sp-io = "26.0.0" -sp-keyring = "27.0.0" -sp-keystore = "0.30.0" -sp-offchain = "22.0.0" -sp-runtime = { default-features = false, version = "27.0.0" } -#sp-serializer = -sp-session = "23.0.0" -sp-timestamp = "22.0.0" -sp-transaction-pool = "22.0.0" -substrate-prometheus-endpoint = "0.15.0" -try-runtime-cli = { optional = true, version = "0.34.0" } +frame-benchmarking = { workspace = true, features = ["std"] } +frame-benchmarking-cli = { workspace = true } +sc-basic-authorship = { workspace = true } +sc-chain-spec = { workspace = true } +sc-cli = { workspace = true } +sc-client-api = { workspace = true } +sc-consensus = { workspace = true } +sc-executor = { workspace = true } +sc-network = { workspace = true } +sc-network-common = { workspace = true } +sc-network-sync = { workspace = true } +sc-rpc = { workspace = true } +sc-service = { workspace = true } +sc-sysinfo = { workspace = true } +sc-telemetry = { workspace = true } +sc-tracing = { workspace = true } +sc-transaction-pool = { workspace = true } +sp-api = { workspace = true, features = ["std"] } +sp-block-builder = { workspace = true, features = ["std"] } +sp-blockchain = { workspace = true } +sp-consensus = { workspace = true } +sp-consensus-aura = { workspace = true, features = ["std"] } +sp-core = { workspace = true, features = ["std"] } +sp-inherents = { workspace = true, features = ["std"] } +sp-io = { workspace = true, features = ["std"] } +sp-keyring = { workspace = true } +sp-keystore = { workspace = true, features = ["std"] } +sp-offchain = { workspace = true, features = ["std"] } +sp-runtime = { workspace = true } +sp-session = { workspace = true, features = ["std"] } +sp-timestamp = { workspace = true, features = ["std"] } +sp-transaction-pool = { workspace = true, features = ["std"] } +substrate-prometheus-endpoint = { workspace = true } +try-runtime-cli = { workspace = true, optional = true } # RPC related dependencies -frame-rpc-system = { package = "substrate-frame-rpc-system", version = "24.0.0" } -pallet-transaction-payment-rpc = "26.0.0" -sc-transaction-pool-api = "24.0.0" +frame-rpc-system = { workspace = true } +pallet-transaction-payment-rpc = { workspace = true } +sc-transaction-pool-api = { workspace = true } # Polkadot dependencies -polkadot-cli = "3.0.0" -polkadot-parachain-primitives = "2.0.0" -polkadot-primitives = "3.0.0" -polkadot-service = "3.0.0" -xcm = { package = "staging-xcm", default-features = false, version = "3.0.0" } +polkadot-cli = { workspace = true } +polkadot-parachain-primitives = { workspace = true } +polkadot-primitives = { workspace = true } +polkadot-service = { workspace = true } +xcm = { workspace = true, features = ["std"] } # Cumulus -cumulus-client-cli = "0.3.0" -cumulus-client-collator = "0.3.0" -cumulus-client-consensus-aura = "0.3.0" -cumulus-client-consensus-common = "0.3.0" -cumulus-client-consensus-proposer = "0.3.0" -cumulus-client-consensus-relay-chain = "0.3.0" -cumulus-client-network = "0.3.0" -cumulus-client-service = "0.3.0" -cumulus-primitives-core = "0.3.0" -cumulus-primitives-parachain-inherent = "0.3.0" -cumulus-relay-chain-inprocess-interface = "0.3.0" -cumulus-relay-chain-interface = "0.3.0" -cumulus-relay-chain-rpc-interface = "0.3.0" +cumulus-client-cli = { workspace = true } +cumulus-client-collator = { workspace = true } +cumulus-client-consensus-aura = { workspace = true } +cumulus-client-consensus-common = { workspace = true } +cumulus-client-consensus-proposer = { workspace = true } +cumulus-client-consensus-relay-chain = { workspace = true } +cumulus-client-network = { workspace = true } +cumulus-client-service = { workspace = true } +cumulus-primitives-core = { workspace = true } +cumulus-primitives-parachain-inherent = { workspace = true } +cumulus-relay-chain-inprocess-interface = { workspace = true } +cumulus-relay-chain-interface = { workspace = true } +cumulus-relay-chain-rpc-interface = { workspace = true } [build-dependencies] -substrate-build-script-utils = "8.0.0" +substrate-build-script-utils = { workspace = true } [dev-dependencies] -assert_cmd = "2.0" -nix = "0.24" -tempfile = "3.3.0" +assert_cmd = { workspace = true } +nix = { workspace = true } +tempfile = { workspace = true } [features] default = [] diff --git a/polkadot-parachains/encointer-runtime/Cargo.toml b/polkadot-parachains/encointer-runtime/Cargo.toml index 988bd93..5197fb8 100644 --- a/polkadot-parachains/encointer-runtime/Cargo.toml +++ b/polkadot-parachains/encointer-runtime/Cargo.toml @@ -8,99 +8,91 @@ license = "GPL-3.0" edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ - "derive", -] } -log = { version = "0.4.20", default-features = false } -parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.3.0" } -scale-info = { version = "2.0.1", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.132", default-features = false, optional = true, features = [ - "derive", -] } +log = { workspace = true } +parachain-info = { workspace = true } +parity-scale-codec = { workspace = true } +scale-info = { workspace = true } +serde = { workspace = true } # encointer deps -encointer-balances-tx-payment = { default-features = false, version = "2.0.0" } -encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "2.0.0" } -encointer-primitives = { default-features = false, version = "2.0.0" } -pallet-encointer-balances = { default-features = false, version = "2.0.0" } -pallet-encointer-bazaar = { default-features = false, version = "2.0.0" } -pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "2.0.0" } -pallet-encointer-ceremonies = { default-features = false, version = "2.0.0" } -pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "2.0.0" } -pallet-encointer-communities = { default-features = false, version = "2.0.0" } -pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "2.0.0" } -pallet-encointer-faucet = { default-features = false, version = "2.0.0" } -pallet-encointer-reputation-commitments = { default-features = false, version = "2.0.0" } -pallet-encointer-scheduler = { default-features = false, version = "2.0.0" } +encointer-balances-tx-payment = { workspace = true } +encointer-balances-tx-payment-rpc-runtime-api = { workspace = true } +encointer-primitives = { workspace = true } +pallet-encointer-balances = { workspace = true } +pallet-encointer-bazaar = { workspace = true } +pallet-encointer-bazaar-rpc-runtime-api = { workspace = true } +pallet-encointer-ceremonies = { workspace = true } +pallet-encointer-ceremonies-rpc-runtime-api = { workspace = true } +pallet-encointer-communities = { workspace = true } +pallet-encointer-communities-rpc-runtime-api = { workspace = true } +pallet-encointer-faucet = { workspace = true } +pallet-encointer-reputation-commitments = { workspace = true } +pallet-encointer-scheduler = { workspace = true } # Substrate dependencies (figure out crates.io versions in the respective release-crates-io-* branch: https://github.com/paritytech/polkadot-sdk/blob/release-crates-io-v1.2.0/Cargo.lock -sp-api = { default-features = false, version = "22.0.0" } -sp-block-builder = { default-features = false, version = "22.0.0" } -sp-consensus-aura = { default-features = false, version = "0.28.0" } -sp-core = { default-features = false, version = "24.0.0" } -sp-inherents = { default-features = false, version = "22.0.0" } -sp-io = { default-features = false, version = "26.0.0" } -sp-offchain = { default-features = false, version = "22.0.0" } -sp-runtime = { default-features = false, version = "27.0.0" } -sp-session = { default-features = false, version = "23.0.0" } -sp-std = { default-features = false, version = "11.0.0" } -sp-transaction-pool = { default-features = false, version = "22.0.0" } -sp-version = { default-features = false, version = "25.0.0" } +sp-api = { workspace = true } +sp-block-builder = { workspace = true } +sp-consensus-aura = { workspace = true } +sp-core = { workspace = true } +sp-inherents = { workspace = true } +sp-io = { workspace = true } +sp-offchain = { workspace = true } +sp-runtime = { workspace = true } +sp-session = { workspace = true } +sp-std = { workspace = true } +sp-transaction-pool = { workspace = true } +sp-version = { workspace = true } -frame-executive = { default-features = false, version = "24.0.0" } -frame-support = { default-features = false, version = "24.0.0" } -frame-system = { default-features = false, version = "24.0.0" } -frame-system-rpc-runtime-api = { default-features = false, version = "22.0.0" } -pallet-asset-tx-payment = { default-features = false, version = "24.0.0" } -pallet-aura = { default-features = false, version = "23.0.0" } -pallet-balances = { default-features = false, version = "24.0.0" } -pallet-collective = { default-features = false, version = "24.0.0" } -pallet-insecure-randomness-collective-flip = { default-features = false, version = "12.0.0" } -pallet-membership = { default-features = false, version = "24.0.0" } -pallet-proxy = { default-features = false, version = "24.0.0" } -pallet-scheduler = { default-features = false, version = "25.0.0" } -pallet-timestamp = { default-features = false, version = "23.0.0" } -pallet-transaction-payment = { default-features = false, version = "24.0.0" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "24.0.0" } -pallet-treasury = { default-features = false, version = "23.0.0" } -pallet-utility = { default-features = false, version = "24.0.0" } +frame-executive = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } +frame-system-rpc-runtime-api = { workspace = true } +pallet-asset-tx-payment = { workspace = true } +pallet-aura = { workspace = true } +pallet-balances = { workspace = true } +pallet-collective = { workspace = true } +pallet-insecure-randomness-collective-flip = { workspace = true } +pallet-membership = { workspace = true } +pallet-proxy = { workspace = true } +pallet-scheduler = { workspace = true } +pallet-timestamp = { workspace = true } +pallet-transaction-payment = { workspace = true } +pallet-transaction-payment-rpc-runtime-api = { workspace = true } +pallet-treasury = { workspace = true } +pallet-utility = { workspace = true } -parachains-common = { default-features = false, version = "3.0.0" } +parachains-common = { workspace = true } # Cumulus dependencies -cumulus-pallet-aura-ext = { default-features = false, version = "0.3.0" } -cumulus-pallet-dmp-queue = { default-features = false, version = "0.3.0" } -cumulus-pallet-parachain-system = { default-features = false, features = [ - "parameterized-consensus-hook", -], version = "0.3.0" } -cumulus-pallet-xcm = { default-features = false, version = "0.3.0" } -cumulus-pallet-xcmp-queue = { default-features = false, version = "0.3.0" } -cumulus-primitives-core = { default-features = false, version = "0.3.0" } -cumulus-primitives-timestamp = { default-features = false, version = "0.3.0" } -cumulus-primitives-utility = { default-features = false, version = "0.3.0" } +cumulus-pallet-aura-ext = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-xcm = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-core = { workspace = true } +cumulus-primitives-timestamp = { workspace = true } +cumulus-primitives-utility = { workspace = true } # Polkadot dependencies -pallet-xcm = { default-features = false, version = "3.0.0" } -polkadot-parachain-primitives = { default-features = false, version = "2.0.0" } -polkadot-runtime-common = { default-features = false, version = "3.0.0" } -xcm = { package = "staging-xcm", default-features = false, version = "3.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "3.0.0" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "3.0.0" } +pallet-xcm = { workspace = true } +polkadot-parachain-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # used for try-runtime -frame-try-runtime = { default-features = false, optional = true, version = "0.30.0" } -try-runtime-cli = { default-features = false, optional = true, version = "0.34.0" } +frame-try-runtime = { workspace = true, optional = true } +try-runtime-cli = { workspace = true, optional = true } # Used for runtime benchmarking -frame-benchmarking = { default-features = false, optional = true, version = "24.0.0" } -frame-system-benchmarking = { default-features = false, optional = true, version = "24.0.0" } -hex-literal = { version = "0.3.1", optional = true } +frame-benchmarking = { workspace = true, optional = true } +frame-system-benchmarking = { workspace = true, optional = true } +hex-literal = { workspace = true, optional = true } [build-dependencies] -substrate-wasm-builder = { optional = true, version = "13.0.0" } +substrate-wasm-builder = { workspace = true, optional = true } [features] default = ["std"] @@ -131,7 +123,7 @@ runtime-benchmarks = [ "xcm-executor/runtime-benchmarks", ] std = [ - "codec/std", + "parity-scale-codec/std", "cumulus-pallet-aura-ext/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", diff --git a/polkadot-parachains/encointer-runtime/src/lib.rs b/polkadot-parachains/encointer-runtime/src/lib.rs index 9abf611..fe9c3f8 100644 --- a/polkadot-parachains/encointer-runtime/src/lib.rs +++ b/polkadot-parachains/encointer-runtime/src/lib.rs @@ -50,7 +50,6 @@ use sp_std::prelude::*; use sp_version::NativeVersion; use sp_version::RuntimeVersion; -use codec::{Decode, Encode, MaxEncodedLen}; use encointer_balances_tx_payment::{AssetBalanceOf, AssetIdOf, BalanceToCommunityBalance}; use frame_support::{ construct_runtime, @@ -68,6 +67,7 @@ use frame_system::{ EnsureRoot, }; pub use parachains_common as common; +use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_runtime::RuntimeDebug; use parachains_common::{ diff --git a/polkadot-parachains/launch-runtime/Cargo.toml b/polkadot-parachains/launch-runtime/Cargo.toml index be8e3bf..c0ea4bb 100644 --- a/polkadot-parachains/launch-runtime/Cargo.toml +++ b/polkadot-parachains/launch-runtime/Cargo.toml @@ -7,84 +7,78 @@ license = "GPL-3.0" edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ - "derive", -] } -log = { version = "0.4.20", default-features = false } -parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.3.0" } -scale-info = { version = "2.5.0", default-features = false, features = [ - "derive", -] } -serde = { version = "1.0.132", default-features = false, optional = true, features = ["derive"] } +log = { workspace = true } +parachain-info = { workspace = true } +parity-scale-codec = { workspace = true } +scale-info = { workspace = true } +serde = { workspace = true } # local deps runtime-common = { default-features = false, path = "../runtime-common" } # Substrate dependencies -sp-api = { default-features = false, version = "22.0.0" } -sp-block-builder = { default-features = false, version = "22.0.0" } -sp-consensus-aura = { default-features = false, version = "0.28.0" } -sp-core = { default-features = false, version = "24.0.0" } -sp-inherents = { default-features = false, version = "22.0.0" } -sp-io = { default-features = false, version = "26.0.0" } -sp-offchain = { default-features = false, version = "22.0.0" } -sp-runtime = { default-features = false, version = "27.0.0" } -sp-session = { default-features = false, version = "23.0.0" } -sp-std = { default-features = false, version = "11.0.0" } -sp-transaction-pool = { default-features = false, version = "22.0.0" } -sp-version = { default-features = false, version = "25.0.0" } +sp-api = { workspace = true } +sp-block-builder = { workspace = true } +sp-consensus-aura = { workspace = true } +sp-core = { workspace = true } +sp-inherents = { workspace = true } +sp-io = { workspace = true } +sp-offchain = { workspace = true } +sp-runtime = { workspace = true } +sp-session = { workspace = true } +sp-std = { workspace = true } +sp-transaction-pool = { workspace = true } +sp-version = { workspace = true } -frame-executive = { default-features = false, version = "24.0.0" } -frame-support = { default-features = false, version = "24.0.0" } -frame-system = { default-features = false, version = "24.0.0" } -frame-system-rpc-runtime-api = { default-features = false, version = "22.0.0" } -pallet-asset-tx-payment = { default-features = false, version = "24.0.0" } -pallet-aura = { default-features = false, version = "23.0.0" } -pallet-balances = { default-features = false, version = "24.0.0" } -pallet-collective = { default-features = false, version = "24.0.0" } -pallet-insecure-randomness-collective-flip = { default-features = false, version = "12.0.0" } -pallet-membership = { default-features = false, version = "24.0.0" } -pallet-proxy = { default-features = false, version = "24.0.0" } -pallet-scheduler = { default-features = false, version = "25.0.0" } -pallet-timestamp = { default-features = false, version = "23.0.0" } -pallet-transaction-payment = { default-features = false, version = "24.0.0" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "24.0.0" } -pallet-treasury = { default-features = false, version = "23.0.0" } -pallet-utility = { default-features = false, version = "24.0.0" } +frame-executive = { workspace = true } +frame-support = { workspace = true } +frame-system = { workspace = true } +frame-system-rpc-runtime-api = { workspace = true } +pallet-asset-tx-payment = { workspace = true } +pallet-aura = { workspace = true } +pallet-balances = { workspace = true } +pallet-collective = { workspace = true } +pallet-insecure-randomness-collective-flip = { workspace = true } +pallet-membership = { workspace = true } +pallet-proxy = { workspace = true } +pallet-scheduler = { workspace = true } +pallet-timestamp = { workspace = true } +pallet-transaction-payment = { workspace = true } +pallet-transaction-payment-rpc-runtime-api = { workspace = true } +pallet-treasury = { workspace = true } +pallet-utility = { workspace = true } -parachains-common = { default-features = false, version = "3.0.0" } +parachains-common = { workspace = true } # Cumulus dependencies -cumulus-pallet-aura-ext = { default-features = false, version = "0.3.0" } -cumulus-pallet-dmp-queue = { default-features = false, version = "0.3.0" } -cumulus-pallet-parachain-system = { default-features = false, features = [ - "parameterized-consensus-hook", -], version = "0.3.0" } -cumulus-pallet-xcm = { default-features = false, version = "0.3.0" } -cumulus-pallet-xcmp-queue = { default-features = false, version = "0.3.0" } -cumulus-primitives-core = { default-features = false, version = "0.3.0" } -cumulus-primitives-timestamp = { default-features = false, version = "0.3.0" } -cumulus-primitives-utility = { default-features = false, version = "0.3.0" } +cumulus-pallet-aura-ext = { workspace = true } +cumulus-pallet-dmp-queue = { workspace = true } +cumulus-pallet-parachain-system = { workspace = true } +cumulus-pallet-xcm = { workspace = true } +cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-core = { workspace = true } +cumulus-primitives-timestamp = { workspace = true } +cumulus-primitives-utility = { workspace = true } # Polkadot dependencies -pallet-xcm = { default-features = false, version = "3.0.0" } -polkadot-parachain-primitives = { default-features = false, version = "2.0.0" } -polkadot-runtime-common = { default-features = false, version = "3.0.0" } -xcm = { package = "staging-xcm", default-features = false, version = "3.0.0" } -xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "3.0.0" } -xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "3.0.0" } +pallet-xcm = { workspace = true } +polkadot-parachain-primitives = { workspace = true } +polkadot-runtime-common = { workspace = true } +xcm = { workspace = true } +xcm-builder = { workspace = true } +xcm-executor = { workspace = true } # used for try-runtime -frame-try-runtime = { default-features = false, optional = true, version = "0.30.0" } -try-runtime-cli = { default-features = false, optional = true, version = "0.34.0" } +frame-try-runtime = { workspace = true, optional = true } +try-runtime-cli = { workspace = true, optional = true } # Used for runtime benchmarking -frame-benchmarking = { default-features = false, optional = true, version = "24.0.0" } -frame-system-benchmarking = { default-features = false, optional = true, version = "24.0.0" } -hex-literal = { version = "0.3.1", optional = true } +frame-benchmarking = { workspace = true, optional = true } +frame-system-benchmarking = { workspace = true, optional = true } +hex-literal = { workspace = true, optional = true } [build-dependencies] -substrate-wasm-builder = { optional = true, version = "13.0.0" } +substrate-wasm-builder = { workspace = true, optional = true } [features] default = ["std"] @@ -108,7 +102,7 @@ runtime-benchmarks = [ "xcm-executor/runtime-benchmarks", ] std = [ - "codec/std", + "parity-scale-codec/std", "cumulus-pallet-aura-ext/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", diff --git a/polkadot-parachains/runtime-common/Cargo.toml b/polkadot-parachains/runtime-common/Cargo.toml index bb9dbe7..00ef636 100644 --- a/polkadot-parachains/runtime-common/Cargo.toml +++ b/polkadot-parachains/runtime-common/Cargo.toml @@ -4,16 +4,16 @@ version = "0.1.0" edition = "2021" [dependencies] -smallvec = "1.6.1" +smallvec = { workspace = true } -kusama-runtime-constants = { default-features = false, version = "3.0.0" } -polkadot-core-primitives = { default-features = false, version = "3.0.0" } +kusama-runtime-constants = { workspace = true } +polkadot-core-primitives = { workspace = true } -frame-support = { default-features = false, version = "24.0.0" } -frame-system = { default-features = false, version = "24.0.0" } -pallet-balances = { default-features = false, version = "24.0.0" } -pallet-treasury = { default-features = false, version = "23.0.0" } -sp-runtime = { default-features = false, version = "27.0.0" } +frame-support = { workspace = true } +frame-system = { workspace = true } +pallet-balances = { workspace = true } +pallet-treasury = { workspace = true } +sp-runtime = { workspace = true } [features] default = ["std"] diff --git a/polkadot-parachains/src/service.rs b/polkadot-parachains/src/service.rs index cca4323..cecd648 100644 --- a/polkadot-parachains/src/service.rs +++ b/polkadot-parachains/src/service.rs @@ -13,7 +13,6 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . -use codec::Codec; use cumulus_client_cli::CollatorOptions; use cumulus_client_collator::service::CollatorService; use cumulus_client_consensus_aura::collators::basic::{ @@ -29,6 +28,7 @@ use cumulus_client_service::{ }; use cumulus_primitives_core::{relay_chain::v2::Hash as PHash, ParaId, PersistedValidationData}; use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; +use parity_scale_codec::Codec; use sc_consensus::ImportQueue; use sp_core::Pair; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 1cb251a..c344275 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,15 @@ # https://stackoverflow.com/questions/75955457/substrate-node-template-cannot-create-a-runtime-error-othercannot-deserialize [toolchain] -channel = "nightly-2023-05-22" -components = [ "rustfmt" ] -targets = [ "wasm32-unknown-unknown" ] -profile = "minimal" +channel = "nightly-2023-11-01" +components = [ + "cargo", + "clippy", + "rust-analyzer", + "rust-src", + "rust-std", + "rustc", + "rustc-dev", + "rustfmt", +] +targets = ["wasm32-unknown-unknown"] +profile = "default" # include rustfmt, clippy