Upgrade to polkadot-v0.9.26 #850

vivekvpandya · 2022-10-28T06:34:57Z

Along with this it also needs following code changes:
https://github.com/zeitgeistpm/moonbeam/commits/polkadot-v0.9.26
https://github.com/zeitgeistpm/nimbus/commits/polkadot-v0.9.26
https://github.com/zeitgeistpm/crowdloan-rewards/commits/polkadot-v0.9.26
https://github.com/zeitgeistpm/frontier/commits/polkadot-v0.9.26

Chralt98 · 2022-10-28T06:53:21Z

I am waiting for the full CI checks and merge conflicts.

…raits and functions with suggested ones.

Chralt98

I think @sea212 , you have the best experience in upgrading to new polkadot versions. So Vivek, assume, that I might missed some important stuff.

zrml/court/src/lib.rs

Cargo.toml

zrml/prediction-markets/src/mock.rs

zrml/liquidity-mining/src/track_incentives_based_on_bought_shares.rs

zrml/liquidity-mining/src/track_incentives_based_on_sold_shares.rs

runtime/battery-station/src/lib.rs

node/Cargo.toml

runtime/common/src/lib.rs

sea212

Changes look good to me. There are some review suggestions in regards to removing some deprecated code in client and bumping the recursion depth in the runtime. In addition, we have to add two more benchmarks that were made available in some pallets. Other than that the PR can be merged as it is.

All dependencies updated and Cargo.lock updated
Runtimes builds in all modes
Client builds in all modes
Cleanly use original repositories instead of forks wherever possible (no duplicate crates [fork/original] in Cargo.lock)
Runtime logic appropriately adjusted
Benchmarks work
Try-runtime upgrade succeeds
Ensure all benchmarkable pallets are listed as benchmarks and have a custom weights file.

