Resolve conflicts#988
Merged
pandres95 merged 9 commits intoNov 3, 2025
Merged
Conversation
…nfig (polkadot-fellows#844) **Depends on** paritytech/polkadot-sdk#9451 --- Based on PR paritytech/polkadot-sdk#1781 and [PRDoc](https://github.com/paritytech/polkadot-sdk/blob/beb9030b249cc078b3955232074a8495e7e0302a/prdoc/1.9.0/pr_1781.prdoc#L29), the new way for providing the single block migrations should be through `SingleBlockMigrations` in `frame_system::Config`. Providing them from `frame_executive::Executive` is still supported, but from what I understood is or will be deprecated. > `SingleBlockMigrations` this is the new way of configuring migrations that run in a single block. Previously they were defined as last generic argument of Executive. This shift is brings all central configuration about migrations closer into view of the developer (migrations that are configured in Executive will still work for now but is deprecated). Will also open a PR on polkadot-sdk side, adding a deprecation warning.
<!-- Remember that you can run `/merge` to enable auto-merge in the PR --> <!-- Remember to modify the changelog. If you don't need to modify it, you can check the following box. Instead, if you have already modified it, simply delete the following line. --> - [x] Does not require a CHANGELOG entry --------- Co-authored-by: GitHub Action <action@github.com>
Fixes BridgeHubPolkadot Snowbridge benchmarks leftover from: polkadot-fellows#959 catched by the test: https://github.com/polkadot-fellows/runtimes/actions/runs/18527148143/job/52800544994 <!-- Remember that you can run `/merge` to enable auto-merge in the PR --> <!-- Remember to modify the changelog. If you don't need to modify it, you can check the following box. Instead, if you have already modified it, simply delete the following line. --> - [X] Does not require a CHANGELOG entry
It looks like we missed some of the [runtime API](https://github.com/paritytech/polkadot-sdk/blob/590f23d2d83c2b79aabfda711a91fe0bdc5e64a0/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs#L958-L962) when initially merging it into fellows-runtime in [PR-796](polkadot-fellows#796), this API is required to generate proofs.
Brings paritytech/polkadot-sdk#10051 to here, to be made into a 1.9.3 release for Kusama. Can be merged, but a 1.9.3 release should come only after we verify the fix in westend. --------- Co-authored-by: Dónal Murray <donalm@seadanda.dev>
Release 1.9.3 for KAH only.
FRAME "View Functions" (paritytech/polkadot-sdk#216) support was implemented and released in Polkadot SDK with paritytech/polkadot-sdk#4722, but it was never exposed on the System Chains' runtimes. This PR adds the missing `execute_view_function()` to all System Chains' Runtime APIs.
# Conflicts: # Cargo.lock # Cargo.toml
Contributor
|
The encointer errors are most certainly because of duplicate dep issues still, and I believe that the encointer crates are on the correct versions. But if you believe everything is correct on your end, I can look into it. |
clangenb
reviewed
Oct 24, 2025
Comment on lines
-1930
to
+1933
| "bp-header-chain", | ||
| "bp-messages", | ||
| "bp-polkadot-core", | ||
| "bp-runtime", | ||
| "bp-header-chain 0.23.0", | ||
| "bp-messages 0.23.0", | ||
| "bp-polkadot-core 0.23.0", | ||
| "bp-runtime 0.23.0", |
Contributor
There was a problem hiding this comment.
You are introducing many duplicate dependencies. Is this on purpose?
clangenb
reviewed
Oct 24, 2025
| "parity-scale-codec", | ||
| "scale-info", | ||
| "sp-core 38.1.0", | ||
| "sp-runtime 43.0.0", |
Contributor
There was a problem hiding this comment.
I think it is not on purpose. For example: this new duplicate dependency uses the old sp-runtime v43.0.0, whereas the current one is supposed to be v44.0.0.
I believe encointer's error will go away once the duplicate sp-runtime dependency has been resolved, aka sp-runtime v43.0.0 has been completely eliminated from the workspace.
pandres95
merged commit 6a02332
into
polkadot-fellows:pandres95-upgrade-to-stable2509
13 of 69 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@clangenb there are a couple of Encointer errors: