Integrate SDK 2604 by ggwpez · Pull Request #1159 · polkadot-fellows/runtimes

ggwpez · 2026-05-01T13:04:37Z

Integrates SDK release 2604.

Contracts

@0xRVE — #11460 CallbackHandle check
@0xRVE — #11590 Asset-conversion precompile · 4759eb9e4
@pgherveou — #11416 Auto-mapping (AutoMap) · 6dd3ddc6b AH-Polkadot/Kusama: enable pallet-revive AutoMap (#11416) #1165
@mokita-j — #11507 Revive debug enable

Bridges

@acatangiu — #11694 pallet_xcm_bridge_hub_router UnpaidExport flag · 635ac29a8
@yrong — #11354 Snowbridge inbound nonce API · c6fa9f236

Async backing / collator

@sandreim — #11778 Relay-parent offset

Account recovery

@ggwpez — #10482 pallet-recovery modernization (HoldConsideration follow-up + re-bench) · 7401ea900

Penpal / integration tests

@clangenb — #10726 Penpal merged Assets/ForeignAssets (downstream fixups) · 3a8aa4280
@clangenb — Encointer pallet integration 2604: Revert this afterwards c944b09

General

Re-benchmark weights Weights for release 2.3 #1163
Check for in-code TODOs
Check for all migrations

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Add `get_reserves` weight stub on PAH+KAH. SDK PR #11817 made it a required (no-default) method on `pallet_asset_conversion::WeightInfo`, so the local weight files won't compile without it. Placeholder values copied from the SDK's asset-hub-westend reference; re-bench before release. Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

- Wired `pallet-recovery` into the asset-hub-westend benchmark list. - Fixed the benchmark setup: `finish_attempt` / `cancel_attempt` advance `frame_system`'s block number, which does not move `RelaychainDataProvider`, causing `NotYetInheritable` / `NotYetCancelable`. Under `runtime-benchmarks`, use `frame_system` as the `BlockNumberProvider` so the time-delay guards can be satisfied. Note: similar fix in fellowship repo [here](polkadot-fellows/runtimes#1183) as part of [integration of SDK 2604](polkadot-fellows/runtimes#1159). --------- Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

bkontur · 2026-05-25T13:32:36Z

 	/// Unreleased migrations. Add new ones here:
