From 841208380709e338c8ae0a4b15ea5772d73252dd Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Sat, 19 Nov 2022 14:17:57 +0300 Subject: [PATCH] Drop crowdloan pallet (fix runtime version section) --- Cargo.lock | 133 ++++++++------------------------------- bin/node/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- runtime/alpha/Cargo.toml | 6 +- runtime/alpha/src/lib.rs | 11 +--- runtime/ipci/Cargo.toml | 2 +- runtime/local/Cargo.toml | 2 +- runtime/main/Cargo.toml | 6 +- runtime/main/src/lib.rs | 11 +--- service/Cargo.toml | 2 +- 10 files changed, 34 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45d3dedf8..05b88d113 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "alpha-runtime" -version = "2.5.0" +version = "2.6.0" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -100,7 +100,6 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-identity", - "pallet-robonomics-crowdloan", "pallet-robonomics-datalog", "pallet-robonomics-digital-twin", "pallet-robonomics-launch", @@ -119,7 +118,6 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "robonomics-primitives", - "rococo-runtime", "scale-info", "serde", "serde_derive", @@ -1854,9 +1852,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" dependencies = [ "cc", "cxxbridge-flags", @@ -1866,9 +1864,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" dependencies = [ "cc", "codespan-reporting", @@ -1881,15 +1879,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" [[package]] name = "cxxbridge-macro" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", @@ -3327,9 +3325,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3389,7 +3387,7 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipci-runtime" -version = "2.5.0" +version = "2.6.0" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -4607,7 +4605,7 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "local-runtime" -version = "2.5.0" +version = "2.6.0" dependencies = [ "frame-benchmarking", "frame-executive", @@ -4736,7 +4734,7 @@ dependencies = [ [[package]] name = "main-runtime" -version = "2.5.0" +version = "2.6.0" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -4748,7 +4746,6 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "kusama-runtime", "lazy_static", "pallet-assets", "pallet-balances", @@ -4758,7 +4755,6 @@ dependencies = [ "pallet-membership", "pallet-multisig", "pallet-preimage", - "pallet-robonomics-crowdloan", "pallet-robonomics-datalog", "pallet-robonomics-digital-twin", "pallet-robonomics-launch", @@ -8106,11 +8102,10 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -8118,9 +8113,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -8295,7 +8290,7 @@ dependencies = [ [[package]] name = "robonomics-node" -version = "2.5.0" +version = "2.6.0" dependencies = [ "parity-util-mem", "robonomics-service", @@ -8339,7 +8334,7 @@ dependencies = [ [[package]] name = "robonomics-rpc" -version = "2.5.0" +version = "2.6.0" dependencies = [ "hex", "jsonrpsee 0.15.1", @@ -8369,7 +8364,7 @@ dependencies = [ [[package]] name = "robonomics-service" -version = "2.4.0" +version = "2.6.0" dependencies = [ "alpha-runtime", "clap", @@ -8469,84 +8464,6 @@ dependencies = [ "librocksdb-sys", ] -[[package]] -name = "rococo-runtime" -version = "0.9.28" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.28#314298c32ac6df996ea8f3fe23fa5d3768340066" -dependencies = [ - "beefy-merkle-tree", - "beefy-primitives", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-collective", - "pallet-grandpa", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-mmr", - "pallet-multisig", - "pallet-offences", - "pallet-proxy", - "pallet-session", - "pallet-staking", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm 0.9.28", - "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rococo-runtime-constants", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)", - "sp-inherents", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)", - "sp-session", - "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] -name = "rococo-runtime-constants" -version = "0.9.28" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.28#314298c32ac6df996ea8f3fe23fa5d3768340066" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.28)", -] - [[package]] name = "rpassword" version = "5.0.1" @@ -9959,9 +9876,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", @@ -11705,9 +11622,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml index 1c712e370..52852c844 100644 --- a/bin/node/Cargo.toml +++ b/bin/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "robonomics-node" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] description = "Robonomics node implementation in Rust & Substrate." edition = "2021" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 31e7666d3..581eceaec 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "robonomics-rpc" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] edition = "2021" license = "Apache-2.0" diff --git a/runtime/alpha/Cargo.toml b/runtime/alpha/Cargo.toml index 884fe30b1..f75bc8daa 100644 --- a/runtime/alpha/Cargo.toml +++ b/runtime/alpha/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alpha-runtime" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] edition = "2021" build = "build.rs" @@ -47,7 +47,6 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false } # robonomics dependencies -pallet-robonomics-crowdloan = { path = "../../frame/crowdloan", default-features = false } pallet-robonomics-rws = { path = "../../frame/rws", default-features = false } pallet-robonomics-launch = { path = "../../frame/launch", default-features = false } pallet-robonomics-datalog = { path = "../../frame/datalog", default-features = false } @@ -72,7 +71,6 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature pallet-xcm = { path = "../../vendor/pallet-xcm", default-features = false } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.28" } polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', default-features = false, branch = "release-v0.9.28" } -rococo-runtime = { git = 'https://github.com/paritytech/polkadot', default-features = false, branch = "release-v0.9.28" } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } @@ -108,7 +106,6 @@ std = [ "pallet-timestamp/std", "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-robonomics-crowdloan/std", "pallet-robonomics-rws/std", "pallet-robonomics-launch/std", "pallet-robonomics-datalog/std", @@ -129,6 +126,5 @@ std = [ "pallet-xcm/std", "polkadot-parachain/std", "polkadot-primitives/std", - "rococo-runtime/std", "scale-info/std", ] diff --git a/runtime/alpha/src/lib.rs b/runtime/alpha/src/lib.rs index 90d7ded76..318fe3ece 100644 --- a/runtime/alpha/src/lib.rs +++ b/runtime/alpha/src/lib.rs @@ -77,7 +77,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("robonomics-alpha"), impl_name: create_runtime_str!("robonomics-airalab"), authoring_version: 1, - spec_version: 9, + spec_version: 11, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -355,14 +355,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } -impl pallet_robonomics_crowdloan::Config for Runtime { - type ParachainId = ParachainInfo; - type XcmRouter = xcm_config::XcmRouter; - type RelayRuntime = rococo_runtime::Runtime; - type RelayCall = rococo_runtime::Call; - type Event = Event; -} - parameter_types! { pub const WindowSize: u64 = 128; pub const MaximumMessageSize: usize = 512; @@ -472,7 +464,6 @@ construct_runtime! { TransactionPayment: pallet_transaction_payment, // Robonomics Network pallets. - Crowdloan: pallet_robonomics_crowdloan, Datalog: pallet_robonomics_datalog, Launch: pallet_robonomics_launch, RWS: pallet_robonomics_rws, diff --git a/runtime/ipci/Cargo.toml b/runtime/ipci/Cargo.toml index 25b259e45..36540b703 100644 --- a/runtime/ipci/Cargo.toml +++ b/runtime/ipci/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ipci-runtime" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] edition = "2021" build = "build.rs" diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index e0ced1384..0a46761b0 100644 --- a/runtime/local/Cargo.toml +++ b/runtime/local/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "local-runtime" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] edition = "2021" build = "build.rs" diff --git a/runtime/main/Cargo.toml b/runtime/main/Cargo.toml index 7294ea3a8..ec8737abd 100644 --- a/runtime/main/Cargo.toml +++ b/runtime/main/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "main-runtime" -version = "2.5.0" +version = "2.6.0" authors = ["Airalab "] edition = "2021" build = "build.rs" @@ -54,7 +54,6 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28", default-features = false } # robonomics dependencies -pallet-robonomics-crowdloan = { path = "../../frame/crowdloan", default-features = false } pallet-robonomics-datalog = { path = "../../frame/datalog", default-features = false } pallet-robonomics-digital-twin = { path = "../../frame/digital-twin", default-features = false } pallet-robonomics-launch = { path = "../../frame/launch", default-features = false } @@ -79,7 +78,6 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature pallet-xcm = { path = "../../vendor/pallet-xcm", default-features = false } polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.28" } polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', default-features = false, branch = "release-v0.9.28" } -kusama-runtime = { git = 'https://github.com/paritytech/polkadot', default-features = false, branch = "release-v0.9.28" } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.28" } @@ -127,7 +125,6 @@ std = [ "pallet-robonomics-launch/std", "pallet-robonomics-liability/std", "pallet-robonomics-lighthouse/std", - "pallet-robonomics-crowdloan/std", "pallet-robonomics-rws/std", "pallet-robonomics-staking/std", "cumulus-pallet-parachain-system/std", @@ -143,6 +140,5 @@ std = [ "polkadot-parachain/std", "polkadot-primitives/std", "parachain-info/std", - "kusama-runtime/std", "scale-info/std", ] diff --git a/runtime/main/src/lib.rs b/runtime/main/src/lib.rs index 46b7413cf..72d9b561d 100644 --- a/runtime/main/src/lib.rs +++ b/runtime/main/src/lib.rs @@ -75,7 +75,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("robonomics"), impl_name: create_runtime_str!("robonomics-airalab"), authoring_version: 1, - spec_version: 26, + spec_version: 28, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -539,14 +539,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} -impl pallet_robonomics_crowdloan::Config for Runtime { - type ParachainId = ParachainInfo; - type XcmRouter = xcm_config::XcmRouter; - type RelayRuntime = kusama_runtime::Runtime; - type RelayCall = kusama_runtime::Call; - type Event = Event; -} - parameter_types! { pub const WindowSize: u64 = 128; pub const MaximumMessageSize: usize = 512; @@ -671,7 +663,6 @@ construct_runtime! { DigitalTwin: pallet_robonomics_digital_twin = 54, RWS: pallet_robonomics_rws = 55, Liability: pallet_robonomics_liability = 56, - Crowdloan: pallet_robonomics_crowdloan = 57, Lighthouse: pallet_robonomics_lighthouse = 60, diff --git a/service/Cargo.toml b/service/Cargo.toml index 35e18b73b..a4756e965 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "robonomics-service" -version = "2.4.0" +version = "2.6.0" authors = ["Airalab "] description = "Robonomics node console line interface." build = "build.rs"