Upgrade to substrate 2.0.0

Cargo.toml

@@ -34,33 +34,33 @@ serde_json = "1.0.57"
 url = "2.1.1"
 codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = ["derive", "full"] }
 
-frame-metadata = { version = "11.0.0-rc6", package = "frame-metadata" }
-frame-support = { version = "2.0.0-rc6", package = "frame-support" }
-sp-runtime = { version = "2.0.0-rc6", package = "sp-runtime" }
-sp-version = { version = "2.0.0-rc6", package = "sp-version" }
-pallet-indices = { version = "2.0.0-rc6", package = "pallet-indices" }
+frame-metadata = { version = "12", package = "frame-metadata" }
+frame-support = { version = "2.0.0", package = "frame-support" }
+sp-runtime = { version = "2.0.0", package = "sp-runtime" }
+sp-version = { version = "2.0.0", package = "sp-version" }
+pallet-indices = { version = "2.0.0", package = "pallet-indices" }
 hex = "0.4.2"
-sp-std = "2.0.0-rc6"
-application-crypto = { version = "2.0.0-rc6", package = "sp-application-crypto" }
-sp-finality-grandpa = "2.0.0-rc6"
-sp-consensus-babe = "0.8.0-rc6"
-pallet-im-online = "2.0.0-rc6"
-sp-authority-discovery = "2.0.0-rc6"
-pallet-staking = "2.0.0-rc6"
+sp-std = "2.0.0"
+application-crypto = { version = "2.0.0", package = "sp-application-crypto" }
+sp-finality-grandpa = "2.0.0"
+sp-consensus-babe = "0.8.0"
+pallet-im-online = "2.0.0"
+sp-authority-discovery = "2.0.0"
+pallet-staking = "2.0.0"
 
-sp-rpc = { version = "2.0.0-rc6", package = "sp-rpc" }
-sp-core = { version = "2.0.0-rc6", package = "sp-core" }
-sc-rpc-api = { version = "0.8.0-rc6", package = "sc-rpc-api" }
-sp-transaction-pool = { version = "2.0.0-rc6", package = "sp-transaction-pool" }
+sp-rpc = { version = "2.0.0", package = "sp-rpc" }
+sp-core = { version = "2.0.0", package = "sp-core" }
+sc-rpc-api = { version = "0.8.0", package = "sc-rpc-api" }
+sp-transaction-pool = { version = "2.0.0", package = "sp-transaction-pool" }
 substrate-subxt-client = { version = "0.4.0", path = "client", optional = true }
 substrate-subxt-proc-macro = { version = "0.12.0", path = "proc-macro" }
 
 [dev-dependencies]
-async-std = { version = "1.6.3", features = ["attributes"] }
+async-std = { version = "1.6.4", features = ["attributes"] }
 env_logger = "0.7.1"
-frame-system = { version = "2.0.0-rc6", package = "frame-system" }
-pallet-balances = { version = "2.0.0-rc6", package = "pallet-balances" }
-sp-keyring = { version = "2.0.0-rc6", package = "sp-keyring" }
+frame-system = { version = "2.0.0", package = "frame-system" }
+pallet-balances = { version = "2.0.0", package = "pallet-balances" }
+sp-keyring = { version = "2.0.0", package = "sp-keyring" }
 substrate-subxt-client = { version = "0.4.0", path = "client" }
 tempdir = "0.3.7"
 test-node = { path = "test-node" }

client/Cargo.toml

@@ -12,19 +12,19 @@ description = "Embed a substrate node into your subxt application."
 keywords = ["parity", "substrate", "blockchain"]
 
 [dependencies]
