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

Upstream Statemine Release v5 Changes to Master #720

Merged
merged 57 commits into from
Nov 8, 2021
Merged

Upstream Statemine Release v5 Changes to Master #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
ede4d52
Update references
bkchr Oct 8, 2021
cf3e4be
Merge branch 'master' of github.com:paritytech/cumulus into release-s…
apopiak Oct 12, 2021
40bef59
update deps
apopiak Oct 12, 2021
7360a62
set substrate deps for pallet-asset-tx-payment
apopiak Oct 13, 2021
79809c1
add DisabledValidatorsThreshold to parachain template
apopiak Oct 13, 2021
9e9c759
add DisabledValidatorsThreshold to statemint runtimes
apopiak Oct 13, 2021
580dfcd
adjust imports
apopiak Oct 13, 2021
5cc3c13
update Cargo-lock
apopiak Oct 13, 2021
9a28018
add DisabledValidatorsThreshold to mock config
apopiak Oct 13, 2021
efd4079
cargo +nightly fmt
apopiak Oct 13, 2021
eebadf0
adjust on_disabled type
apopiak Oct 13, 2021
0f320d8
remove on_chain_votes function in ParachainHost impl
apopiak Oct 13, 2021
cf04b27
remove ScrapedOnChainVotes
apopiak Oct 13, 2021
f8e5ece
bump polkadot-collator version
apopiak Oct 13, 2021
b4ea44a
update Cargo.lock
apopiak Oct 13, 2021
d4a202a
set spec_versions to 500
apopiak Oct 14, 2021
e632c5f
Statemine cannot execute.
gavofyork Oct 14, 2021
f2941c6
disallow XCM execute on statemint
apopiak Oct 14, 2021
7667119
cargo fmt
apopiak Oct 14, 2021
4a704cc
remove unnecessary dep on node-primitives
apopiak Oct 15, 2021
ae23b3d
select parachains-common/std feature when building rococo-runtime wit…
apopiak Oct 15, 2021
0e01e63
adjust Statemint to the three digit spec_version format
apopiak Oct 15, 2021
86ed61c
Add script to generate simple changelogs (#668)
chevdor Oct 15, 2021
72b0b8b
Update weights from v4 for v5 comparison (#673)
NachoPal Oct 18, 2021
eccc2d0
Fix benchmarks after Parachain Template (#677)
NachoPal Oct 19, 2021
1bed7c6
Weights updates for Statemine v5 (#682)
NachoPal Oct 20, 2021
8ce22ec
mention Storage in construct_runtime macro for pallet-xcm (#680)
apopiak Oct 20, 2021
8ab829f
Use pallet-xcm for version wrapping (#689)
apopiak Oct 20, 2021
6c6d7a0
patch weight for batch_all from rerun
apopiak Oct 21, 2021
a0e7189
Runtime version bump to v503 (#694)
chevdor Oct 22, 2021
35e135e
adjust genesis value generation scripts to output entries array + add…
apopiak Oct 26, 2021
4f3362a
add script to generate shell spec from runtime wasm
apopiak Oct 26, 2021
537d772
Ensure a bad datastream cannot cause problems (#701)
gavofyork Oct 27, 2021
a71e04f
update Polkadot (to 0.9.11 169bab55d)
apopiak Oct 27, 2021
2f73537
bump spec versions
apopiak Oct 27, 2021
1dab315
Allow Queries and Subscriptions
gavofyork Oct 26, 2021
c3240a7
fix build
joepetrowski Oct 27, 2021
e7aa76f
make fmt happy
joepetrowski Oct 27, 2021
215c13a
statemint imports
joepetrowski Oct 27, 2021
4932deb
slight naming changes in script
apopiak Oct 28, 2021
54f59bc
add shell genesis data + wasm + chainspec
apopiak Oct 28, 2021
b933596
adjust generated shell spec with production config values
apopiak Oct 29, 2021
40e6560
Merge branch 'release-statemine-v5' of github.com:paritytech/cumulus …
apopiak Nov 3, 2021
24377a6
update Substrate and Polkadot to master
apopiak Nov 3, 2021
d2ec4ef
fix deps
apopiak Nov 3, 2021
f9cbf07
swap out bootnodes for statemint shell
apopiak Nov 4, 2021
7f74ab2
add a script for verifying the shell chain spec
apopiak Nov 4, 2021
aec894c
add sha checksum for head data
apopiak Nov 4, 2021
07f3d6b
remove verification script
apopiak Nov 4, 2021
08e9343
remove hex wasm file
apopiak Nov 4, 2021
8c3564a
pull recent master
apopiak Nov 4, 2021
ea8b9ff
Merge branch 'release-statemint-shell' of github.com:paritytech/cumul…
apopiak Nov 4, 2021
ece1243
update Substrate and Polkadot again and fix compilation
apopiak Nov 4, 2021
153ee49
Merge branch 'master' of github.com:paritytech/cumulus into apopiak/u…
apopiak Nov 4, 2021
8132b14
update and fix lock file
apopiak Nov 4, 2021
a43ad72
formatting
apopiak Nov 4, 2021
0bd6acf
remove redundant dispatch_as weight
apopiak Nov 4, 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,163 changes: 545 additions & 618 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pallets/collator-selection/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fn register_validators<T: Config + session::Config>(count: u32) {
let validators = (0..count).map(|c| validator::<T>(c)).collect::<Vec<_>>();

for (who, keys) in validators {
<session::Module<T>>::set_keys(RawOrigin::Signed(who).into(), keys, vec![]).unwrap();
<session::Pallet<T>>::set_keys(RawOrigin::Signed(who).into(), keys, vec![]).unwrap();
}
}

Expand Down Expand Up @@ -157,7 +157,7 @@ benchmarks! {
let bond: BalanceOf<T> = T::Currency::minimum_balance() * 2u32.into();
T::Currency::make_free_balance_be(&caller, bond.clone());

<session::Module<T>>::set_keys(
<session::Pallet<T>>::set_keys(
RawOrigin::Signed(caller.clone()).into(),
keys::<T>(c + 1),
vec![]
Expand Down
12 changes: 6 additions & 6 deletions parachain-template/pallets/template/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"], default-features = false }
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }

frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "master" }
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" }
Comment on lines +18 to +20
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the noise, seems like diener reformatted the deps


[dev-dependencies]
serde = { version = "1.0.119" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion parachain-template/pallets/template/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use super::*;

#[allow(unused)]
use crate::Module as Template;
use crate::Pallet as Template;
use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, whitelisted_caller};
use frame_system::RawOrigin;

Expand Down
4 changes: 4 additions & 0 deletions parachain-template/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }

[dependencies]
hex-literal = { version = '0.3.1', optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]}
log = { version = "0.4.14", default-features = false }
scale-info = { version = "1.0.0", default-features = false, features = ["derive"] }
Expand Down Expand Up @@ -69,6 +70,7 @@ cumulus-primitives-timestamp = { path = "../../primitives/timestamp", default-fe
cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false }
pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
parachain-info = { path = "../../polkadot-parachains/pallets/parachain-info", default-features = false }
cumulus-pallet-session-benchmarking = {path = "../../pallets/session-benchmarking", default-features = false, version = "3.0.0"}

# Polkadot Dependencies
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
Expand Down Expand Up @@ -130,6 +132,7 @@ std = [
]

runtime-benchmarks = [
'hex-literal',
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"frame-benchmarking",
Expand All @@ -141,4 +144,5 @@ runtime-benchmarks = [
"pallet-template/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
'cumulus-pallet-session-benchmarking/runtime-benchmarks',
]
5 changes: 3 additions & 2 deletions parachain-template/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ pub type LocalOriginToLocation = ();
/// queues.
pub type XcmRouter = (
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
);
Expand Down Expand Up @@ -545,7 +545,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type Event = Event;
type XcmExecutor = XcmExecutor<XcmConfig>;
type ChannelInfo = ParachainSystem;
type VersionWrapper = ();
type VersionWrapper = PolkadotXcm;
}

impl cumulus_pallet_dmp_queue::Config for Runtime {
Expand Down Expand Up @@ -778,6 +778,7 @@ impl_runtime_apis! {

list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);
list_benchmark!(list, extra, pallet_balances, Balances);
list_benchmark!(list, extra, pallet_session, SessionBench::<Runtime>);
list_benchmark!(list, extra, pallet_timestamp, Timestamp);
list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);

Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "polkadot-collator"
version = "4.0.0"
version = "5.0.0"
authors = ["Parity Technologies <[email protected]>"]
build = "build.rs"
edition = "2018"
Expand Down
12 changes: 6 additions & 6 deletions polkadot-parachains/parachains-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "master
sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }

# Polkadot dependencies
polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
xcm = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = "master", default-features = false }
polkadot-runtime-common = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
xcm = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }
xcm-executor = { git = 'https://github.com/paritytech/polkadot', default-features = false , branch = "master" }

# Local dependencies
pallet-asset-tx-payment = { path = '../../pallets/asset-tx-payment', default-features = false }
pallet-collator-selection = { path = '../../pallets/collator-selection', default-features = false }

[dev-dependencies]
sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = "master", default-features = false }
sp-io = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "master" }
pallet-authorship = { git = 'https://github.com/paritytech/substrate', default-features = false , branch = "master" }

[build-dependencies]
substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = "master" }
Expand Down
1 change: 1 addition & 0 deletions polkadot-parachains/res/shell-statemint-head-data
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x000000000000000000000000000000000000000000000000000000000000000000c1ef26b567de07159e4ecd415fbbb0340c56a09c4d72c82516d0f3bc2b782c8003170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c11131400
38 changes: 38 additions & 0 deletions polkadot-parachains/res/shell-statemint.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions polkadot-parachains/statemine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("statemine"),
impl_name: create_runtime_str!("statemine"),
authoring_version: 1,
spec_version: 5,
spec_version: 504,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 3,
Expand Down Expand Up @@ -606,7 +606,7 @@ pub type LocalOriginToLocation = ();
/// queues.
pub type XcmRouter = (
// Two routers - use UMP to communicate with the relay chain:
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,
cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm>,
// ..and XCMP to communicate with the sibling chains.
XcmpQueue,
);
Expand Down Expand Up @@ -638,7 +638,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
type Event = Event;
type XcmExecutor = XcmExecutor<XcmConfig>;
type ChannelInfo = ParachainSystem;
type VersionWrapper = ();
type VersionWrapper = PolkadotXcm;
}

impl cumulus_pallet_dmp_queue::Config for Runtime {
Expand Down Expand Up @@ -742,7 +742,7 @@ construct_runtime!(

// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 31,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,

Expand Down
Loading