Skip to content

check assets accounts and add them to balances #482

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
pepoviola merged 4 commits into from
Dec 22, 2025
Merged

check assets accounts and add them to balances #482

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c2984b
check assets accounts and add them to balances
pepoviola Dec 17, 2025
0a4f759
fmt
pepoviola Dec 18, 2025
6d3bf2a
clippy
pepoviola Dec 18, 2025
0e37e29
changes from feedback
pepoviola Dec 18, 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
171 changes: 138 additions & 33 deletions crates/orchestrator/src/generators/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,11 @@ impl ChainSpec {
// override `parachainInfo/parachainId`
override_parachain_info(&pointer, &mut chain_spec_json, para.id);

// check if `assets` pallet config
let balances_to_add =
generate_balance_to_add_from_assets_pallet(&pointer, &chain_spec_json);
add_balances(&pointer, &mut chain_spec_json, balances_to_add);

// write spec
let content = serde_json::to_string_pretty(&chain_spec_json).map_err(|_| {
GeneratorError::ChainSpecGeneration("can not parse chain-spec value as json".into())
Expand Down Expand Up @@ -911,13 +916,17 @@ impl ChainSpec {
clear_authorities(&pointer, &mut chain_spec_json, &self.context);

// add balances
add_balances(
&pointer,
&mut chain_spec_json,
&relaychain.nodes,
token_decimals,
staking_min,
);
let mut balances_to_add =
generate_balance_to_add_from_nodes(&relaychain.nodes, staking_min);

// ensure zombie account (//Zombie) have funds
// we will use for internal usage (e.g new validators)
balances_to_add.push((
"5FTcLfwFc7ctvqp3RhbEig6UuHLHcHVRujuUm8r21wy4dAR8".to_string(),

@mchristou mchristou Dec 18, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We use this account in multiple places, we can extract it into a constant

1000 * 10_u128.pow(token_decimals as u32),
));

add_balances(&pointer, &mut chain_spec_json, balances_to_add);

// add staking
add_staking(
Expand Down Expand Up @@ -1348,9 +1357,8 @@ fn get_staking_min(runtime_config_ptr: &str, chain_spec_json: &mut serde_json::V
fn add_balances(
runtime_config_ptr: &str,
chain_spec_json: &mut serde_json::Value,
nodes: &Vec<NodeSpec>,
token_decimals: u8,
staking_min: u128,
balances_to_add: Vec<(String, u128)>,
// token_decimals: u8,
) {
if let Some(val) = chain_spec_json.pointer_mut(runtime_config_ptr) {
let Some(balances) = val.pointer("/balances/balances") else {
Expand All @@ -1361,27 +1369,10 @@ fn add_balances(

// create a balance map
let mut balances_map = generate_balance_map(balances);
for node in nodes {
if node.initial_balance.eq(&0) {
continue;
};

// TODO: handle error here and check the `accounts.accounts` design
// Double down the minimal stake defined
let balance = std::cmp::max(node.initial_balance, staking_min * 2);
for k in ["sr", "sr_stash"] {
let account = node.accounts.accounts.get(k).unwrap();
balances_map.insert(account.address.clone(), balance);
}
for balance in balances_to_add {
balances_map.insert(balance.0, balance.1);
}

// ensure zombie account (//Zombie) have funds
// we will use for internal usage (e.g new validators)
balances_map.insert(
"5FTcLfwFc7ctvqp3RhbEig6UuHLHcHVRujuUm8r21wy4dAR8".to_string(),
1000 * 10_u128.pow(token_decimals as u32),
);

// convert the map and store again
let new_balances: Vec<(&String, &u128)> =
balances_map.iter().collect::<Vec<(&String, &u128)>>();
Expand Down Expand Up @@ -1611,6 +1602,46 @@ fn override_parachain_info(
unreachable!("pointer to runtime config should be valid!")
}
}

fn generate_balance_to_add_from_assets_pallet(
runtime_config_ptr: &str,
chain_spec_json: &serde_json::Value,
) -> Vec<(String, u128)> {
if let Some(val) = chain_spec_json.pointer(runtime_config_ptr) {
if let Some(assets_accounts) = val.pointer("/assets/accounts") {
let assets_accounts = assets_accounts
.as_array()
.expect("assets_accounts config should be an array, qed");
let accounts_to_add: Vec<(String, u128)> = assets_accounts
.iter()
.map(|account| {
let account = account
.as_array()
.expect("assets_accounts config should be an array, qed");
// map account / balance
(
account[1]
.as_str()
.expect("account should be a valid string. qed")
.to_string(),
account[2]
.as_number()
.expect("balance should be a valid str")
.to_string()
.parse::<u128>()
.expect("balance should be a valid u128"),
)
})
.collect();
accounts_to_add
} else {
vec![]
}
} else {
unreachable!("pointer to runtime config should be valid!")
}
}

fn add_collator_selection(
runtime_config_ptr: &str,
chain_spec_json: &mut serde_json::Value,
Expand Down Expand Up @@ -1663,6 +1694,28 @@ fn generate_balance_map(balances: &serde_json::Value) -> HashMap<String, u128> {
balances_map
}

fn generate_balance_to_add_from_nodes(
nodes: &Vec<NodeSpec>,

@mchristou mchristou Dec 18, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It is more flexible to use &[NodeSpec]

staking_min: u128,
) -> Vec<(String, u128)> {
// generate balances to add
let mut balances_to_add = vec![];

for node in nodes {
if node.initial_balance.eq(&0) {
continue;
};

// Double down the minimal stake defined
let balance = std::cmp::max(node.initial_balance, staking_min * 2);
for k in ["sr", "sr_stash"] {
let account = node.accounts.accounts.get(k).unwrap();
balances_to_add.push((account.address.clone(), balance));
}
}
balances_to_add
}

#[cfg(test)]
mod tests {
use std::fs;
Expand All @@ -1673,6 +1726,7 @@ mod tests {
use crate::{generators, shared::types::NodeAccounts};

const ROCOCO_LOCAL_PLAIN_TESTING: &str = "./testing/rococo-local-plain.json";
const ROCOCO_PENPAL_LOCAL_PLAIN_TESTING: &str = "./testing/rococo-penpal-local-plain.json";

fn chain_spec_test(file: &str) -> serde_json::Value {
let content = fs::read_to_string(file).unwrap();
Expand Down Expand Up @@ -1832,7 +1886,8 @@ mod tests {
};

let nodes = vec![node];
add_balances("/genesis/runtime", &mut spec_plain, &nodes, 12, 0);
let balances_to_add = generate_balance_to_add_from_nodes(&nodes, 0);
add_balances("/genesis/runtime", &mut spec_plain, balances_to_add);

let new_balances = spec_plain
.pointer("/genesis/runtime/balances/balances")
Expand Down Expand Up @@ -1860,7 +1915,12 @@ mod tests {
let balances_map = generate_balance_map(balances);

let nodes: Vec<NodeSpec> = vec![];
add_balances("/genesis/runtime", &mut spec_plain, &nodes, 12, 0);
let mut balances_to_add = generate_balance_to_add_from_nodes(&nodes, 0);
balances_to_add.push((
"5FTcLfwFc7ctvqp3RhbEig6UuHLHcHVRujuUm8r21wy4dAR8".to_string(),
1000 * 10_u128.pow(12),
));
add_balances("/genesis/runtime", &mut spec_plain, balances_to_add);

let new_balances = spec_plain
.pointer("/genesis/runtime/balances/balances")
Expand All @@ -1870,7 +1930,11 @@ mod tests {

// sr and sr_stash keys exists
assert!(new_balances_map.contains_key("5FTcLfwFc7ctvqp3RhbEig6UuHLHcHVRujuUm8r21wy4dAR8"));
assert_eq!(new_balances_map.len(), balances_map.len() + 1);
assert_eq!(
new_balances_map.len(),
balances_map.len() + 1,
"Number of balances should includes one more key (zombie key)."
);
}

#[test]
Expand All @@ -1897,7 +1961,8 @@ mod tests {
};

let nodes = vec![node];
add_balances("/genesis/runtime", &mut spec_plain, &nodes, 12, 0);
let balances_to_add = generate_balance_to_add_from_nodes(&nodes, 0);
add_balances("/genesis/runtime", &mut spec_plain, balances_to_add);

let new_balances = spec_plain.pointer("/genesis/runtime/balances/balances");

Expand Down Expand Up @@ -2070,4 +2135,44 @@ mod tests {
let node_key = get_node_keys(&node, SessionKeyType::default(), true);
assert_eq!(node_key.2["aura"], node.accounts.accounts["ed"].address);
}

#[test]
fn ensure_penpal_assets_works() {
let mut spec_plain = chain_spec_test(ROCOCO_PENPAL_LOCAL_PLAIN_TESTING);

let balances = spec_plain
.pointer("/genesis/runtimeGenesis/patch/balances/balances")
.unwrap();
let balances_map = generate_balance_map(balances);
println!("balance {:?}", balances_map);

let nodes: Vec<NodeSpec> = vec![];
let balances_to_add = generate_balance_to_add_from_nodes(&nodes, 0);
add_balances(
"/genesis/runtimeGenesis/patch",
&mut spec_plain,
balances_to_add,
);

//
let balances_to_add_from_assets = generate_balance_to_add_from_assets_pallet(
"/genesis/runtimeGenesis/patch",
&spec_plain,
);
println!("to add : {:?}", balances_to_add_from_assets);
add_balances(
"/genesis/runtimeGenesis/patch",
&mut spec_plain,
balances_to_add_from_assets,
);

let new_balances = spec_plain
.pointer("/genesis/runtimeGenesis/patch/balances/balances")
.unwrap();

let new_balances_map = generate_balance_map(new_balances);
println!("balance {:?}", new_balances_map);

assert_eq!(new_balances_map.len(), balances_map.len() + 1);
}
}
1 change: 1 addition & 0 deletions crates/orchestrator/src/network_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ impl NetworkSpec {
)
}

#[allow(clippy::redundant_iter_cloned)]
async fn retrieve_all_nodes_available_args_output(
ns: Arc<dyn ProviderNamespace + Send + Sync>,
image_command_to_nodes_mapping: &HashMap<(Option<String>, String), Vec<&mut NodeSpec>>,
Expand Down
150 changes: 150 additions & 0 deletions crates/orchestrator/testing/rococo-penpal-local-plain.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading