From 760d49c55130b83fc1bbb7c89cb2c69f0a158243 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 20 Jul 2020 17:47:09 +0200 Subject: [PATCH] Remove Sudo (#1437) * Remove Sudo NOTE: To ensure minimal index changes to pre-existing pallet deployments, this is done with a "swap_remove" style; the previous last pallet (Purchase), which is hitherto unused, has been shifted into the old index of Sudo. * Remove CC1 designation. * Fixes * Bump * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes --- polkadot/Cargo.lock | 41 ++++++------ polkadot/Cargo.toml | 2 +- polkadot/README.md | 6 +- polkadot/availability-store/Cargo.toml | 2 +- polkadot/cli/Cargo.toml | 2 +- polkadot/collator/Cargo.toml | 2 +- polkadot/erasure-coding/Cargo.toml | 2 +- polkadot/network/Cargo.toml | 2 +- polkadot/network/test/Cargo.toml | 2 +- polkadot/node/service/src/chain_spec.rs | 8 +-- polkadot/parachain/Cargo.toml | 2 +- .../test-parachains/adder/Cargo.toml | 2 +- .../parachain/test-parachains/halt/Cargo.toml | 2 +- polkadot/primitives/Cargo.toml | 2 +- polkadot/rpc/Cargo.toml | 2 +- polkadot/runtime/common/Cargo.toml | 2 +- polkadot/runtime/kusama/Cargo.toml | 2 +- polkadot/runtime/kusama/src/lib.rs | 2 +- polkadot/runtime/polkadot/Cargo.toml | 4 +- polkadot/runtime/polkadot/src/lib.rs | 66 ++++++++++++------- polkadot/runtime/test-runtime/Cargo.toml | 2 +- polkadot/runtime/westend/Cargo.toml | 2 +- polkadot/runtime/westend/src/lib.rs | 2 +- .../scripts/gitlab/publish_draft_release.sh | 2 +- polkadot/service/Cargo.toml | 2 +- polkadot/service/res/polkadot.json | 2 +- polkadot/service/src/chain_spec.rs | 8 +-- polkadot/statement-table/Cargo.toml | 2 +- polkadot/validation/Cargo.toml | 2 +- 29 files changed, 90 insertions(+), 89 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 4b651d27ad..9bfe0b0d9e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -2422,7 +2422,7 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-benchmarking", @@ -4302,7 +4302,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot" -version = "0.8.16" +version = "0.8.17" dependencies = [ "assert_cmd", "futures 0.3.5", @@ -4316,7 +4316,7 @@ dependencies = [ [[package]] name = "polkadot-availability-store" -version = "0.8.16" +version = "0.8.17" dependencies = [ "derive_more 0.99.9", "exit-future", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.8.16" +version = "0.8.17" dependencies = [ "frame-benchmarking-cli", "futures 0.3.5", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "polkadot-collator" -version = "0.8.16" +version = "0.8.17" dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.16" +version = "0.8.17" dependencies = [ "derive_more 0.15.0", "parity-scale-codec", @@ -4417,7 +4417,7 @@ dependencies = [ [[package]] name = "polkadot-network" -version = "0.8.16" +version = "0.8.17" dependencies = [ "arrayvec 0.4.12", "bytes 0.5.5", @@ -4466,7 +4466,7 @@ dependencies = [ [[package]] name = "polkadot-network-test" -version = "0.8.16" +version = "0.8.17" dependencies = [ "futures 0.3.5", "log 0.4.8", @@ -4585,7 +4585,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.8.16" +version = "0.8.17" dependencies = [ "derive_more 0.99.9", "log 0.4.8", @@ -4624,7 +4624,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-system", @@ -4648,7 +4648,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.8.16" +version = "0.8.17" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -4674,7 +4674,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-benchmarking", @@ -4710,7 +4710,6 @@ dependencies = [ "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", - "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -4749,7 +4748,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-benchmarking", @@ -4837,7 +4836,7 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.8.16" +version = "0.8.17" dependencies = [ "env_logger", "frame-benchmarking", @@ -4981,7 +4980,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.8.16" +version = "0.8.17" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5001,7 +5000,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-executive", @@ -5132,7 +5131,7 @@ dependencies = [ [[package]] name = "polkadot-validation" -version = "0.8.16" +version = "0.8.17" dependencies = [ "ansi_term 0.12.1", "bitvec", @@ -8360,7 +8359,7 @@ dependencies = [ [[package]] name = "test-parachain-adder" -version = "0.8.16" +version = "0.8.17" dependencies = [ "dlmalloc", "parity-scale-codec", @@ -8401,7 +8400,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "0.8.16" +version = "0.8.17" dependencies = [ "substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -9340,7 +9339,7 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.16" +version = "0.8.17" dependencies = [ "bitvec", "frame-benchmarking", diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml index d39a7676a5..40adacde41 100644 --- a/polkadot/Cargo.toml +++ b/polkadot/Cargo.toml @@ -4,7 +4,7 @@ path = "src/main.rs" [package] name = "polkadot" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/README.md b/polkadot/README.md index 496d5933d6..0b971154b8 100644 --- a/polkadot/README.md +++ b/polkadot/README.md @@ -61,9 +61,9 @@ cargo build --release This repo supports runtimes for Polkadot, Kusama, and Westend. -### Connect to Polkadot Chain Candidate 1 (CC1) +### Connect to Polkadot Mainnet -Connect to the global Polkadot CC1 network by running: +Connect to the global Polkadot Mainnet network by running: ```bash ./target/release/polkadot --chain=polkadot @@ -71,7 +71,7 @@ Connect to the global Polkadot CC1 network by running: You can see your node on [telemetry] (set a custom name with `--name "my custom name"`). -[telemetry]: https://telemetry.polkadot.io/#list/Polkadot%20CC1 +[telemetry]: https://telemetry.polkadot.io/#list/Polkadot ### Connect to the "Kusama" Canary Network diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml index df44280747..25b39a0262 100644 --- a/polkadot/availability-store/Cargo.toml +++ b/polkadot/availability-store/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "polkadot-availability-store" description = "Persistent database for parachain data" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml index 503e9ae914..2847d1b1c7 100644 --- a/polkadot/cli/Cargo.toml +++ b/polkadot/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-cli" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Polkadot Relay-chain Client Node" edition = "2018" diff --git a/polkadot/collator/Cargo.toml b/polkadot/collator/Cargo.toml index bcdf18c800..09d0112121 100644 --- a/polkadot/collator/Cargo.toml +++ b/polkadot/collator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-collator" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Collator node implementation" edition = "2018" diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml index 12841881fd..ab9b31e151 100644 --- a/polkadot/erasure-coding/Cargo.toml +++ b/polkadot/erasure-coding/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-erasure-coding" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml index bb6b85e87d..db5f99e714 100644 --- a/polkadot/network/Cargo.toml +++ b/polkadot/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-network" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Polkadot-specific networking protocol" edition = "2018" diff --git a/polkadot/network/test/Cargo.toml b/polkadot/network/test/Cargo.toml index 6aff183c39..b5397c46d2 100644 --- a/polkadot/network/test/Cargo.toml +++ b/polkadot/network/test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-network-test" -version = "0.8.16" +version = "0.8.17" license = "GPL-3.0" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs index db9d9c5dde..d46239ddd1 100644 --- a/polkadot/node/service/src/chain_spec.rs +++ b/polkadot/node/service/src/chain_spec.rs @@ -194,9 +194,6 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { vesting: Some(polkadot::VestingConfig { vesting: vec![], }), - sudo: Some(polkadot::SudoConfig { - key: endowed_accounts[0].clone(), - }), } } @@ -599,7 +596,7 @@ fn testnet_accounts() -> Vec { /// Helper function to create polkadot GenesisConfig for testing pub fn polkadot_testnet_genesis( initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, - root_key: AccountId, + _root_key: AccountId, endowed_accounts: Option>, ) -> polkadot::GenesisConfig { let endowed_accounts: Vec = endowed_accounts.unwrap_or_else(testnet_accounts); @@ -667,9 +664,6 @@ pub fn polkadot_testnet_genesis( vesting: Some(polkadot::VestingConfig { vesting: vec![], }), - sudo: Some(polkadot::SudoConfig { - key: root_key, - }), } } diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml index 57e76f5acb..b7676170b8 100644 --- a/polkadot/parachain/Cargo.toml +++ b/polkadot/parachain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-parachain" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Types and utilities for creating and working with parachains" edition = "2018" diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml index 87d215b1eb..6d8f15e743 100644 --- a/polkadot/parachain/test-parachains/adder/Cargo.toml +++ b/polkadot/parachain/test-parachains/adder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-parachain-adder" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Test parachain which adds to a number as its state transition" edition = "2018" diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml index aac322e753..1dd71cf306 100644 --- a/polkadot/parachain/test-parachains/halt/Cargo.toml +++ b/polkadot/parachain/test-parachains/halt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-parachain-halt" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] description = "Test parachain which executes forever" edition = "2018" diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml index d0d6c7ea50..96a15f68c5 100644 --- a/polkadot/primitives/Cargo.toml +++ b/polkadot/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-primitives" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml index c94d7d1a8e..58b300480f 100644 --- a/polkadot/rpc/Cargo.toml +++ b/polkadot/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-rpc" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml index 9511c3e919..5cf992c76f 100644 --- a/polkadot/runtime/common/Cargo.toml +++ b/polkadot/runtime/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-runtime-common" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml index 6d9090a334..a8083a8a39 100644 --- a/polkadot/runtime/kusama/Cargo.toml +++ b/polkadot/runtime/kusama/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kusama-runtime" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 92d0ddcda9..6eed529ab8 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -87,7 +87,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kusama"), impl_name: create_runtime_str!("parity-kusama"), authoring_version: 2, - spec_version: 2016, + spec_version: 2017, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml index 721640186f..0af2fda617 100644 --- a/polkadot/runtime/polkadot/Cargo.toml +++ b/polkadot/runtime/polkadot/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-runtime" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" @@ -60,7 +60,6 @@ system = { package = "frame-system", git = "https://github.com/paritytech/substr system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sudo = { package = "pallet-sudo", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } vesting = { package = "pallet-vesting", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -140,7 +139,6 @@ std = [ "sp-session/std", "randomness-collective-flip/std", "runtime-common/std", - "sudo/std", "vesting/std", "utility/std", ] diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 826caba583..debecc27ee 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -93,13 +93,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("polkadot"), impl_name: create_runtime_str!("parity-polkadot"), authoring_version: 0, - spec_version: 16, + spec_version: 17, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, #[cfg(feature = "disable-runtime-api")] apis: version::create_apis_vec![[]], - transaction_version: 2, + transaction_version: 3, }; /// Native version. @@ -132,7 +132,7 @@ impl Filter for BaseFilter { Call::Authorship(_) | Call::Staking(_) | Call::Offences(_) | Call::Session(_) | Call::FinalityTracker(_) | Call::Grandpa(_) | Call::ImOnline(_) | Call::AuthorityDiscovery(_) | - Call::Utility(_) | Call::Claims(_) | Call::Vesting(_) | Call::Sudo(_) | + Call::Utility(_) | Call::Claims(_) | Call::Vesting(_) | Call::Identity(_) | Call::Proxy(_) | Call::Multisig(_) | Call::Poll(_) | Call::Purchase(_) => true, @@ -815,11 +815,6 @@ impl multisig::Trait for Runtime { type WeightInfo = (); } -impl sudo::Trait for Runtime { - type Event = Event; - type Call = Call; -} - parameter_types! { // One storage item; key size 32, value size 8; . pub const ProxyDepositBase: Balance = deposit(1, 8); @@ -831,13 +826,43 @@ parameter_types! { /// The type used to represent the kinds of proxying allowed. #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)] pub enum ProxyType { - Any, - NonTransfer, - Governance, - Staking, - SudoBalances, - IdentityJudgement, + Any = 0, + NonTransfer = 1, + Governance = 2, + Staking = 3, + // Skip 4 as it is now removed (was SudoBalances) + IdentityJudgement = 5, } + +#[cfg(test)] +mod proxt_type_tests { + use super::*; + + #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug)] + pub enum OldProxyType { + Any, + NonTransfer, + Governance, + Staking, + SudoBalances, + IdentityJudgement, + } + + #[test] + fn proxy_type_decodes_correctly() { + for (i, j) in vec![ + (OldProxyType::Any, ProxyType::Any), + (OldProxyType::NonTransfer, ProxyType::NonTransfer), + (OldProxyType::Governance, ProxyType::Governance), + (OldProxyType::Staking, ProxyType::Staking), + (OldProxyType::IdentityJudgement, ProxyType::IdentityJudgement), + ].into_iter() { + assert_eq!(i.encode(), j.encode()); + } + assert!(ProxyType::decode(&mut &OldProxyType::SudoBalances.encode()[..]).is_err()); + } +} + impl Default for ProxyType { fn default() -> Self { Self::Any } } impl InstanceFilter for ProxyType { fn filter(&self, c: &Call) -> bool { @@ -876,7 +901,6 @@ impl InstanceFilter for ProxyType { Call::Vesting(vesting::Call::vest_other(..)) | // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` Call::Utility(..) | - // Specifically omitting Sudo pallet Call::Identity(..) | Call::Proxy(..) | Call::Multisig(..) @@ -889,11 +913,6 @@ impl InstanceFilter for ProxyType { ProxyType::Staking => matches!(c, Call::Staking(..) | Call::Utility(utility::Call::batch(..)) | Call::Utility(..) ), - ProxyType::SudoBalances => match c { - Call::Sudo(sudo::Call::sudo(ref x)) => matches!(x.as_ref(), &Call::Balances(..)), - Call::Utility(..) => true, - _ => false, - }, ProxyType::IdentityJudgement => matches!(c, Call::Identity(identity::Call::provide_judgement(..)) | Call::Utility(utility::Call::batch(..)) @@ -1037,8 +1056,8 @@ construct_runtime! { // Cunning utilities. Usable initially. Utility: utility::{Module, Call, Event}, - // Sudo. Last module. Usable initially, but removed once governance enabled. - Sudo: sudo::{Module, Call, Storage, Config, Event}, + // DOT Purchase module. Late addition; this is in place of Sudo. + Purchase: purchase::{Module, Call, Storage, Event}, // Identity. Late addition. Identity: identity::{Module, Call, Storage, Event}, @@ -1051,9 +1070,6 @@ construct_runtime! { // Poll module. Poll: poll::{Module, Call, Storage, Event}, - - // DOT Purchase module. Late addition. - Purchase: purchase::{Module, Call, Storage, Event}, } } diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml index b5c0153768..9c62784bbd 100644 --- a/polkadot/runtime/test-runtime/Cargo.toml +++ b/polkadot/runtime/test-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-test-runtime" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml index 4d9e9e5853..0305b48c3f 100644 --- a/polkadot/runtime/westend/Cargo.toml +++ b/polkadot/runtime/westend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "westend-runtime" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" build = "build.rs" diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index fe72c3aea1..5764cbc96c 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westend"), impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 36, + spec_version: 37, impl_version: 0, #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, diff --git a/polkadot/scripts/gitlab/publish_draft_release.sh b/polkadot/scripts/gitlab/publish_draft_release.sh index c91846bc88..a228c4afe7 100755 --- a/polkadot/scripts/gitlab/publish_draft_release.sh +++ b/polkadot/scripts/gitlab/publish_draft_release.sh @@ -228,7 +228,7 @@ echo "$release_text" echo "[+] Pushing release to github" # Create release on github -release_name="Polkadot CC1 $version" +release_name="Polkadot $version" data=$(jq -Rs --arg version "$version" \ --arg release_name "$release_name" \ --arg release_text "$release_text" \ diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml index a3670aed2a..9ce1613401 100644 --- a/polkadot/service/Cargo.toml +++ b/polkadot/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-service" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/service/res/polkadot.json b/polkadot/service/res/polkadot.json index 90e3f529a8..4f5b99fa88 100644 --- a/polkadot/service/res/polkadot.json +++ b/polkadot/service/res/polkadot.json @@ -1,5 +1,5 @@ { - "name": "Polkadot CC1", + "name": "Polkadot", "id": "polkadot", "chainType": "Live", "bootNodes": [ diff --git a/polkadot/service/src/chain_spec.rs b/polkadot/service/src/chain_spec.rs index fe8d98d055..efbdc4c100 100644 --- a/polkadot/service/src/chain_spec.rs +++ b/polkadot/service/src/chain_spec.rs @@ -194,9 +194,6 @@ fn polkadot_staging_testnet_config_genesis() -> polkadot::GenesisConfig { vesting: Some(polkadot::VestingConfig { vesting: vec![], }), - sudo: Some(polkadot::SudoConfig { - key: endowed_accounts[0].clone(), - }), } } @@ -599,7 +596,7 @@ fn testnet_accounts() -> Vec { /// Helper function to create polkadot GenesisConfig for testing pub fn polkadot_testnet_genesis( initial_authorities: Vec<(AccountId, AccountId, BabeId, GrandpaId, ImOnlineId, ValidatorId, AuthorityDiscoveryId)>, - root_key: AccountId, + _root_key: AccountId, endowed_accounts: Option>, ) -> polkadot::GenesisConfig { let endowed_accounts: Vec = endowed_accounts.unwrap_or_else(testnet_accounts); @@ -667,9 +664,6 @@ pub fn polkadot_testnet_genesis( vesting: Some(polkadot::VestingConfig { vesting: vec![], }), - sudo: Some(polkadot::SudoConfig { - key: root_key, - }), } } diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml index cf03189f18..870d8cb0b1 100644 --- a/polkadot/statement-table/Cargo.toml +++ b/polkadot/statement-table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-statement-table" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018" diff --git a/polkadot/validation/Cargo.toml b/polkadot/validation/Cargo.toml index b5fb88dd6d..aabf5286f5 100644 --- a/polkadot/validation/Cargo.toml +++ b/polkadot/validation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-validation" -version = "0.8.16" +version = "0.8.17" authors = ["Parity Technologies "] edition = "2018"