Skip to content

Commit 120504a

Browse files
smiasojedsmiasojed
authored
Update to polkadot v1.10.0 (#233)
1 parent 17065f3 commit 120504a

File tree

9 files changed

+812
-888
lines changed

9 files changed

+812
-888
lines changed

‎Cargo.lock

Lines changed: 704 additions & 763 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[workspace.package]
22
authors = ["anonymous"]
33
edition = "2021"
4-
version = "0.40.0"
4+
version = "0.41.0"
55
license = "Unlicense"
66
homepage = "https://github.com/paritytech/substrate-contracts-node"
77
repository = "https://github.com/paritytech/substrate-contracts-node"
@@ -26,112 +26,112 @@ jsonrpsee = { version = "0.22", features = ["server"] }
2626
log = { version = "0.4.20", default-features = false }
2727
serde = { version = "1.0.195", features = ["derive"] }
2828
serde_json = "1.0.111"
29-
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
29+
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
3030
smallvec = "1.11.2"
3131
color-print = "0.3.5"
3232
wasmtime="8.0.1"
3333

3434
# Substrate
35-
frame-benchmarking = { version = "31.0.0", default-features = false }
36-
frame-benchmarking-cli = { version = "35.0.1" }
37-
frame-executive = { version = "31.0.0", default-features = false }
38-
frame-support = { version = "31.0.0", default-features = false }
39-
frame-system = { version = "31.0.0", default-features = false }
40-
frame-system-benchmarking = { version = "31.0.0", default-features = false }
41-
frame-system-rpc-runtime-api = { version = "29.0.0", default-features = false }
42-
frame-try-runtime = { version = "0.37.0", default-features = false }
43-
pallet-aura = { version = "30.0.0", default-features = false }
44-
pallet-authorship = { version = "31.0.0", default-features = false }
45-
pallet-balances = { version = "31.0.0", default-features = false }
46-
pallet-session = { version = "31.0.0", default-features = false }
47-
pallet-sudo = { version = "31.0.0", default-features = false }
48-
pallet-timestamp = { version = "30.0.0", default-features = false }
49-
pallet-transaction-payment = { version = "31.0.0", default-features = false }
50-
pallet-message-queue = { version = "34.0.0", default-features = false }
51-
pallet-transaction-payment-rpc = { version = "33.0.0" }
52-
pallet-transaction-payment-rpc-runtime-api = { version = "31.0.0", default-features = false }
53-
sc-basic-authorship = { version = "0.37.0" }
54-
sc-chain-spec = { version = "30.0.1" }
55-
sc-cli = { version = "0.39.0" }
56-
sc-client-api = { version = "31.0.0" }
57-
sc-consensus = { version = "0.36.0" }
58-
sc-executor = { version = "0.35.0" }
59-
sc-network = { version = "0.37.0" }
60-
sc-network-sync = { version = "0.36.0" }
61-
sc-offchain = { version = "32.0.0" }
62-
sc-rpc = { version = "32.0.0" }
63-
sc-service = { version = "0.38.0" }
64-
sc-sysinfo = { version = "30.0.0" }
65-
sc-telemetry = { version = "17.0.0" }
66-
sc-tracing = { version = "31.0.0" }
67-
sc-transaction-pool = { version = "31.0.0" }
68-
sc-transaction-pool-api = { version = "31.0.0" }
69-
sp-api = { version = "29.0.0", default-features = false }
70-
sp-keyring = { version = "34.0.0", default-features = false }
71-
sp-block-builder = { version = "29.0.0", default-features = false }
72-
sp-blockchain = { version = "31.0.0" }
73-
sp-consensus-aura = { version = "0.35.0", default-features = false }
74-
sp-core = { version = "31.0.0", default-features = false }
75-
sp-inherents = { version = "29.0.0", default-features = false }
76-
sp-io = { version = "33.0.0", default-features = false }
77-
sp-keystore = { version = "0.37.0" }
78-
sp-offchain = { version = "29.0.0", default-features = false }
79-
sp-runtime = { version = "34.0.0", default-features = false }
80-
sp-session = { version = "30.0.0", default-features = false }
35+
frame-benchmarking = { version = "32.0.0", default-features = false }
36+
frame-benchmarking-cli = { version = "36.0.0" }
37+
frame-executive = { version = "32.0.0", default-features = false }
38+
frame-support = { version = "32.0.0", default-features = false }
39+
frame-system = { version = "32.0.0", default-features = false }
40+
frame-system-benchmarking = { version = "32.0.0", default-features = false }
41+
frame-system-rpc-runtime-api = { version = "30.0.0", default-features = false }
42+
frame-try-runtime = { version = "0.38.0", default-features = false }
43+
pallet-aura = { version = "31.0.0", default-features = false }
44+
pallet-authorship = { version = "32.0.0", default-features = false }
45+
pallet-balances = { version = "33.0.0", default-features = false }
46+
pallet-session = { version = "32.0.0", default-features = false }
47+
pallet-sudo = { version = "32.0.0", default-features = false }
48+
pallet-timestamp = { version = "31.0.0", default-features = false }
49+
pallet-transaction-payment = { version = "32.0.0", default-features = false }
50+
pallet-message-queue = { version = "35.0.0", default-features = false }
51+
pallet-transaction-payment-rpc = { version = "34.0.0" }
52+
pallet-transaction-payment-rpc-runtime-api = { version = "32.0.0", default-features = false }
53+
sc-basic-authorship = { version = "0.38.0" }
54+
sc-chain-spec = { version = "31.0.0" }
55+
sc-cli = { version = "0.40.0" }
56+
sc-client-api = { version = "32.0.0" }
57+
sc-consensus = { version = "0.37.0" }
58+
sc-executor = { version = "0.36.0" }
59+
sc-network = { version = "0.38.0" }
60+
sc-network-sync = { version = "0.37.0" }
61+
sc-offchain = { version = "33.0.0" }
62+
sc-rpc = { version = "33.0.0" }
63+
sc-service = { version = "0.39.0" }
64+
sc-sysinfo = { version = "31.0.0" }
65+
sc-telemetry = { version = "18.0.0" }
66+
sc-tracing = { version = "32.0.0" }
67+
sc-transaction-pool = { version = "32.0.0" }
68+
sc-transaction-pool-api = { version = "32.0.0" }
69+
sp-api = { version = "30.0.0", default-features = false }
70+
sp-keyring = { version = "35.0.0", default-features = false }
71+
sp-block-builder = { version = "30.0.0", default-features = false }
72+
sp-blockchain = { version = "32.0.0" }
73+
sp-consensus-aura = { version = "0.36.0", default-features = false }
74+
sp-core = { version = "32.0.0", default-features = false }
75+
sp-inherents = { version = "30.0.0", default-features = false }
76+
sp-io = { version = "34.0.0", default-features = false }
77+
sp-keystore = { version = "0.38.0" }
78+
sp-offchain = { version = "30.0.0", default-features = false }
79+
sp-runtime = { version = "35.0.0", default-features = false }
80+
sp-session = { version = "31.0.0", default-features = false }
8181
sp-std = { version = "14.0.0", default-features = false }
82-
sp-timestamp = { version = "29.0.0" }
83-
sp-transaction-pool = { version = "29.0.0", default-features = false }
84-
sp-version = { version = "32.0.0", default-features = false }
85-
substrate-frame-rpc-system = { version = "31.0.0" }
82+
sp-timestamp = { version = "30.0.0" }
83+
sp-transaction-pool = { version = "30.0.0", default-features = false }
84+
sp-version = { version = "33.0.0", default-features = false }
85+
substrate-frame-rpc-system = { version = "32.0.0" }
8686
substrate-prometheus-endpoint = { version = "0.17.0" }
87-
substrate-wasm-builder = { version = "20.0.0" }
87+
substrate-wasm-builder = { version = "21.0.0" }
8888
substrate-build-script-utils = { version = "11.0.0" }
89-
try-runtime-cli = { version = "0.41.0" }
89+
try-runtime-cli = { version = "0.42.0" }
9090

9191
# extra deps for running a solo node on top of a parachain
92-
pallet-grandpa = { version = "31.0.0", default-features = false }
93-
sc-consensus-grandpa = { version = "0.22.0", default-features = false }
94-
sp-consensus-grandpa = { version = "16.0.0", default-features = false }
95-
sp-genesis-builder = { version = "0.10.0", default-features = false }
96-
sp-storage = { version = "20.0.0", default-features = false }
97-
sc-consensus-aura = { version = "0.37.0", default-features = false }
98-
sc-consensus-manual-seal = { version = "0.38.0", default-features = false }
92+
pallet-grandpa = { version = "32.0.0", default-features = false }
93+
sc-consensus-grandpa = { version = "0.23.0", default-features = false }
94+
sp-consensus-grandpa = { version = "17.0.0", default-features = false }
95+
sp-genesis-builder = { version = "0.11.0", default-features = false }
96+
sp-storage = { version = "21.0.0", default-features = false }
97+
sc-consensus-aura = { version = "0.38.0", default-features = false }
98+
sc-consensus-manual-seal = { version = "0.39.0", default-features = false }
9999

100100
# extra deps for setting up pallet-contracts
101-
pallet-contracts = { version = "30.0.0", default-features = false }
102-
pallet-insecure-randomness-collective-flip = { version = "19.0.0", default-features = false }
103-
pallet-assets = { version = "32.0.0", default-features = false }
104-
pallet-utility = { version = "31.0.0", default-features = false }
101+
pallet-contracts = { version = "31.0.0", default-features = false }
102+
pallet-insecure-randomness-collective-flip = { version = "20.0.0", default-features = false }
103+
pallet-assets = { version = "33.0.0", default-features = false }
104+
pallet-utility = { version = "32.0.0", default-features = false }
105105

106106
# Polkadot
107-
pallet-xcm = { version = "10.0.1", default-features = false }
108-
polkadot-cli = { version = "10.0.0", features = ["rococo-native"] }
109-
polkadot-parachain-primitives = { version = "9.0.0", default-features = false }
110-
polkadot-primitives = { version = "10.0.0" }
111-
polkadot-runtime-common = { version = "10.0.0", default-features = false }
112-
xcm = { version = "10.0.0", package = "staging-xcm", default-features = false }
113-
xcm-builder = { version = "10.0.0", package = "staging-xcm-builder", default-features = false }
114-
xcm-executor = { version = "10.0.0", package = "staging-xcm-executor", default-features = false }
107+
pallet-xcm = { version = "11.0.0", default-features = false }
108+
polkadot-cli = { version = "11.0.0", features = ["rococo-native"] }
109+
polkadot-parachain-primitives = { version = "10.0.0", default-features = false }
110+
polkadot-primitives = { version = "11.0.0" }
111+
polkadot-runtime-common = { version = "11.0.0", default-features = false }
112+
xcm = { version = "11.0.0", package = "staging-xcm", default-features = false }
113+
xcm-builder = { version = "11.0.0", package = "staging-xcm-builder", default-features = false }
114+
xcm-executor = { version = "11.0.0", package = "staging-xcm-executor", default-features = false }
115115

116116
# Cumulus
117-
cumulus-client-cli = { version = "0.10.0" }
118-
cumulus-client-collator = { version = "0.10.0" }
119-
cumulus-client-consensus-proposer = { version = "0.10.0" }
120-
cumulus-client-consensus-aura = { version = "0.10.0" }
121-
cumulus-client-consensus-common = { version = "0.10.0" }
122-
cumulus-client-service = { version = "0.10.0" }
123-
cumulus-pallet-aura-ext = { version = "0.10.0", default-features = false }
124-
cumulus-pallet-dmp-queue = { version = "0.10.0", default-features = false }
125-
cumulus-pallet-parachain-system = { version = "0.10.0", default-features = false, features = ["parameterized-consensus-hook",] }
126-
cumulus-pallet-session-benchmarking = { version = "12.0.0", default-features = false }
127-
cumulus-pallet-xcm = { version = "0.10.0", default-features = false }
128-
cumulus-pallet-xcmp-queue = { version = "0.10.0", default-features = false }
129-
cumulus-primitives-core = { version = "0.10.0", default-features = false }
130-
cumulus-primitives-parachain-inherent = { version = "0.10.0" }
131-
cumulus-primitives-timestamp = { version = "0.10.0", default-features = false }
132-
cumulus-primitives-utility = { version = "0.10.0", default-features = false }
133-
cumulus-relay-chain-interface = { version = "0.10.0" }
134-
pallet-collator-selection = { version = "12.0.0", default-features = false }
135-
parachain-info = { version = "0.10.0", package = "staging-parachain-info", default-features = false }
136-
parachains-common = { version = "10.0.0", default-features = false }
117+
cumulus-client-cli = { version = "0.11.0" }
118+
cumulus-client-collator = { version = "0.11.0" }
119+
cumulus-client-consensus-proposer = { version = "0.11.0" }
120+
cumulus-client-consensus-aura = { version = "0.11.0" }
121+
cumulus-client-consensus-common = { version = "0.11.0" }
122+
cumulus-client-service = { version = "0.11.0" }
123+
cumulus-pallet-aura-ext = { version = "0.11.0", default-features = false }
124+
cumulus-pallet-dmp-queue = { version = "0.11.0", default-features = false }
125+
cumulus-pallet-parachain-system = { version = "0.11.0", default-features = false, features = ["parameterized-consensus-hook",] }
126+
cumulus-pallet-session-benchmarking = { version = "13.0.0", default-features = false }
127+
cumulus-pallet-xcm = { version = "0.11.0", default-features = false }
128+
cumulus-pallet-xcmp-queue = { version = "0.11.0", default-features = false }
129+
cumulus-primitives-core = { version = "0.11.0", default-features = false }
130+
cumulus-primitives-parachain-inherent = { version = "0.11.0" }
131+
cumulus-primitives-timestamp = { version = "0.11.0", default-features = false }
132+
cumulus-primitives-utility = { version = "0.11.0", default-features = false }
133+
cumulus-relay-chain-interface = { version = "0.11.0" }
134+
pallet-collator-selection = { version = "13.0.0", default-features = false }
135+
parachain-info = { version = "0.11.0", package = "staging-parachain-info", default-features = false }
136+
parachains-common = { version = "11.0.0", default-features = false }
137137

‎node/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ serde_json = { workspace = true }
2727
wasmtime = { workspace = true }
2828

2929
# Local
30-
contracts-parachain-runtime = { path = "../parachain-runtime", features = ["parachain"], version = "0.40.0" }
31-
contracts-node-runtime = { path = "../runtime", version = "0.40.0" }
30+
contracts-parachain-runtime = { path = "../parachain-runtime", features = ["parachain"], version = "0.41.0" }
31+
contracts-node-runtime = { path = "../runtime", version = "0.41.0" }
3232

3333
# Substrate
3434
frame-benchmarking = { workspace = true }

‎node/src/service.rs

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImpo
1818
use cumulus_client_consensus_proposer::Proposer;
1919
use cumulus_client_service::{
2020
build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks,
21-
BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams,
21+
BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, ParachainHostFunctions,
22+
StartRelayChainTasksParams,
2223
};
2324
use cumulus_primitives_core::{relay_chain::CollatorPair, ParaId};
2425
use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
@@ -27,9 +28,7 @@ use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface};
2728
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
2829
use sc_client_api::Backend;
2930
use sc_consensus::ImportQueue;
30-
use sc_executor::{
31-
HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
32-
};
31+
use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};
3332
use sc_network::NetworkBlock;
3433
use sc_network_sync::SyncingService;
3534
use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
@@ -38,22 +37,7 @@ use sc_transaction_pool_api::OffchainTransactionPoolFactory;
3837
use sp_keystore::KeystorePtr;
3938
use substrate_prometheus_endpoint::Registry;
4039

