Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

polkadot v1.2.0 #207

Merged
merged 11 commits into from
Nov 6, 2023
Merged

polkadot v1.2.0 #207

merged 11 commits into from
Nov 6, 2023

Conversation

brenzi
Copy link
Member

@brenzi brenzi commented Nov 2, 2023

closes #206

  • upgrade to crates.io dependencies for polkadot -v1.2.0
  • looking up crate versions un the release branch for crates.io: https://github.com/paritytech/polkadot-sdk/blob/release-crates-io-v1.2.0/Cargo.lock
  • backport encointer-runtime from polkadot-fellows/runtime#80 (before getting rid of the runtime in this repo later)
  • replace polkadot-launch with zombienet config
    • tested block production and rpc-interface list-communities

because of a semver violation, I had to cargo update -p [email protected]. see here

Comment on lines -682 to -686
// Encointer customization: This part is different from upstream. We don't use the relay
// consensus part from further below, we start with aura consensus directly.
//
// We do this because our launch-runtime comes with consensus, whereas the upstream
// shell runtime does not have that.
Copy link
Member Author

Choose a reason for hiding this comment

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

I think we can get rid of this legacy now. agree @clangenb ?
don't think it will ever happen again that we start with a shell which isn't launch-runtime

Copy link
Member

Choose a reason for hiding this comment

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

The issue was different, there was extra code from upstream, which we didn't use, and so we removed it, but when I look at the code, it seems that we have harmonized it with upstream now anyhow. So we can remove it.

@brenzi brenzi requested a review from clangenb November 2, 2023 18:54
Copy link
Member

@clangenb clangenb left a comment

Choose a reason for hiding this comment

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

Looks good to me!

polkadot-parachains/launch-runtime/src/lib.rs Show resolved Hide resolved
Comment on lines -682 to -686
// Encointer customization: This part is different from upstream. We don't use the relay
// consensus part from further below, we start with aura consensus directly.
//
// We do this because our launch-runtime comes with consensus, whereas the upstream
// shell runtime does not have that.
Copy link
Member

Choose a reason for hiding this comment

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

The issue was different, there was extra code from upstream, which we didn't use, and so we removed it, but when I look at the code, it seems that we have harmonized it with upstream now anyhow. So we can remove it.

@brenzi brenzi merged commit b9d21b5 into master Nov 6, 2023
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

upgrade to polkadot-v1.2.0
2 participants