Skip to content

[AHM] Fix derived account translation script #872

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.

Sign up for GitHub

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

Merged
ggwpez merged 2 commits into from
Sep 4, 2025
Merged

[AHM] Fix derived account translation script #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1ba7a1
AHM Fix derived account translation script
ggwpez Sep 1, 2025
6037a10
Merge remote-tracking branch 'origin/oty-dev-asset-hub-migration-2506…
ggwpez Sep 4, 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
24 changes: 14 additions & 10 deletions integration-tests/ahm/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ use pallet_ah_migrator::{
MigrationStage as AhMigrationStage, MigrationStartBlock as AhMigrationStartBlock,
};
use pallet_rc_migrator::{
child_bounties::ChildBountiesMigratedCorrectly, staking::StakingMigratedCorrectly,
types::RcMigrationCheck, MigrationEndBlock as RcMigrationEndBlock,
MigrationStage as RcMigrationStage, MigrationStartBlock as RcMigrationStartBlock,
RcMigrationStage as RcMigrationStageStorage,
child_bounties::ChildBountiesMigratedCorrectly,
staking::StakingMigratedCorrectly,
types::{RcMigrationCheck, ToPolkadotSs58},
MigrationEndBlock as RcMigrationEndBlock, MigrationStage as RcMigrationStage,
MigrationStartBlock as RcMigrationStartBlock, RcMigrationStage as RcMigrationStageStorage,
};
use polkadot_primitives::UpwardMessage;
use polkadot_runtime::{RcMigrator, Runtime as Polkadot};
Expand Down Expand Up @@ -338,7 +339,7 @@ async fn find_translatable_accounts() {
// Para ID -> (RC sovereign, AH sovereign)
let mut sov_translations = BTreeMap::<u32, (AccountId32, AccountId32)>::new();
// Para ID -> (RC derived, index, AH derived)
let mut derived_translations = BTreeMap::<u32, (AccountId32, u16, AccountId32)>::new();
let mut derived_translations = Vec::<(ParaId, AccountId32, u16, AccountId32)>::new();
Copy link
Member Author

@ggwpez ggwpez Sep 4, 2025

Choose a reason for hiding this comment

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

Bug was here


// Try to find Para sovereign and derived accounts.
for para_id in 0..(u16::MAX as u32) {
Expand Down Expand Up @@ -389,8 +390,12 @@ async fn find_translatable_accounts() {
"Found RC derived for para {}: {} -> {} (index {})",
&para_id, &rc_para_derived, &ah_para_derived, &derivation_index
);
derived_translations
.insert(para_id, (rc_para_derived, derivation_index, ah_para_derived));
derived_translations.push((
para_id.into(),
rc_para_derived,
derivation_index,
ah_para_derived,
));
}
}
}
Expand Down Expand Up @@ -427,10 +432,9 @@ pub const SOV_TRANSLATIONS: &[((AccountId32, &'static str), (AccountId32, &'stat
pub const DERIVED_TRANSLATIONS: &[((AccountId32, &'static str), u16, (AccountId32, &'static str))] = &[\n",
);

let mut derived_translations = derived_translations.into_iter().collect::<Vec<_>>();
derived_translations.sort_by(|(_, (rc_acc, _, _)), (_, (rc_acc2, _, _))| rc_acc.cmp(rc_acc2));
derived_translations.sort_by(|(_, rc_acc, _, _), (_, rc_acc2, _, _)| rc_acc.cmp(rc_acc2));

for (para_id, (rc_acc, derivation_index, ah_acc)) in derived_translations.iter() {
for (para_id, rc_acc, derivation_index, ah_acc) in derived_translations.iter() {
rust.push_str(&format!("\t// para {} (derivation index {})\n", para_id, derivation_index));
rust.push_str(&format!(
"\t(({}, \"{}\"), {}, ({}, \"{}\")),\n",
Expand Down
128 changes: 128 additions & 0 deletions pallets/ah-migrator/src/sovereign_account_translation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,22 @@ pub const DERIVED_TRANSLATIONS: &[(
u16,
(AccountId32, &'static str),
)] = &[
// para 2012 (derivation index 2)
(
(
AccountId32::new(hex!(
"06926c6bab20739b8d4710e56a9ce6db7b0f67986a4f29664919620653f3a435"
)),
"5CDKe9iak7oYywsYUF37ThPcvAVysueu3TuUAJawZospbwkF",
),
2,
(
AccountId32::new(hex!(
"d06990044418b18883108cf323580cc769414ddbee42bcebaf72331c175a9d90"
)),
"5GmyB9gUJYn1pyUdRYF9LxWNrRFGc9wC38pb72MfSr2WFZ9e",
),
),
// para 2012 (derivation index 5)
(
(
Expand Down Expand Up @@ -860,6 +876,22 @@ pub const DERIVED_TRANSLATIONS: &[(
"5GzE1vRVr8nG4WAPmX76RtLWK1XxxBfMwCTcKWQTKkugD2iQ",
),
),
// para 2001 (derivation index 0)
(
(
AccountId32::new(hex!(
"5a53736d8e96f1c007cf0d630acf5209b20611617af23ce924c8e25328eb5d28"
)),
"5E78xTBiaN3nAGYtcNnqTJQJqYAkSDGggKqaDfpNsKyPpbcb",
),
0,
(
AccountId32::new(hex!(
"290bf94235666a351d9c8082c77e689813a905d0bbffdbd8b4a619ec5303ba27"
)),
"5CzXNqgBZT5yMpMETdfH55saYNKQoJBXsSfnu4d2s1ejYFir",
),
),
// para 2030 (derivation index 2)
(
(
Expand Down Expand Up @@ -892,6 +924,54 @@ pub const DERIVED_TRANSLATIONS: &[(
"5CY9tzuRaRxKpFZxdfobKdAUJqyz3GNaM6gYdbH7LrEwcJQw",
),
),
// para 2030 (derivation index 1)
(
(
AccountId32::new(hex!(
"96d16ffaae52a6a195b6d9f0b365677aedb77675f423813112c5ef5434523622"
)),
"5FUTFngRdSAPG4BVXCEs7nV6dAsMk8MV4ZU3CDGvx66nXHnR",
),
1,
(
AccountId32::new(hex!(
"39d0a3c793549eda79b5cd3f8ab1c5879326352eb6583696249e38684b9451c1"
)),
"5DNWZkkAxLhqF8tevcbRGyARAVM7abukftmqvoDFUN5dDDDz",
),
),
// para 2012 (derivation index 1)
(
(
AccountId32::new(hex!(
"aa006b3de1565c48ade1c1f3b646090be49389327f6b214076e5d2bd2ba0fb02"
)),
"5Fuc82fy32ccsRXWyovjsLms4AsPYToHnXuvGjCjYGcPvcEA",
),
1,
(
AccountId32::new(hex!(
"26b0b1d07bded0e85c829f664ff9440b3ad0d8855fc7634d547e99ecd70d78cf"
)),
"5CwSAaoAnoN3t5Ui15g3xr5SmrEqQj8DJvFPBmXgcKpFYmN4",
),
),
// para 2030 (derivation index 0)
(
(
AccountId32::new(hex!(
"adcea185416af2d3e8df8c1c8ee8a634bf1c3275b3820cb6d935300d42c73b2a"
)),
"5FzbXK46dYRXsTaXuUb3uJ1QCNBRf3KV8Tpue2Ec6iAj8nxL",
),
0,
(
AccountId32::new(hex!(
"69f880852768f2d00acfa7824533aa4378e48d1b9fbc6b44500e8b98debeaccd"
)),
"5ETehspFKFNpBbe5DsfuziN6BWq5Qwp1J8qcTQQoAxwa7BsS",
),
),
// para 2000 (derivation index 0)
(
(
Expand Down Expand Up @@ -924,6 +1004,54 @@ pub const DERIVED_TRANSLATIONS: &[(
"5GcexD4YNqcKTbW1YWDRczQzpxic61byeNeLaHgqQHk8pxQJ",
),
),
// para 2012 (derivation index 4)
(
(
AccountId32::new(hex!(
"f60aa184555b35cfcd6dc246424240068da18dd1bfeefccf8d5a26713b9917f7"
)),
"5HdJo46v12tW24Nveanm1T4qkkVfd6XDD7cvemroTuritRrr",
),
4,
(
AccountId32::new(hex!(
"0891c74febe45a39b18715a5c4a0f9592203f53efee5c75e648a0388974b2ca7"
)),
"5CFwYbNXv57T58auh8JHGxopJu91cBsDoCNE7tEymkcV1wb3",
),
),
// para 2012 (derivation index 0)
(
(
AccountId32::new(hex!(
"f82777e46281c5f5000af5dbb01fa41cdf0ff53ac4167b7297e386d834ff7c0e"
)),
"5Hg5TTyFP8NKXXs7rvDNBvDsa23E7kh5Xxr55xoCFkQCmbB9",
),
0,
(
AccountId32::new(hex!(
"2e007ed75739bb293788b83c94dee3247d1561337b69f593cc044cf11606f573"
)),
"5D72CxkFjKEC9QXDpoAZAxdBn9q8JhJzAdHXqwwTVTALxC7q",
),
),
// para 2012 (derivation index 3)
(
(
AccountId32::new(hex!(
"fe5326ff816ac945120d53cffdd00919268032f0e478d40c23dea72a69e53660"
)),
"5HpAindoSKd56yA1UsAmcv6PvoTbhCgZSy1ah5DY3r4rFYZ6",
),
3,
(
AccountId32::new(hex!(
"ceca601fde11eed1f4c6fe4f0a2ba581b75c1011a94d0426226c79e9f23ca956"
)),
"5GjqqeHW7am6pbBoD6Afw6Pnytgsm4uP6JzdQHsRpL3FYRFE",
),
),
];

#[cfg(feature = "kusama-ahm")]
Expand Down
Loading