The runtime-benchmarks feature was made available for cumulus-pallet-parachain-system and session-keys-primitives. Please add those to the runtime-benchmarks feature in our runtimes, to the add_benchmark! and list_benchmark! marcros and finally configure the pallets to use our custom weight for them in runtime/common/weights (for this you have to copy weight files from the original repositories for now, we'll replace those with our benchmarks before the release).

node/Cargo.toml

sea212 · 2022-11-04T08:11:54Z

node/src/cli/cli_parachain.rs

@@ -224,7 +224,7 @@ impl sc_cli::SubstrateCli for RelayChainCli {
 #[derive(Debug, Parser)]
 pub struct ExportGenesisStateCommand {


We should be able to remove custom ExportGenesisStateCommand subcommand struct, because it is included in cumulus now:
substrate-developer-hub/substrate-parachain-template@polkadot-v0.9.23...polkadot-v0.9.26#diff-76397c90c6ee2b6b98efd989d3ae3c11e0bde3db30b5ef46f2762180f56041a8

In node/cli.rs, we can then replace:

/// Export the genesis state of the parachain. #[cfg(feature = "parachain")] #[clap(name = "export-genesis-state")] ExportGenesisState(cli_parachain::ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. #[cfg(feature = "parachain")] #[clap(name = "export-genesis-wasm")] ExportGenesisWasm(cli_parachain::ExportGenesisWasmCommand),

by

/// Export the genesis state of the parachain. #[cfg(feature = "parachain")] ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. #[cfg(feature = "parachain")] ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand),

See
substrate-developer-hub/substrate-parachain-template@polkadot-v0.9.23...polkadot-v0.9.26#diff-76397c90c6ee2b6b98efd989d3ae3c11e0bde3db30b5ef46f2762180f56041a8L46-L78
and
substrate-developer-hub/substrate-parachain-template@polkadot-v0.9.23...polkadot-v0.9.26#diff-76397c90c6ee2b6b98efd989d3ae3c11e0bde3db30b5ef46f2762180f56041a8R27-R31

Also in line 53 we can parse the command directly using clap instead of parsing functions exposed by polkadot client RunCmd: substrate-developer-hub/substrate-parachain-template@polkadot-v0.9.23...polkadot-v0.9.26#diff-76397c90c6ee2b6b98efd989d3ae3c11e0bde3db30b5ef46f2762180f56041a8R91

I don't think we can remove completely as we are taking parachain_id as parameter and that goes to following code to fill details in Extensions struct.

32 pub fn battery_station_staging_config( 31 #[cfg(feature = "parachain")] parachain_id: cumulus_primitives_core::ParaId, 30 ) -> Result<BatteryStationChainSpec, String> { ... 8 #[cfg(feature = "parachain")] 7 crate::chain_spec::Extensions { 6 relay_chain: "rococo".into(), 5 parachain_id: parachain_id.into(), 4 }, 3 #[cfg(not(feature = "parachain"))] 2 Default::default(), 1 )) 153 }

For others it is possible as they don't require parameter for parachain_id instead they use constant value
https://github.com/AcalaNetwork/Acala/blob/master/node/service/src/chain_spec/acala.rs#L97

Based on this let us try to find a way to be as close as possible to the parachain template code. Because currently the parachain node doesn't sync, we should try to use the new ExportGenesisState and ExportGenesisWasm method to generate our new genesis configuration for onboarding it on the rococo relaychain.

runtime/battery-station/src/lib.rs

runtime/common/src/lib.rs

Chralt98 · 2022-11-04T09:45:48Z

Thanks for sharing your check list and the method you use to find the needed changes. Saved ✅

sea212 · 2022-11-10T07:19:39Z

@Chralt98 Can you please review the changes? Before approving, please also execute the node once locally and ensure it syncs with BS and Zeitgeist mainnet.

Chralt98

Always hard to catch possible flaws in polkadot version updates. I checked a couple of dependencies and looked correct to me. Lucky, that we have the CI.

I executed:

cargo build --bin zeitgeist --features parachain --manifest-path Cargo.toml --profile=production

# main-net sync check
./target/production/zeitgeist --tmp

# test-net sync check
./target/production/zeitgeist --chain=battery_station --tmp

After the upgrade to polkadot 0.9.26 the production parachain node did produce the following output:

main-net sync:

test-net sync:

The parachain found no peers in both cases.

Standalone (without feature parachain and without chain argument) does produce blocks in standalone local dev chain mode:

node/src/chain_spec/mod.rs

node/Cargo.toml

Chralt98 · 2022-11-11T11:02:25Z

node/src/cli/cli_parachain.rs

@@ -224,7 +224,7 @@ impl sc_cli::SubstrateCli for RelayChainCli {
 #[derive(Debug, Parser)]
 pub struct ExportGenesisStateCommand {


Based on this let us try to find a way to be as close as possible to the parachain template code. Because currently the parachain node doesn't sync, we should try to use the new ExportGenesisState and ExportGenesisWasm method to generate our new genesis configuration for onboarding it on the rococo relaychain.

Chralt98 · 2022-11-21T15:37:22Z

@sea212 You might have something against the approach of using a constant parachain id. I am open for a revert on this too.. but love on the other hand the simplicity of a constant ...

sea212

LGTM, thanks for polishing the codebase, it's shiney again 😎

Can you create an issue in regards to fixing the client (connection issue)? Priority should be critical imo.

vivekvpandya · 2022-11-24T09:42:27Z

LGTM, thanks for polishing the codebase, it's shiney again sunglasses

Can you create an issue in regards to fixing the client (connection issue)? Priority should be critical imo.

Please find new issue #883

node/src/cli.rs

Chralt98

Let us roll out the non-client runtime upgrade!

Chralt98

just CI checks are not fully correct

Chralt98 · 2022-11-24T12:33:22Z

Can we re-run the workflow?

workflow run is incorrect

vivekvpandya added 4 commits October 20, 2022 14:58

Upgrade Cargo.toml for pallets for polkadot-v0.9.26

8807a5c

update runtime and node to version 0.9.26

b6cd6cb

Fixes required for 0.9.26

8d0afae

Use bounded_vec!

c63a554

vivekvpandya requested review from sea212, Chralt98 and maltekliemann October 28, 2022 06:34

vivekvpandya self-assigned this Oct 28, 2022

vivekvpandya added 5 commits October 31, 2022 12:13

Merge branch 'main' into upgrade_0926 and replace use of depricated t…

f93fc24

…raits and functions with suggested ones.

Make node compile

82b9170

Format and clippy issues resolved

f614c22

Merge branch 'main' into upgrade_0926

852cdac

Fix compilation after rebase

c5c74fb

vivekvpandya marked this pull request as ready for review November 1, 2022 06:47

Update cargo lock

5e582f4

maltekliemann added the s:review-needed The pull request requires reviews label Nov 2, 2022

Pin tracing-core version

4752b8b

Chralt98 reviewed Nov 3, 2022

View reviewed changes

Changes as per review comments

b032514

sea212 linked an issue Nov 4, 2022 that may be closed by this pull request

Upgrade codebase to polkadot-v0.9.26 #766

Closed

sea212 reviewed Nov 4, 2022

View reviewed changes

Address review comments

e1a3f3b

sea212 previously approved these changes Nov 8, 2022

View reviewed changes

sea212 mentioned this pull request Nov 9, 2022

Configure and test whitelisted XCM reserve transfers #661

Merged

Chralt98 reviewed Nov 10, 2022

View reviewed changes

Chralt98 reviewed Nov 11, 2022

View reviewed changes

Align node folder to parachain-template

882feb9

vivekvpandya added 5 commits November 22, 2022 11:53

Merge branch 'main' into upgrade_0926

4e6e9e5

Upgrade polkadot version in global-dispute.

f15c0e8

Fix build failure

5c4395a

Fix test issues

432984e

Fix clippy errors

0c18c20

vivekvpandya requested review from Chralt98 and sea212 November 24, 2022 09:26

sea212 previously approved these changes Nov 24, 2022

View reviewed changes

Chralt98 reviewed Nov 24, 2022

View reviewed changes

node/src/cli.rs Show resolved Hide resolved

Chralt98 previously approved these changes Nov 24, 2022

View reviewed changes

Chralt98 added s:accepted This pull request is ready for merge s:review-needed The pull request requires reviews and removed s:review-needed The pull request requires reviews s:accepted This pull request is ready for merge labels Nov 24, 2022

Chralt98 reviewed Nov 24, 2022

View reviewed changes

Chralt98 self-requested a review November 24, 2022 12:33

remove unnecessary dependency

071bf7e

Chralt98 dismissed sea212’s stale review via 071bf7e November 24, 2022 12:44

Chralt98 approved these changes Nov 24, 2022

View reviewed changes

Chralt98 requested a review from sea212 November 24, 2022 13:51

sea212 approved these changes Nov 24, 2022

View reviewed changes

sea212 added s:accepted This pull request is ready for merge and removed s:review-needed The pull request requires reviews labels Nov 24, 2022

sea212 added this to the v0.3.7 milestone Nov 24, 2022

sea212 merged commit 8de3b3a into main Nov 24, 2022

sea212 deleted the upgrade_0926 branch November 24, 2022 16:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to polkadot-v0.9.26 #850

Upgrade to polkadot-v0.9.26 #850

vivekvpandya commented Oct 28, 2022 •

edited

Loading

Chralt98 commented Oct 28, 2022

Chralt98 left a comment

sea212 left a comment •

edited

Loading

sea212 Nov 4, 2022

sea212 Nov 4, 2022

vivekvpandya Nov 7, 2022

Chralt98 Nov 11, 2022

Chralt98 commented Nov 4, 2022

sea212 commented Nov 10, 2022

Chralt98 left a comment •

edited

Loading

Chralt98 Nov 11, 2022

Chralt98 commented Nov 21, 2022

sea212 left a comment

vivekvpandya commented Nov 24, 2022

Chralt98 left a comment

Chralt98 left a comment

Chralt98 commented Nov 24, 2022

		@@ -224,7 +224,7 @@ impl sc_cli::SubstrateCli for RelayChainCli {
		#[derive(Debug, Parser)]
		pub struct ExportGenesisStateCommand {

Upgrade to polkadot-v0.9.26 #850

Upgrade to polkadot-v0.9.26 #850

Conversation

vivekvpandya commented Oct 28, 2022 • edited Loading

Chralt98 commented Oct 28, 2022

Chralt98 left a comment

Choose a reason for hiding this comment

sea212 left a comment • edited Loading

Choose a reason for hiding this comment

sea212 Nov 4, 2022

Choose a reason for hiding this comment

sea212 Nov 4, 2022

Choose a reason for hiding this comment

vivekvpandya Nov 7, 2022

Choose a reason for hiding this comment

Chralt98 Nov 11, 2022

Choose a reason for hiding this comment

Chralt98 commented Nov 4, 2022

sea212 commented Nov 10, 2022

Chralt98 left a comment • edited Loading

Choose a reason for hiding this comment

Chralt98 Nov 11, 2022

Choose a reason for hiding this comment

Chralt98 commented Nov 21, 2022

sea212 left a comment

Choose a reason for hiding this comment

vivekvpandya commented Nov 24, 2022

Chralt98 left a comment

Choose a reason for hiding this comment

Chralt98 left a comment

Choose a reason for hiding this comment

Chralt98 commented Nov 24, 2022

vivekvpandya commented Oct 28, 2022 •

edited

Loading

sea212 left a comment •

edited

Loading

Chralt98 left a comment •

edited

Loading