Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ef3c172
RC side for Recovery pallet
ggwpez Aug 15, 2025
23504f8
Pallets compile
ggwpez Aug 15, 2025
2782157
Merge branch 'oty-dev-asset-hub-migration-2506' into oty-ahm-recovery
ggwpez Aug 18, 2025
75bd080
fmt
ggwpez Aug 18, 2025
7763590
Merge remote-tracking branch 'origin/dev-asset-hub-migration' into ot…
ggwpez Aug 19, 2025
a6b6710
fmt
ggwpez Aug 19, 2025
ee995e4
xcm config polkadot
muharem Aug 19, 2025
2d66d62
kusama relay
muharem Aug 19, 2025
ff92c55
polkadot xcm config
muharem Aug 19, 2025
25564a8
kusama: remove nis
muharem Aug 21, 2025
fdf0d06
asset hub kusama
muharem Aug 21, 2025
da3b54f
runtimes tests fixes
muharem Aug 21, 2025
8e07bac
Merge remote-tracking branch 'upstream/oty-dev-asset-hub-migration-25…
muharem Aug 24, 2025
f9f0fce
fix ah migrator benches
muharem Aug 25, 2025
0e33c03
staking bench
muharem Aug 25, 2025
960f824
remove fast unstake bench methods
muharem Aug 25, 2025
74d9912
make tests pass
muharem Aug 28, 2025
438d219
CI command fix
muharem Aug 28, 2025
4710cd5
features fix
muharem Aug 28, 2025
961796e
Merge branch 'oty-dev-asset-hub-migration-2506' into muharem-ahm-kusama
ggwpez Sep 1, 2025
975dbf7
zepter
ggwpez Sep 1, 2025
2df59c1
Delete Paseo stuff
ggwpez Sep 1, 2025
fa5479f
fix
ggwpez Sep 1, 2025
94e0ff2
fix
ggwpez Sep 1, 2025
4a20371
zepter
ggwpez Sep 1, 2025
acf9d38
fix features
ggwpez Sep 1, 2025
7c48637
fix ci
ggwpez Sep 1, 2025
0fd9f27
taplo
ggwpez Sep 1, 2025
2b3ed80
hotfix proxy test for Kusama
ggwpez Sep 2, 2025
517cd53
Kusama CI
ggwpez Sep 2, 2025
483e30c
test
ggwpez Sep 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/zepter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workflows:
# Check that `A` activates the features of `B`.
'propagate-feature',
# These are the features to check:
'--features=try-runtime,runtime-benchmarks,std,stable2503',
'--features=try-runtime,runtime-benchmarks,std,stable2503,kusama',
# Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
'--left-side-feature-missing=ignore',
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,21 @@ jobs:
lz4 -d ah-polkadot.snap.lz4 ah-polkadot.snap

- name: Test Asset Hub Migration (Polkadot)
run: cargo test --locked -q -p polkadot-integration-tests-ahm -r --features try-runtime -- --nocapture --test-threads 1
run: cargo test --locked -q -p polkadot-integration-tests-ahm -r --features polkadot --features try-runtime -- --nocapture --test-threads 1
env:
RUST_BACKTRACE: 1
SNAP_RC: "../../polkadot.snap"
SNAP_AH: "../../ah-polkadot.snap"
RUST_LOG: "warn"

- name: Test Benchmarks Asset Hub Migration (Polkadot)
run: cargo test --locked -q -p polkadot-integration-tests-ahm -r --features runtime-benchmarks -- bench_rc bench_ops bench_ah --nocapture
run: cargo test --locked -q -p polkadot-integration-tests-ahm -r --features polkadot --features runtime-benchmarks -- bench_rc bench_ops bench_ah --nocapture
env:
RUST_BACKTRACE: 1
RUST_LOG: "warn"

