From e912c1c82ae3ea5082d4b3d2044d3c502c9157da Mon Sep 17 00:00:00 2001 From: NachoPal Date: Wed, 20 Oct 2021 18:20:57 +0200 Subject: [PATCH 1/5] randomess collective flip removed --- Cargo.lock | 87 +++++++++++++++++++----- parachain-template/runtime/Cargo.toml | 2 - parachain-template/runtime/src/lib.rs | 3 - polkadot-parachains/rococo/Cargo.toml | 2 - polkadot-parachains/rococo/src/lib.rs | 14 +++- polkadot-parachains/statemine/Cargo.toml | 2 - polkadot-parachains/statemine/src/lib.rs | 15 ++-- polkadot-parachains/statemint/Cargo.toml | 2 - polkadot-parachains/statemint/src/lib.rs | 14 +++- polkadot-parachains/westmint/Cargo.toml | 2 - polkadot-parachains/westmint/src/lib.rs | 15 ++-- test/runtime-upgrade/Cargo.toml | 2 - test/runtime/Cargo.toml | 2 - test/runtime/src/lib.rs | 3 - 14 files changed, 115 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d43bd2a15c..2b0a2c91327 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1877,7 +1877,6 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "pallet-randomness-collective-flip", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -1909,7 +1908,6 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "pallet-randomness-collective-flip", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -5657,6 +5655,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "pallet-randomness-collective-flip" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#794e9a91927dda5ffa6b29b1771ccdde947af7a2" @@ -5671,6 +5670,8 @@ dependencies = [ ] [[package]] +======= +>>>>>>> d3fb4f06 (randomess collective flip removed) name = "pallet-recovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a9465729e2c5d2ef8d87ac404da27e5e10adde8a" @@ -6098,7 +6099,6 @@ dependencies = [ "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-randomness-collective-flip", "pallet-session", "pallet-sudo", "pallet-template", @@ -8439,6 +8439,74 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD +======= +name = "rockmine-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "hex-literal 0.3.3", + "log", + "node-primitives", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-proxy", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain", + "polkadot-runtime-common", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +>>>>>>> d3fb4f06 (randomess collective flip removed) name = "rocksdb" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8469,7 +8537,6 @@ dependencies = [ "pallet-assets", "pallet-aura", "pallet-balances", - "pallet-randomness-collective-flip", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -8661,15 +8728,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -[[package]] -name = "safe-mix" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" -dependencies = [ - "rustc_version 0.2.3", -] - [[package]] name = "salsa20" version = "0.8.1" @@ -10833,7 +10891,6 @@ dependencies = [ "pallet-collator-selection", "pallet-multisig", "pallet-proxy", - "pallet-randomness-collective-flip", "pallet-session", "pallet-sudo", "pallet-timestamp", @@ -10899,7 +10956,6 @@ dependencies = [ "pallet-collator-selection", "pallet-multisig", "pallet-proxy", - "pallet-randomness-collective-flip", "pallet-session", "pallet-sudo", "pallet-timestamp", @@ -12325,7 +12381,6 @@ dependencies = [ "pallet-collator-selection", "pallet-multisig", "pallet-proxy", - "pallet-randomness-collective-flip", "pallet-session", "pallet-sudo", "pallet-timestamp", diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml index e3da6f807b3..8c9b76202fd 100644 --- a/parachain-template/runtime/Cargo.toml +++ b/parachain-template/runtime/Cargo.toml @@ -51,7 +51,6 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate" pallet-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" } @@ -106,7 +105,6 @@ std = [ "pallet-authorship/std", "pallet-balances/std", "pallet-collator-selection/std", - "pallet-randomness-collective-flip/std", "pallet-session/std", "pallet-sudo/std", "pallet-template/std", diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs index a5cf0d7a3ab..338a39aed6d 100644 --- a/parachain-template/runtime/src/lib.rs +++ b/parachain-template/runtime/src/lib.rs @@ -390,8 +390,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedXcmpWeight = ReservedXcmpWeight; } -impl pallet_randomness_collective_flip::Config for Runtime {} - impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -629,7 +627,6 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system::{ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned, } = 1, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, diff --git a/polkadot-parachains/rococo/Cargo.toml b/polkadot-parachains/rococo/Cargo.toml index 1c4e12ce5f3..72cda0e06a6 100644 --- a/polkadot-parachains/rococo/Cargo.toml +++ b/polkadot-parachains/rococo/Cargo.toml @@ -32,7 +32,6 @@ frame-system = { git = "https://github.com/paritytech/substrate", default-featur frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -85,7 +84,6 @@ std = [ "frame-system/std", "pallet-assets/std", "pallet-balances/std", - "pallet-randomness-collective-flip/std", "pallet-timestamp/std", "pallet-sudo/std", "pallet-transaction-payment/std", diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index 698fcaad09f..aabe7e8984d 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -232,8 +232,6 @@ impl pallet_balances::Config for Runtime { type ReserveIdentifier = [u8; 8]; } -impl pallet_randomness_collective_flip::Config for Runtime {} - parameter_types! { pub const OperationalFeeMultiplier: u8 = 5; } @@ -512,7 +510,6 @@ construct_runtime! { System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, ParachainSystem: cumulus_pallet_parachain_system::{ @@ -579,8 +576,19 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, + RemoveCollectiveFlip >; +pub struct RemoveCollectiveFlip; +impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip { + fn on_runtime_upgrade() -> Weight { + use frame_support::storage::migration; + // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip` + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + ::DbWeight::get().writes(1) + } +} + impl_runtime_apis! { impl sp_api::Core for Runtime { fn version() -> RuntimeVersion { diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml index ce1b05faadf..63f2446a983 100644 --- a/polkadot-parachains/statemine/Cargo.toml +++ b/polkadot-parachains/statemine/Cargo.toml @@ -40,7 +40,6 @@ pallet-authorship = { git = "https://github.com/paritytech/substrate", default-f pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -127,7 +126,6 @@ std = [ "pallet-balances/std", "pallet-multisig/std", "pallet-proxy/std", - "pallet-randomness-collective-flip/std", "pallet-session/std", "pallet-sudo/std", "pallet-timestamp/std", diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs index 715b5dc3a14..1976eab41e8 100644 --- a/polkadot-parachains/statemine/src/lib.rs +++ b/polkadot-parachains/statemine/src/lib.rs @@ -457,8 +457,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedXcmpWeight = ReservedXcmpWeight; } -impl pallet_randomness_collective_flip::Config for Runtime {} - impl parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -724,7 +722,6 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system::{ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned, } = 1, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, @@ -786,9 +783,19 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - (), + RemoveCollectiveFlip, >; +pub struct RemoveCollectiveFlip; +impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip { + fn on_runtime_upgrade() -> Weight { + use frame_support::storage::migration; + // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip` + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + ::DbWeight::get().writes(1) + } +} + impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml index 58b3e826c08..89d796ff300 100644 --- a/polkadot-parachains/statemint/Cargo.toml +++ b/polkadot-parachains/statemint/Cargo.toml @@ -40,7 +40,6 @@ pallet-authorship = { git = "https://github.com/paritytech/substrate", default-f pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -127,7 +126,6 @@ std = [ "pallet-balances/std", "pallet-multisig/std", "pallet-proxy/std", - "pallet-randomness-collective-flip/std", "pallet-session/std", "pallet-sudo/std", "pallet-timestamp/std", diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index 8e51f1a3953..0f5b3fbf42f 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -224,8 +224,6 @@ impl pallet_transaction_payment::Config for Runtime { type OperationalFeeMultiplier = OperationalFeeMultiplier; } -impl pallet_randomness_collective_flip::Config for Runtime {} - parameter_types! { pub const AssetDeposit: Balance = 100 * DOLLARS; // 100 DOLLARS deposit to create asset pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT; @@ -727,7 +725,6 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system::{ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned, } = 1, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 2, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, @@ -789,8 +786,19 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, + RemoveCollectiveFlip >; +pub struct RemoveCollectiveFlip; +impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip { + fn on_runtime_upgrade() -> Weight { + use frame_support::storage::migration; + // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip` + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + ::DbWeight::get().writes(1) + } +} + impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml index d4c1b5f8a96..57b570192c4 100644 --- a/polkadot-parachains/westmint/Cargo.toml +++ b/polkadot-parachains/westmint/Cargo.toml @@ -40,7 +40,6 @@ pallet-authorship = { git = "https://github.com/paritytech/substrate", default-f pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-proxy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -127,7 +126,6 @@ std = [ "pallet-balances/std", "pallet-multisig/std", "pallet-proxy/std", - "pallet-randomness-collective-flip/std", "pallet-session/std", "pallet-sudo/std", "pallet-timestamp/std", diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index aa9a13cb0b5..f6da36e46c0 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -213,8 +213,6 @@ impl pallet_transaction_payment::Config for Runtime { type OperationalFeeMultiplier = OperationalFeeMultiplier; } -impl pallet_randomness_collective_flip::Config for Runtime {} - impl pallet_sudo::Config for Runtime { type Event = Event; type Call = Call; @@ -702,7 +700,6 @@ construct_runtime!( ParachainSystem: cumulus_pallet_parachain_system::{ Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned, }, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, ParachainInfo: parachain_info::{Pallet, Storage, Config}, Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event}, @@ -767,9 +764,19 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - (), + RemoveCollectiveFlip, >; +pub struct RemoveCollectiveFlip; +impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip { + fn on_runtime_upgrade() -> Weight { + use frame_support::storage::migration; + // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip` + migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); + ::DbWeight::get().writes(1) + } +} + impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { diff --git a/test/runtime-upgrade/Cargo.toml b/test/runtime-upgrade/Cargo.toml index efe92061965..a425abc59e2 100644 --- a/test/runtime-upgrade/Cargo.toml +++ b/test/runtime-upgrade/Cargo.toml @@ -14,7 +14,6 @@ frame-executive = { git = "https://github.com/paritytech/substrate", default-fea frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -50,7 +49,6 @@ std = [ "frame-support/std", "frame-system/std", "pallet-balances/std", - "pallet-randomness-collective-flip/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment/std", diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml index 9b6cadb634f..52870e30d6e 100644 --- a/test/runtime/Cargo.toml +++ b/test/runtime/Cargo.toml @@ -14,7 +14,6 @@ frame-executive = { git = "https://github.com/paritytech/substrate", default-fea frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } @@ -50,7 +49,6 @@ std = [ "frame-support/std", "frame-system/std", "pallet-balances/std", - "pallet-randomness-collective-flip/std", "pallet-sudo/std", "pallet-timestamp/std", "pallet-transaction-payment/std", diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index 64fef7a0318..752d17d882f 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -235,8 +235,6 @@ impl pallet_transaction_payment::Config for Runtime { type OperationalFeeMultiplier = OperationalFeeMultiplier; } -impl pallet_randomness_collective_flip::Config for Runtime {} - impl pallet_sudo::Config for Runtime { type Call = Call; type Event = Event; @@ -270,7 +268,6 @@ construct_runtime! { Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage}, TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, } } From eca74809c828e68688fdf963570b74253a87713b Mon Sep 17 00:00:00 2001 From: NachoPal Date: Mon, 8 Nov 2021 18:58:38 +0100 Subject: [PATCH 2/5] cargo.lock + fix --- Cargo.lock | 85 --------------------------- polkadot-parachains/rococo/src/lib.rs | 2 +- 2 files changed, 1 insertion(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b0a2c91327..6be426465b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5655,23 +5655,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "pallet-randomness-collective-flip" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#794e9a91927dda5ffa6b29b1771ccdde947af7a2" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "safe-mix", - "scale-info", - "sp-runtime", - "sp-std", -] - -[[package]] -======= ->>>>>>> d3fb4f06 (randomess collective flip removed) name = "pallet-recovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a9465729e2c5d2ef8d87ac404da27e5e10adde8a" @@ -8439,74 +8422,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= -name = "rockmine-runtime" -version = "1.0.0" -dependencies = [ - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-ping", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "hex-literal 0.3.3", - "log", - "node-primitives", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-multisig", - "pallet-proxy", - "pallet-session", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "parachain-info", - "parachains-common", - "parity-scale-codec", - "polkadot-parachain", - "polkadot-runtime-common", - "scale-info", - "serde", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - -[[package]] ->>>>>>> d3fb4f06 (randomess collective flip removed) name = "rocksdb" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index aabe7e8984d..8a93af66722 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -188,7 +188,7 @@ impl frame_system::Config for Runtime { type AccountData = pallet_balances::AccountData; type OnNewAccount = (); type OnKilledAccount = (); - type DbWeight = (); + type DbWeight = RocksDbWeight; type BaseCallFilter = frame_support::traits::Everything; type SystemWeightInfo = (); type BlockWeights = RuntimeBlockWeights; From bfaea9e5b732eb56d57834252fab88eada3b5505 Mon Sep 17 00:00:00 2001 From: NachoPal Date: Tue, 9 Nov 2021 11:26:39 +0100 Subject: [PATCH 3/5] remove migration for statemint --- polkadot-parachains/statemint/src/lib.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index 0f5b3fbf42f..51a09bebf41 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -786,19 +786,8 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - RemoveCollectiveFlip >; -pub struct RemoveCollectiveFlip; -impl frame_support::traits::OnRuntimeUpgrade for RemoveCollectiveFlip { - fn on_runtime_upgrade() -> Weight { - use frame_support::storage::migration; - // Remove the storage value `RandomMaterial` from removed pallet `RandomnessCollectiveFlip` - migration::remove_storage_prefix(b"RandomnessCollectiveFlip", b"RandomMaterial", b""); - ::DbWeight::get().writes(1) - } -} - impl_runtime_apis! { impl sp_consensus_aura::AuraApi for Runtime { fn slot_duration() -> sp_consensus_aura::SlotDuration { From 82c21a7212321c709d32da17d70ac5ccad17529f Mon Sep 17 00:00:00 2001 From: NachoPal Date: Tue, 9 Nov 2021 15:19:02 +0100 Subject: [PATCH 4/5] fmt fix --- polkadot-parachains/rococo/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index 8a93af66722..e41111c6084 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -576,7 +576,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - RemoveCollectiveFlip + RemoveCollectiveFlip, >; pub struct RemoveCollectiveFlip; From a24c5153d832a722c7759581a354d1634bc533a0 Mon Sep 17 00:00:00 2001 From: Alexander Popiak Date: Tue, 9 Nov 2021 15:54:38 +0100 Subject: [PATCH 5/5] update cargo.lock --- Cargo.lock | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efc9655076f..736987ea46b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2000,7 +2000,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.3.3", + "rustc_version", "syn", ] @@ -8508,15 +8508,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" @@ -10291,15 +10282,6 @@ dependencies = [ "semver-parser 0.7.0", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - [[package]] name = "semver" version = "0.11.0" @@ -10555,7 +10537,7 @@ dependencies = [ "rand 0.8.4", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", + "rustc_version", "sha2 0.9.8", "subtle", "x25519-dalek",