-async-std = "1.6.3"
+async-std = "1.6.4"
 futures = { version = "0.3.5", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 jsonrpsee = "0.1.0"
 log = "0.4.11"
-sc-network = { version = "0.8.0-rc6", default-features = false }
-sc-service = { version = "0.8.0-rc6", default-features = false }
+sc-network = { version = "0.8.0", default-features = false }
+sc-service = { version = "0.8.0", default-features = false }
 serde_json = "1.0.57"
-sp-keyring = "2.0.0-rc6"
+sp-keyring = "2.0.0"
 thiserror = "1.0.20"
 
 [dev-dependencies]
-async-std = { version = "1.6.3", features = ["attributes"] }
+async-std = { version = "1.6.4", features = ["attributes"] }
 env_logger = "0.7.1"
 substrate-subxt = { path = ".." }
 tempdir = "0.3.7"

proc-macro/Cargo.toml

@@ -24,11 +24,11 @@ syn = "1.0.38"
 synstructure = "0.12.4"
 
 [dev-dependencies]
-async-std = { version = "1.6.3", features = ["attributes"] }
-codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
+async-std = { version = "1.6.4", features = ["attributes"] }
+codec = { package = "parity-scale-codec", version = "1.3.5", features = ["derive"] }
 env_logger = "0.7.1"
 pretty_assertions = "0.6.1"
-sp-keyring = "2.0.0-rc6"
+sp-keyring = "2.0.0"
 substrate-subxt = { path = ".." }
 trybuild = "1.0.32"
 

src/frame/contracts.rs

@@ -116,6 +116,7 @@ pub struct InstantiatedEvent<T: Contracts> {
 }
 
 #[cfg(test)]
+#[cfg(feature = "integration-tests")]
 mod tests {
     use sp_keyring::AccountKeyring;
 

src/frame/staking.rs

@@ -57,7 +57,7 @@ pub struct ErasRewardPointsStore<T: Staking> {
 #[derive(Clone, Encode, Decode, Debug, Call)]
 pub struct SetPayeeCall<T: Staking> {
     /// The payee
-    pub payee: RewardDestination,
+    pub payee: RewardDestination<T::AccountId>,
     /// Marker for the runtime
     pub _runtime: PhantomData<T>,
 }
@@ -99,7 +99,7 @@ pub struct LedgerStore<T: Staking> {
 /// Where the reward payment should be made. Keyed by stash.
 #[derive(Encode, Copy, Clone, Debug, Hash, PartialEq, Eq, Ord, PartialOrd, Store)]
 pub struct PayeeStore<T: Staking> {
-    #[store(returns = RewardDestination)]
+    #[store(returns = RewardDestination<T::AccountId>)]
     /// Tٗhe stash account
     pub stash: T::AccountId,
 }

src/metadata.rs

@@ -482,7 +482,7 @@ impl TryFrom<RuntimeMetadataPrefixed> for Metadata {
             return Err(ConversionError::InvalidPrefix.into())
         }
         let meta = match metadata.1 {
-            RuntimeMetadata::V11(meta) => meta,
+            RuntimeMetadata::V12(meta) => meta,
             _ => return Err(ConversionError::InvalidVersion.into()),
         };
         let mut modules = HashMap::new();

test-node/Cargo.toml

@@ -15,28 +15,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.5"
 log = "0.4.11"
-structopt = "0.3.16"
+structopt = "0.3.17"
 parking_lot = "0.11.0"
 
-sc-cli = { version = "0.8.0-rc6", features = ["wasmtime"] }
-sp-core = "2.0.0-rc6"
-sc-executor = { version = "0.8.0-rc6", features = ["wasmtime"] }
-sc-service = { version = "0.8.0-rc6", features = ["wasmtime"] }
-sp-inherents = "2.0.0-rc6"
-sc-transaction-pool = "2.0.0-rc6"
-sp-transaction-pool = "2.0.0-rc6"
-sc-network = "0.8.0-rc6"
-sc-consensus-aura = "0.8.0-rc6"
-sp-consensus-aura = "0.8.0-rc6"
-sp-consensus = "0.8.0-rc6"
-sc-consensus = "0.8.0-rc6"
-sc-finality-grandpa = "0.8.0-rc6"
-sp-finality-grandpa = "2.0.0-rc6"
-sc-client-api = "2.0.0-rc6"
-sp-runtime = "2.0.0-rc6"
-sc-basic-authorship = "0.8.0-rc6"
+sc-cli = { version = "0.8.0", features = ["wasmtime"] }
+sp-core = "2.0.0"
+sc-executor = { version = "0.8.0", features = ["wasmtime"] }
+sc-service = { version = "0.8.0", features = ["wasmtime"] }
+sp-inherents = "2.0.0"
+sc-transaction-pool = "2.0.0"
+sp-transaction-pool = "2.0.0"
+sc-network = "0.8.0"
+sc-consensus-aura = "0.8.0"
+sp-consensus-aura = "0.8.0"
+sp-consensus = "0.8.0"
+sc-consensus = "0.8.0"
+sc-finality-grandpa = "0.8.0"
+sp-finality-grandpa = "2.0.0"
+sc-client-api = "2.0.0"
+sp-runtime = "2.0.0"
+sc-basic-authorship = "0.8.0"
 
 test-node-runtime = { path = "runtime" }
 
 [build-dependencies]
-substrate-build-script-utils = "2.0.0-rc6"
+substrate-build-script-utils = "2.0.0"

test-node/runtime/Cargo.toml

@@ -11,32 +11,32 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = ["derive"] }
 
-frame-executive = { version = "2.0.0-rc6", default-features = false }
-frame-support = { version = "2.0.0-rc6", default-features = false }
-frame-system = { version = "2.0.0-rc6", default-features = false }
-pallet-aura = { version = "2.0.0-rc6", default-features = false }
-pallet-balances = { version = "2.0.0-rc6", default-features = false }
-pallet-grandpa = { version = "2.0.0-rc6", default-features = false }
-pallet-randomness-collective-flip = { version = "2.0.0-rc6", default-features = false }
-pallet-staking = { version = "2.0.0-rc6", default-features = false }
-pallet-sudo = { version = "2.0.0-rc6", default-features = false }
-pallet-timestamp = { version = "2.0.0-rc6", default-features = false }
-pallet-transaction-payment = { version = "2.0.0-rc6", default-features = false }
-serde = { version = "1.0.115", optional = true, features = ["derive"] }
-sp-api = { version = "2.0.0-rc6", default-features = false }
-sp-block-builder = { version = "2.0.0-rc6", default-features = false }
-sp-consensus-aura = { version = "0.8.0-rc6", default-features = false }
-sp-core = { version = "2.0.0-rc6", default-features = false }
-sp-inherents = { version = "2.0.0-rc6", default-features = false }
-sp-io = { version = "2.0.0-rc6", default-features = false }
-sp-offchain = { version = "2.0.0-rc6", default-features = false }
-sp-runtime = { version = "2.0.0-rc6", default-features = false }
-sp-session = { version = "2.0.0-rc6", default-features = false }
-sp-std = { version = "2.0.0-rc6", default-features = false }
-sp-transaction-pool = { version = "2.0.0-rc6", default-features = false }
-sp-version = { version = "2.0.0-rc6", default-features = false }
+frame-executive = { version = "2.0.0", default-features = false }
+frame-support = { version = "2.0.0", default-features = false }
+frame-system = { version = "2.0.0", default-features = false }
+pallet-aura = { version = "2.0.0", default-features = false }
+pallet-balances = { version = "2.0.0", default-features = false }
+pallet-grandpa = { version = "2.0.0", default-features = false }
+pallet-randomness-collective-flip = { version = "2.0.0", default-features = false }
+pallet-staking = { version = "2.0.0", default-features = false }
+pallet-sudo = { version = "2.0.0", default-features = false }
+pallet-timestamp = { version = "2.0.0", default-features = false }
+pallet-transaction-payment = { version = "2.0.0", default-features = false }
+serde = { version = "1.0.116", optional = true, features = ["derive"] }
+sp-api = { version = "2.0.0", default-features = false }
+sp-block-builder = { version = "2.0.0", default-features = false }
+sp-consensus-aura = { version = "0.8.0", default-features = false }
+sp-core = { version = "2.0.0", default-features = false }
+sp-inherents = { version = "2.0.0", default-features = false }
+sp-io = { version = "2.0.0", default-features = false }
+sp-offchain = { version = "2.0.0", default-features = false }
+sp-runtime = { version = "2.0.0", default-features = false }
+sp-session = { version = "2.0.0", default-features = false }
+sp-std = { version = "2.0.0", default-features = false }
+sp-transaction-pool = { version = "2.0.0", default-features = false }
+sp-version = { version = "2.0.0", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder-runner = "1.0.6"

test-node/runtime/src/lib.rs

@@ -226,10 +226,6 @@ impl frame_system::Trait for Runtime {
     type AvailableBlockRatio = AvailableBlockRatio;
     /// Version of the runtime.
     type Version = Version;
-    /// Converts a module to the index of the module in `construct_runtime!`.
-    ///
-    /// This type is being generated by `construct_runtime!`.
-    type ModuleToIndex = ModuleToIndex;
     /// What to do if a new account is created.
     type OnNewAccount = ();
     /// What to do if an account is fully reaped from the system.
@@ -238,6 +234,8 @@ impl frame_system::Trait for Runtime {
     type AccountData = pallet_balances::AccountData<Balance>;
     /// Weight information for the extrinsics of this pallet.
     type SystemWeightInfo = ();
+    /// Provides information about the pallet setup in the runtime.
+    type PalletInfo = PalletInfo;
 }
 
 impl pallet_aura::Trait for Runtime {
@@ -259,6 +257,7 @@ impl pallet_grandpa::Trait for Runtime {
     )>>::IdentificationTuple;
 
     type HandleEquivocation = ();
+    type WeightInfo = ();
 }
 
 parameter_types! {
@@ -286,6 +285,7 @@ impl pallet_balances::Trait for Runtime {
     type ExistentialDeposit = ExistentialDeposit;
     type AccountStore = System;
     type WeightInfo = ();
+    type MaxLocks = ();
 }
 
 parameter_types! {