- name: Test Benchmarks Asset Hub Migration (Kusama)
run: cargo test --locked -q -p polkadot-integration-tests-ahm -r --features kusama --features runtime-benchmarks -- bench_rc bench_ops bench_ah --nocapture
env:
RUST_BACKTRACE: 1
RUST_LOG: "warn"
Expand Down
38 changes: 35 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ ss58-registry = { version = "1.47.0" }
resolver = "2"

members = [
"integration-tests/ahm",
"pallets/ah-migrator",
"pallets/rc-migrator",
"pallets/ah-ops",
"integration-tests/ahm",
"pallets/rc-migrator",

"chain-spec-generator",
"integration-tests/emulated/chains/parachains/assets/asset-hub-kusama",
Expand Down
53 changes: 40 additions & 13 deletions integration-tests/ahm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
[package]
name = "polkadot-integration-tests-ahm"
version = "0.1.0" # Wont work in the SDK otherwise
version = "0.1.0"
authors.workspace = true
edition.workspace = true
license = "Apache-2.0"
description = "Polkadot integration tests for the Asset Hub Migration"
publish = false

[dev-dependencies]
[dependencies]
codec = { workspace = true, default-features = true }
asset-hub-polkadot-runtime = { workspace = true }
authority-discovery-primitives = { workspace = true, default-features = true }
babe-primitives = { workspace = true, default-features = true }
beefy-primitives = { workspace = true, default-features = true }
Expand All @@ -30,9 +29,7 @@ parachains-common = { workspace = true, default-features = true }
pallet-multisig = { workspace = true, default-features = true }
polkadot-parachain-primitives = { workspace = true, default-features = true }
polkadot-primitives = { workspace = true, default-features = true }
polkadot-runtime = { workspace = true }
polkadot-runtime-common = { workspace = true, default-features = true }
polkadot-runtime-constants = { workspace = true, default-features = true }
remote-externalities = { workspace = true }
runtime-parachains = { workspace = true, default-features = true }
sp-core = { workspace = true, default-features = true }
Expand All @@ -59,21 +56,49 @@ pallet-preimage = { workspace = true, default-features = true }
pallet-staking-async = { workspace = true, default-features = true }
pallet-referenda = { workspace = true, default-features = true }

polkadot-runtime = { workspace = true, optional = true }
polkadot-runtime-constants = { workspace = true, default-features = true, optional = true }
asset-hub-polkadot-runtime = { workspace = true, optional = true }

kusama-runtime = { workspace = true, optional = true }
kusama-runtime-constants = { workspace = true, default-features = true, optional = true }
asset-hub-kusama-runtime = { workspace = true, optional = true }

[features]
default = ["std"]
polkadot = [
"asset-hub-polkadot-runtime",
"polkadot-runtime",
"polkadot-runtime-constants",
]
paseo = [
Copy link
Member

Choose a reason for hiding this comment

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

We can delete this now.

"asset-hub-polkadot-runtime",
"polkadot-runtime",
"polkadot-runtime-constants",
]
kusama = [
"asset-hub-kusama-runtime/kusama",
"kusama-runtime-constants",
"kusama-runtime/kusama",
"pallet-ah-migrator/kusama",
"pallet-rc-migrator/kusama",
]
std = [
"cumulus-pallet-parachain-system/std",
"frame-benchmarking/std",
"hex/std",
"kusama-runtime?/std",
"log/std",
"polkadot-runtime/std",
"polkadot-runtime?/std",
"rand/std",
]
try-runtime = [
"asset-hub-polkadot-runtime/try-runtime",
"asset-hub-kusama-runtime?/try-runtime",
"asset-hub-polkadot-runtime?/try-runtime",
"cumulus-pallet-parachain-system/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
"kusama-runtime?/try-runtime",
"pallet-ah-migrator/try-runtime",
"pallet-ah-ops/try-runtime",
"pallet-balances/try-runtime",
Expand All @@ -89,19 +114,22 @@ try-runtime = [
"pallet-timestamp/try-runtime",
"pallet-whitelist/try-runtime",
"pallet-xcm/try-runtime",
"parachains-common/try-runtime",
"polkadot-runtime-common/try-runtime",
"polkadot-runtime/try-runtime",
"polkadot-runtime?/try-runtime",
"runtime-parachains/try-runtime",
"sp-runtime/try-runtime",
"parachains-common/try-runtime"
]
runtime-benchmarks = [
"asset-hub-polkadot-runtime/runtime-benchmarks",
"asset-hub-kusama-runtime?/runtime-benchmarks",
"asset-hub-polkadot-runtime?/runtime-benchmarks",
"cumulus-pallet-parachain-system/runtime-benchmarks",
"cumulus-primitives-core/runtime-benchmarks",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"kusama-runtime-constants?/runtime-benchmarks",
"kusama-runtime?/runtime-benchmarks",
"pallet-ah-migrator/runtime-benchmarks",
"pallet-ah-ops/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
Expand All @@ -121,11 +149,10 @@ runtime-benchmarks = [
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"polkadot-runtime-constants/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
"polkadot-runtime-constants?/runtime-benchmarks",
"polkadot-runtime?/runtime-benchmarks",
"runtime-parachains/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm/runtime-benchmarks",
]
paseo = []
6 changes: 6 additions & 0 deletions integration-tests/ahm/src/accounts_translation_works.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

//! Test that account translation works (Para sovereign and derived).

use crate::porting_prelude::*;

use hex_literal::hex;
use pallet_ah_migrator::types::AhMigrationCheck;
use pallet_rc_migrator::{accounts::AccountState, types::RcMigrationCheck};
Expand All @@ -27,6 +29,7 @@ type AssetHubRuntime = asset_hub_polkadot_runtime::Runtime;

pub struct AccountTranslationWorks;

#[cfg(not(feature = "kusama"))]
pub const TRANSLATIONS: &[(AccountId32, AccountId32)] = &[
// para 2034: 5Ec4AhPbkXX97KXMcf9v9SkRNG4Gyc3VhcMMuQe9QXfAHnrC ->
// 5Eg2fntQqFi3EvFWAf71G66Ecjjah26bmFzoANAeHFgj9Lia
Expand All @@ -36,6 +39,9 @@ pub const TRANSLATIONS: &[(AccountId32, AccountId32)] = &[
),
];

#[cfg(feature = "kusama")]
pub const TRANSLATIONS: &[(AccountId32, AccountId32)] = &[];

impl RcMigrationCheck for AccountTranslationWorks {
type RcPrePayload = ();

Expand Down
1 change: 1 addition & 0 deletions integration-tests/ahm/src/balances_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
//! types directly.

use crate::porting_prelude::*;

use frame_support::{defensive_assert, traits::Currency};
use pallet_ah_migrator::types::AhMigrationCheck;
use pallet_rc_migrator::types::RcMigrationCheck;
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/ahm/src/bench_ah.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#![cfg(feature = "runtime-benchmarks")]

use crate::porting_prelude::*;

use asset_hub_polkadot_runtime::{Runtime as AssetHub, System as AssetHubSystem};
use pallet_ah_migrator::benchmarking::*;
use sp_runtime::BuildStorage;
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/ahm/src/bench_ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#![cfg(feature = "runtime-benchmarks")]

use crate::porting_prelude::*;

use asset_hub_polkadot_runtime::{Runtime as AssetHub, System as AssetHubSystem};
use pallet_ah_ops::benchmarking::*;
use sp_runtime::BuildStorage;
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/ahm/src/bench_rc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#![cfg(feature = "runtime-benchmarks")]

use crate::porting_prelude::*;

use pallet_rc_migrator::benchmarking::*;
use polkadot_runtime::{Runtime as RelayChain, System as RcSystem};
use sp_runtime::BuildStorage;
Expand Down
Loading
Loading