Skip to content

Commit

Permalink
Bump Substrate to v2.0.0 (paritytech#382)
Browse files Browse the repository at this point in the history 
* Change script to update versions.

* Bump versions.

* Address remainders.

* cargo fmt --all

* Fix tests.

* Whitelist BlueOak license

* Fix benchmarks?
  • Loading branch information
@tomusdrw @bkchr
tomusdrw authored and bkchr committed Apr 10, 2024
1 parent 3cd8937 commit be050bd
Show file tree
Hide file tree
Showing 28 changed files with 428 additions and 344 deletions.
106 changes: 53 additions & 53 deletions bridges/bin/millau-runtime/Cargo.toml
View file
Expand Up @@ -23,14 +23,14 @@ features = ["derive"]

# Substrate Dependencies
[dependencies.pallet-aura]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-balances]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

Expand All @@ -45,26 +45,26 @@ default-features = false
path = "../../modules/message-lane"

[dependencies.frame-support]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-grandpa]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-randomness-collective-flip]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-sudo]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

Expand All @@ -74,124 +74,124 @@ default-features = false
path = "../../modules/shift-session-manager"

[dependencies.pallet-session]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.frame-system]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.frame-system-rpc-runtime-api]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-timestamp]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.pallet-transaction-payment]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.frame-executive]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

# Substrate Primitives
[dependencies.sp-api]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-block-builder]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-consensus-aura]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-core]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-inherents]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-io]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-offchain]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-runtime]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-session]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-staking]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-std]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-transaction-pool]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.sp-version]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

[dependencies.frame-benchmarking]
optional = true
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
default-features = false
git = "https://github.com/paritytech/substrate/"

Expand All @@ -209,7 +209,7 @@ path = "../../primitives/message-lane"

[build-dependencies.wasm-builder-runner]
version = "1.0.5"
tag = 'v2.0.0-rc6'
tag = 'v2.0.0'
package = "substrate-wasm-builder-runner"
git = "https://github.com/paritytech/substrate/"

Expand Down
20 changes: 12 additions & 8 deletions bridges/bin/millau-runtime/src/lib.rs
View file
Expand Up @@ -200,16 +200,15 @@ 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;
/// Provides information about the pallet setup in the runtime.
type PalletInfo = PalletInfo;
/// What to do if a new account is created.
type OnNewAccount = ();
/// What to do if an account is fully reaped from the system.
type OnKilledAccount = ();
/// The data to be stored in an account.
type AccountData = pallet_balances::AccountData<Balance>;
// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
/// Weight information for the extrinsics of this pallet.
type SystemWeightInfo = ();
}
Expand All @@ -230,15 +229,13 @@ impl pallet_bridge_call_dispatch::Trait for Runtime {
impl pallet_grandpa::Trait for Runtime {
type Event = Event;
type Call = Call;

type KeyOwnerProofSystem = ();

type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::Proof;

type KeyOwnerIdentification =
<Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(KeyTypeId, GrandpaId)>>::IdentificationTuple;

type HandleEquivocation = ();
// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
type WeightInfo = ();
}

parameter_types! {
Expand All @@ -250,11 +247,15 @@ impl pallet_timestamp::Trait for Runtime {
type Moment = u64;
type OnTimestampSet = Aura;
type MinimumPeriod = MinimumPeriod;
// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
type WeightInfo = ();
}

parameter_types! {
pub const ExistentialDeposit: u128 = 500;
// For weight estimation, we assume that the most locks on an individual account will be 50.
// This number may need to be adjusted in the future if this assumption no longer holds true.
pub const MaxLocks: u32 = 50;
}

impl pallet_balances::Trait for Runtime {
Expand All @@ -265,7 +266,9 @@ impl pallet_balances::Trait for Runtime {
type DustRemoval = ();
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
type WeightInfo = ();
type MaxLocks = MaxLocks;
}

parameter_types! {
Expand Down Expand Up @@ -301,6 +304,7 @@ impl pallet_session::Trait for Runtime {
type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
type Keys = SessionKeys;
type DisabledValidatorsThreshold = ();
// TODO: update me (https://github.com/paritytech/parity-bridges-common/issues/78)
type WeightInfo = ();
}

Expand Down

0 comments on commit be050bd

Please sign in to comment.