diff --git a/app/onchain/contracts/aid_escrow/src/lib.rs b/app/onchain/contracts/aid_escrow/src/lib.rs index e691d90e..3e4bdbc5 100644 --- a/app/onchain/contracts/aid_escrow/src/lib.rs +++ b/app/onchain/contracts/aid_escrow/src/lib.rs @@ -27,7 +27,6 @@ use soroban_sdk::{ // --- Storage Keys --- const KEY_ADMIN: Symbol = symbol_short!("admin"); -const KEY_TOTAL_LOCKED: Symbol = symbol_short!("locked"); // Map const KEY_VERSION: Symbol = symbol_short!("version"); const KEY_PKG_COUNTER: Symbol = symbol_short!("pkg_cnt"); const KEY_CONFIG: Symbol = symbol_short!("config"); @@ -75,6 +74,15 @@ pub struct Config { pub allowed_tokens: Vec
, } +/// Per-token instance-storage key for the locked amount. +/// Replaces the old `Map` stored under KEY_TOTAL_LOCKED. +/// Each token has its own cell: `TotalLocked::Token(token_address) → i128`. +#[contracttype] +#[derive(Clone, Debug, PartialEq)] +pub enum TotalLocked { + Token(Address), +} + #[contracttype] #[derive(Clone, Debug, PartialEq)] pub struct Aggregates { @@ -551,21 +559,14 @@ impl AidEscrow { // --- SOLVENCY CHECK --- let contract_balance = Self::token_balance(&env, &token, &env.current_contract_address())?; - let mut locked_map: Map = env - .storage() - .instance() - .get(&KEY_TOTAL_LOCKED) - .unwrap_or(Map::new(&env)); - - let current_locked = locked_map.get(token.clone()).unwrap_or(0); + let current_locked = Self::get_locked(&env, &token); if contract_balance < current_locked + amount { return Err(Error::InsufficientFunds); } // --- STATE UPDATES --- - locked_map.set(token.clone(), current_locked + amount); - env.storage().instance().set(&KEY_TOTAL_LOCKED, &locked_map); + Self::set_locked(&env, &token, current_locked + amount); let created_at = env.ledger().timestamp(); let claim_starts_at = Self::resolve_claim_starts_at(&env, &metadata, created_at)?; @@ -651,12 +652,7 @@ impl AidEscrow { let unit = 10i128.pow(decimals); let contract_balance = Self::token_balance(&env, &token, &env.current_contract_address())?; - let mut locked_map: Map = env - .storage() - .instance() - .get(&KEY_TOTAL_LOCKED) - .unwrap_or(Map::new(&env)); - let mut current_locked = locked_map.get(token.clone()).unwrap_or(0); + let mut current_locked = Self::get_locked(&env, &token); // Read the current package counter let mut counter: u64 = env.storage().instance().get(&KEY_PKG_COUNTER).unwrap_or(0); @@ -735,9 +731,8 @@ impl AidEscrow { created_ids.push_back(id); } - // Persist updated locked map, counter, and aggregation index - locked_map.set(token.clone(), current_locked); - env.storage().instance().set(&KEY_TOTAL_LOCKED, &locked_map); + // Persist updated locked amount, counter, and aggregation index + Self::set_locked(&env, &token, current_locked); env.storage().instance().set(&KEY_PKG_COUNTER, &counter); env.storage().instance().set(&KEY_PKG_IDX, &idx); @@ -1128,12 +1123,7 @@ impl AidEscrow { let contract_balance = Self::token_balance(&env, &token, &env.current_contract_address())?; // 4. Get total locked amount for the token - let locked_map: Map = env - .storage() - .instance() - .get(&KEY_TOTAL_LOCKED) - .unwrap_or(Map::new(&env)); - let total_locked = locked_map.get(token.clone()).unwrap_or(0); + let total_locked = Self::get_locked(&env, &token); // 5. Calculate available surplus and validate let available_surplus = contract_balance - total_locked; @@ -1186,21 +1176,24 @@ impl AidEscrow { } fn decrement_locked(env: &Env, token: &Address, amount: i128) { - let mut locked_map: Map = env - .storage() - .instance() - .get(&KEY_TOTAL_LOCKED) - .unwrap_or(Map::new(env)); + let current = Self::get_locked(env, token); + let new_locked = if current > amount { current - amount } else { 0 }; + Self::set_locked(env, token, new_locked); + } - let current = locked_map.get(token.clone()).unwrap_or(0); - let new_locked = if current > amount { - current - amount - } else { - 0 - }; + /// Returns the amount currently locked for a given token (single-cell read). + fn get_locked(env: &Env, token: &Address) -> i128 { + env.storage() + .instance() + .get(&TotalLocked::Token(token.clone())) + .unwrap_or(0) + } - locked_map.set(token.clone(), new_locked); - env.storage().instance().set(&KEY_TOTAL_LOCKED, &locked_map); + /// Persists the locked amount for a given token (single-cell write). + fn set_locked(env: &Env, token: &Address, amount: i128) { + env.storage() + .instance() + .set(&TotalLocked::Token(token.clone()), &amount); } fn validate_token(env: &Env, token: &Address) -> Result { @@ -1418,12 +1411,7 @@ impl AidEscrow { /// Returns the total amount currently locked for a specific token. pub fn get_total_locked(env: Env, token: Address) -> i128 { - let locked_map: Map = env - .storage() - .instance() - .get(&KEY_TOTAL_LOCKED) - .unwrap_or(Map::new(&env)); - locked_map.get(token).unwrap_or(0) + Self::get_locked(&env, &token) } /// Returns the cumulative amount ever claimed for a specific token. diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/default_claim_starts_at_is_created_at.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/default_claim_starts_at_is_created_at.1.json index f028293e..b59a22fe 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/default_claim_starts_at_is_created_at.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/default_claim_starts_at_is_created_at.1.json @@ -563,23 +563,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -603,6 +586,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_claimed_too_early.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_claimed_too_early.1.json index acfd307f..98d1d2a3 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_claimed_too_early.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_claimed_too_early.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_package_is_expired.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_package_is_expired.1.json index 966eeff9..d43d6953 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_package_is_expired.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/fails_when_package_is_expired.1.json @@ -528,23 +528,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -568,6 +551,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_fails_with_invalid_proof.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_fails_with_invalid_proof.1.json index 0b932471..3f67643c 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_fails_with_invalid_proof.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_fails_with_invalid_proof.1.json @@ -546,23 +546,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -586,6 +569,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_succeeds_with_valid_proof.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_succeeds_with_valid_proof.1.json index a278ad44..03f4c791 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_succeeds_with_valid_proof.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/merkle_allowlist_claim_succeeds_with_valid_proof.1.json @@ -589,23 +589,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -629,6 +612,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_claimed_at_exact_expiry_boundary.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_claimed_at_exact_expiry_boundary.1.json index 9b2d4186..a8a1ca9d 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_claimed_at_exact_expiry_boundary.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_claimed_at_exact_expiry_boundary.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_recipient_claims_within_window.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_recipient_claims_within_window.1.json index fedc0854..f3ea4f3c 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_recipient_claims_within_window.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim/succeeds_when_recipient_claims_within_window.1.json @@ -565,23 +565,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -605,6 +588,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/fails_when_claimed_1_second_before_start.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/fails_when_claimed_1_second_before_start.1.json index 9bafb2f0..a2eb5109 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/fails_when_claimed_1_second_before_start.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/fails_when_claimed_1_second_before_start.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_1_second_after_start.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_1_second_after_start.1.json index 280bb308..77c69132 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_1_second_after_start.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_1_second_after_start.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_at_exact_start_time.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_at_exact_start_time.1.json index 56a1617e..ac55d64e 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_at_exact_start_time.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/claim_start_boundaries/succeeds_when_claimed_at_exact_start_time.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_after.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_after.1.json index acf14a19..9c1eb8ba 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_after.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_after.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_before.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_before.1.json index 4f287c56..e9e2776c 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_before.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/fails_when_claim_starts_at_equals_expires_at_and_claimed_before.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/narrow_claim_window_1_second.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/narrow_claim_window_1_second.1.json index 0a9edc0b..2cbfca30 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/narrow_claim_window_1_second.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/narrow_claim_window_1_second.1.json @@ -581,23 +581,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -621,6 +604,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/succeeds_when_claim_starts_at_equals_expires_at_and_claimed_at_boundary.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/succeeds_when_claim_starts_at_equals_expires_at_and_claimed_at_boundary.1.json index f00684f4..d5241bf4 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/succeeds_when_claim_starts_at_equals_expires_at_and_claimed_at_boundary.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/succeeds_when_claim_starts_at_equals_expires_at_and_claimed_at_boundary.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/zero_claim_window_fails_creation.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/zero_claim_window_fails_creation.1.json index 71ca8d73..559950ff 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/zero_claim_window_fails_creation.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/combined_boundaries/zero_claim_window_fails_creation.1.json @@ -546,23 +546,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -586,6 +569,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/fails_when_package_id_already_exists.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/fails_when_package_id_already_exists.1.json index b62f5fd5..e8fc08e6 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/fails_when_package_id_already_exists.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/fails_when_package_id_already_exists.1.json @@ -528,23 +528,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -568,6 +551,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_metadata.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_metadata.1.json index 12d7deda..78bd8bb8 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_metadata.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_metadata.1.json @@ -546,23 +546,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -586,6 +569,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_valid_inputs.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_valid_inputs.1.json index b62f5fd5..e8fc08e6 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_valid_inputs.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/create_package/succeeds_with_valid_inputs.1.json @@ -528,23 +528,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -568,6 +551,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/locked_funds_released_after_claim_allows_new_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/locked_funds_released_after_claim_allows_new_package.1.json index 39d3043f..f00c5cd9 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/locked_funds_released_after_claim_allows_new_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/locked_funds_released_after_claim_allows_new_package.1.json @@ -852,23 +852,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -892,6 +875,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/package_with_zero_expiry_never_expires.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/package_with_zero_expiry_never_expires.1.json index e4c183aa..31d46743 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/package_with_zero_expiry_never_expires.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/package_with_zero_expiry_never_expires.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/refund_succeeds_on_expired_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/refund_succeeds_on_expired_package.1.json index 9c049b24..79b0b565 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/refund_succeeds_on_expired_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/edge_cases/refund_succeeds_on_expired_package.1.json @@ -580,23 +580,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -620,6 +603,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_1_second_after_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_1_second_after_expiry.1.json index 428b13be..d69644ba 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_1_second_after_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_1_second_after_expiry.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_long_after_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_long_after_expiry.1.json index be460cd6..979edf34 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_long_after_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/fails_when_claimed_long_after_expiry.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_1_second_before_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_1_second_before_expiry.1.json index af7bb180..d5decb76 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_1_second_before_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_1_second_before_expiry.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_at_exact_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_at_exact_expiry.1.json index bad14790..99aa3e7e 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_at_exact_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/expiry_boundaries/succeeds_when_claimed_at_exact_expiry.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/claim_with_proof_fails_after_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/claim_with_proof_fails_after_expiry.1.json index 42af1a9c..4d2c65f3 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/claim_with_proof_fails_after_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/claim_with_proof_fails_after_expiry.1.json @@ -547,23 +547,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -587,6 +570,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_can_be_retried_if_time_reverted.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_can_be_retried_if_time_reverted.1.json index 404fb3c0..ef576b5e 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_can_be_retried_if_time_reverted.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_can_be_retried_if_time_reverted.1.json @@ -584,23 +584,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -624,6 +607,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_returns_error_but_status_remains_created.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_returns_error_but_status_remains_created.1.json index 498b04e9..0fe319da 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_returns_error_but_status_remains_created.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/late_claim_behavior/late_claim_returns_error_but_status_remains_created.1.json @@ -549,23 +549,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -589,6 +572,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_10.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_10.1.json index aa7db12e..53d4b6d1 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_10.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_10.1.json @@ -2086,24 +2086,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "100000000" - } - } - ] + "u64": "10" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "10" @@ -2111,18 +2102,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "10" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "100000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_100.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_100.1.json index 0ba7e7bb..b6ba8a80 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_100.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_100.1.json @@ -17566,24 +17566,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "1000000000" - } - } - ] + "u64": "100" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "100" @@ -17591,18 +17582,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "100" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "1000000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_200.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_200.1.json index 1cbae6e6..695cecf6 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_200.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_200.1.json @@ -34766,24 +34766,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "2000000000" - } - } - ] + "u64": "200" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "200" @@ -34791,18 +34782,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "200" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "2000000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_25.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_25.1.json index 8ea2504d..77fe6ff5 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_25.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_25.1.json @@ -4666,24 +4666,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "250000000" - } - } - ] + "u64": "25" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "25" @@ -4691,18 +4682,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "25" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "250000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_50.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_50.1.json index 7f182ffd..689a979d 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_50.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_batch_create_packages_50.1.json @@ -8966,24 +8966,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "500000000" - } - } - ] + "u64": "50" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "50" @@ -8991,18 +8982,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "50" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "500000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.1.json index c47462cc..319568ee 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.1.json @@ -545,23 +545,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -585,6 +568,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.2.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.2.json index b76d255b..3033ae1d 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.2.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_claim_with_proof.2.json @@ -488,23 +488,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -528,6 +511,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_aggregates.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_aggregates.1.json index 29924f21..2a78bfaa 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_aggregates.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_aggregates.1.json @@ -8967,24 +8967,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "500000000" - } - } - ] + "u64": "50" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "50" @@ -8992,18 +8983,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "50" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "500000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_package.1.json index b62f5fd5..e8fc08e6 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_get_package.1.json @@ -528,23 +528,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -568,6 +551,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.1.json index 31b7e6ec..a629c287 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.1.json @@ -527,23 +527,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -567,6 +550,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.2.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.2.json index 7b26ae8c..de0e564f 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.2.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_claim.2.json @@ -464,23 +464,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -504,6 +487,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_create_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_create_package.1.json index 31b7e6ec..a629c287 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_create_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/profile_single_create_package.1.json @@ -527,23 +527,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -567,6 +550,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_all_claimed.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_all_claimed.1.json index 1d4012f8..94f4f2c3 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_all_claimed.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_all_claimed.1.json @@ -818,23 +818,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -858,6 +841,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_disburse_counts_as_claimed.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_disburse_counts_as_claimed.1.json index 68f90d8d..99e6a280 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_disburse_counts_as_claimed.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_disburse_counts_as_claimed.1.json @@ -851,23 +851,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -891,6 +874,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_filters_by_token.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_filters_by_token.1.json index 28d80784..09fcb73e 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_filters_by_token.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_filters_by_token.1.json @@ -1299,31 +1299,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "30000000" - } - }, - { - "key": { - "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -1347,6 +1322,36 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "30000000" + } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_many_packages.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_many_packages.1.json index 62030427..f4dc12e7 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_many_packages.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_many_packages.1.json @@ -3001,24 +3001,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "10" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "10" @@ -3026,18 +3017,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "10" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_mixed_statuses.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_mixed_statuses.1.json index 7589dbd4..2d1c138c 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_mixed_statuses.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_mixed_statuses.1.json @@ -1369,23 +1369,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -1409,6 +1392,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_revoke_then_refund.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_revoke_then_refund.1.json index f5b8e4ba..9c7894f7 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_revoke_then_refund.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_revoke_then_refund.1.json @@ -634,23 +634,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -674,6 +657,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_single_created_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_single_created_package.1.json index ce739c91..49d8de14 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_single_created_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_single_created_package.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "20000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "20000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_unknown_token.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_unknown_token.1.json index 53979164..7a80cdba 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_unknown_token.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_unknown_token.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_update_after_transitions.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_update_after_transitions.1.json index ac4cdebe..baecb668 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_update_after_transitions.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_aggregates_update_after_transitions.1.json @@ -567,23 +567,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -607,6 +590,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_empty_arrays.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_empty_arrays.1.json index fa963207..5de911f7 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_empty_arrays.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_empty_arrays.1.json @@ -231,24 +231,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "0" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "0" @@ -256,18 +247,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "0" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_success.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_success.1.json index 24f7cec9..ff32e53f 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_success.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_create_packages_success.1.json @@ -885,24 +885,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CACMVW2KK4H5FZDFF2AUCAKQTEJMZZWJUIZF23XMRVYQBSXYLHZ6BKWN" - }, - "val": { - "i128": "60000000" - } - } - ] + "u64": "3" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "3" @@ -910,18 +901,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "3" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CACMVW2KK4H5FZDFF2AUCAKQTEJMZZWJUIZF23XMRVYQBSXYLHZ6BKWN" + } + ] }, "val": { - "u32": 1 + "i128": "60000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_then_individual_no_id_collision.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_then_individual_no_id_collision.1.json index 4f9f8b61..f17c1f4b 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_then_individual_no_id_collision.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_batch_then_individual_no_id_collision.1.json @@ -944,23 +944,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CACMVW2KK4H5FZDFF2AUCAKQTEJMZZWJUIZF23XMRVYQBSXYLHZ6BKWN" - }, - "val": { - "i128": "30000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -984,6 +967,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CACMVW2KK4H5FZDFF2AUCAKQTEJMZZWJUIZF23XMRVYQBSXYLHZ6BKWN" + } + ] + }, + "val": { + "i128": "30000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_cancel_package_flow.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_cancel_package_flow.1.json index 5e1c20a7..8092592a 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_cancel_package_flow.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_cancel_package_flow.1.json @@ -815,23 +815,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -855,6 +838,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_config_constraints_on_extend_expiration.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_config_constraints_on_extend_expiration.1.json index 4b56d910..b667e1ac 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_config_constraints_on_extend_expiration.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_config_constraints_on_extend_expiration.1.json @@ -607,23 +607,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -647,6 +630,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_core_accounting_invariants.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_core_accounting_invariants.1.json index ba3ad7c6..5c1dc8d8 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_core_accounting_invariants.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_core_accounting_invariants.1.json @@ -603,23 +603,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -643,6 +626,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_core_flow_fund_create_claim.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_core_flow_fund_create_claim.1.json index 07b57876..926fd436 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_core_flow_fund_create_claim.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_core_flow_fund_create_claim.1.json @@ -603,23 +603,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -643,6 +626,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_distributor_package_creation.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_distributor_package_creation.1.json index b2a339f4..3043308b 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_distributor_package_creation.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_distributor_package_creation.1.json @@ -643,23 +643,6 @@ "map": [] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -683,6 +666,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_expiry_and_refund.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_expiry_and_refund.1.json index 6b33c48b..f81bd553 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_expiry_and_refund.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_expiry_and_refund.1.json @@ -585,23 +585,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -625,6 +608,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_cancelled_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_cancelled_package.1.json index 71474eb0..369681c2 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_cancelled_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_cancelled_package.1.json @@ -582,23 +582,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -622,6 +605,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_claimed_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_claimed_package.1.json index 5a3ace71..6c4418f5 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_claimed_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_claimed_package.1.json @@ -566,23 +566,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -606,6 +589,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_expired_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_expired_package.1.json index 23e40162..8eb208c7 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_expired_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_expired_package.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_multiple_extends.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_multiple_extends.1.json index 2e372620..f0531c6e 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_multiple_extends.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_multiple_extends.1.json @@ -640,23 +640,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -680,6 +663,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_success.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_success.1.json index d11e8345..e1cc9141 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_success.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_success.1.json @@ -585,23 +585,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -625,6 +608,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_unbounded_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_unbounded_package.1.json index ac761f10..47bcbc76 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_unbounded_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_unbounded_package.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_zero_additional_time.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_zero_additional_time.1.json index fe4ac962..6955a947 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_zero_additional_time.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiration_zero_additional_time.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_rejects_non_increasing_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_rejects_non_increasing_expiry.1.json index 221363d9..67c0f5ec 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_rejects_non_increasing_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_rejects_non_increasing_expiry.1.json @@ -531,23 +531,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -571,6 +554,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_success.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_success.1.json index 6ad94623..de3d8209 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_success.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extend_expiry_success.1.json @@ -585,23 +585,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -625,6 +608,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_extended_event_records_old_and_new_expiry.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_extended_event_records_old_and_new_expiry.1.json index 990268e3..80b0e7dd 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_extended_event_records_old_and_new_expiry.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_extended_event_records_old_and_new_expiry.1.json @@ -584,23 +584,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -624,6 +607,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_get_recipient_package_count_returns_multiple_packages.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_get_recipient_package_count_returns_multiple_packages.1.json index 7bc04676..92ea9e5d 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_get_recipient_package_count_returns_multiple_packages.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_get_recipient_package_count_returns_multiple_packages.1.json @@ -763,23 +763,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "20000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -803,6 +786,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "20000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_integration_flow.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_integration_flow.1.json index 080129b3..5ef291f3 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_integration_flow.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_integration_flow.1.json @@ -603,24 +603,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "1" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "1" @@ -628,18 +619,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "1" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_multiple_packages.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_multiple_packages.1.json index 4a943679..1e1611db 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_multiple_packages.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_multiple_packages.1.json @@ -764,23 +764,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" - }, - "val": { - "i128": "30000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -804,6 +787,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CDLDVFKHEZ2RVB3NG4UQA4VPD3TSHV6XMHXMHP2BSGCJ2IIWVTOHGDSG" + } + ] + }, + "val": { + "i128": "30000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_claimed_event.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_claimed_event.1.json index 4f41dd3a..a334b45d 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_claimed_event.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_claimed_event.1.json @@ -600,24 +600,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "1" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "1" @@ -625,18 +616,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "1" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_created_event.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_created_event.1.json index 357cca04..faf19d99 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_created_event.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_created_event.1.json @@ -529,23 +529,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -569,6 +552,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_disbursed_event.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_disbursed_event.1.json index 75ee23d8..17a0035f 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_disbursed_event.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_disbursed_event.1.json @@ -583,24 +583,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "1" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "1" @@ -608,18 +599,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "1" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_refunded_event.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_refunded_event.1.json index ef35446c..5137ee7b 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_refunded_event.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_refunded_event.1.json @@ -583,24 +583,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "1" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "1" @@ -608,18 +599,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "1" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_revoked_event.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_revoked_event.1.json index 5d1b1292..54991fc7 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_package_revoked_event.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_package_revoked_event.1.json @@ -583,24 +583,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "0" - } - } - ] + "u64": "1" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "1" @@ -608,18 +599,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "1" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] }, "val": { - "u32": 1 + "i128": "0" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_solvency_check.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_solvency_check.1.json index a112ff41..70f30579 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_solvency_check.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_solvency_check.1.json @@ -531,23 +531,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -571,6 +554,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_view_package_status.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_view_package_status.1.json index 850a173f..76f4090b 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_view_package_status.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_view_package_status.1.json @@ -601,23 +601,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -641,6 +624,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/test_withdraw_surplus_insufficient_surplus.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/test_withdraw_surplus_insufficient_surplus.1.json index 964f5037..789ff47a 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/test_withdraw_surplus_insufficient_surplus.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/test_withdraw_surplus_insufficient_surplus.1.json @@ -530,23 +530,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "80000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -570,6 +553,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "80000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_cancel_package.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_cancel_package.1.json index 973d915d..f92e10cf 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_cancel_package.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_cancel_package.1.json @@ -450,23 +450,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "0" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -490,6 +473,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "0" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_few_packages.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_few_packages.1.json index 35692422..4d097e92 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_few_packages.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_few_packages.1.json @@ -631,23 +631,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "30000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -671,6 +654,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] + }, + "val": { + "i128": "30000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_pagination.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_pagination.1.json index 659adb35..c632531b 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_pagination.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/tests/test_list_recipient_packages_pagination.1.json @@ -1233,24 +1233,15 @@ }, { "key": { - "symbol": "locked" + "symbol": "pkg_cnt" }, "val": { - "map": [ - { - "key": { - "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" - }, - "val": { - "i128": "50000000" - } - } - ] + "u64": "5" } }, { "key": { - "symbol": "pkg_cnt" + "symbol": "pkg_idx" }, "val": { "u64": "5" @@ -1258,18 +1249,25 @@ }, { "key": { - "symbol": "pkg_idx" + "symbol": "version" }, "val": { - "u64": "5" + "u32": 1 } }, { "key": { - "symbol": "version" + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CCABDO7UZXYE4W6GVSEGSNNZTKSLFQGKXXQTH6OX7M7GKZ4Z6CUJNGZN" + } + ] }, "val": { - "u32": 1 + "i128": "50000000" } } ] diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/token_decimal_normalization/succeeds_with_whole_token_amounts.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/token_decimal_normalization/succeeds_with_whole_token_amounts.1.json index fe5bdbdc..52a6b938 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/token_decimal_normalization/succeeds_with_whole_token_amounts.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/token_decimal_normalization/succeeds_with_whole_token_amounts.1.json @@ -527,23 +527,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -567,6 +550,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] } diff --git a/app/onchain/contracts/aid_escrow/test_snapshots/token_interactions/claim_keeps_accounting_unchanged_when_token_transfer_reverts.1.json b/app/onchain/contracts/aid_escrow/test_snapshots/token_interactions/claim_keeps_accounting_unchanged_when_token_transfer_reverts.1.json index 444ba0ae..e868e102 100644 --- a/app/onchain/contracts/aid_escrow/test_snapshots/token_interactions/claim_keeps_accounting_unchanged_when_token_transfer_reverts.1.json +++ b/app/onchain/contracts/aid_escrow/test_snapshots/token_interactions/claim_keeps_accounting_unchanged_when_token_transfer_reverts.1.json @@ -553,23 +553,6 @@ ] } }, - { - "key": { - "symbol": "locked" - }, - "val": { - "map": [ - { - "key": { - "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" - }, - "val": { - "i128": "10000000" - } - } - ] - } - }, { "key": { "symbol": "pkg_cnt" @@ -593,6 +576,21 @@ "val": { "u32": 1 } + }, + { + "key": { + "vec": [ + { + "symbol": "Token" + }, + { + "address": "CBUSYNQKASUYFWYC3M2GUEDMX4AIVWPALDBYJPNK6554BREHTGZ2IUNF" + } + ] + }, + "val": { + "i128": "10000000" + } } ] }