Skip to content

Commit f475528

Browse files
committed
chore(upgrade): v1.11.0 to v1.13.0
- Upgrade Polkadot-sdk 1.10.0 to 1.13.0 - Update weights to reflect the new version.1.13.0 Notable Changes: Polkadot-sdk 1.12.0 - [Improve MockValidationDataInherentDataProvider to support async backing](paritytech/polkadot-sdk#4442) - [Balances-Pallet add burn_allow_death extrinsic](paritytech/polkadot-sdk#3964) - [Add Async Backing to Parachain Template](paritytech/polkadot-sdk#4295) Polkadot-sdk 1.13.0 - [DeprecatedRuntimeGenesisConfig generic type parameter in GenericChainSpec struct](paritytech/polkadot-sdk#4410) - [Move the `para_id` from `MockXcmConfig` to `MockValidationDataInherentDataProvider` to make it more prominent](paritytech/polkadot-sdk#4555) - [Remove parameterized-consensus-hook feature](paritytech/polkadot-sdk#4380) For more details, please refer to: - [Polkadot-sdk release 1.12.0](https://github.com/paritytech/polkadot-sdk/releases/polkadot-v1.12.0) - [Polkadot-sdk release 1.13.0](https://github.com/paritytech/polkadot-sdk/releases/polkadot-v1.13.0) - [Async Backing](https://wiki.polkadot.network/docs/maintain-guides-async-backing) issue-2025 issue-1983
1 parent 978d6af commit f475528

57 files changed

Lines changed: 2539 additions & 2355 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
rust 1.70
1+
rust 1.77.0
22
make 4.3
33
cmake 3.24.1

Cargo.lock

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

Cargo.toml

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ start:
1414
start-paseo-relay:
1515
./scripts/init.sh start-paseo-relay-chain
1616

17+
18+
start-paseo-collator-alice:
19+
./scripts/init.sh start-paseo-collator-alice
20+
21+
start-paseo-collator-bob:
22+
./scripts/init.sh start-paseo-collator-bob
23+
1724
start-frequency:
1825
./scripts/init.sh start-frequency
1926

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ make start-interval
216216

217217
### Mixed Terminal/Docker
218218

219-
This option runs one collator node as local host process and two relay chain validator nodes in each own docker container.
219+
This option runs two collator nodes as local host processes and two relay chain validator nodes, each in its own docker container.
220220

221221
1. Start relay chain validator nodes.
222222

223223
```sh
224-
make start-relay
224+
make start-paseo-relay
225225
```
226226

227227
1. Register a new parachain slot (parachain id) for Frequency. _Note, if parachain was
@@ -232,13 +232,16 @@ This option runs one collator node as local host process and two relay chain val
232232
make register
233233
```
234234

235-
1. Start Frequency as parachain. This step will generate genesis/wasm and start the parachain collator.
235+
1. Start Frequency as parachain with a single collator.
236236

237237
```sh
238-
make start-frequency
238+
make start-paseo-collator-alice
239+
```
240+
```sh
241+
make start-paseo-collator-bob
239242
```
240243

241-
1. Onboard Frequency to the relay chain
244+
1. Generate genesis/wasm and onboard Frequency to the relay chain.
242245
```sh
243246
make onboard
244247
```

docker/docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: "3"
44
services:
55
relay_paseo_alice:
66
container_name: alice
7-
image: "parity/polkadot:v1.1.0"
7+
image: "parity/polkadot:v1.13.0"
88
platform: linux/x86_64
99
hostname: relay_alice
1010
ports:
@@ -26,12 +26,12 @@ services:
2626
--rpc-cors=all
2727
--rpc-methods=Unsafe
2828
--alice
29-
--log="main"
29+
-ltxpool=trace
3030
restart: unless-stopped
3131

3232
relay_paseo_bob:
3333
container_name: bob
34-
image: "parity/polkadot:v1.1.0"
34+
image: "parity/polkadot:v1.13.0"
3535
platform: linux/x86_64
3636
hostname: relay_bob
3737
ports:
@@ -72,5 +72,5 @@ services:
7272
- "30333:30333" # p2p port
7373
- "9944:9944" # ws and rpc port
7474
depends_on:
75-
- relay_alice
76-
- relay_bob
75+
- relay_paseo_alice
76+
- relay_paseo_bob

node/cli/src/benchmarking.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,11 @@ pub fn inherent_benchmark_data() -> Result<InherentData> {
175175
let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
176176
let mock_para_inherent_provider =
177177
cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
178+
para_id: 1000.into(),
179+
current_para_block_head: Some(cumulus_primitives_core::relay_chain::HeadData::default()),
178180
current_para_block: 0,
179181
relay_offset: 1,
180-
relay_blocks_per_para_block: 2,
182+
relay_blocks_per_para_block: 1,
181183
xcm_config: Default::default(),
182184
raw_downward_messages: Default::default(),
183185
raw_horizontal_messages: Default::default(),

node/cli/src/cli.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ use cli_opt::SealingMode;
1414
/// Sub-commands supported by the collator.
1515
#[derive(Debug, clap::Subcommand)]
1616
pub enum Subcommand {
17+
/// Key management cli utilities
18+
#[command(subcommand)]
19+
Key(sc_cli::KeySubcommand),
1720
/// Build a chain specification.
1821
BuildSpec(sc_cli::BuildSpecCmd),
1922

node/cli/src/command.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ pub fn run() -> Result<()> {
267267
let cli = Cli::from_args();
268268

269269
match &cli.subcommand {
270+
Some(Subcommand::Key(cmd)) => cmd.run(&cli),
270271
Some(Subcommand::BuildSpec(cmd)) => {
271272
let runner = cli.create_runner(cmd)?;
272273
runner.sync_run(|config| cmd.run(config.chain_spec, config.network))

node/service/src/chain_spec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use sp_core::{Pair, Public};
88
use sp_runtime::traits::{IdentifyAccount, Verify};
99

1010
/// Dummy chain spec for building and checking
11-
pub type DummyChainSpec = sc_service::GenericChainSpec<(), Extensions>;
11+
pub type DummyChainSpec = sc_service::GenericChainSpec<Extensions>;
1212

1313
#[cfg(feature = "frequency")]
1414
pub mod frequency;

0 commit comments

Comments
 (0)