Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fix wrong deposit amount in council voters. #2562

Merged
7 commits merged into from
Mar 17, 2021
Merged

Fix wrong deposit amount in council voters. #2562

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ed223b
Fix wrong deposit amount in council voters.
kianenigma Mar 4, 2021
d3d58fa
Fix some build
kianenigma Mar 5, 2021
7c8bfb5
make it all compile.. so far.
kianenigma Mar 5, 2021
141c0e7
Master.into()
kianenigma Mar 17, 2021
092d56b
Fix
kianenigma Mar 17, 2021
730476a
break build
kianenigma Mar 17, 2021
63a05b1
Okay fix it again
kianenigma Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ try-runtime = [
"polkadot-runtime/try-runtime",
"kusama-runtime/try-runtime",
"westend-runtime/try-runtime",
"rococo-runtime/try-runtime",
]

real-overseer = [
Expand Down
20 changes: 16 additions & 4 deletions runtime/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,16 @@ std = [
"frame-support/std",
"pallet-authorship/std",
"pallet-balances/std",
"sp-runtime/std",
"sp-session/std",
"sp-staking/std",
"pallet-session/std",
"pallet-staking/std",
"frame-system/std",
"pallet-timestamp/std",
"pallet-vesting/std",
"pallet-transaction-payment/std",
"pallet-treasury/std",
"sp-runtime/std",
"sp-session/std",
"sp-staking/std",
"frame-system/std",
"runtime-parachains/std",
"xcm/std",
]
Expand All @@ -93,3 +94,14 @@ runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
]
try-runtime = [
"runtime-parachains/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-session/try-runtime",
"pallet-staking/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-vesting/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-treasury/try-runtime",
]
51 changes: 42 additions & 9 deletions runtime/kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ no_std = []
only-staking = []
std = [
"authority-discovery-primitives/std",
"pallet-authority-discovery/std",
"bitvec/std",
"primitives/std",
"rustc-hex/std",
Expand All @@ -109,6 +108,8 @@ std = [
"sp-std/std",
"sp-io/std",
"frame-support/std",
"frame-executive/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-bounties/std",
Expand All @@ -118,7 +119,6 @@ std = [
"pallet-elections-phragmen/std",
"pallet-election-provider-multi-phase/std",
"pallet-democracy/std",
"frame-executive/std",
"pallet-grandpa/std",
"pallet-identity/std",
"pallet-im-online/std",
Expand All @@ -129,28 +129,29 @@ std = [
"pallet-offences/std",
"pallet-proxy/std",
"pallet-recovery/std",
"sp-runtime/std",
"sp-staking/std",
"pallet-scheduler/std",
"pallet-session/std",
"pallet-society/std",
"pallet-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
"pallet-timestamp/std",
"pallet-tips/std",
"pallet-treasury/std",
"sp-version/std",
"pallet-utility/std",
"pallet-vesting/std",
"pallet-babe/std",
"pallet-randomness-collective-flip/std",
"sp-runtime/std",
"sp-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
"sp-version/std",
"serde_derive",
"serde/std",
"log/std",
"pallet-babe/std",
"babe-primitives/std",
"sp-session/std",
"pallet-randomness-collective-flip/std",
"runtime-common/std",
"frame-try-runtime/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
Expand Down Expand Up @@ -187,6 +188,38 @@ runtime-benchmarks = [
try-runtime = [
"frame-executive/try-runtime",
"frame-try-runtime",
"frame-system/try-runtime",
"pallet-authority-discovery/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-bounties/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-collective/try-runtime",
"pallet-elections-phragmen/try-runtime",
"pallet-election-provider-multi-phase/try-runtime",
"pallet-democracy/try-runtime",
"pallet-grandpa/try-runtime",
"pallet-identity/try-runtime",
"pallet-im-online/try-runtime",
"pallet-indices/try-runtime",
"pallet-membership/try-runtime",
"pallet-multisig/try-runtime",
"pallet-nicks/try-runtime",
"pallet-offences/try-runtime",
"pallet-proxy/try-runtime",
"pallet-recovery/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-session/try-runtime",
"pallet-society/try-runtime",
"pallet-staking/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-tips/try-runtime",
"pallet-treasury/try-runtime",
"pallet-utility/try-runtime",
"pallet-vesting/try-runtime",
"pallet-babe/try-runtime",
"pallet-randomness-collective-flip/try-runtime",
"runtime-common/try-runtime",
]
# When enabled, the runtime api will not be build.
#
Expand Down
7 changes: 0 additions & 7 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,13 +955,6 @@ impl pallet_proxy::Config for Runtime {
type AnnouncementDepositFactor = AnnouncementDepositFactor;
}

pub struct CustomOnRuntimeUpgrade;
impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
fn on_runtime_upgrade() -> frame_support::weights::Weight {
0
}
}

construct_runtime! {
pub enum Runtime where
Block = Block,
Expand Down
15 changes: 12 additions & 3 deletions runtime/parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@ std = [
"sp-std/std",
"sp-io/std",
"frame-support/std",
"pallet-authorship/std",
"pallet-balances/std",
"sp-runtime/std",
"sp-session/std",
"sp-staking/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-session/std",
"pallet-staking/std",
"frame-system/std",
"pallet-timestamp/std",
"pallet-vesting/std",
"frame-system/std",
"xcm/std",
"xcm-executor/std",
"log/std",
Expand All @@ -94,3 +94,12 @@ runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
]
try-runtime = [
"frame-support/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-session/try-runtime",
"pallet-staking/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-vesting/try-runtime",
]
51 changes: 41 additions & 10 deletions runtime/polkadot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ no_std = []
only-staking = []
std = [
"authority-discovery-primitives/std",
"pallet-authority-discovery/std",
"bitvec/std",
"primitives/std",
"rustc-hex/std",
Expand All @@ -107,6 +106,8 @@ std = [
"offchain-primitives/std",
"sp-std/std",
"frame-support/std",
"frame-executive/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-bounties/std",
Expand All @@ -116,7 +117,6 @@ std = [
"pallet-elections-phragmen/std",
"pallet-election-provider-multi-phase/std",
"pallet-democracy/std",
"frame-executive/std",
"pallet-grandpa/std",
"pallet-identity/std",
"pallet-im-online/std",
Expand All @@ -126,27 +126,28 @@ std = [
"pallet-nicks/std",
"pallet-offences/std",
"pallet-proxy/std",
"sp-runtime/std",
"sp-staking/std",
"pallet-scheduler/std",
"pallet-session/std",
"pallet-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
"pallet-timestamp/std",
"pallet-treasury/std",
"pallet-tips/std",
"pallet-babe/std",
"pallet-randomness-collective-flip/std",
"pallet-vesting/std",
"pallet-utility/std",
"sp-runtime/std",
"sp-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
"sp-version/std",
"serde_derive",
"serde/std",
"log/std",
"pallet-babe/std",
"babe-primitives/std",
"sp-session/std",
"pallet-randomness-collective-flip/std",
"runtime-common/std",
"pallet-vesting/std",
"pallet-utility/std",
"frame-try-runtime/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
Expand Down Expand Up @@ -182,6 +183,36 @@ runtime-benchmarks = [
try-runtime = [
"frame-executive/try-runtime",
"frame-try-runtime",
"frame-system/try-runtime",
"pallet-authority-discovery/try-runtime",
"pallet-authorship/try-runtime",
"pallet-balances/try-runtime",
"pallet-bounties/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-collective/try-runtime",
"pallet-elections-phragmen/try-runtime",
"pallet-election-provider-multi-phase/try-runtime",
"pallet-democracy/try-runtime",
"pallet-grandpa/try-runtime",
"pallet-identity/try-runtime",
"pallet-im-online/try-runtime",
"pallet-indices/try-runtime",
"pallet-membership/try-runtime",
"pallet-multisig/try-runtime",
"pallet-nicks/try-runtime",
"pallet-offences/try-runtime",
"pallet-proxy/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-session/try-runtime",
"pallet-staking/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-treasury/try-runtime",
"pallet-tips/try-runtime",
"pallet-babe/try-runtime",
"pallet-randomness-collective-flip/try-runtime",
"pallet-vesting/try-runtime",
"pallet-utility/try-runtime",
"runtime-common/try-runtime",
]
# When enabled, the runtime api will not be build.
#
Expand Down
17 changes: 9 additions & 8 deletions runtime/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,13 +959,6 @@ impl pallet_proxy::Config for Runtime {
type AnnouncementDepositFactor = AnnouncementDepositFactor;
}

pub struct CustomOnRuntimeUpgrade;
impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
fn on_runtime_upgrade() -> frame_support::weights::Weight {
0
}
}

construct_runtime! {
pub enum Runtime where
Block = Block,
Expand Down Expand Up @@ -1088,9 +1081,17 @@ impl frame_support::traits::OnRuntimeUpgrade for FixPolkadotCouncilVotersDeposit
},
);

frame_support::debug::info!(target: "runtime::polkadot", "updated {} + {} voter's deposit.", updated, skipped);
log::info!(target: "runtime::polkadot", "updated {} + {} voter's deposit.", updated, skipped);
BlockWeights::get().max_block
}

fn pre_upgrade() -> Result<(), &'static str> {
todo!()
}

fn post_upgrade() -> Result<(), &'static str> {
todo!()
}
}

#[cfg(not(feature = "disable-runtime-api"))]
Expand Down
37 changes: 28 additions & 9 deletions runtime/rococo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,39 +67,39 @@ default = ["std"]
no_std = []
std = [
"authority-discovery-primitives/std",
"babe-primitives/std",
"parity-scale-codec/std",
"frame-executive/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-babe/std",
"babe-primitives/std",
"pallet-balances/std",
"parity-scale-codec/std",
"frame-executive/std",
"pallet-grandpa/std",
"pallet-sudo/std",
"pallet-indices/std",
"pallet-im-online/std",
"pallet-session/std",
"pallet-staking/std",
"pallet-offences/std",
"pallet-timestamp/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"inherents/std",
"frame-support/std",
"polkadot-parachain/std",
"primitives/std",
"runtime-common/std",
"runtime-parachains/std",
"pallet-session/std",
"sp-api/std",
"sp-core/std",
"sp-io/std",
"sp-runtime/std",
"sp-session/std",
"sp-staking/std",
"sp-std/std",
"pallet-staking/std",
"frame-system/std",
"frame-system-rpc-runtime-api/std",
"offchain-primitives/std",
"pallet-offences/std",
"pallet-timestamp/std",
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"block-builder-api/std",
"tx-pool-api/std",
"sp-version/std",
Expand Down Expand Up @@ -129,3 +129,22 @@ runtime-benchmarks = [
"pallet-staking/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
]
try-runtime = [
"frame-executive/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"pallet-authority-discovery/try-runtime",
"pallet-authorship/try-runtime",
"pallet-babe/try-runtime",
"pallet-balances/try-runtime",
"pallet-grandpa/try-runtime",
"pallet-sudo/try-runtime",
"pallet-indices/try-runtime",
"pallet-im-online/try-runtime",
"pallet-session/try-runtime",
"pallet-staking/try-runtime",
"pallet-offences/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"runtime-common/try-runtime",
]
Loading