41-
/// Native executor type.
42-
pub struct ParachainNativeExecutor;
43-
44-
impl sc_executor::NativeExecutionDispatch for ParachainNativeExecutor {
45-
type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
46-
47-
fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
48-
contracts_parachain_runtime::api::dispatch(method, data)
49-
}
50-
51-
fn native_version() -> sc_executor::NativeVersion {
52-
contracts_parachain_runtime::native_version()
53-
}
54-
}
55-
56-
type ParachainExecutor = NativeElseWasmExecutor<ParachainNativeExecutor>;
40+
type ParachainExecutor = WasmExecutor<ParachainHostFunctions>;
5741

5842
type ParachainClient = TFullClient<Block, RuntimeApi, ParachainExecutor>;
5943

@@ -91,16 +75,14 @@ pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error>
9175
.default_heap_pages
9276
.map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ });
9377

94-
let wasm = WasmExecutor::builder()
78+
let executor = ParachainExecutor::builder()
9579
.with_execution_method(config.wasm_method)
9680
.with_onchain_heap_alloc_strategy(heap_pages)
9781
.with_offchain_heap_alloc_strategy(heap_pages)
9882
.with_max_runtime_instances(config.max_runtime_instances)
9983
.with_runtime_cache_size(config.runtime_cache_size)
10084
.build();
10185

102-
let executor = ParachainExecutor::new_with_wasm_executor(wasm);
103-
10486
let (client, backend, keystore_container, task_manager) =
10587
sc_service::new_full_parts::<Block, RuntimeApi, _>(
10688
config,

‎parachain-runtime/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ substrate-wasm-builder = {workspace = true, optional = true }
1717
codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = ["derive"] }
1818
hex-literal = { version = "0.4.1", optional = true }
1919
log = { version = "0.4.20", default-features = false }
20-
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
20+
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
2121
smallvec = "1.11.2"
2222

2323
# Substrate
@@ -178,5 +178,4 @@ try-runtime = [
178178
"sp-runtime/try-runtime",
179179
]
180180

181-
experimental = [ "pallet-aura/experimental" ]
182181
parachain = []

‎parachain-runtime/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ parameter_types! {
276276
/// The default types are being injected by [`derive_impl`](`frame_support::derive_impl`) from
277277
/// [`ParaChainDefaultConfig`](`struct@frame_system::config_preludes::ParaChainDefaultConfig`),
278278
/// but overridden as needed.
279-
#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
279+
#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig)]
280280
impl frame_system::Config for Runtime {
281281
/// The identifier used to distinguish between accounts.
282282
type AccountId = AccountId;
@@ -411,6 +411,7 @@ impl pallet_message_queue::Config for Runtime {
411411
type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
412412
type MaxStale = sp_core::ConstU32<8>;
413413
type ServiceWeight = MessageQueueServiceWeight;
414+
type IdleMaxServiceWeight = ();
414415
}
415416

416417
impl cumulus_pallet_aura_ext::Config for Runtime {}
@@ -452,7 +453,6 @@ impl pallet_aura::Config for Runtime {
452453
type DisabledValidators = ();
453454
type MaxAuthorities = ConstU32<100_000>;
454455
type AllowMultipleBlocksPerSlot = ConstBool<false>;
455-
#[cfg(feature = "experimental")]
456456
type SlotDuration = pallet_aura::MinimumPeriodTimesTwo<Self>;
457457
}
458458

@@ -560,7 +560,7 @@ impl_runtime_apis! {
560560
}
561561

562562
fn authorities() -> Vec<AuraId> {
563-
Aura::authorities().into_inner()
563+
pallet_aura::Authorities::<Runtime>::get().into_inner()
564564
}
565565
}
566566

‎parachain-runtime/src/xcm_config.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ impl xcm_executor::Config for XcmConfig {
143143
type SafeCallFilter = Everything;
144144
type Aliasers = Nothing;
145145
type TransactionalProcessor = FrameTransactionalProcessor;
146+
type HrmpNewChannelOpenRequestHandler = ();
147+
type HrmpChannelAcceptedHandler = ();
148+
type HrmpChannelClosingHandler = ();
146149
}
147150

148151
/// No local origins on this chain are allowed to dispatch XCM sends/executions.

‎runtime/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,3 @@ try-runtime = [
128128
"pallet-assets/try-runtime",
129129
"sp-runtime/try-runtime",
130130
]
131-
experimental = [ "pallet-aura/experimental" ]

‎runtime/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ parameter_types! {
173173

174174
// Configure FRAME pallets to include in runtime.
175175

176-
#[derive_impl(frame_system::config_preludes::SolochainDefaultConfig as frame_system::DefaultConfig)]
176+
#[derive_impl(frame_system::config_preludes::SolochainDefaultConfig)]
177177
impl frame_system::Config for Runtime {
178178
/// The block type for the runtime.
179179
type Block = Block;

0 commit comments

Comments
 (0)