-	pub type Unreleased = (cumulus_pallet_xcmp_queue::migration::v6::MigrateV5ToV6<Runtime>,);
+	pub type Unreleased = (
+		cumulus_pallet_xcmp_queue::migration::v6::MigrateV5ToV6<Runtime>,


Looks like xcmp-6 was already applied, we should remove all already applied migrations (follow-up?)

Suggested change

cumulus_pallet_xcmp_queue::migration::v6::MigrateV5ToV6<Runtime>,

We can do a general sweep afterwards. Thanks for pointing it out but i just want to get this merged now 🙈

…ansition (#1184) Filter `staking.reap_stash` from both `BaseCallFilter` and the XCM `SafeCallFilter` while the validator self-stake transition to higher bond. Also see [ref #1890](https://polkadot.subsquare.io/referenda/1890).

## Summary Two small cleanups bundled together. **1. Use upstream emulated-test macros.** paritytech/polkadot-sdk#12003 was backported into `emulated-integration-tests-common` v32 (already in our dependency tree). Drop the `assets_balance_on!`, `foreign_balance_on!` and `asset_exists_on!` macros previously redefined per-test-crate in asset-hub-{kusama,polkadot}, and pull from upstream via the existing `pub use emulated_integration_tests_common::*` in `integration_tests_helpers`. **2. Drop dead `StakingPot` from asset-hub-polkadot.** The Polkadot Asset Hub runtime no longer routes any fees to `StakingPot`. Remove the unused `lib.rs` import, the `xcm_config.rs` parameter type definition (and now-unused `CollatorSelection` re-export), the dev-genesis pre-funding, and the matching emulated-test genesis pre-funding. Kusama still uses `StakingPot` for collator fee accumulation and is unchanged.  - [ ] Does not require a CHANGELOG entry --------- Co-authored-by: GitHub Action <action@github.com>

github-actions · 2026-05-27T09:55:55Z

2 actionable issues found.

Review Suggestions

system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_dap.rs:28-32

Both set_budget_allocation() and drip_issuance() return Weight::default() ([Line 28]-[Line 32]), but this WeightInfo is wired into the live runtime in staking/mod.rs ([Line 154]). drip_issuance is a block-hook path that now performs minting/distribution work, so advertising zero weight can undercharge block execution and allow overweight blocks once the hook runs. Replace these stubs with real benchmarked values before release, or at minimum copy conservative upstream/reference weights instead of zero.

system-parachains/asset-hubs/asset-hub-polkadot/src/migrations.rs:137-138

The new Revive auto-mapping setup is enabled in the runtime (OnNewAccount/OnKilledAccount switched to pallet_revive::AutoMapper<Runtime> and AutoMap = ConstBool<true> in src/lib.rs), but the corresponding storage migration is explicitly skipped here ([Line 137]-[Line 138]). That leaves pre-existing accounts/contracts without the v3 mapping state expected by the new logic, which can break account lookups or cause inconsistent behavior immediately after upgrade. Include pallet_revive::migrations::v3::Migration<Runtime> in the runtime migrations, or gate the runtime config change until the manual migration has been executed and enforced.

Ank4n · 2026-05-27T14:35:37Z

Call for reviews: this is a prerequisite for the new staking budget split referendum we want to submit early June so it can be on-chain by mid-June (June 1 was the target - already running a bit behind).

@kianenigma @bkchr @franciscoaguirre @acatangiu @muharem

muharem · 2026-05-27T15:05:07Z

-	pub const FriendDepositFactor: Balance = 50 * CENTS;
-	pub const RecoveryDeposit: Balance = 500 * CENTS;
+	pub const RecoverySecurityDeposit: Balance = 500 * CENTS;
+	pub const RecoveryDepositBase: Balance = system_para_deposit(1, 0);


sometimes results too small deposit. we had such issue with bounties

Yes I manually set the Security deposit to 5 KSM, for the recovery deposit itself it is not spammable. So if someone wants to create 5000 of those then okay :D

bkontur

lgtm modulo weights https://github.com/polkadot-fellows/runtimes/pull/1159/files#r3313860718

rockbmb

TL;DR PET E2E suites had spurious failures when run against this PR's runtimes; this LGTM (usual testing caveats apply).

Running PET E2E suites against #1159

(@ggwpez the below addresses the failed runs you pointed out to me)

I ran PET against runtimes build from this PR (CI run #7111, rockbmb-test-release-2604 branch cut from this one + #1180 for PET sharding + stability).

Kusama runs were clean. Polkadot shards 1/3 and 2/3 had 15 failures - assetHubPolkadot.accounts (9) and assetHubPolkadot.scheduler (6). All totalIssuance assertions off by ~707k DOT. Looked like a real inflation bug.

Cause

pallet_dap::migrations::MigrateV1ToV2 in AH-Polkadot Unreleased migrations. One-shot catch-up mint covering the gap between last era boundary and upgrade timestamp. VersionedMigration<1,2,...> with idempotent guard - fires once on first block after on_runtime_upgrade, never again.

PET forks mainnet, applies wasmOverride, measures totalIssuance deltas starting from that first block - where the mint lands.

Validation

Two experiments, same 69 tests:

Removed DAP migration from Unreleased, rebuilt WASM → 69/69 pass.
Kept migration, advanced one block before measuring (consumes the mint) → 69/69 pass.

…1192) Use `weights::pallet_*_precompiles::WeightInfo<Runtime>` instead of the crate-default `SubstrateWeight` for `pallet_assets_precompiles` and `pallet_vesting_precompiles` on both Asset Hub Polkadot and Kusama. - AHP: copy benchmarked weight files from #1163 and register them in `weights/mod.rs`. - AHK: register the existing (orphan) `pallet_assets_precompiles` weights, fix its trait path, and add a stop-gap `pallet_vesting_precompiles` (AHP-measured values) until a Kusama benchmark run is available.   - [ ] Does not require a CHANGELOG entry

kianenigma

LGTM, if #1193 can be merged before this it would also be good, but not strictly needed.

ggwpez · 2026-05-28T17:46:32Z

LGTM, if #1193 can be merged before this it would also be good, but not strictly needed.

This is not yet the release, just SDK integration, so we still have time :)

github-actions · 2026-05-29T10:28:19Z

2 actionable issues found.

Review Suggestions

system-parachains/asset-hubs/asset-hub-polkadot/src/migrations.rs:137-138

The runtime enables pallet_revive::AutoMapper and AutoMap = ConstBool<true> in this upgrade, but the corresponding pallet_revive::migrations::v3::Migration<Runtime> is explicitly omitted from MbmMigrations with only a comment about doing it manually. That leaves pre-existing accounts unmigrated unless an out-of-band transaction is guaranteed to run before any code depends on the new mapping, which is easy to miss in a runtime upgrade and can break account lookup/compatibility for already-existing accounts. Include the v3 migration in the runtime migrations, or add an on-chain, versioned migration path that is guaranteed to execute as part of the upgrade instead of relying on a manual follow-up.

system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs:678-683

The proxy filter for Kusama recovery calls was updated to the new recovery extrinsics, but it now permits Recovery::set_friend_groups, which is the configuration/setup call for recovery state rather than an execution-only action. This widens the authority of existing non-transfer proxies from using an already-established recovery flow to being able to reconfigure recovery friend groups on behalf of the proxied account, which is a behavioral and security change for deployed proxy setups. Restrict the proxy filter to the execution-phase calls (initiate_attempt, approve_attempt, finish_attempt, cancel_attempt, possibly slash_attempt if intended) and keep configuration-changing calls like set_friend_groups excluded unless that privilege expansion is explicitly desired and documented.

ggwpez · 2026-05-29T10:59:09Z

/merge

fellowship-merge-bot · 2026-05-29T11:00:56Z

Enabled auto-merge in Pull Request

Available commands

/merge: Enables auto-merge for Pull Request
/merge cancel: Cancels auto-merge for Pull Request
/merge help: Shows this menu

For more information see the documentation

ggwpez added 2 commits April 24, 2026 16:20

disable encointer

c944b09

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11279

6c44991

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

ggwpez marked this pull request as draft May 1, 2026 13:04

This comment was marked as spam.

Sign in to view

ggwpez added 21 commits May 4, 2026 19:21

Integrate paritytech/polkadot-sdk#10726

3a8aa42

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#7035

d05264e

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11527

d9de49a

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11398

3094d5a

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11594

573fcb5

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11590

4759eb9

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11416

6dd3ddc

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11694

635ac29

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11616

dfb2fdb

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11750

6139688

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#10477

6ef62d0

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11651

d94eaa6

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11804

a161716

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11354

c6fa9f2

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11930

b46d94e

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Ignore Claude folder

f349f7b

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Update to polkadot-unstable2604-rc1

3240115

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#10482

7401ea9

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Integrate paritytech/polkadot-sdk#11847

b85fe76

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

fmt

b2600a4

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

ggwpez force-pushed the oty-prepare-release-2604 branch from 41640ef to b2600a4 Compare May 4, 2026 17:25

This comment was marked as spam.

Sign in to view

Ank4n reviewed May 5, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-kusama/src/staking/mod.rs

Ank4n reviewed May 5, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs Outdated

Ank4n reviewed May 5, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-polkadot/src/staking/mod.rs

bkontur reviewed May 25, 2026

View reviewed changes

Comment thread integration-tests/emulated/helpers/src/lib.rs Outdated

bkontur reviewed May 25, 2026

View reviewed changes

Comment thread integration-tests/emulated/helpers/src/lib.rs Outdated

bkontur reviewed May 25, 2026

View reviewed changes

Comment thread integration-tests/emulated/tests/assets/asset-hub-polkadot/src/tests/mod.rs Outdated

bkontur reviewed May 25, 2026

View reviewed changes

bkontur reviewed May 26, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs Outdated

Ank4n and others added 3 commits May 26, 2026 09:29

Merge remote-tracking branch 'origin/main' into oty-prepare-release-2604

f765b04

Ank4n approved these changes May 27, 2026

View reviewed changes

muharem approved these changes May 27, 2026

View reviewed changes

franciscoaguirre approved these changes May 27, 2026

View reviewed changes

acatangiu approved these changes May 27, 2026

View reviewed changes

bkontur reviewed May 27, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs Outdated

bkontur reviewed May 27, 2026

View reviewed changes

Comment thread system-parachains/asset-hubs/asset-hub-polkadot/src/weights/mod.rs

bkontur approved these changes May 27, 2026

View reviewed changes

rockbmb approved these changes May 28, 2026

View reviewed changes

kianenigma approved these changes May 28, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into oty-prepare-release-2604

136856f

fellowship-merge-bot Bot enabled auto-merge (squash) May 29, 2026 11:00

fellowship-merge-bot Bot merged commit 1fb092f into main May 29, 2026
191 of 197 checks passed

github-project-automation Bot moved this from Todo to Done in Runtime releases May 29, 2026

rockbmb mentioned this pull request Jun 4, 2026

Release 2.3.0 #1195

Merged

Conversation

ggwpez commented May 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contracts

Bridges

Async backing / collator

Account recovery

Penpal / integration tests

General

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkontur May 25, 2026

Choose a reason for hiding this comment

Uh oh!

ggwpez May 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 27, 2026

Review Suggestions

Uh oh!

Ank4n commented May 27, 2026

Uh oh!

muharem May 27, 2026

Choose a reason for hiding this comment

Uh oh!

ggwpez May 29, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bkontur left a comment

Choose a reason for hiding this comment

Uh oh!

rockbmb left a comment

Choose a reason for hiding this comment

Running PET E2E suites against #1159

Cause

Validation

Uh oh!

kianenigma left a comment

Choose a reason for hiding this comment

Uh oh!

ggwpez commented May 28, 2026

Uh oh!

github-actions Bot commented May 29, 2026

Review Suggestions

Uh oh!

ggwpez commented May 29, 2026

Uh oh!

fellowship-merge-bot Bot commented May 29, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

ggwpez commented May 1, 2026 •

edited

Loading