diff --git a/contract/src/events.rs b/contract/src/events.rs index dbcd4bf9..eb494e10 100644 --- a/contract/src/events.rs +++ b/contract/src/events.rs @@ -116,6 +116,7 @@ pub fn publish_fee_cleared(env: &Env) { env.events() .publish((Symbol::new(env, "fee_cleared"),), ()); } + pub fn publish_subscription_amount_updated( env: &Env, user: &Address, diff --git a/contract/src/lib.rs b/contract/src/lib.rs index e513cd0f..da01c1a8 100644 --- a/contract/src/lib.rs +++ b/contract/src/lib.rs @@ -251,7 +251,7 @@ impl FlowPay { trial_period, referrer, ); - let _ = subscription_metadata::set_metadata(&env, &user, label); + subscription_metadata::set_metadata(&env, &user, label); } /// Charges the next due recurring payment for `user`. @@ -1365,67 +1365,16 @@ impl FlowPay { } fn extend_subscription_ttl(env: &Env, user: &Address) { - storage::extend_subscription_ttl(env, user); + env.storage().persistent().extend_ttl( + &DataKey::Subscription(user.clone()), + SUBSCRIPTION_TTL_LEDGERS, + SUBSCRIPTION_TTL_LEDGERS, + ); env.storage() .instance() .extend_ttl(SUBSCRIPTION_TTL_LEDGERS, SUBSCRIPTION_TTL_LEDGERS); } -/// Shared implementation for `pay_per_use` and `pay_per_use_to`. `recipient` -/// is `None` for `pay_per_use` (defaults to `sub.merchant`, matching its -/// existing behavior exactly) and `Some(addr)` for `pay_per_use_to`. -fn pay_per_use_inner(env: &Env, user: Address, amount: i128, recipient: Option
) { - ensure_contract_not_paused(env); - user.require_auth(); - - if amount <= 0 { - env.panic_with_error(ContractError::AmountMustBePositive); - } - if amount > MAX_AMOUNT { - env.panic_with_error(ContractError::AmountExceedsMaximum); - } - - let key = DataKey::Subscription(user.clone()); - - let sub: Subscription = env - .storage() - .persistent() - .get(&key) - .unwrap_or_else(|| env.panic_with_error(ContractError::NoSubscriptionFound)); - - if !sub.active { - env.panic_with_error(ContractError::SubscriptionInactive); - } - if sub.paused { - env.panic_with_error(ContractError::SubscriptionPaused); - } - - // Only the explicit `pay_per_use_to` path re-validates the whitelist; - // `pay_per_use` (recipient == None) keeps its existing behavior of not - // re-checking a merchant that was already whitelisted at subscribe time. - let is_pay_per_use_to = recipient.is_some(); - let recipient = recipient.unwrap_or_else(|| sub.merchant.clone()); - - if is_pay_per_use_to - && whitelist::is_whitelist_enabled(env) - && !whitelist::is_whitelisted(env, &recipient) - { - env.panic_with_error(ContractError::MerchantNotWhitelisted); - } - - spending_limit::enforce_limit(env, &user, amount); - - let fee_amount = fee::transfer_pay_per_use(env, &user, &sub.token, amount, &recipient); - let net_amount = amount - fee_amount; - - check_and_update_global_volume(env, amount); - merchant_stats::increment_revenue_with_daily(env, &recipient, net_amount); - spending_limit::record_spend(env, &user, amount); - extend_subscription_ttl(env, &user); - - events::publish_pay_per_use(env, &user, &recipient, amount); -} - fn subscribe_inner( env: &Env, user: Address, @@ -1446,7 +1395,6 @@ fn subscribe_inner( env.panic_with_error(ContractError::MerchantFrozen); } - // Prevent new subscriptions when contract is paused let paused = env .storage() .instance() @@ -1457,7 +1405,16 @@ fn subscribe_inner( } validation::require_valid_amount(env, amount); + if interval == 0 { + env.panic_with_error(ContractError::IntervalMustBePositive); + } + use soroban_sdk::xdr::ToXdr; + if token.clone().to_xdr(env).get(7) == Some(0) { + env.panic_with_error(ContractError::InvalidTokenAddress); + } + + validation::check_allowance(env, &user, &token, amount); if interval < 60 { env.panic_with_error(ContractError::IntervalTooShort); } @@ -1466,19 +1423,18 @@ fn subscribe_inner( env.panic_with_error(ContractError::IntervalTooShort); } - use soroban_sdk::xdr::ToXdr; - if token.clone().to_xdr(env).get(7) == Some(0) { - env.panic_with_error(ContractError::InvalidTokenAddress); + let token_client = token::Client::new(env, &token); + let allowance = token_client.allowance(&user, &env.current_contract_address()); + if allowance < amount { + env.panic_with_error(ContractError::InsufficientAllowance); } - validation::check_allowance(env, &user, &token, amount); - let now = env.ledger().timestamp(); let trial_duration = trial_period.unwrap_or(0); let last_charged = now + trial_duration; let existing = storage::get_subscription(env, &user); - let should_increment = existing.as_ref().is_none_or(|s| !s.active); + let should_increment = existing.as_ref().map_or(true, |s| !s.active); if let Some(ref existing_sub) = existing { if existing_sub.active && existing_sub.merchant != merchant { @@ -1514,7 +1470,7 @@ fn subscribe_inner( events::publish_subscribed(env, &user, &sub); } -pub(crate) fn check_and_update_global_volume(env: &Env, amount: i128) { +fn check_and_update_global_volume(env: &Env, amount: i128) { let now = env.ledger().timestamp(); let mut window: GlobalVolumeWindow = env .storage() diff --git a/contract/src/test.rs b/contract/src/test.rs index 32ecc892..9e5131c5 100644 --- a/contract/src/test.rs +++ b/contract/src/test.rs @@ -204,15 +204,7 @@ fn test_charge_applies_protocol_fee_and_records_net_revenue() { let expected_net: i128 = amount - expected_fee; let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &amount, &interval, &token_addr, &None, &None); let merchant_before = token.balance(&merchant); let collector_before = token.balance(&collector); @@ -243,15 +235,7 @@ fn test_charge_with_zero_fee_bps_skips_fee_transfer() { let amount: i128 = 5_0000000; let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &amount, &interval, &token_addr, &None, &None); let merchant_before = token.balance(&merchant); let collector_before = token.balance(&collector); @@ -494,15 +478,7 @@ fn test_charge_succeeds_after_merchant_frozen() { }); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.freeze_merchant(&merchant); assert!(client.is_merchant_frozen(&merchant)); @@ -528,15 +504,7 @@ fn test_pay_per_use_succeeds_after_merchant_frozen() { storage::set_admin(&env, &admin); }); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.freeze_merchant(&merchant); @@ -941,15 +909,7 @@ fn test_pay_per_use_applies_protocol_fee_and_records_net_revenue() { client.propose_fee(&collector, &250); client.commit_fee(); // 2.5% - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let amount: i128 = 8_0000000; let expected_fee: i128 = 200_0000; @@ -1124,15 +1084,7 @@ fn test_pay_per_use_with_zero_fee_bps_transfers_full_amount() { }); client.propose_fee(&collector, &0); client.commit_fee(); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let amount: i128 = 3_0000000; let merchant_before = token.balance(&merchant); @@ -1371,15 +1323,7 @@ fn test_interval_minimum_valid() { client.initialize(&token_addr, &admin); client.set_min_interval(&60u64); - client.subscribe( - &user, - &merchant, - &1_0000000, - &3600, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &3600, &token_addr, &None, &None); let sub = client.get_subscription(&user).unwrap(); assert_eq!(sub.interval, 3600); } @@ -1683,15 +1627,7 @@ fn test_batch_charge_paused() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.pause(&user); env.ledger().with_mut(|l| { @@ -2170,15 +2106,7 @@ fn test_remove_daily_limit_allows_pay_per_use_after_removal() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.set_daily_limit(&user, &3_0000000); client.pay_per_use(&user, &2_0000000); client.remove_daily_limit(&user); @@ -2261,24 +2189,8 @@ fn test_admin_batch_pause_subscriptions_freezes_multiple_accounts() { storage::set_admin(&env, &user_a); }); - client.subscribe( - &user_a, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &2_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &2_0000000, &86400, &token_addr, &None, &None); let mut users = Vec::new(&env); users.push_back(user_a.clone()); @@ -2322,24 +2234,8 @@ fn test_batch_pause_subscriptions_handles_valid_missing_and_pre_paused_accounts( storage::set_admin(&env, &user_a); }); - client.subscribe( - &user_a, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.pause(&user_b); let mut users = Vec::new(&env); @@ -2487,16 +2383,6 @@ fn test_grace_period_ttl_extension() { assert_eq!(got, seconds); } -#[test] -#[should_panic] -fn test_double_initialize() { - let (env, contract_id, token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - client.initialize(&token_addr, &admin); - client.initialize(&token_addr, &admin); -} - #[test] fn test_referral_clears_on_resubscribe_with_none() { let (env, contract_id, token_addr, user, merchant) = setup(); @@ -2542,7 +2428,10 @@ fn test_self_referral_rejected_via_try_subscribe() { &Some(user.clone()), ); - assert_eq!(result, Err(Ok(soroban_sdk::Error::from_contract_error(11)))); + assert_eq!( + result, + Err(Ok(soroban_sdk::Error::from_contract_error(11))) + ); } // ───────────────────────────────────────────── @@ -2650,15 +2539,7 @@ fn test_clear_metadata_removes_label() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let label = soroban_sdk::String::from_str(&env, "pro"); client.set_metadata(&user, &label); @@ -2735,361 +2616,131 @@ fn test_charge_history_capped_at_12() { assert_eq!(client.get_charge_history(&user).len(), 12); } +// ───────────────────────────────────────────── +// contract_health_check tests +// ───────────────────────────────────────────── + #[test] -fn test_get_charge_history_three_charges_ascending() { - let (env, contract_id, token_addr, user, merchant) = setup(); +fn test_health_check_initialized_unpaused() { + let (env, contract_id, token_addr, _user, _merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); + let admin = Address::generate(&env); + client.initialize(&token_addr, &admin); - let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + let report = client.contract_health_check(); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - let t1 = env.ledger().timestamp(); + assert!(report.is_healthy, "initialized and unpaused contract should be healthy"); + assert!(!report.contract_paused); + assert!(report.token_configured); + assert!(report.admin_configured); +} - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - let t2 = env.ledger().timestamp(); +#[test] +fn test_health_check_paused() { + let (env, contract_id, token_addr, _user, _merchant) = setup(); + let client = FlowPayClient::new(&env, &contract_id); + let admin = Address::generate(&env); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - let t3 = env.ledger().timestamp(); + client.initialize(&token_addr, &admin); + client.pause_contract(); + + let report = client.contract_health_check(); + + assert!(!report.is_healthy, "paused contract should not be healthy"); + assert!(report.contract_paused); +} + +#[test] +fn test_health_check_pre_initialize() { + let env = Env::default(); + env.mock_all_auths(); + let contract_id = env.register_contract(None, FlowPay); + let client = FlowPayClient::new(&env, &contract_id); + + let report = client.contract_health_check(); - let history = client.get_charge_history(&user); - assert_eq!(history.len(), 3); - assert_eq!(history.get(0).unwrap(), t1); - assert_eq!(history.get(1).unwrap(), t2); - assert_eq!(history.get(2).unwrap(), t3); + assert!(!report.token_configured, "token should not be configured before initialize"); + assert!(!report.is_healthy, "uninitialized contract should not be healthy"); } #[test] -fn test_get_charge_history_page_offset_limit() { +fn test_health_check_active_subscription_count() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - let interval: u64 = 86400; + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + + let report = client.contract_health_check(); + assert_eq!(report.active_subscription_count, 1); +} + +#[test] +fn test_ttl_extension() { + let (env, contract_id, token_addr, user, merchant) = setup(); + let client = FlowPayClient::new(&env, &contract_id); + + env.ledger().with_mut(|l| { + l.max_entry_ttl = 10_000_000; + }); + client.subscribe( &user, &merchant, &1_0000000, - &interval, + &86400, &token_addr, &None, &None, ); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - let t1 = env.ledger().timestamp(); + // We can't easily assert the exact TTL in the test environment without more complex mock_all_auths + // or internal access, but we can verify the function exists and doesn't panic. + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; + // Keep the contract instance itself alive across the jump below — only the + // Subscription entry's TTL is extended by extend_subscription_ttl, but the + // contract instance needs its own TTL or the whole contract becomes archived. + // Extend a bit past SUBSCRIPTION_TTL_LEDGERS to cover the two ledger jumps below. + env.as_contract(&contract_id, || { + env.storage() + .instance() + .extend_ttl(SUBSCRIPTION_TTL_LEDGERS + 10, SUBSCRIPTION_TTL_LEDGERS + 10); }); - client.charge(&user); - let t2 = env.ledger().timestamp(); env.ledger().with_mut(|l| { - l.timestamp += interval + 1; + l.sequence_number += SUBSCRIPTION_TTL_LEDGERS - 1; }); - client.charge(&user); - let t3 = env.ledger().timestamp(); - let page = client.get_charge_history_page(&user, &1u32, &2u32); - assert_eq!(page.len(), 2); - assert_eq!(page.get(0).unwrap(), t2); - assert_eq!(page.get(1).unwrap(), t3); + client.extend_subscription_ttl(&user); + assert!(client.get_subscription(&user).is_some()); } #[test] #[should_panic] -fn test_clear_charge_history_non_admin_panics() { +fn test_subscribe_interval_under_60_panics() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); + client.subscribe(&user, &merchant, &1_0000000, &0, &token_addr, &None, &None); +} + +#[test] +fn test_subscribe_interval_minimum_succeeds() { + let (env, contract_id, token_addr, user, merchant) = setup(); + let client = FlowPayClient::new(&env, &contract_id); let admin = Address::generate(&env); - env.as_contract(&contract_id, || { - storage::set_admin(&env, &admin); - }); + client.initialize(&token_addr, &admin); + client.set_min_interval(&60u64); - env.set_auths(&[]); - client.clear_charge_history(&user); + client.subscribe(&user, &merchant, &1_0000000, &3600, &token_addr, &None, &None); + + let sub = client.get_subscription(&user).unwrap(); + assert_eq!(sub.interval, 3600); } #[test] -fn test_clear_charge_history_admin_succeeds() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let admin = Address::generate(&env); - env.as_contract(&contract_id, || { - storage::set_admin(&env, &admin); - }); - - let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); - - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - - assert_eq!(client.get_charge_history(&user).len(), 1); - - client.clear_charge_history(&user); - - assert_eq!(client.get_charge_history(&user).len(), 0); -} - -#[test] -fn test_get_charge_history_empty_for_no_history() { - let (env, contract_id, _token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let random = Address::generate(&env); - let history = client.get_charge_history(&random); - assert_eq!(history.len(), 0); -} - -#[test] -fn test_get_charge_history_page_limit_capped_at_12() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); - - for _ in 0..14 { - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - } - - let page = client.get_charge_history_page(&user, &0u32, &100u32); - assert_eq!(page.len(), 12); -} - -#[test] -fn test_get_charge_history_page_offset_beyond_length() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); - - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); - client.charge(&user); - - let page = client.get_charge_history_page(&user, &5u32, &2u32); - assert_eq!(page.len(), 0); -} - -#[test] -fn test_clear_charge_history_nonexistent_key_no_panic() { - let (env, contract_id, _token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let admin = Address::generate(&env); - env.as_contract(&contract_id, || { - storage::set_admin(&env, &admin); - }); - - let random = Address::generate(&env); - client.clear_charge_history(&random); -} - -// ───────────────────────────────────────────── -// contract_health_check tests -// ───────────────────────────────────────────── - -#[test] -fn test_health_check_initialized_unpaused() { - let (env, contract_id, token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - client.initialize(&token_addr, &admin); - - let report = client.contract_health_check(); - - assert!( - report.is_healthy, - "initialized and unpaused contract should be healthy" - ); - assert!(!report.contract_paused); - assert!(report.token_configured); - assert!(report.admin_configured); -} - -#[test] -fn test_health_check_paused() { - let (env, contract_id, token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - - client.initialize(&token_addr, &admin); - client.pause_contract(); - - let report = client.contract_health_check(); - - assert!(!report.is_healthy, "paused contract should not be healthy"); - assert!(report.contract_paused); -} - -#[test] -fn test_health_check_pre_initialize() { - let env = Env::default(); - env.mock_all_auths(); - let contract_id = env.register_contract(None, FlowPay); - let client = FlowPayClient::new(&env, &contract_id); - - let report = client.contract_health_check(); - - assert!( - !report.token_configured, - "token should not be configured before initialize" - ); - assert!( - !report.is_healthy, - "uninitialized contract should not be healthy" - ); -} - -#[test] -fn test_health_check_active_subscription_count() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - - let report = client.contract_health_check(); - assert_eq!(report.active_subscription_count, 1); -} - -#[test] -fn test_ttl_extension() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - env.ledger().with_mut(|l| { - l.max_entry_ttl = 10_000_000; - }); - - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - - // We can't easily assert the exact TTL in the test environment without more complex mock_all_auths - // or internal access, but we can verify the function exists and doesn't panic. - - // Keep the contract instance itself alive across the jump below — only the - // Subscription entry's TTL is extended by extend_subscription_ttl, but the - // contract instance needs its own TTL or the whole contract becomes archived. - // Extend a bit past SUBSCRIPTION_TTL_LEDGERS to cover the two ledger jumps below. - env.as_contract(&contract_id, || { - env.storage() - .instance() - .extend_ttl(SUBSCRIPTION_TTL_LEDGERS + 10, SUBSCRIPTION_TTL_LEDGERS + 10); - }); - - env.ledger().with_mut(|l| { - l.sequence_number += SUBSCRIPTION_TTL_LEDGERS - 1; - }); - client.extend_subscription_ttl(&user); - - assert!(client.get_subscription(&user).is_some()); -} - - -#[test] -#[should_panic] -fn test_subscribe_interval_under_60_panics() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - client.subscribe(&user, &merchant, &1_0000000, &0, &token_addr, &None, &None); -} - -#[test] -fn test_subscribe_interval_minimum_succeeds() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - client.initialize(&token_addr, &admin); - client.set_min_interval(&60u64); - - client.subscribe( - &user, - &merchant, - &1_0000000, - &3600, - &token_addr, - &None, - &None, - ); - - let sub = client.get_subscription(&user).unwrap(); - assert_eq!(sub.interval, 3600); -} - -#[test] -#[should_panic(expected = "Error(Contract, #15)")] -fn test_subscribe_amount_above_cap_panics() { +#[should_panic(expected = "Error(Contract, #15)")] +fn test_subscribe_amount_above_cap_panics() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); @@ -3114,20 +2765,12 @@ fn test_subscribe_amount_at_cap_succeeds() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - let sac = soroban_sdk::token::StellarAssetClient::new(&env, &token_addr); + let sac = StellarAssetClient::new(&env, &token_addr); sac.mint(&user, &MAX_SUBSCRIPTION_AMOUNT); - let token = soroban_sdk::token::Client::new(&env, &token_addr); + let token = TokenClient::new(&env, &token_addr); token.approve(&user, &contract_id, &MAX_SUBSCRIPTION_AMOUNT, &200); - client.subscribe( - &user, - &merchant, - &MAX_SUBSCRIPTION_AMOUNT, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &MAX_SUBSCRIPTION_AMOUNT, &86400, &token_addr, &None, &None); client.subscribe( &user, &merchant, @@ -3142,7 +2785,16 @@ fn test_subscribe_amount_at_cap_succeeds() { assert_eq!(sub.amount, MAX_SUBSCRIPTION_AMOUNT); } +#[test] +#[should_panic] +fn test_double_initialize() { + let (env, contract_id, token_addr, _user, _merchant) = setup(); + let client = FlowPayClient::new(&env, &contract_id); + let admin = Address::generate(&env); + client.initialize(&token_addr, &admin); // first call + client.initialize(&token_addr, &admin); // second call — should panic +} // ───────────────────────────────────────────── // Admin transfer tests @@ -3250,7 +2902,7 @@ fn test_initialize_without_valid_token() { let admin = Address::generate(&env); client.initialize(&invalid_token, &admin); - + // Success means it didn't panic, which is the current expected behavior. } @@ -3276,19 +2928,9 @@ fn test_global_volume_within_limit() { let amount: i128 = 1_000_0000000; // well under limit let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &amount, &interval, &token_addr, &None, &None); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); client.charge(&user); // Should succeed - well under the 50 trillion stroops limit } @@ -3306,28 +2948,10 @@ fn test_global_volume_exceeds_limit() { let amount: i128 = 30_000_000_000_000; // 30 trillion stroops each let interval: u64 = 86400; - client.subscribe( - &user_a, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &amount, &interval, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &amount, &interval, &token_addr, &None, &None); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); // First charge succeeds (30 trillion used) client.charge(&user_a); @@ -3344,42 +2968,19 @@ fn test_global_volume_window_reset() { let user_a = setup_large_balance(&env, &contract_id, &token_addr); let user_b = setup_large_balance(&env, &contract_id, &token_addr); - let amount: i128 = 1_000_0000000; // well under MAX_AMOUNT + let amount: i128 = 5_000_000_000000; // 5 trillion stroops (under MAX_SUBSCRIPTION_AMOUNT) let interval: u64 = 86400; - client.subscribe( - &user_a, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &amount, &interval, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &amount, &interval, &token_addr, &None, &None); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); client.charge(&user_a); // 5 trillion used this window - // Advance time past the 1-hour window boundary (3601 seconds) - env.ledger().with_mut(|l| { - l.timestamp += 3601; - }); + env.ledger().with_mut(|l| { l.timestamp += 3601; }); - env.ledger().with_mut(|l| { - l.timestamp += interval; - }); + env.ledger().with_mut(|l| { l.timestamp += interval; }); // This charge should succeed because the window has reset client.charge(&user_b); @@ -3497,15 +3098,7 @@ fn test_get_protocol_stats_after_subscribe() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let stats = client.get_protocol_stats(); assert_eq!(stats.active_count, 1); @@ -3645,7 +3238,6 @@ fn test_get_min_interval_default() { assert_eq!(client.get_min_interval(), 3600); } - /// subscribe panics with IntervalTooShort when interval < default floor of 3600. #[test] #[should_panic] @@ -3653,15 +3245,7 @@ fn test_subscribe_interval_too_short_panics_default_floor() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); // 1800 seconds (30 min) < 3600 default floor - client.subscribe( - &user, - &merchant, - &1_0000000, - &1800, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &1800, &token_addr, &None, &None); } /// Lowering the floor via set_min_interval then subscribing at the new floor succeeds. @@ -3711,25 +3295,15 @@ fn test_set_min_interval_non_admin_panics() { #[test] fn test_clear_merchant_revenue_history_drops_history() { let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - - client.set_initial_admin(&admin); - - // Produce some history via a charge - let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + let client = FlowPayClient::new(&env, &contract_id); + let admin = Address::generate(&env); + + client.set_initial_admin(&admin); + + // Produce some history via a charge + let interval: u64 = 86400; + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); client.charge(&user); // History should have one entry @@ -3766,12 +3340,7 @@ fn test_clear_merchant_revenue_history_idempotent() { // Second call — still no data, must not panic client.clear_merchant_revenue_history(&unknown_merchant); - assert_eq!( - client - .get_merchant_revenue_history(&unknown_merchant, &5u32) - .len(), - 0 - ); + assert_eq!(client.get_merchant_revenue_history(&unknown_merchant, &5u32).len(), 0); } /// Calling clear_merchant_revenue_history without an admin configured panics. @@ -3796,33 +3365,9 @@ fn test_subscriber_index_three_unique_users() { let user_b = setup_funded_user(&env, &contract_id, &token_addr); let user_c = setup_funded_user(&env, &contract_id, &token_addr); - client.subscribe( - &user_a, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_c, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + client.subscribe(&user_c, &merchant, &1_0000000, &86400, &token_addr, &None, &None); assert_eq!(client.get_subscriber_count(), 3); @@ -3838,15 +3383,7 @@ fn test_get_subscriber_at_returns_first() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); assert_eq!(client.get_subscriber_at(&0u64), Some(user)); assert_eq!(client.get_subscriber_at(&1u64), None); @@ -3857,27 +3394,11 @@ fn test_resubscribe_active_does_not_duplicate_index() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); assert_eq!(client.get_subscriber_count(), 1); // Re-subscribe while still active — must not append a second entry - client.subscribe( - &user, - &merchant, - &2_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &2_0000000, &86400, &token_addr, &None, &None); assert_eq!(client.get_subscriber_count(), 1); let page = client.get_subscriber_page(&0u64, &10u32); @@ -3889,15 +3410,7 @@ fn test_subscriber_page_offset_beyond_count_returns_empty() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); assert_eq!(client.get_subscriber_count(), 1); let page = client.get_subscriber_page(&1u64, &10u32); @@ -4308,10 +3821,8 @@ fn test_set_metadata_label_at_limit_succeeds() { let (env, contract_id, _token_addr, user, _merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - let valid_label = soroban_sdk::String::from_str( - &env, - "this_is_a_perfectly_valid_sixty_four_character_metadata_label_ok", - ); + let valid_label = + soroban_sdk::String::from_str(&env, "this_is_a_perfectly_valid_sixty_four_character_metadata_label_ok"); assert_eq!(valid_label.len(), 64); client.set_metadata(&user, &valid_label); @@ -4325,10 +3836,8 @@ fn test_set_metadata_label_exceeding_limit_fails() { let (env, contract_id, _token_addr, user, _merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - let invalid_label = soroban_sdk::String::from_str( - &env, - "this_is_an_invalid_sixty_five_character_metadata_label_too_long_!", - ); + let invalid_label = + soroban_sdk::String::from_str(&env, "this_is_an_invalid_sixty_five_character_metadata_label_too_long_!"); assert_eq!(invalid_label.len(), 65); client.set_metadata(&user, &invalid_label); @@ -4340,15 +3849,7 @@ fn test_set_metadata_label_exceeding_limit_fails() { fn test_set_metadata_wrong_user_panics() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let attacker = Address::generate(&env); let label = soroban_sdk::String::from_str(&env, "hacked"); client.set_metadata(&attacker, &label); @@ -4358,15 +3859,7 @@ fn test_set_metadata_wrong_user_panics() { fn test_get_subscription_label_returns_set_value() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let label = soroban_sdk::String::from_str(&env, "premium"); client.set_metadata(&user, &label); assert_eq!(client.get_subscription_label(&user), Some(label)); @@ -4380,6 +3873,7 @@ fn test_get_subscription_label_none_when_not_set() { assert!(client.get_subscription_label(&random).is_none()); } + // ───────────────────────────────────────────── // Tests for pause() and resume() // ───────────────────────────────────────────── @@ -4389,15 +3883,7 @@ fn test_pause_sets_paused_true() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.pause(&user); let sub = client.get_subscription(&user).unwrap(); @@ -4411,20 +3897,10 @@ fn test_charge_on_paused_subscription_panics() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.pause(&user); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); client.charge(&user); } @@ -4434,15 +3910,7 @@ fn test_pay_per_use_on_paused_subscription_panics() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.pause(&user); client.pay_per_use(&user, &1_0000000); @@ -4454,21 +3922,11 @@ fn test_resume_unpauses_and_charge_succeeds() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.pause(&user); client.resume(&user); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); client.charge(&user); let sub = client.get_subscription(&user).unwrap(); @@ -4481,15 +3939,7 @@ fn test_pause_on_inactive_subscription_panics() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.cancel(&user); client.pause(&user); } @@ -4504,15 +3954,7 @@ fn test_next_charge_at_returns_correct_timestamp() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); let sub = client.get_subscription(&user).unwrap(); let expected = sub.last_charged + sub.interval; @@ -4526,15 +3968,7 @@ fn test_next_charge_at_none_after_cancel() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.cancel(&user); assert!(client.next_charge_at(&user).is_none()); @@ -4554,15 +3988,7 @@ fn test_transfer_subscription_succeeds() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); let new_user = Address::generate(&env); let sac = StellarAssetClient::new(&env, &token_addr); @@ -4572,10 +3998,7 @@ fn test_transfer_subscription_succeeds() { client.transfer_subscription(&user, &new_user); - assert!( - client.get_subscription(&user).is_none(), - "old subscription should be removed" - ); + assert!(client.get_subscription(&user).is_none(), "old subscription should be removed"); let new_sub = client.get_subscription(&new_user).unwrap(); assert!(new_sub.active, "new subscription should be active"); @@ -4595,24 +4018,8 @@ fn test_transfer_subscription_to_active_user_panics() { let token = TokenClient::new(&env, &token_addr); token.approve(&new_user, &contract_id, &10_000_0000000, &200); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); - client.subscribe( - &new_user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); + client.subscribe(&new_user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.transfer_subscription(&user, &new_user); } @@ -4709,7 +4116,15 @@ fn test_subscribe_exact_allowance_succeeds() { token.approve(&user, &contract_id, &amount, &200); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe(&user, &merchant, &amount, &86400, &token_addr, &None, &None); + client.subscribe( + &user, + &merchant, + &amount, + &86400, + &token_addr, + &None, + &None, + ); let sub = client.get_subscription(&user).unwrap(); assert!(sub.active, "subscription should be active"); @@ -4743,14 +4158,30 @@ fn test_resubscribe_zero_allowance_panics() { token.approve(&user, &contract_id, &10_000_0000000, &200); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe(&user, &merchant, &amount, &86400, &token_addr, &None, &None); + client.subscribe( + &user, + &merchant, + &amount, + &86400, + &token_addr, + &None, + &None, + ); client.cancel(&user); // Revoke allowance so second subscribe sees zero. token.approve(&user, &contract_id, &0, &200); // Re-subscribe must panic because allowance is zero. - client.subscribe(&user, &merchant, &amount, &86400, &token_addr, &None, &None); + client.subscribe( + &user, + &merchant, + &amount, + &86400, + &token_addr, + &None, + &None, + ); } // ───────────────────────────────────────────── @@ -4773,15 +4204,7 @@ fn test_set_subscription_amount_admin_succeeds() { let new_amount: i128 = 3_0000000; let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &original_amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &original_amount, &interval, &token_addr, &None, &None); let sub_before = client.get_subscription(&user).unwrap(); assert_eq!(sub_before.amount, original_amount); @@ -4827,15 +4250,7 @@ fn test_set_subscription_amount_non_admin_panics() { storage::set_admin(&env, &admin); }); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); // Remove all authorizations so the admin auth check fails. env.set_auths(&[]); @@ -4854,24 +4269,16 @@ fn test_set_subscription_interval_admin_succeeds() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - let admin = Address::generate(&env); - env.as_contract(&contract_id, || { - storage::set_admin(&env, &admin); - }); - - let amount: i128 = 1_0000000; - let original_interval: u64 = 86400; // 1 day - let new_interval: u64 = 30 * 24 * 3600; // 30 days - - client.subscribe( - &user, - &merchant, - &amount, - &original_interval, - &token_addr, - &None, - &None, - ); + let admin = Address::generate(&env); + env.as_contract(&contract_id, || { + storage::set_admin(&env, &admin); + }); + + let amount: i128 = 1_0000000; + let original_interval: u64 = 86400; // 1 day + let new_interval: u64 = 30 * 24 * 3600; // 30 days + + client.subscribe(&user, &merchant, &amount, &original_interval, &token_addr, &None, &None); let sub_before = client.get_subscription(&user).unwrap(); assert_eq!(sub_before.interval, original_interval); @@ -4881,10 +4288,7 @@ fn test_set_subscription_interval_admin_succeeds() { client.set_subscription_interval(&user, &new_interval); let sub_after = client.get_subscription(&user).unwrap(); - assert_eq!( - sub_after.interval, new_interval, - "interval should be updated" - ); + assert_eq!(sub_after.interval, new_interval, "interval should be updated"); assert_eq!( sub_after.last_charged, last_charged_before, "last_charged must not change" @@ -4913,15 +4317,7 @@ fn test_set_subscription_interval_zero_panics() { storage::set_admin(&env, &admin); }); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.set_subscription_interval(&user, &0); } @@ -4955,15 +4351,7 @@ fn test_set_subscription_interval_non_admin_panics() { storage::set_admin(&env, &admin); }); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); env.set_auths(&[]); @@ -4994,15 +4382,7 @@ fn test_withdraw_merchant_revenue_succeeds() { let amount: i128 = 5_0000000; let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &amount, &interval, &token_addr, &None, &None); env.ledger().with_mut(|l| { l.timestamp += interval + 1; @@ -5021,7 +4401,6 @@ fn test_withdraw_merchant_revenue_succeeds() { let merchant_balance_before = token.balance(&merchant); client.withdraw_merchant_revenue(&merchant); - // Revenue counter must be reset to zero. assert_eq!( @@ -5061,15 +4440,7 @@ fn test_next_charge_at_none_for_paused_subscription() { let (env, contract_id, token_addr, user, merchant) = setup(); let client = FlowPayClient::new(&env, &contract_id); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); client.pause(&user); assert!(client.next_charge_at(&user).is_none()); @@ -5081,22 +4452,12 @@ fn test_is_charge_due_transitions_after_interval() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); // Before interval elapses: not due assert!(!client.is_charge_due(&user)); - env.ledger().with_mut(|l| { - l.timestamp += interval; - }); + env.ledger().with_mut(|l| { l.timestamp += interval; }); assert!(client.is_charge_due(&user)); } @@ -5106,20 +4467,10 @@ fn test_is_charge_due_false_for_paused_subscription() { let client = FlowPayClient::new(&env, &contract_id); let interval: u64 = 86400; - client.subscribe( - &user, - &merchant, - &1_0000000, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); client.pause(&user); - env.ledger().with_mut(|l| { - l.timestamp += interval + 1; - }); + env.ledger().with_mut(|l| { l.timestamp += interval + 1; }); assert!(!client.is_charge_due(&user)); } @@ -5160,42 +4511,10 @@ fn test_batch_pause_subscriptions_mixed_inputs() { let amount: i128 = 1_0000000; let interval: u64 = 86400; - client.subscribe( - &user_a, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_b, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_c, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - client.subscribe( - &user_d, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); + client.subscribe(&user_a, &merchant, &amount, &interval, &token_addr, &None, &None); + client.subscribe(&user_b, &merchant, &amount, &interval, &token_addr, &None, &None); + client.subscribe(&user_c, &merchant, &amount, &interval, &token_addr, &None, &None); + client.subscribe(&user_d, &merchant, &amount, &interval, &token_addr, &None, &None); // Pre-pause user_c client.pause(&user_c); @@ -5210,11 +4529,11 @@ fn test_batch_pause_subscriptions_mixed_inputs() { // Build batch with mixed inputs: valid, missing, already-paused, valid let no_sub_user = Address::generate(&env); let mut users = soroban_sdk::Vec::new(&env); - users.push_back(user_a.clone()); // valid → should be paused - users.push_back(no_sub_user.clone()); // no subscription → skipped - users.push_back(user_c.clone()); // already paused → no-op - users.push_back(user_b.clone()); // valid → should be paused - users.push_back(user_d.clone()); // valid → should be paused + users.push_back(user_a.clone()); // valid → should be paused + users.push_back(no_sub_user.clone()); // no subscription → skipped + users.push_back(user_c.clone()); // already paused → no-op + users.push_back(user_b.clone()); // valid → should be paused + users.push_back(user_d.clone()); // valid → should be paused let events_before = env.events().all().len(); @@ -5249,10 +4568,7 @@ fn test_batch_pause_subscriptions_mixed_inputs() { topic_symbol == Symbol::new(&env, "subscription_paused") }) .count(); - assert_eq!( - paused_event_count, 3, - "should emit 3 subscription_paused events" - ); + assert_eq!(paused_event_count, 3, "should emit 3 subscription_paused events"); } /// Non-admin callers must be rejected with an auth panic. @@ -5267,15 +4583,7 @@ fn test_batch_pause_subscriptions_non_admin_panics() { storage::set_admin(&env, &admin); }); - client.subscribe( - &user, - &merchant, - &1_0000000, - &86400, - &token_addr, - &None, - &None, - ); + client.subscribe(&user, &merchant, &1_0000000, &86400, &token_addr, &None, &None); // Clear all auths — admin auth should fail and panic env.set_auths(&[]); @@ -5304,196 +4612,3 @@ fn test_batch_pause_subscriptions_exceeds_max_size_panics() { } client.batch_pause_subscriptions(&users); } - -// ───────────────────────────────────────────── -// CONTRACT-07: get_merchant_sub_count tests -// ───────────────────────────────────────────── - -#[test] -fn test_merchant_sub_count_two_users_cancel_one() { - let (env, contract_id, token_addr, user_a, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let user_b = Address::generate(&env); - let sac = StellarAssetClient::new(&env, &token_addr); - sac.mint(&user_b, &10_000_0000000); - let token = TokenClient::new(&env, &token_addr); - token.approve(&user_b, &contract_id, &10_000_0000000, &200); - - let amount: i128 = 1_0000000; - let interval: u64 = 86400; - - client.subscribe( - &user_a, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - assert_eq!(client.get_merchant_sub_count(&merchant), 1); - - client.subscribe( - &user_b, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - assert_eq!(client.get_merchant_sub_count(&merchant), 2); - - client.cancel(&user_a); - assert_eq!(client.get_merchant_sub_count(&merchant), 1); -} - -#[test] -fn test_merchant_sub_count_resubscribe_different_merchant() { - let (env, contract_id, token_addr, user, merchant_a) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let merchant_b = Address::generate(&env); - - let amount: i128 = 1_0000000; - let interval: u64 = 86400; - - // Subscribe user to merchant A - client.subscribe( - &user, - &merchant_a, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - assert_eq!(client.get_merchant_sub_count(&merchant_a), 1); - assert_eq!(client.get_merchant_sub_count(&merchant_b), 0); - - // Re-subscribe user to merchant B - client.subscribe( - &user, - &merchant_b, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - assert_eq!(client.get_merchant_sub_count(&merchant_a), 0); - assert_eq!(client.get_merchant_sub_count(&merchant_b), 1); -} - -#[test] -fn test_merchant_sub_count_never_subscribed_returns_zero() { - let (env, contract_id, _token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let unknown_merchant = Address::generate(&env); - assert_eq!(client.get_merchant_sub_count(&unknown_merchant), 0); -} - -#[test] -fn test_merchant_sub_count_double_cancel_no_underflow() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - let amount: i128 = 1_0000000; - let interval: u64 = 86400; - - client.subscribe( - &user, - &merchant, - &amount, - &interval, - &token_addr, - &None, - &None, - ); - assert_eq!(client.get_merchant_sub_count(&merchant), 1); - - client.cancel(&user); - assert_eq!(client.get_merchant_sub_count(&merchant), 0); - - // Second cancel must not underflow - client.cancel(&user); - assert_eq!(client.get_merchant_sub_count(&merchant), 0); -} - -#[test] -fn test_is_charge_due_false_past_grace_window() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - env.as_contract(&contract_id, || { - storage::set_admin(&env, &user); - }); - - let interval: u64 = 86400; - let grace: u64 = 3600; - client.subscribe(&user, &merchant, &1_0000000, &interval, &token_addr, &None, &None); - client.propose_grace_period(&grace); - client.commit_grace_period(); - - env.ledger().with_mut(|l| { l.timestamp += interval + grace + 1; }); - - assert!(!client.is_charge_due(&user)); -} - -#[test] -fn test_is_charge_due_false_for_unknown_address() { - let (env, contract_id, _token_addr, _user, _merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - assert!(!client.is_charge_due(&Address::generate(&env))); -} - -#[test] -fn test_daily_limit_day_start_boundary() { - let (env, contract_id, token_addr, user, merchant) = setup(); - let client = FlowPayClient::new(&env, &contract_id); - - client.subscribe(&user, &merchant, &100_0000000, &86400, &token_addr, &None, &None); - client.set_daily_limit(&user, &50_0000000); - - // Spend 10 - client.pay_per_use(&user, &10_0000000); - assert_eq!(client.get_daily_spent(&user), 10_0000000); - - // Spend 10 more - client.pay_per_use(&user, &10_0000000); - assert_eq!(client.get_daily_spent(&user), 20_0000000); - - // Manually extend DailyLimit (and other entries touched by the upcoming pay_per_use) - // TTL so they survive the time skip below. - env.as_contract(&contract_id, || { - let key = DataKey::DailyLimit(user.clone()); - // 35,000 ledgers > LEDGERS_PER_DAY (17,280) - env.storage().temporary().extend_ttl(&key, 35000, 35000); - env.storage() - .persistent() - .extend_ttl(&DataKey::MerchantRevenue(merchant.clone()), 35000, 35000); - env.storage().persistent().extend_ttl( - &DataKey::MerchantRevenueHistory(merchant.clone()), - 35000, - 35000, - ); - }); - - // Advance sequence by LEDGERS_PER_DAY + 1 to expire DayStart (17,280 + 1 = 17,281) - env.ledger().with_mut(|l| { - l.sequence_number += 17281; - l.timestamp += 17281 * 5; - }); - - // Renew the token allowance, which expired when the ledger sequence jumped past it - let token = TokenClient::new(&env, &token_addr); - token.approve(&user, &contract_id, &10_000_0000000, &(env.ledger().sequence() + 200)); - - // New spend on new day - client.pay_per_use(&user, &15_0000000); - - // Should only be 15, not 35 - assert_eq!(client.get_daily_spent(&user), 15_0000000); -} diff --git a/contract/src/upgrade.rs b/contract/src/upgrade.rs index a3d07e22..6c57e890 100644 --- a/contract/src/upgrade.rs +++ b/contract/src/upgrade.rs @@ -28,6 +28,5 @@ pub fn commit_upgrade(env: &Env) { #[cfg(test)] pub fn upgrade(env: &Env, new_wasm_hash: BytesN<32>) { - // Keep direct upgrade available for the test environment events::publish_upgraded(env, &new_wasm_hash); } diff --git a/contract/test_snapshots/bench/bench_batch_charge_10_users.1.json b/contract/test_snapshots/bench/bench_batch_charge_10_users.1.json index 3cabdabd..3bb48363 100644 --- a/contract/test_snapshots/bench/bench_batch_charge_10_users.1.json +++ b/contract/test_snapshots/bench/bench_batch_charge_10_users.1.json @@ -6931,6 +6931,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -7285,6 +7344,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -7639,6 +7757,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -7993,6 +8170,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -8351,30 +8587,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -8386,7 +8619,69 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "subscribed" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + }, + { + "i128": { + "hi": 0, + "lo": 10000000 + } + }, + { + "u64": 86400 + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -8701,6 +8996,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -9055,6 +9409,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -9409,6 +9822,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -9763,6 +10235,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2ZMN" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -10117,6 +10648,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4BV5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/bench/bench_charge.1.json b/contract/test_snapshots/bench/bench_charge.1.json index 22f4b5dd..64d3b6c6 100644 --- a/contract/test_snapshots/bench/bench_charge.1.json +++ b/contract/test_snapshots/bench/bench_charge.1.json @@ -732,7 +732,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1621,6 +1621,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/bench/bench_charge_vs_subscribe_ratio.1.json b/contract/test_snapshots/bench/bench_charge_vs_subscribe_ratio.1.json index 93b4111d..150cb8ba 100644 --- a/contract/test_snapshots/bench/bench_charge_vs_subscribe_ratio.1.json +++ b/contract/test_snapshots/bench/bench_charge_vs_subscribe_ratio.1.json @@ -732,7 +732,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1621,6 +1621,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/bench/bench_pay_per_use.1.json b/contract/test_snapshots/bench/bench_pay_per_use.1.json index adad9710..48702418 100644 --- a/contract/test_snapshots/bench/bench_pay_per_use.1.json +++ b/contract/test_snapshots/bench/bench_pay_per_use.1.json @@ -293,6 +293,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -1677,6 +1720,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/bench/bench_subscribe.1.json b/contract/test_snapshots/bench/bench_subscribe.1.json index b2247012..a414e042 100644 --- a/contract/test_snapshots/bench/bench_subscribe.1.json +++ b/contract/test_snapshots/bench/bench_subscribe.1.json @@ -1312,6 +1312,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 10000000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_active_count_decrements_on_cancel.1.json b/contract/test_snapshots/test/test_active_count_decrements_on_cancel.1.json index 127b9111..6d262e50 100644 --- a/contract/test_snapshots/test/test_active_count_decrements_on_cancel.1.json +++ b/contract/test_snapshots/test/test_active_count_decrements_on_cancel.1.json @@ -1366,6 +1366,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_active_count_does_not_double_count_on_resubscribe.1.json b/contract/test_snapshots/test/test_active_count_does_not_double_count_on_resubscribe.1.json index 5fbe9780..1a7491ec 100644 --- a/contract/test_snapshots/test/test_active_count_does_not_double_count_on_resubscribe.1.json +++ b/contract/test_snapshots/test/test_active_count_does_not_double_count_on_resubscribe.1.json @@ -295,7 +295,7 @@ }, "durability": "persistent", "val": { - "u64": 1 + "u64": 0 } } }, @@ -1429,6 +1429,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1639,6 +1698,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_active_count_increments_on_subscribe.1.json b/contract/test_snapshots/test/test_active_count_increments_on_subscribe.1.json index 216aa9b0..635f4411 100644 --- a/contract/test_snapshots/test/test_active_count_increments_on_subscribe.1.json +++ b/contract/test_snapshots/test/test_active_count_increments_on_subscribe.1.json @@ -1361,6 +1361,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_active_count_multiple_users.1.json b/contract/test_snapshots/test/test_active_count_multiple_users.1.json index da66463a..12439696 100644 --- a/contract/test_snapshots/test/test_active_count_multiple_users.1.json +++ b/contract/test_snapshots/test/test_active_count_multiple_users.1.json @@ -2092,6 +2092,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2255,6 +2314,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_charged_and_skipped.1.json b/contract/test_snapshots/test/test_batch_charge_charged_and_skipped.1.json index 2250e0d1..9ef5c5b9 100644 --- a/contract/test_snapshots/test/test_batch_charge_charged_and_skipped.1.json +++ b/contract/test_snapshots/test/test_batch_charge_charged_and_skipped.1.json @@ -2416,6 +2416,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2579,6 +2638,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2742,6 +2860,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_grace_period_elapsed.1.json b/contract/test_snapshots/test/test_batch_charge_grace_period_elapsed.1.json index a8654c32..76ec40c9 100644 --- a/contract/test_snapshots/test/test_batch_charge_grace_period_elapsed.1.json +++ b/contract/test_snapshots/test/test_batch_charge_grace_period_elapsed.1.json @@ -1570,6 +1570,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_inactive.1.json b/contract/test_snapshots/test/test_batch_charge_inactive.1.json index e1757270..2c431780 100644 --- a/contract/test_snapshots/test/test_batch_charge_inactive.1.json +++ b/contract/test_snapshots/test/test_batch_charge_inactive.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_ordering.1.json b/contract/test_snapshots/test/test_batch_charge_ordering.1.json index 662f6880..c6afecbb 100644 --- a/contract/test_snapshots/test/test_batch_charge_ordering.1.json +++ b/contract/test_snapshots/test/test_batch_charge_ordering.1.json @@ -3128,6 +3128,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -3291,6 +3350,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -3454,6 +3572,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_paused.1.json b/contract/test_snapshots/test/test_batch_charge_paused.1.json index 6e817b20..5573fe76 100644 --- a/contract/test_snapshots/test/test_batch_charge_paused.1.json +++ b/contract/test_snapshots/test/test_batch_charge_paused.1.json @@ -1410,6 +1410,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1493,6 +1552,27 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "paused" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_stress.1.json b/contract/test_snapshots/test/test_batch_charge_stress.1.json index 7a55ef70..76d23bc7 100644 --- a/contract/test_snapshots/test/test_batch_charge_stress.1.json +++ b/contract/test_snapshots/test/test_batch_charge_stress.1.json @@ -60516,6 +60516,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -60870,6 +60929,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -61224,6 +61342,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -61582,30 +61759,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -61617,7 +61791,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -61626,10 +61800,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -61638,31 +61817,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATYON" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -61674,39 +61853,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -61715,7 +61862,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -61932,6 +62168,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAX5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -62286,6 +62581,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXI7N" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -62640,6 +62994,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYRE5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -62994,6 +63407,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA2ZMN" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -63348,6 +63820,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4BV5" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -63702,6 +64233,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6J5N" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -64060,30 +64650,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABB6KO" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABB6KO" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -64095,7 +64682,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -64104,10 +64691,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -64116,31 +64708,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABB6KO" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDWC6" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -64152,39 +64744,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDWC6" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -64193,7 +64753,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDWC6" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDWC6" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -64410,6 +65059,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDWC6" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -64764,6 +65472,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFO3O" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -65118,6 +65885,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABHGT6" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -65472,6 +66298,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI7IO" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -65826,6 +66711,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKXA6" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -66180,6 +67124,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABMPZO" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -66538,30 +67541,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABOHR6" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABOHR6" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -66573,7 +67573,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -66582,10 +67582,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -66594,31 +67599,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABOHR6" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR4OP" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -66630,39 +67635,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR4OP" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -66671,7 +67644,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR4OP" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR4OP" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -66888,6 +67950,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR4OP" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -67242,6 +68363,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABTUG7" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -67596,6 +68776,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVM7P" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -67950,6 +69189,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABXEX7" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -68304,6 +69602,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABY5MP" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -68658,6 +70015,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2VE7" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -69016,30 +70432,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4N5P" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4N5P" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -69051,7 +70464,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -69060,10 +70473,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -69072,31 +70490,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4N5P" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6FV7" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -69108,39 +70526,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6FV7" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -69149,7 +70535,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6FV7" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6FV7" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -69366,6 +70841,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB6FV7" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -69720,6 +71254,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBKTY" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -70074,6 +71667,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDC3I" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -70428,6 +72080,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACF2CY" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -70782,6 +72493,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHSKI" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -71136,6 +72906,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACILRY" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -71494,30 +73323,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACKDZI" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACKDZI" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -71529,7 +73355,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -71538,10 +73364,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -71550,31 +73381,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACKDZI" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM3AY" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -71586,39 +73417,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM3AY" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -71627,7 +73426,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM3AY" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM3AY" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -71844,6 +73732,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACM3AY" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -72198,6 +74145,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACOTII" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -72552,6 +74558,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACRIXZ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -72906,6 +74971,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACTA7J" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -73260,6 +75384,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVYGZ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -73614,6 +75797,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACXQOJ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -73972,30 +76214,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACYJVZ" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACYJVZ" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -74007,7 +76246,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -74016,10 +76255,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -74028,31 +76272,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACYJVZ" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2B5J" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -74064,39 +76308,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2B5J" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -74105,7 +76317,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2B5J" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2B5J" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -74322,6 +76623,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC2B5J" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -74676,6 +77036,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4ZEZ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -75030,6 +77449,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC6RMJ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -75384,6 +77862,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBG3K" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -75738,6 +78275,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADDOT2" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -76092,6 +78688,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFWKK" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -76450,30 +79105,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADH6C2" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADH6C2" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -76485,7 +79137,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -76494,10 +79146,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -76506,31 +79163,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADH6C2" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIHZK" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -76542,39 +79199,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIHZK" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -76583,7 +79208,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIHZK" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIHZK" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -76800,6 +79514,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIHZK" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -77154,6 +79927,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADKPR2" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -77508,6 +80340,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADMXIK" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -77862,6 +80753,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADO7A2" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -78216,6 +81166,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADRE7L" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -78570,6 +81579,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADTMX3" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -78928,30 +81996,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADVUOL" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADVUOL" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -78963,7 +82028,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -78972,10 +82037,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -78984,31 +82054,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADVUOL" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX4G3" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -79020,39 +82090,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX4G3" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -79061,7 +82099,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX4G3" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX4G3" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -79278,6 +82405,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX4G3" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -79632,6 +82818,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADYF5L" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -79986,6 +83231,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2NV3" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -80340,6 +83644,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4VML" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -80694,6 +84057,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD65E3" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -81048,6 +84470,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEADAU" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -81406,30 +84887,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECLIE" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECLIE" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -81441,7 +84919,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -81450,10 +84928,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -81462,31 +84945,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAECLIE" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEETRU" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -81498,39 +84981,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEETRU" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -81539,7 +84990,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEETRU" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEETRU" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -81756,6 +85296,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEETRU" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -82110,6 +85709,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEG3ZE" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -82464,6 +86122,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEJCCU" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -82818,6 +86535,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAELKKE" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -83172,6 +86948,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAENSTU" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -83526,6 +87361,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEP23E" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -83884,30 +87778,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQBEV" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQBEV" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -83919,7 +87810,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -83928,10 +87819,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -83940,31 +87836,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQBEV" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAESJMF" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -83976,39 +87872,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAESJMF" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -84017,7 +87881,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAESJMF" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAESJMF" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -84234,6 +88187,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAESJMF" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -84588,6 +88600,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEURVV" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -84942,6 +89013,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWZ5F" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -85296,6 +89426,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZAGV" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -85650,6 +89839,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE3IOF" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -86004,6 +90252,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE5QXV" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -86362,30 +90669,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE7Y7F" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE7Y7F" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -86397,7 +90701,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -86406,10 +90710,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -86418,31 +90727,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE7Y7F" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAPIG" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -86454,39 +90763,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAPIG" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -86495,7 +90772,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAPIG" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAPIG" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -86712,6 +91078,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAPIG" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -87066,6 +91491,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCHAW" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -87420,6 +91904,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFE7ZG" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -87774,6 +92317,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFGXRW" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -88128,6 +92730,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFJOKG" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -88482,6 +93143,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFLGCW" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -88840,30 +93560,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFN63G" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFN63G" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -88875,7 +93592,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -88884,10 +93601,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -88896,31 +93618,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFN63G" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFPWTW" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -88932,39 +93654,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFPWTW" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -88973,7 +93663,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFPWTW" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFPWTW" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -89190,6 +93969,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFPWTW" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -89544,6 +94382,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQNMH" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -89898,6 +94795,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFSFEX" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -90252,6 +95208,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFU55H" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -90606,6 +95621,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFWVVX" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -90960,6 +96034,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFZMOH" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -91318,30 +96451,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF3EGX" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF3EGX" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -91353,7 +96483,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -91362,10 +96492,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -91374,31 +96509,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF3EGX" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF547H" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -91410,39 +96545,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF547H" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -91451,7 +96554,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF547H" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF547H" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -91668,6 +96860,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF547H" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -92022,6 +97273,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF7UXX" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -92376,6 +97686,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGA3RQ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -92730,6 +98099,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGCTZA" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -93084,6 +98512,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGELAQ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -93438,6 +98925,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGGDIA" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -93796,30 +99342,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGJ2TQ" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGJ2TQ" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -93831,7 +99374,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -93840,10 +99383,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -93852,31 +99400,31 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "subscribed" }, { - "symbol": "mint" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGJ2TQ" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGLS3A" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 10000000 } + }, + { + "u64": 86400 } ] } @@ -93888,39 +99436,7 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "mint" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGLS3A" - }, - { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", "type_": "diagnostic", "body": { "v0": { @@ -93929,7 +99445,96 @@ "symbol": "fn_return" }, { - "symbol": "mint" + "symbol": "subscribe" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": null, + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "mint" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGLS3A" + }, + { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "mint" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGLS3A" + }, + { + "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "mint" } ], "data": "void" @@ -94146,6 +99751,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGLS3A" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -94500,6 +100164,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGNKCQ" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -94854,6 +100577,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGPCKA" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -95208,6 +100990,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQZVR" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -95562,6 +101403,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGSR5B" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_charge_with_fee.1.json b/contract/test_snapshots/test/test_batch_charge_with_fee.1.json index f31bc4f1..d2ecceec 100644 --- a/contract/test_snapshots/test/test_batch_charge_with_fee.1.json +++ b/contract/test_snapshots/test/test_batch_charge_with_fee.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "u32": 100 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", @@ -332,7 +297,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", "key": { "ledger_key_nonce": { - "nonce": 4270020994084947596 + "nonce": 4837995959683129791 } }, "durability": "temporary" @@ -347,7 +312,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", "key": { "ledger_key_nonce": { - "nonce": 4270020994084947596 + "nonce": 4837995959683129791 } }, "durability": "temporary", @@ -1230,73 +1195,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 6277191135259896685 + "nonce": 4270020994084947596 } }, "durability": "temporary" @@ -1311,7 +1210,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { - "nonce": 6277191135259896685 + "nonce": 4270020994084947596 } }, "durability": "temporary", @@ -1329,7 +1228,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM", "key": { "ledger_key_nonce": { - "nonce": 5806905060045992000 + "nonce": 2032731177588607455 } }, "durability": "temporary" @@ -1344,7 +1243,7 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM", "key": { "ledger_key_nonce": { - "nonce": 5806905060045992000 + "nonce": 2032731177588607455 } }, "durability": "temporary", @@ -2776,6 +2675,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2939,6 +2897,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_batch_pause_subscriptions_handles_valid_missing_and_pre_paused_accounts.1.json b/contract/test_snapshots/test/test_batch_pause_subscriptions_handles_valid_missing_and_pre_paused_accounts.1.json index ff3ccabb..a540d66e 100644 --- a/contract/test_snapshots/test/test_batch_pause_subscriptions_handles_valid_missing_and_pre_paused_accounts.1.json +++ b/contract/test_snapshots/test/test_batch_pause_subscriptions_handles_valid_missing_and_pre_paused_accounts.1.json @@ -442,6 +442,51 @@ 4095 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "PauseExpiry" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "PauseExpiry" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + } + ] + }, + "durability": "persistent", + "val": { + "u64": 18446744073709551615 + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], [ { "contract_data": { diff --git a/contract/test_snapshots/test/test_batch_pause_subscriptions_mixed_inputs.1.json b/contract/test_snapshots/test/test_batch_pause_subscriptions_mixed_inputs.1.json index d47ae7e5..6709f7ab 100644 --- a/contract/test_snapshots/test/test_batch_pause_subscriptions_mixed_inputs.1.json +++ b/contract/test_snapshots/test/test_batch_pause_subscriptions_mixed_inputs.1.json @@ -704,6 +704,51 @@ 4095 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "PauseExpiry" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5" + } + ] + }, + "durability": "persistent" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "PauseExpiry" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQG5" + } + ] + }, + "durability": "persistent", + "val": { + "u64": 18446744073709551615 + } + } + }, + "ext": "v0" + }, + 4095 + ] + ], [ { "contract_data": { diff --git a/contract/test_snapshots/test/test_cancel.1.json b/contract/test_snapshots/test/test_cancel.1.json index 11c3f600..844d6026 100644 --- a/contract/test_snapshots/test/test_cancel.1.json +++ b/contract/test_snapshots/test/test_cancel.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_cancel_nonexistent.1.json b/contract/test_snapshots/test/test_cancel_nonexistent.1.json index 88a7f449..311931d8 100644 --- a/contract/test_snapshots/test/test_cancel_nonexistent.1.json +++ b/contract/test_snapshots/test/test_cancel_nonexistent.1.json @@ -904,16 +904,21 @@ "v0": { "topics": [ { - "symbol": "log" + "symbol": "error" + }, + { + "error": { + "contract": 4 + } } ], "data": { "vec": [ { - "string": "caught panic 'no subscription found' from contract function 'Symbol(cancel)'" + "string": "failing with contract error" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + "u32": 4 } ] } @@ -935,7 +940,32 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 4 + } + } + ], + "data": { + "string": "escalating error to panic" + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "error" + }, + { + "error": { + "contract": 4 } } ], @@ -960,7 +990,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 4 } } ], @@ -999,7 +1029,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 4 } } ], diff --git a/contract/test_snapshots/test/test_charge_after_cancel.1.json b/contract/test_snapshots/test/test_charge_after_cancel.1.json index f2f5c38b..5711e0fa 100644 --- a/contract/test_snapshots/test/test_charge_after_cancel.1.json +++ b/contract/test_snapshots/test/test_charge_after_cancel.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1529,7 +1588,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1539,7 +1598,7 @@ "string": "failing with contract error" }, { - "u32": 16 + "u32": 5 } ] } @@ -1561,7 +1620,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1586,7 +1645,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1611,7 +1670,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1650,7 +1709,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], diff --git a/contract/test_snapshots/test/test_charge_after_grace_window_panics.1.json b/contract/test_snapshots/test/test_charge_after_grace_window_panics.1.json index 78434ca1..ec01d825 100644 --- a/contract/test_snapshots/test/test_charge_after_grace_window_panics.1.json +++ b/contract/test_snapshots/test/test_charge_after_grace_window_panics.1.json @@ -1570,6 +1570,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_applies_protocol_fee_and_records_net_revenue.1.json b/contract/test_snapshots/test/test_charge_applies_protocol_fee_and_records_net_revenue.1.json index 36f792ed..ecb331e7 100644 --- a/contract/test_snapshots/test/test_charge_applies_protocol_fee_and_records_net_revenue.1.json +++ b/contract/test_snapshots/test/test_charge_applies_protocol_fee_and_records_net_revenue.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "u32": 500 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", @@ -811,7 +776,7 @@ "val": { "i128": { "hi": 0, - "lo": 100000000 + "lo": 200000000 } } }, @@ -873,72 +838,6 @@ { "contract_data": { "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -953,7 +852,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -1992,6 +1891,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_before_trial_end_panics.1.json b/contract/test_snapshots/test/test_charge_before_trial_end_panics.1.json index b1f3d67f..4b3c02b0 100644 --- a/contract/test_snapshots/test/test_charge_before_trial_end_panics.1.json +++ b/contract/test_snapshots/test/test_charge_before_trial_end_panics.1.json @@ -1317,6 +1317,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_exact_transfer_amount.1.json b/contract/test_snapshots/test/test_charge_exact_transfer_amount.1.json index 883dbac2..3f0789d5 100644 --- a/contract/test_snapshots/test/test_charge_exact_transfer_amount.1.json +++ b/contract/test_snapshots/test/test_charge_exact_transfer_amount.1.json @@ -374,190 +374,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -920,7 +736,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1809,6 +1625,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_history_capped_at_12.1.json b/contract/test_snapshots/test/test_charge_history_capped_at_12.1.json index e25019cb..1dd6d59e 100644 --- a/contract/test_snapshots/test/test_charge_history_capped_at_12.1.json +++ b/contract/test_snapshots/test/test_charge_history_capped_at_12.1.json @@ -1119,268 +1119,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -1821,7 +1559,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -2710,6 +2448,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_history_recorded.1.json b/contract/test_snapshots/test/test_charge_history_recorded.1.json index 30b2649a..8a872f42 100644 --- a/contract/test_snapshots/test/test_charge_history_recorded.1.json +++ b/contract/test_snapshots/test/test_charge_history_recorded.1.json @@ -372,190 +372,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -918,7 +734,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -1807,6 +1623,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_insufficient_allowance.1.json b/contract/test_snapshots/test/test_charge_insufficient_allowance.1.json index da8c57b6..f1e49e7d 100644 --- a/contract/test_snapshots/test/test_charge_insufficient_allowance.1.json +++ b/contract/test_snapshots/test/test_charge_insufficient_allowance.1.json @@ -1377,6 +1377,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_on_paused_subscription_panics.1.json b/contract/test_snapshots/test/test_charge_on_paused_subscription_panics.1.json index 265a27e3..91fe45cd 100644 --- a/contract/test_snapshots/test/test_charge_on_paused_subscription_panics.1.json +++ b/contract/test_snapshots/test/test_charge_on_paused_subscription_panics.1.json @@ -1410,6 +1410,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1493,6 +1552,27 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "paused" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_succeeds_after_merchant_frozen.1.json b/contract/test_snapshots/test/test_charge_succeeds_after_merchant_frozen.1.json index 1f162474..435b7e59 100644 --- a/contract/test_snapshots/test/test_charge_succeeds_after_merchant_frozen.1.json +++ b/contract/test_snapshots/test/test_charge_succeeds_after_merchant_frozen.1.json @@ -811,7 +811,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -1733,6 +1733,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_too_early.1.json b/contract/test_snapshots/test/test_charge_too_early.1.json index 1d3c5bd6..c59c06c9 100644 --- a/contract/test_snapshots/test/test_charge_too_early.1.json +++ b/contract/test_snapshots/test/test_charge_too_early.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_updates_last_charged.1.json b/contract/test_snapshots/test/test_charge_updates_last_charged.1.json index 6f56430d..70cb279a 100644 --- a/contract/test_snapshots/test/test_charge_updates_last_charged.1.json +++ b/contract/test_snapshots/test/test_charge_updates_last_charged.1.json @@ -371,190 +371,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -917,7 +733,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1806,6 +1622,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_with_zero_fee_bps_skips_fee_transfer.1.json b/contract/test_snapshots/test/test_charge_with_zero_fee_bps_skips_fee_transfer.1.json index 7ae3ee98..9d89f09a 100644 --- a/contract/test_snapshots/test/test_charge_with_zero_fee_bps_skips_fee_transfer.1.json +++ b/contract/test_snapshots/test/test_charge_with_zero_fee_bps_skips_fee_transfer.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "u32": 0 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", @@ -810,7 +775,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -872,72 +837,6 @@ { "contract_data": { "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -952,7 +851,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -1918,6 +1817,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_charge_within_grace_window_succeeds.1.json b/contract/test_snapshots/test/test_charge_within_grace_window_succeeds.1.json index 720e24a2..04436600 100644 --- a/contract/test_snapshots/test/test_charge_within_grace_window_succeeds.1.json +++ b/contract/test_snapshots/test/test_charge_within_grace_window_succeeds.1.json @@ -780,7 +780,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -1879,6 +1879,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_clear_merchant_revenue_history_drops_history.1.json b/contract/test_snapshots/test/test_clear_merchant_revenue_history_drops_history.1.json index f1d37eeb..eb9e067d 100644 --- a/contract/test_snapshots/test/test_clear_merchant_revenue_history_drops_history.1.json +++ b/contract/test_snapshots/test/test_clear_merchant_revenue_history_drops_history.1.json @@ -716,7 +716,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -1685,6 +1685,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_clear_metadata_removes_label.1.json b/contract/test_snapshots/test/test_clear_metadata_removes_label.1.json index f19f07a3..3c05d691 100644 --- a/contract/test_snapshots/test/test_clear_metadata_removes_label.1.json +++ b/contract/test_snapshots/test/test_clear_metadata_removes_label.1.json @@ -1421,6 +1421,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_custom_sac_token_end_to_end_flow.1.json b/contract/test_snapshots/test/test_custom_sac_token_end_to_end_flow.1.json index 4338863e..3d958bf4 100644 --- a/contract/test_snapshots/test/test_custom_sac_token_end_to_end_flow.1.json +++ b/contract/test_snapshots/test/test_custom_sac_token_end_to_end_flow.1.json @@ -489,6 +489,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -957,7 +1000,7 @@ "val": { "i128": { "hi": 0, - "lo": 70000000 + "lo": 120000000 } } }, @@ -2540,6 +2583,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_daily_limit_accumulates_across_calls.1.json b/contract/test_snapshots/test/test_daily_limit_accumulates_across_calls.1.json index f5eb817a..1495ec48 100644 --- a/contract/test_snapshots/test/test_daily_limit_accumulates_across_calls.1.json +++ b/contract/test_snapshots/test/test_daily_limit_accumulates_across_calls.1.json @@ -398,14 +398,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -418,25 +418,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 40000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -446,13 +441,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -469,13 +461,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -490,8 +479,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -501,68 +489,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 20000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 20000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 0 } ] }, @@ -579,52 +512,10 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { "u64": 0 @@ -633,54 +524,16 @@ }, "durability": "persistent", "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 40000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -2037,6 +1890,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_daily_limit_allows_spend_within_limit.1.json b/contract/test_snapshots/test/test_daily_limit_allows_spend_within_limit.1.json index c575e428..2613a8dd 100644 --- a/contract/test_snapshots/test/test_daily_limit_allows_spend_within_limit.1.json +++ b/contract/test_snapshots/test/test_daily_limit_allows_spend_within_limit.1.json @@ -373,14 +373,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -393,25 +393,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 50000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -421,13 +416,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -444,13 +436,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -465,8 +454,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -476,62 +464,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 0 } ] }, @@ -548,52 +487,10 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { "u64": 0 @@ -602,54 +499,16 @@ }, "durability": "persistent", "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 50000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1967,6 +1826,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_daily_limit_blocks_cumulative_overspend.1.json b/contract/test_snapshots/test/test_daily_limit_blocks_cumulative_overspend.1.json index 0dc143b7..00f3e0cd 100644 --- a/contract/test_snapshots/test/test_daily_limit_blocks_cumulative_overspend.1.json +++ b/contract/test_snapshots/test/test_daily_limit_blocks_cumulative_overspend.1.json @@ -367,6 +367,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -1784,6 +1827,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2154,26 +2256,21 @@ "v0": { "topics": [ { - "symbol": "log" + "symbol": "error" + }, + { + "error": { + "contract": 25 + } } ], "data": { "vec": [ { -<<<<<<< HEAD - "string": "caught panic 'daily spending limit exceeded' from contract function 'Symbol(obj#547)'" -======= - "string": "caught panic 'daily spending limit exceeded' from contract function 'Symbol(obj#533)'" ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "string": "failing with contract error" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - }, - { - "i128": { - "hi": 0, - "lo": 30000000 - } + "u32": 25 } ] } @@ -2195,7 +2292,32 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 + } + } + ], + "data": { + "string": "escalating error to panic" + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "error" + }, + { + "error": { + "contract": 25 } } ], @@ -2220,7 +2342,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 } } ], @@ -2265,7 +2387,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 } } ], diff --git a/contract/test_snapshots/test/test_daily_limit_blocks_overspend.1.json b/contract/test_snapshots/test/test_daily_limit_blocks_overspend.1.json index 00f00015..620e8758 100644 --- a/contract/test_snapshots/test/test_daily_limit_blocks_overspend.1.json +++ b/contract/test_snapshots/test/test_daily_limit_blocks_overspend.1.json @@ -1419,6 +1419,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1604,22 +1663,21 @@ "v0": { "topics": [ { - "symbol": "log" + "symbol": "error" + }, + { + "error": { + "contract": 25 + } } ], "data": { "vec": [ { - "string": "caught panic 'daily spending limit exceeded' from contract function 'Symbol(obj#323)'" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + "string": "failing with contract error" }, { - "i128": { - "hi": 0, - "lo": 50000000 - } + "u32": 25 } ] } @@ -1641,7 +1699,32 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 + } + } + ], + "data": { + "string": "escalating error to panic" + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "error" + }, + { + "error": { + "contract": 25 } } ], @@ -1666,7 +1749,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 } } ], @@ -1711,7 +1794,7 @@ }, { "error": { - "wasm_vm": "invalid_action" + "contract": 25 } } ], diff --git a/contract/test_snapshots/test/test_daily_limit_visibility_and_spend_tracking.1.json b/contract/test_snapshots/test/test_daily_limit_visibility_and_spend_tracking.1.json index 61e59732..1bb17870 100644 --- a/contract/test_snapshots/test/test_daily_limit_visibility_and_spend_tracking.1.json +++ b/contract/test_snapshots/test/test_daily_limit_visibility_and_spend_tracking.1.json @@ -378,14 +378,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -398,25 +398,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 10000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -426,13 +421,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -449,13 +441,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -470,8 +459,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -481,62 +469,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 0 } ] }, @@ -553,52 +492,10 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { "u64": 0 @@ -607,54 +504,16 @@ }, "durability": "persistent", "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 10000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1972,6 +1831,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_get_fee_returns_current_fee_settings.1.json b/contract/test_snapshots/test/test_get_fee_returns_current_fee_settings.1.json index f9ca8ed9..6fe73d53 100644 --- a/contract/test_snapshots/test/test_get_fee_returns_current_fee_settings.1.json +++ b/contract/test_snapshots/test/test_get_fee_returns_current_fee_settings.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "u32": 250 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [] ], "ledger": { @@ -325,72 +290,6 @@ 6311999 ] ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], [ { "contract_data": { diff --git a/contract/test_snapshots/test/test_get_protocol_stats_after_subscribe.1.json b/contract/test_snapshots/test/test_get_protocol_stats_after_subscribe.1.json index fbb30abf..9549200e 100644 --- a/contract/test_snapshots/test/test_get_protocol_stats_after_subscribe.1.json +++ b/contract/test_snapshots/test/test_get_protocol_stats_after_subscribe.1.json @@ -1317,7 +1317,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -1377,8 +1376,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { diff --git a/contract/test_snapshots/test/test_get_protocol_stats_with_fee.1.json b/contract/test_snapshots/test/test_get_protocol_stats_with_fee.1.json index 3db375b3..8932fc08 100644 --- a/contract/test_snapshots/test/test_get_protocol_stats_with_fee.1.json +++ b/contract/test_snapshots/test/test_get_protocol_stats_with_fee.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "u32": 100 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [] ], "ledger": { @@ -325,72 +290,6 @@ 6311999 ] ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], [ { "contract_data": { diff --git a/contract/test_snapshots/test/test_get_subscriber_at_returns_first.1.json b/contract/test_snapshots/test/test_get_subscriber_at_returns_first.1.json index b0630052..0344adf9 100644 --- a/contract/test_snapshots/test/test_get_subscriber_at_returns_first.1.json +++ b/contract/test_snapshots/test/test_get_subscriber_at_returns_first.1.json @@ -1314,6 +1314,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_get_subscription_label_returns_set_value.1.json b/contract/test_snapshots/test/test_get_subscription_label_returns_set_value.1.json index 08e7e0ea..f89ded26 100644 --- a/contract/test_snapshots/test/test_get_subscription_label_returns_set_value.1.json +++ b/contract/test_snapshots/test/test_get_subscription_label_returns_set_value.1.json @@ -586,10 +586,6 @@ }, "ext": "v0" }, -<<<<<<< HEAD -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 6307200 ] ], @@ -994,10 +990,6 @@ }, "ext": "v0" }, -<<<<<<< HEAD -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 6307200 ] ] diff --git a/contract/test_snapshots/test/test_get_trial_end_with_trial_period.1.json b/contract/test_snapshots/test/test_get_trial_end_with_trial_period.1.json index ec489695..79299021 100644 --- a/contract/test_snapshots/test/test_get_trial_end_with_trial_period.1.json +++ b/contract/test_snapshots/test/test_get_trial_end_with_trial_period.1.json @@ -1317,6 +1317,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_get_trial_end_without_trial_period.1.json b/contract/test_snapshots/test/test_get_trial_end_without_trial_period.1.json index 0b6ad525..aabe6670 100644 --- a/contract/test_snapshots/test/test_get_trial_end_without_trial_period.1.json +++ b/contract/test_snapshots/test/test_get_trial_end_without_trial_period.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_global_volume_exceeds_limit.1.json b/contract/test_snapshots/test/test_global_volume_exceeds_limit.1.json index 3071e35f..49be55a5 100644 --- a/contract/test_snapshots/test/test_global_volume_exceeds_limit.1.json +++ b/contract/test_snapshots/test/test_global_volume_exceeds_limit.1.json @@ -191,8 +191,6 @@ } ] ], -<<<<<<< HEAD -======= [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", @@ -265,18 +263,12 @@ } ] ], - [], ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 [] ], "ledger": { "protocol_version": 21, "sequence_number": 0, -<<<<<<< HEAD - "timestamp": 0, -======= "timestamp": 86401, ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "network_id": "0000000000000000000000000000000000000000000000000000000000000000", "base_reserve": 0, "min_persistent_entry_ttl": 4096, @@ -443,211 +435,6 @@ 6311999 ] ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", -<<<<<<< HEAD -======= - "key": { - "vec": [ - { - "symbol": "ChargeHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "ChargeHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "u64": 86401 - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenue" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenue" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueDay" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueDay" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } - } - }, - "ext": "v0" - }, - 1555200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], [ { "contract_data": { @@ -899,7 +686,7 @@ "symbol": "last_charged" }, "val": { - "u64": 86401 + "u64": 0 } }, { @@ -1080,7 +867,6 @@ { "contract_data": { "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "key": "ledger_key_contract_instance", "durability": "persistent" } @@ -1099,9 +885,6 @@ "executable": { "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, -<<<<<<< HEAD - "storage": null -======= "storage": [ { "key": { @@ -1114,52 +897,15 @@ "val": { "u64": 2 } - }, - { - "key": { - "vec": [ - { - "symbol": "GlobalVolumeWindow" - } - ] - }, - "val": { - "map": [ - { - "key": { - "symbol": "accumulated_volume" - }, - "val": { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } - }, - { - "key": { - "symbol": "current_window_start" - }, - "val": { - "u64": 86401 - } - } - ] - } } ] ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } } }, "ext": "v0" }, -<<<<<<< HEAD - 4095 -======= 6307200 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -1231,8 +977,6 @@ [ { "contract_data": { -<<<<<<< HEAD -======= "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", "key": { "ledger_key_nonce": { @@ -1299,7 +1043,6 @@ [ { "contract_data": { ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM", "key": { "ledger_key_nonce": { @@ -1507,11 +1250,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD "lo": 100000000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } }, @@ -1600,72 +1339,7 @@ } ] }, - "durability": "temporary", - "val": { - "map": [ - { - "key": { - "symbol": "amount" - }, - "val": { - "i128": { - "hi": 0, - "lo": 100000000000000 - } - } - }, - { - "key": { - "symbol": "live_until_ledger" - }, - "val": { - "u32": 200 - } - } - ] - } - } - }, - "ext": "v0" - }, - 201 - ] - ], - [ - { - "contract_data": { - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Balance" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Balance" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ] - }, - "durability": "persistent", + "durability": "temporary", "val": { "map": [ { @@ -1675,24 +1349,16 @@ "val": { "i128": { "hi": 0, - "lo": 100000000000 + "lo": 100000000000000 } } }, { "key": { - "symbol": "authorized" - }, - "val": { - "bool": true - } - }, - { - "key": { - "symbol": "clawback" + "symbol": "live_until_ledger" }, "val": { - "bool": false + "u32": 200 } } ] @@ -1701,7 +1367,7 @@ }, "ext": "v0" }, - 518400 + 201 ] ], [ @@ -1714,9 +1380,7 @@ "symbol": "Balance" }, { -<<<<<<< HEAD -======= - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, @@ -1736,7 +1400,7 @@ "symbol": "Balance" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, @@ -1750,7 +1414,7 @@ "val": { "i128": { "hi": 0, - "lo": 30000000000000 + "lo": 100000000000 } } }, @@ -1789,7 +1453,6 @@ "symbol": "Balance" }, { ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" } ] @@ -1824,11 +1487,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD "lo": 100000000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } }, @@ -2060,11 +1719,7 @@ }, "ext": "v0" }, -<<<<<<< HEAD - 4095 -======= 6307200 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ] ] @@ -2819,8 +2474,6 @@ "v0": { "topics": [ { -<<<<<<< HEAD -======= "symbol": "fn_call" }, { @@ -2875,30 +2528,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 30000000000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -2910,7 +2560,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -2919,10 +2569,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000000 + } + } } } }, @@ -2931,26 +2586,20 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "0000000000000000000000000000000000000000000000000000000000000003" + "symbol": "subscribed" }, { - "symbol": "subscribe" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" } ], "data": { "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, @@ -2962,12 +2611,7 @@ }, { "u64": 86400 - }, - { - "address": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL" - }, - "void", - "void" + } ] } } @@ -2984,25 +2628,13 @@ "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + "symbol": "fn_return" }, { - "symbol": "allowance" + "symbol": "subscribe" } ], - "data": { - "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" - } - ] - } + "data": "void" } } }, @@ -3011,46 +2643,26 @@ { "event": { "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "contract_id": null, "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "fn_return" + "symbol": "fn_call" }, { - "symbol": "allowance" - } - ], - "data": { - "i128": { - "hi": 0, - "lo": 100000000000000 - } - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "subscribed" + "bytes": "0000000000000000000000000000000000000000000000000000000000000003" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + "symbol": "subscribe" } ], "data": { "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, @@ -3062,7 +2674,12 @@ }, { "u64": 86400 - } + }, + { + "address": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL" + }, + "void", + "void" ] } } @@ -3079,13 +2696,25 @@ "v0": { "topics": [ { - "symbol": "fn_return" + "symbol": "fn_call" }, { - "symbol": "subscribe" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], - "data": "void" + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } } } }, @@ -3094,23 +2723,23 @@ { "event": { "ext": "v0", - "contract_id": null, + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "0000000000000000000000000000000000000000000000000000000000000003" + "symbol": "fn_return" }, { - "symbol": "charge" + "symbol": "allowance" } ], "data": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + "i128": { + "hi": 0, + "lo": 100000000000000 + } } } } @@ -3132,25 +2761,16 @@ "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" }, { - "symbol": "transfer_from" + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" }, { - "i128": { - "hi": 0, - "lo": 30000000000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -3163,27 +2783,21 @@ "event": { "ext": "v0", "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "transfer" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "symbol": "fn_return" }, { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" + "symbol": "allowance" } ], "data": { "i128": { "hi": 0, - "lo": 30000000000000 + "lo": 100000000000000 } } } @@ -3191,27 +2805,6 @@ }, "failed_call": false }, - { - "event": { - "ext": "v0", - "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", - "type_": "diagnostic", - "body": { - "v0": { - "topics": [ - { - "symbol": "fn_return" - }, - { - "symbol": "transfer_from" - } - ], - "data": "void" - } - } - }, - "failed_call": false - }, { "event": { "ext": "v0", @@ -3221,62 +2814,25 @@ "v0": { "topics": [ { - "symbol": "charged" + "symbol": "subscribed" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" } ], "data": { - "map": [ - { - "key": { - "symbol": "charged_at" - }, - "val": { - "u64": 86401 - } - }, - { - "key": { - "symbol": "fee" - }, - "val": { - "i128": { - "hi": 0, - "lo": 0 - } - } - }, + "vec": [ { - "key": { - "symbol": "gross" - }, - "val": { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" }, { - "key": { - "symbol": "merchant" - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "i128": { + "hi": 0, + "lo": 30000000000000 } }, { - "key": { - "symbol": "net" - }, - "val": { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - } + "u64": 86400 } ] } @@ -3297,7 +2853,7 @@ "symbol": "fn_return" }, { - "symbol": "charge" + "symbol": "subscribe" } ], "data": "void" @@ -3325,7 +2881,7 @@ } ], "data": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" } } } @@ -3356,7 +2912,7 @@ "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" @@ -3386,7 +2942,7 @@ "symbol": "transfer" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" @@ -3436,16 +2992,11 @@ "v0": { "topics": [ { ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "symbol": "error" }, { "error": { -<<<<<<< HEAD - "contract": 15 -======= "contract": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -3455,11 +3006,7 @@ "string": "failing with contract error" }, { -<<<<<<< HEAD - "u32": 15 -======= "u32": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } ] } @@ -3481,11 +3028,7 @@ }, { "error": { -<<<<<<< HEAD - "contract": 15 -======= "contract": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -3510,11 +3053,7 @@ }, { "error": { -<<<<<<< HEAD - "contract": 15 -======= "contract": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -3539,11 +3078,7 @@ }, { "error": { -<<<<<<< HEAD - "contract": 15 -======= "contract": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -3553,39 +3088,13 @@ "string": "contract call failed" }, { -<<<<<<< HEAD - "symbol": "subscribe" -======= "symbol": "charge" ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 }, { "vec": [ { -<<<<<<< HEAD "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 30000000000000 - } - }, - { - "u64": 86400 - }, - { - "address": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL" - }, - "void", - "void" -======= - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" } ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] } ] @@ -3608,11 +3117,7 @@ }, { "error": { -<<<<<<< HEAD - "contract": 15 -======= "contract": 28 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], diff --git a/contract/test_snapshots/test/test_global_volume_window_reset.1.json b/contract/test_snapshots/test/test_global_volume_window_reset.1.json index 2b139452..40cf946d 100644 --- a/contract/test_snapshots/test/test_global_volume_window_reset.1.json +++ b/contract/test_snapshots/test/test_global_volume_window_reset.1.json @@ -209,11 +209,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -249,11 +245,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -490,11 +482,7 @@ }, "ext": "v0" }, -<<<<<<< HEAD 6307200 -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -543,11 +531,7 @@ }, "ext": "v0" }, -<<<<<<< HEAD 6307200 -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -588,11 +572,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 20000000000 -======= - "lo": 60000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 10000000000000 } } } @@ -646,11 +626,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } @@ -704,11 +680,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } @@ -758,21 +730,13 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } ] @@ -1010,11 +974,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } }, @@ -1141,11 +1101,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } }, @@ -1272,11 +1228,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 10000000000000 } } }, @@ -1643,11 +1595,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 99990000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 95000000000000 } } }, @@ -1746,11 +1694,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 99990000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 95000000000000 } } }, @@ -1888,11 +1832,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 20000000000 -======= - "lo": 60000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 10000000000000 } } }, @@ -1965,11 +1905,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 99990000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 95000000000000 } } }, @@ -2042,11 +1978,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 99990000000000 -======= - "lo": 70000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 95000000000000 } } }, @@ -2933,11 +2865,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -3018,7 +2946,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -3078,8 +3005,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -3099,11 +3024,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -3166,11 +3087,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -3251,7 +3168,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -3311,8 +3227,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -3332,11 +3246,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } }, { @@ -3428,11 +3338,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } ] @@ -3466,11 +3372,7 @@ "data": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } @@ -3542,11 +3444,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } }, @@ -3565,11 +3463,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } @@ -3659,11 +3553,7 @@ { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } ] @@ -3697,11 +3587,7 @@ "data": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } @@ -3773,11 +3659,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } }, @@ -3796,11 +3678,7 @@ "val": { "i128": { "hi": 0, -<<<<<<< HEAD - "lo": 10000000000 -======= - "lo": 30000000000000 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + "lo": 5000000000000 } } } diff --git a/contract/test_snapshots/test/test_global_volume_within_limit.1.json b/contract/test_snapshots/test/test_global_volume_within_limit.1.json index 2155838c..99a68f5d 100644 --- a/contract/test_snapshots/test/test_global_volume_within_limit.1.json +++ b/contract/test_snapshots/test/test_global_volume_within_limit.1.json @@ -267,11 +267,7 @@ }, "ext": "v0" }, -<<<<<<< HEAD 6307200 -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -736,7 +732,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000000 + "lo": 20000000000 } } }, @@ -1629,7 +1625,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -1689,8 +1684,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { diff --git a/contract/test_snapshots/test/test_health_check_active_subscription_count.1.json b/contract/test_snapshots/test/test_health_check_active_subscription_count.1.json index 996fb051..a9655a9c 100644 --- a/contract/test_snapshots/test/test_health_check_active_subscription_count.1.json +++ b/contract/test_snapshots/test/test_health_check_active_subscription_count.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1440,8 +1499,6 @@ "symbol": "instance_ttl_ledgers" }, "val": { - "u32": 4095 - "u32": 6311999 "u32": 6307200 } }, diff --git a/contract/test_snapshots/test/test_health_check_initialized_unpaused.1.json b/contract/test_snapshots/test/test_health_check_initialized_unpaused.1.json index 413c838a..91d28bf2 100644 --- a/contract/test_snapshots/test/test_health_check_initialized_unpaused.1.json +++ b/contract/test_snapshots/test/test_health_check_initialized_unpaused.1.json @@ -1073,8 +1073,6 @@ "symbol": "instance_ttl_ledgers" }, "val": { - "u32": 4095 - "u32": 6311999 "u32": 100000 } }, @@ -1083,7 +1081,6 @@ "symbol": "is_healthy" }, "val": { - "bool": false "bool": true } }, diff --git a/contract/test_snapshots/test/test_health_check_paused.1.json b/contract/test_snapshots/test/test_health_check_paused.1.json index 787dbceb..7f166b83 100644 --- a/contract/test_snapshots/test/test_health_check_paused.1.json +++ b/contract/test_snapshots/test/test_health_check_paused.1.json @@ -1196,8 +1196,6 @@ "symbol": "instance_ttl_ledgers" }, "val": { - "u32": 4095 - "u32": 6311999 "u32": 100000 } }, diff --git a/contract/test_snapshots/test/test_health_check_pre_initialize.1.json b/contract/test_snapshots/test/test_health_check_pre_initialize.1.json index 0459213f..9ac366e2 100644 --- a/contract/test_snapshots/test/test_health_check_pre_initialize.1.json +++ b/contract/test_snapshots/test/test_health_check_pre_initialize.1.json @@ -143,7 +143,6 @@ }, "val": { "u32": 4095 - "u32": 6311999 } }, { diff --git a/contract/test_snapshots/test/test_initialize_backward_compat.1.json b/contract/test_snapshots/test/test_initialize_backward_compat.1.json index 10ca78b3..97167ae3 100644 --- a/contract/test_snapshots/test/test_initialize_backward_compat.1.json +++ b/contract/test_snapshots/test/test_initialize_backward_compat.1.json @@ -2243,6 +2243,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "f65bd4d892e052cedba1fd62974e564ffa9226ca720624f331c36770bea46c44" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "f65bd4d892e052cedba1fd62974e564ffa9226ca720624f331c36770bea46c44", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_interval_minimum_valid.1.json b/contract/test_snapshots/test/test_interval_minimum_valid.1.json index 299065db..3d676482 100644 --- a/contract/test_snapshots/test/test_interval_minimum_valid.1.json +++ b/contract/test_snapshots/test/test_interval_minimum_valid.1.json @@ -461,17 +461,6 @@ }, "val": { "symbol": "" -<<<<<<< HEAD - } - }, - { - "key": { - "symbol": "label" - }, - "val": { - "symbol": "default" -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } }, { @@ -1588,6 +1577,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1721,17 +1769,6 @@ }, "val": { "symbol": "" -<<<<<<< HEAD - } - }, - { - "key": { - "symbol": "label" - }, - "val": { - "symbol": "default" -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } }, { diff --git a/contract/test_snapshots/test/test_interval_too_short.1.json b/contract/test_snapshots/test/test_interval_too_short.1.json index 8facd9b6..c9a50528 100644 --- a/contract/test_snapshots/test/test_interval_too_short.1.json +++ b/contract/test_snapshots/test/test_interval_too_short.1.json @@ -916,6 +916,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": true + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_is_charge_due_false_for_paused_subscription.1.json b/contract/test_snapshots/test/test_is_charge_due_false_for_paused_subscription.1.json index 31566620..d2913a35 100644 --- a/contract/test_snapshots/test/test_is_charge_due_false_for_paused_subscription.1.json +++ b/contract/test_snapshots/test/test_is_charge_due_false_for_paused_subscription.1.json @@ -1410,6 +1410,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_is_charge_due_transitions_after_interval.1.json b/contract/test_snapshots/test/test_is_charge_due_transitions_after_interval.1.json index bcdb0809..4442d02a 100644 --- a/contract/test_snapshots/test/test_is_charge_due_transitions_after_interval.1.json +++ b/contract/test_snapshots/test/test_is_charge_due_transitions_after_interval.1.json @@ -1314,6 +1314,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_merchant_revenue_accumulates.1.json b/contract/test_snapshots/test/test_merchant_revenue_accumulates.1.json index 6af814f3..26fc56c0 100644 --- a/contract/test_snapshots/test/test_merchant_revenue_accumulates.1.json +++ b/contract/test_snapshots/test/test_merchant_revenue_accumulates.1.json @@ -351,14 +351,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -371,25 +371,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 30000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -399,13 +394,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 } ] }, @@ -422,13 +414,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 } ] }, @@ -443,8 +432,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -454,68 +442,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 20000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 1 } ] }, @@ -532,108 +465,28 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" + "u64": 1 } ] }, "durability": "persistent", "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 30000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1002,7 +855,7 @@ "val": { "i128": { "hi": 0, - "lo": 30000000 + "lo": 50000000 } } }, @@ -1924,6 +1777,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_merchant_revenue_from_charge.1.json b/contract/test_snapshots/test/test_merchant_revenue_from_charge.1.json index 6280475a..126e854a 100644 --- a/contract/test_snapshots/test/test_merchant_revenue_from_charge.1.json +++ b/contract/test_snapshots/test/test_merchant_revenue_from_charge.1.json @@ -372,190 +372,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -918,7 +734,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1807,6 +1623,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_merchant_revenue_from_pay_per_use.1.json b/contract/test_snapshots/test/test_merchant_revenue_from_pay_per_use.1.json index 0cf62496..fbd74156 100644 --- a/contract/test_snapshots/test/test_merchant_revenue_from_pay_per_use.1.json +++ b/contract/test_snapshots/test/test_merchant_revenue_from_pay_per_use.1.json @@ -301,14 +301,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -321,25 +321,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 30000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -349,13 +344,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -372,13 +364,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -393,8 +382,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -404,62 +392,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 30000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 0 } ] }, @@ -476,52 +415,10 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { "u64": 0 @@ -530,54 +427,16 @@ }, "durability": "persistent", "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 30000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1862,6 +1721,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_multi_token_independent_subscriptions.1.json b/contract/test_snapshots/test/test_multi_token_independent_subscriptions.1.json index 0c95fb5d..b2081fd9 100644 --- a/contract/test_snapshots/test/test_multi_token_independent_subscriptions.1.json +++ b/contract/test_snapshots/test/test_multi_token_independent_subscriptions.1.json @@ -594,241 +594,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 10000000 - } - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 2 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 2 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -1369,7 +1134,7 @@ "val": { "i128": { "hi": 0, - "lo": 20000000 + "lo": 40000000 } } }, @@ -3025,6 +2790,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -3188,6 +3012,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "f65bd4d892e052cedba1fd62974e564ffa9226ca720624f331c36770bea46c44" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "f65bd4d892e052cedba1fd62974e564ffa9226ca720624f331c36770bea46c44", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_multiple_users.1.json b/contract/test_snapshots/test/test_multiple_users.1.json index 2e328053..8e368a51 100644 --- a/contract/test_snapshots/test/test_multiple_users.1.json +++ b/contract/test_snapshots/test/test_multiple_users.1.json @@ -495,280 +495,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 10000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 1 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 2 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -1348,7 +1074,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -2666,6 +2392,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2829,6 +2614,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_next_charge_at_none_after_cancel.1.json b/contract/test_snapshots/test/test_next_charge_at_none_after_cancel.1.json index 129f15c1..b350e868 100644 --- a/contract/test_snapshots/test/test_next_charge_at_none_after_cancel.1.json +++ b/contract/test_snapshots/test/test_next_charge_at_none_after_cancel.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_next_charge_at_none_for_paused_subscription.1.json b/contract/test_snapshots/test/test_next_charge_at_none_for_paused_subscription.1.json index 2cad01fa..3e9a22d4 100644 --- a/contract/test_snapshots/test/test_next_charge_at_none_for_paused_subscription.1.json +++ b/contract/test_snapshots/test/test_next_charge_at_none_for_paused_subscription.1.json @@ -1414,30 +1414,27 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", + "type_": "diagnostic", "body": { "v0": { "topics": [ { - "symbol": "subscribed" + "symbol": "fn_call" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" } ], "data": { "vec": [ { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000 - } + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" }, { - "u64": 86400 + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" } ] } @@ -1449,7 +1446,7 @@ { "event": { "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", "type_": "diagnostic", "body": { "v0": { @@ -1458,10 +1455,15 @@ "symbol": "fn_return" }, { - "symbol": "subscribe" + "symbol": "allowance" } ], - "data": "void" + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } } } }, @@ -1470,23 +1472,33 @@ { "event": { "ext": "v0", - "contract_id": null, - "type_": "diagnostic", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", "body": { "v0": { "topics": [ { - "symbol": "fn_call" - }, - { - "bytes": "0000000000000000000000000000000000000000000000000000000000000003" + "symbol": "subscribed" }, { - "symbol": "pause" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ], "data": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + }, + { + "i128": { + "hi": 0, + "lo": 10000000 + } + }, + { + "u64": 86400 + } + ] } } } @@ -1505,16 +1517,10 @@ "symbol": "fn_return" }, { - "symbol": "get_subscriber_page" + "symbol": "subscribe" } ], - "data": { - "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ] - } + "data": "void" } } }, @@ -1525,7 +1531,6 @@ "ext": "v0", "contract_id": null, "type_": "diagnostic", - "type_": "contract", "body": { "v0": { "topics": [ @@ -1542,6 +1547,20 @@ "data": { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { "symbol": "paused" }, { diff --git a/contract/test_snapshots/test/test_next_charge_at_returns_correct_timestamp.1.json b/contract/test_snapshots/test/test_next_charge_at_returns_correct_timestamp.1.json index fcf4f668..3b583d11 100644 --- a/contract/test_snapshots/test/test_next_charge_at_returns_correct_timestamp.1.json +++ b/contract/test_snapshots/test/test_next_charge_at_returns_correct_timestamp.1.json @@ -1314,6 +1314,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_no_referral_returns_none.1.json b/contract/test_snapshots/test/test_no_referral_returns_none.1.json index 42b2bfd6..fb24da9b 100644 --- a/contract/test_snapshots/test/test_no_referral_returns_none.1.json +++ b/contract/test_snapshots/test/test_no_referral_returns_none.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_non_admin_set_grace_period_panics.1.json b/contract/test_snapshots/test/test_non_admin_set_grace_period_panics.1.json index 34add5ea..4299ed18 100644 --- a/contract/test_snapshots/test/test_non_admin_set_grace_period_panics.1.json +++ b/contract/test_snapshots/test/test_non_admin_set_grace_period_panics.1.json @@ -902,7 +902,7 @@ } ], "data": { - "u64": 86400 + "u64": 3600 } } } @@ -1019,7 +1019,7 @@ { "vec": [ { - "u64": 86400 + "u64": 3600 } ] } diff --git a/contract/test_snapshots/test/test_pause_on_inactive_subscription_panics.1.json b/contract/test_snapshots/test/test_pause_on_inactive_subscription_panics.1.json index 7b4fea2f..58a24e1a 100644 --- a/contract/test_snapshots/test/test_pause_on_inactive_subscription_panics.1.json +++ b/contract/test_snapshots/test/test_pause_on_inactive_subscription_panics.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1529,7 +1588,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1539,7 +1598,7 @@ "string": "failing with contract error" }, { - "u32": 16 + "u32": 5 } ] } @@ -1561,7 +1620,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1586,7 +1645,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1611,7 +1670,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1650,7 +1709,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], diff --git a/contract/test_snapshots/test/test_pause_sets_paused_true.1.json b/contract/test_snapshots/test/test_pause_sets_paused_true.1.json index eb2b21a8..cc4e9fad 100644 --- a/contract/test_snapshots/test/test_pause_sets_paused_true.1.json +++ b/contract/test_snapshots/test/test_pause_sets_paused_true.1.json @@ -1410,6 +1410,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1493,6 +1552,27 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "paused" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use.1.json b/contract/test_snapshots/test/test_pay_per_use.1.json index 949537df..de0b7513 100644 --- a/contract/test_snapshots/test/test_pay_per_use.1.json +++ b/contract/test_snapshots/test/test_pay_per_use.1.json @@ -302,14 +302,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -322,25 +322,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 50000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -350,13 +345,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -373,13 +365,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 0 } ] }, @@ -394,8 +383,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -405,62 +393,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 0 } ] }, @@ -477,52 +416,10 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { "u64": 0 @@ -531,54 +428,16 @@ }, "durability": "persistent", "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 50000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1863,6 +1722,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_applies_protocol_fee_and_records_net_revenue.1.json b/contract/test_snapshots/test/test_pay_per_use_applies_protocol_fee_and_records_net_revenue.1.json index 4b0deaf0..759492fd 100644 --- a/contract/test_snapshots/test/test_pay_per_use_applies_protocol_fee_and_records_net_revenue.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_applies_protocol_fee_and_records_net_revenue.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "u32": 250 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", @@ -336,6 +301,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -896,72 +904,6 @@ { "contract_data": { "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 8370022561469687789 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 8370022561469687789 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", "key": { "ledger_key_nonce": { "nonce": 2032731177588607455 @@ -976,7 +918,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 2032731177588607455 @@ -994,7 +936,7 @@ [ { "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -1009,7 +951,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -2048,6 +1990,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_does_not_update_last_charged.1.json b/contract/test_snapshots/test/test_pay_per_use_does_not_update_last_charged.1.json index 2053005f..023fb862 100644 --- a/contract/test_snapshots/test/test_pay_per_use_does_not_update_last_charged.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_does_not_update_last_charged.1.json @@ -302,14 +302,14 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent" + "durability": "temporary" } }, [ @@ -322,25 +322,20 @@ "key": { "vec": [ { - "symbol": "MerchantRevenue" + "symbol": "DayStart" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" } ] }, - "durability": "persistent", - "val": { - "i128": { - "hi": 0, - "lo": 50000000 - } - } + "durability": "temporary", + "val": "void" } }, "ext": "v0" }, - 4095 + 17280 ] ], [ @@ -350,13 +345,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 } ] }, @@ -373,13 +365,10 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueDay" + "symbol": "MerchantRevenue" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "u64": 1 } ] }, @@ -394,8 +383,7 @@ }, "ext": "v0" }, - 1555200 -<<<<<<< HEAD + 4095 ] ], [ @@ -405,62 +393,13 @@ "key": { "vec": [ { - "symbol": "MerchantRevenueHistory" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" }, { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" + "u64": 1 } ] }, @@ -477,108 +416,28 @@ "key": { "vec": [ { - "symbol": "MerchantSubCount" + "symbol": "MerchantRevenueDay" }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" }, { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" + "u64": 1 } ] }, "durability": "persistent", "val": { - "u64": 1 + "i128": { + "hi": 0, + "lo": 50000000 + } } } }, "ext": "v0" }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 + 1555200 ] ], [ @@ -1863,6 +1722,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_exceeds_cap.1.json b/contract/test_snapshots/test/test_pay_per_use_exceeds_cap.1.json index 59ab4843..02787542 100644 --- a/contract/test_snapshots/test/test_pay_per_use_exceeds_cap.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_exceeds_cap.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_inactive.1.json b/contract/test_snapshots/test/test_pay_per_use_inactive.1.json index 3c903e4f..0e6ce0fc 100644 --- a/contract/test_snapshots/test/test_pay_per_use_inactive.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_inactive.1.json @@ -1365,6 +1365,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1539,7 +1598,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1549,7 +1608,7 @@ "string": "failing with contract error" }, { - "u32": 16 + "u32": 5 } ] } @@ -1571,7 +1630,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1596,7 +1655,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1621,7 +1680,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], @@ -1666,7 +1725,7 @@ }, { "error": { - "contract": 16 + "contract": 5 } } ], diff --git a/contract/test_snapshots/test/test_pay_per_use_on_paused_subscription_panics.1.json b/contract/test_snapshots/test/test_pay_per_use_on_paused_subscription_panics.1.json index 3aa68726..d229ce93 100644 --- a/contract/test_snapshots/test/test_pay_per_use_on_paused_subscription_panics.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_on_paused_subscription_panics.1.json @@ -1410,6 +1410,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1493,6 +1552,27 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "paused" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_succeeds_after_merchant_frozen.1.json b/contract/test_snapshots/test/test_pay_per_use_succeeds_after_merchant_frozen.1.json index fe1e6428..5620b2ca 100644 --- a/contract/test_snapshots/test/test_pay_per_use_succeeds_after_merchant_frozen.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_succeeds_after_merchant_frozen.1.json @@ -314,6 +314,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -1788,6 +1831,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_with_zero_fee_bps_transfers_full_amount.1.json b/contract/test_snapshots/test/test_pay_per_use_with_zero_fee_bps_transfers_full_amount.1.json index 8d90d839..f3412afc 100644 --- a/contract/test_snapshots/test/test_pay_per_use_with_zero_fee_bps_transfers_full_amount.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_with_zero_fee_bps_transfers_full_amount.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" - }, - { - "u32": 0 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ], + [], + [], [ [ "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", @@ -335,6 +300,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -895,72 +903,6 @@ { "contract_data": { "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4270020994084947596 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 8370022561469687789 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 8370022561469687789 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", "key": { "ledger_key_nonce": { "nonce": 2032731177588607455 @@ -975,7 +917,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 2032731177588607455 @@ -993,7 +935,7 @@ [ { "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -1008,7 +950,7 @@ "data": { "contract_data": { "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", "key": { "ledger_key_nonce": { "nonce": 4837995959683129791 @@ -1974,6 +1916,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_pay_per_use_zero_amount.1.json b/contract/test_snapshots/test/test_pay_per_use_zero_amount.1.json index 70d343fa..2ca1df7c 100644 --- a/contract/test_snapshots/test/test_pay_per_use_zero_amount.1.json +++ b/contract/test_snapshots/test/test_pay_per_use_zero_amount.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_referral_cleared_on_cancel.1.json b/contract/test_snapshots/test/test_referral_cleared_on_cancel.1.json index e87b0c50..79954e8c 100644 --- a/contract/test_snapshots/test/test_referral_cleared_on_cancel.1.json +++ b/contract/test_snapshots/test/test_referral_cleared_on_cancel.1.json @@ -1372,6 +1372,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_referral_clears_on_resubscribe_with_none.1.json b/contract/test_snapshots/test/test_referral_clears_on_resubscribe_with_none.1.json index 8b231ff8..592cda03 100644 --- a/contract/test_snapshots/test/test_referral_clears_on_resubscribe_with_none.1.json +++ b/contract/test_snapshots/test/test_referral_clears_on_resubscribe_with_none.1.json @@ -1387,6 +1387,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1622,6 +1681,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_referral_stored_on_subscribe.1.json b/contract/test_snapshots/test/test_referral_stored_on_subscribe.1.json index 5132a279..c94d6a85 100644 --- a/contract/test_snapshots/test/test_referral_stored_on_subscribe.1.json +++ b/contract/test_snapshots/test/test_referral_stored_on_subscribe.1.json @@ -310,7 +310,7 @@ }, "ext": "v0" }, - 6307200 + 4095 ] ], [ @@ -1364,6 +1364,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_referral_updates_on_resubscribe.1.json b/contract/test_snapshots/test/test_referral_updates_on_resubscribe.1.json index 2907affb..ea0280c6 100644 --- a/contract/test_snapshots/test/test_referral_updates_on_resubscribe.1.json +++ b/contract/test_snapshots/test/test_referral_updates_on_resubscribe.1.json @@ -349,7 +349,7 @@ }, "ext": "v0" }, - 6307200 + 4095 ] ], [ @@ -1436,6 +1436,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1673,6 +1732,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_remove_daily_limit_allows_pay_per_use_after_removal.1.json b/contract/test_snapshots/test/test_remove_daily_limit_allows_pay_per_use_after_removal.1.json index c5acf520..bad1a5bf 100644 --- a/contract/test_snapshots/test/test_remove_daily_limit_allows_pay_per_use_after_removal.1.json +++ b/contract/test_snapshots/test/test_remove_daily_limit_allows_pay_per_use_after_removal.1.json @@ -362,6 +362,49 @@ 17280 ] ], + [ + { + "contract_data": { + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary" + } + }, + [ + { + "last_modified_ledger_seq": 0, + "data": { + "contract_data": { + "ext": "v0", + "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", + "key": { + "vec": [ + { + "symbol": "DayStart" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ] + }, + "durability": "temporary", + "val": "void" + } + }, + "ext": "v0" + }, + 17280 + ] + ], [ { "contract_data": { @@ -1851,6 +1894,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_resubscribe.1.json b/contract/test_snapshots/test/test_resubscribe.1.json index d753ac44..35b340d0 100644 --- a/contract/test_snapshots/test/test_resubscribe.1.json +++ b/contract/test_snapshots/test/test_resubscribe.1.json @@ -294,7 +294,7 @@ }, "durability": "persistent", "val": { - "u64": 1 + "u64": 0 } } }, @@ -1428,6 +1428,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1722,6 +1781,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_resubscribe_active_does_not_duplicate_index.1.json b/contract/test_snapshots/test/test_resubscribe_active_does_not_duplicate_index.1.json index a527fb8f..6457be35 100644 --- a/contract/test_snapshots/test/test_resubscribe_active_does_not_duplicate_index.1.json +++ b/contract/test_snapshots/test/test_resubscribe_active_does_not_duplicate_index.1.json @@ -1384,6 +1384,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1594,6 +1653,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_resubscribe_zero_allowance_panics.1.json b/contract/test_snapshots/test/test_resubscribe_zero_allowance_panics.1.json index 6e01cab1..c4d6725b 100644 --- a/contract/test_snapshots/test/test_resubscribe_zero_allowance_panics.1.json +++ b/contract/test_snapshots/test/test_resubscribe_zero_allowance_panics.1.json @@ -1429,6 +1429,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_resume_unpauses_and_charge_succeeds.1.json b/contract/test_snapshots/test/test_resume_unpauses_and_charge_succeeds.1.json index 27c987b2..c8a435c1 100644 --- a/contract/test_snapshots/test/test_resume_unpauses_and_charge_succeeds.1.json +++ b/contract/test_snapshots/test/test_resume_unpauses_and_charge_succeeds.1.json @@ -771,7 +771,7 @@ "val": { "i128": { "hi": 0, - "lo": 10000000 + "lo": 20000000 } } }, @@ -1726,6 +1726,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1809,6 +1868,27 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "contract", + "body": { + "v0": { + "topics": [ + { + "symbol": "paused" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + } + ], + "data": "void" + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_self_referral_rejected_via_try_subscribe.1.json b/contract/test_snapshots/test/test_self_referral_rejected_via_try_subscribe.1.json index d446c5b6..f50da931 100644 --- a/contract/test_snapshots/test/test_self_referral_rejected_via_try_subscribe.1.json +++ b/contract/test_snapshots/test/test_self_referral_rejected_via_try_subscribe.1.json @@ -977,6 +977,65 @@ }, "failed_call": true }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": true + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_and_get_metadata.1.json b/contract/test_snapshots/test/test_set_and_get_metadata.1.json index 17a70a51..c58cc20e 100644 --- a/contract/test_snapshots/test/test_set_and_get_metadata.1.json +++ b/contract/test_snapshots/test/test_set_and_get_metadata.1.json @@ -1413,6 +1413,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_fee_emits_event.1.json b/contract/test_snapshots/test/test_set_fee_emits_event.1.json index 19bc3233..4fb10b51 100644 --- a/contract/test_snapshots/test/test_set_fee_emits_event.1.json +++ b/contract/test_snapshots/test/test_set_fee_emits_event.1.json @@ -80,43 +80,8 @@ ] ], [], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "propose_fee", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "u32": 500 - } - ] - } - }, - "sub_invocations": [] - } - ] - ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "commit_fee", - "args": [] - } - }, - "sub_invocations": [] - } - ] - ] + [], + [] ], "ledger": { "protocol_version": 21, @@ -266,7 +231,7 @@ ] }, "val": { - "u32": 500 + "u32": 100 } }, { @@ -324,72 +289,6 @@ 6311999 ] ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], [ { "contract_data": { @@ -1027,35 +926,6 @@ "symbol": "propose_fee" } ], - "data": { - "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" - }, - { - "u32": 500 - } - ] - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "fee_proposed" -<<<<<<< HEAD -======= - } - ], "data": { "vec": [ { @@ -1063,7 +933,6 @@ }, { "u32": 100 - "u32": 500 } ] } @@ -1072,51 +941,6 @@ }, "failed_call": false }, - { - "event": { - "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "diagnostic", - "body": { - "v0": { - "topics": [ - { - "symbol": "fn_return" - }, - { - "symbol": "propose_fee" - } - ], - "data": "void" - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": null, - "type_": "diagnostic", - "body": { - "v0": { - "topics": [ - { - "symbol": "fn_call" - }, - { - "bytes": "0000000000000000000000000000000000000000000000000000000000000003" - }, - { - "symbol": "commit_fee" - } - ], - "data": "void" - } - } - }, - "failed_call": false - }, { "event": { "ext": "v0", @@ -1126,9 +950,7 @@ "v0": { "topics": [ { - "symbol": "fee_committed" "symbol": "fee_proposed" ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } ], "data": { @@ -1209,11 +1031,7 @@ "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" }, { -<<<<<<< HEAD "u32": 100 -======= - "u32": 500 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } ] } diff --git a/contract/test_snapshots/test/test_set_metadata_label_exceeding_limit_fails.1.json b/contract/test_snapshots/test/test_set_metadata_label_exceeding_limit_fails.1.json index 3d5a1cf3..6145bdc0 100644 --- a/contract/test_snapshots/test/test_set_metadata_label_exceeding_limit_fails.1.json +++ b/contract/test_snapshots/test/test_set_metadata_label_exceeding_limit_fails.1.json @@ -915,7 +915,7 @@ }, { "error": { - "contract": 29 + "contract": 14 } } ], @@ -925,7 +925,7 @@ "string": "failing with contract error" }, { - "u32": 29 + "u32": 14 } ] } @@ -947,7 +947,7 @@ }, { "error": { - "contract": 29 + "contract": 14 } } ], @@ -972,7 +972,7 @@ }, { "error": { - "contract": 29 + "contract": 14 } } ], @@ -997,7 +997,7 @@ }, { "error": { - "contract": 29 + "contract": 14 } } ], @@ -1039,7 +1039,7 @@ }, { "error": { - "contract": 29 + "contract": 14 } } ], diff --git a/contract/test_snapshots/test/test_set_metadata_wrong_user_panics.1.json b/contract/test_snapshots/test/test_set_metadata_wrong_user_panics.1.json index 08156063..68fa57c2 100644 --- a/contract/test_snapshots/test/test_set_metadata_wrong_user_panics.1.json +++ b/contract/test_snapshots/test/test_set_metadata_wrong_user_panics.1.json @@ -585,10 +585,6 @@ }, "ext": "v0" }, -<<<<<<< HEAD -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 6307200 ] ], @@ -993,10 +989,6 @@ }, "ext": "v0" }, -<<<<<<< HEAD -======= - 4095 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 6307200 ] ] diff --git a/contract/test_snapshots/test/test_set_subscription_amount_admin_succeeds.1.json b/contract/test_snapshots/test/test_set_subscription_amount_admin_succeeds.1.json index e0e5516a..2104ff3a 100644 --- a/contract/test_snapshots/test/test_set_subscription_amount_admin_succeeds.1.json +++ b/contract/test_snapshots/test/test_set_subscription_amount_admin_succeeds.1.json @@ -1385,6 +1385,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_subscription_amount_non_admin_panics.1.json b/contract/test_snapshots/test/test_set_subscription_amount_non_admin_panics.1.json index 52773f73..9c0e6928 100644 --- a/contract/test_snapshots/test/test_set_subscription_amount_non_admin_panics.1.json +++ b/contract/test_snapshots/test/test_set_subscription_amount_non_admin_panics.1.json @@ -1326,6 +1326,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_subscription_interval_admin_succeeds.1.json b/contract/test_snapshots/test/test_set_subscription_interval_admin_succeeds.1.json index ddea3f69..16a8c8d3 100644 --- a/contract/test_snapshots/test/test_set_subscription_interval_admin_succeeds.1.json +++ b/contract/test_snapshots/test/test_set_subscription_interval_admin_succeeds.1.json @@ -1383,6 +1383,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_subscription_interval_non_admin_panics.1.json b/contract/test_snapshots/test/test_set_subscription_interval_non_admin_panics.1.json index 30769b54..fe90a7f2 100644 --- a/contract/test_snapshots/test/test_set_subscription_interval_non_admin_panics.1.json +++ b/contract/test_snapshots/test/test_set_subscription_interval_non_admin_panics.1.json @@ -1326,6 +1326,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_subscription_interval_zero_panics.1.json b/contract/test_snapshots/test/test_set_subscription_interval_zero_panics.1.json index f2f958da..b3b11ed1 100644 --- a/contract/test_snapshots/test/test_set_subscription_interval_zero_panics.1.json +++ b/contract/test_snapshots/test/test_set_subscription_interval_zero_panics.1.json @@ -1326,6 +1326,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_set_whitelist_enabled_false_allows_any_merchant.1.json b/contract/test_snapshots/test/test_set_whitelist_enabled_false_allows_any_merchant.1.json index 8a23214a..ea207842 100644 --- a/contract/test_snapshots/test/test_set_whitelist_enabled_false_allows_any_merchant.1.json +++ b/contract/test_snapshots/test/test_set_whitelist_enabled_false_allows_any_merchant.1.json @@ -1536,6 +1536,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_after_set_min_interval_lower_succeeds.1.json b/contract/test_snapshots/test/test_subscribe_after_set_min_interval_lower_succeeds.1.json index 631b7635..526c2bc1 100644 --- a/contract/test_snapshots/test/test_subscribe_after_set_min_interval_lower_succeeds.1.json +++ b/contract/test_snapshots/test/test_subscribe_after_set_min_interval_lower_succeeds.1.json @@ -1552,6 +1552,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_amount_at_cap_succeeds.1.json b/contract/test_snapshots/test/test_subscribe_amount_at_cap_succeeds.1.json index 4df403d1..7de39e72 100644 --- a/contract/test_snapshots/test/test_subscribe_amount_at_cap_succeeds.1.json +++ b/contract/test_snapshots/test/test_subscribe_amount_at_cap_succeeds.1.json @@ -207,42 +207,6 @@ } ] ], - [ - [ - "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - { - "function": { - "contract_fn": { - "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "function_name": "subscribe", - "args": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 10000000000000 - } - }, - { - "u64": 86400 - }, - { - "address": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL" - }, - "void", - "void" - ] - } - }, - "sub_invocations": [] - } - ] - ], [] ], "ledger": { @@ -1731,110 +1695,6 @@ }, "failed_call": false }, - { - "event": { - "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "contract", - "body": { - "v0": { - "topics": [ - { - "symbol": "subscribed" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ], - "data": { - "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 100000000000000 - } - }, - { - "u64": 86400 - } - ] - } - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", - "type_": "diagnostic", - "body": { - "v0": { - "topics": [ - { - "symbol": "fn_return" - }, - { - "symbol": "subscribe" - } - ], - "data": "void" - } - } - }, - "failed_call": false - }, - { - "event": { - "ext": "v0", - "contract_id": null, - "type_": "diagnostic", - "body": { - "v0": { - "topics": [ - { - "symbol": "fn_call" - }, - { - "bytes": "0000000000000000000000000000000000000000000000000000000000000003" - }, - { - "symbol": "subscribe" - } - ], - "data": { - "vec": [ - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - }, - { - "i128": { - "hi": 0, - "lo": 100000000000000 - } - }, - { - "u64": 86400 - }, - { - "address": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL" - }, - "void", - "void" - ] - } - } - } - }, - "failed_call": false - }, { "event": { "ext": "v0", @@ -1980,7 +1840,7 @@ { "i128": { "hi": 0, - "lo": 10000000000000 + "lo": 100000000000000 } }, { @@ -2049,7 +1909,7 @@ "data": { "i128": { "hi": 0, - "lo": 10000000000000 + "lo": 100000000000000 } } } @@ -2108,7 +1968,7 @@ "data": { "i128": { "hi": 0, - "lo": 10000000000000 + "lo": 100000000000000 } } } @@ -2139,7 +1999,7 @@ { "i128": { "hi": 0, - "lo": 10000000000000 + "lo": 100000000000000 } }, { diff --git a/contract/test_snapshots/test/test_subscribe_and_charge.1.json b/contract/test_snapshots/test/test_subscribe_and_charge.1.json index 61da9378..d5ad3c2f 100644 --- a/contract/test_snapshots/test/test_subscribe_and_charge.1.json +++ b/contract/test_snapshots/test/test_subscribe_and_charge.1.json @@ -372,190 +372,6 @@ "ext": "v0" }, 1555200 -<<<<<<< HEAD - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantRevenueHistory" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "vec": [ - { - "i128": { - "hi": 0, - "lo": 50000000 - } - } - ] - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "MerchantSubCount" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 - } - } - }, - "ext": "v0" - }, - 4095 -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 ] ], [ @@ -918,7 +734,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1807,6 +1623,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_exact_allowance_succeeds.1.json b/contract/test_snapshots/test/test_subscribe_exact_allowance_succeeds.1.json index 613f2fe0..9bd6704e 100644 --- a/contract/test_snapshots/test/test_subscribe_exact_allowance_succeeds.1.json +++ b/contract/test_snapshots/test/test_subscribe_exact_allowance_succeeds.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 50000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_interval_minimum_succeeds.1.json b/contract/test_snapshots/test/test_subscribe_interval_minimum_succeeds.1.json index 61e0da85..3d676482 100644 --- a/contract/test_snapshots/test/test_subscribe_interval_minimum_succeeds.1.json +++ b/contract/test_snapshots/test/test_subscribe_interval_minimum_succeeds.1.json @@ -1577,6 +1577,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_interval_too_short_panics_default_floor.1.json b/contract/test_snapshots/test/test_subscribe_interval_too_short_panics_default_floor.1.json index 55a5fcfc..358e18d7 100644 --- a/contract/test_snapshots/test/test_subscribe_interval_too_short_panics_default_floor.1.json +++ b/contract/test_snapshots/test/test_subscribe_interval_too_short_panics_default_floor.1.json @@ -916,6 +916,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": true + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": true + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_overwrites_cancelled_subscription.1.json b/contract/test_snapshots/test/test_subscribe_overwrites_cancelled_subscription.1.json index 4ec74387..30032e0c 100644 --- a/contract/test_snapshots/test/test_subscribe_overwrites_cancelled_subscription.1.json +++ b/contract/test_snapshots/test/test_subscribe_overwrites_cancelled_subscription.1.json @@ -1480,6 +1480,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1842,6 +1901,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_whitelisted_merchant_succeeds.1.json b/contract/test_snapshots/test/test_subscribe_whitelisted_merchant_succeeds.1.json index 0af40922..f77e21d8 100644 --- a/contract/test_snapshots/test/test_subscribe_whitelisted_merchant_succeeds.1.json +++ b/contract/test_snapshots/test/test_subscribe_whitelisted_merchant_succeeds.1.json @@ -1603,6 +1603,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscribe_with_metadata_label_too_long.1.json b/contract/test_snapshots/test/test_subscribe_with_metadata_label_too_long.1.json index 63bfcec7..909df055 100644 --- a/contract/test_snapshots/test/test_subscribe_with_metadata_label_too_long.1.json +++ b/contract/test_snapshots/test/test_subscribe_with_metadata_label_too_long.1.json @@ -932,11 +932,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -946,11 +942,7 @@ "string": "failing with contract error" }, { -<<<<<<< HEAD "u32": 14 -======= - "u32": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } ] } @@ -972,11 +964,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1001,11 +989,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1030,11 +1014,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1093,11 +1073,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], diff --git a/contract/test_snapshots/test/test_subscribe_with_metadata_no_subscription_on_label_failure.1.json b/contract/test_snapshots/test/test_subscribe_with_metadata_no_subscription_on_label_failure.1.json index 63bfcec7..909df055 100644 --- a/contract/test_snapshots/test/test_subscribe_with_metadata_no_subscription_on_label_failure.1.json +++ b/contract/test_snapshots/test/test_subscribe_with_metadata_no_subscription_on_label_failure.1.json @@ -932,11 +932,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -946,11 +942,7 @@ "string": "failing with contract error" }, { -<<<<<<< HEAD "u32": 14 -======= - "u32": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } ] } @@ -972,11 +964,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1001,11 +989,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1030,11 +1014,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], @@ -1093,11 +1073,7 @@ }, { "error": { -<<<<<<< HEAD "contract": 14 -======= - "contract": 29 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } ], diff --git a/contract/test_snapshots/test/test_subscribe_with_metadata_success.1.json b/contract/test_snapshots/test/test_subscribe_with_metadata_success.1.json index 7836c73f..3eabae9a 100644 --- a/contract/test_snapshots/test/test_subscribe_with_metadata_success.1.json +++ b/contract/test_snapshots/test/test_subscribe_with_metadata_success.1.json @@ -1369,7 +1369,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -1429,8 +1428,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { diff --git a/contract/test_snapshots/test/test_subscriber_index_three_unique_users.1.json b/contract/test_snapshots/test/test_subscriber_index_three_unique_users.1.json index 578d0078..5542ee0e 100644 --- a/contract/test_snapshots/test/test_subscriber_index_three_unique_users.1.json +++ b/contract/test_snapshots/test/test_subscriber_index_three_unique_users.1.json @@ -2766,6 +2766,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2929,6 +2988,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -3092,6 +3210,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscriber_page_limit_capped_at_50.1.json b/contract/test_snapshots/test/test_subscriber_page_limit_capped_at_50.1.json index 3f61a1ff..1114c51b 100644 --- a/contract/test_snapshots/test/test_subscriber_page_limit_capped_at_50.1.json +++ b/contract/test_snapshots/test/test_subscriber_page_limit_capped_at_50.1.json @@ -29047,7 +29047,6 @@ "vec": [ { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" -<<<<<<< HEAD }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" @@ -29107,8 +29106,6 @@ "vec": [ { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4" -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 }, { "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" @@ -29504,7 +29501,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -29564,8 +29560,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -29920,7 +29914,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -29980,8 +29973,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -30336,7 +30327,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -30396,8 +30386,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -30752,7 +30740,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -30812,8 +30799,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -31168,7 +31153,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -31228,8 +31212,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -31584,7 +31566,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -31644,8 +31625,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -32000,7 +31979,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -32060,8 +32038,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -32416,7 +32392,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -32476,8 +32451,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -32832,7 +32805,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -32892,8 +32864,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -33248,7 +33218,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -33308,8 +33277,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -33664,7 +33631,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -33724,8 +33690,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -34080,7 +34044,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -34140,8 +34103,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -34496,7 +34457,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -34556,8 +34516,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -34912,7 +34870,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -34972,8 +34929,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -35328,7 +35283,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -35388,8 +35342,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -35744,7 +35696,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -35804,8 +35755,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -36160,7 +36109,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -36220,8 +36168,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -36576,7 +36522,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -36636,8 +36581,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -36992,7 +36935,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -37052,8 +36994,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -37408,7 +37348,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -37468,8 +37407,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -37824,7 +37761,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -37884,8 +37820,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -38240,7 +38174,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -38300,8 +38233,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -38656,7 +38587,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -38716,8 +38646,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -39072,7 +39000,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -39132,8 +39059,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -39488,7 +39413,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -39548,8 +39472,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -39904,7 +39826,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -39964,8 +39885,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -40320,7 +40239,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -40380,8 +40298,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -40736,7 +40652,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -40796,8 +40711,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -41152,7 +41065,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -41212,8 +41124,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -41568,7 +41478,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -41628,8 +41537,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -41984,7 +41891,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -42044,8 +41950,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -42400,7 +42304,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -42460,8 +42363,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -42816,7 +42717,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -42876,8 +42776,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -43232,7 +43130,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -43292,8 +43189,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -43648,7 +43543,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -43708,8 +43602,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -44064,7 +43956,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -44124,8 +44015,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -44480,7 +44369,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -44540,8 +44428,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -44896,7 +44782,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -44956,8 +44841,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -45312,7 +45195,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -45372,8 +45254,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -45728,7 +45608,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -45788,8 +45667,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -46144,7 +46021,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -46204,8 +46080,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -46560,7 +46434,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -46620,8 +46493,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -46976,7 +46847,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -47036,8 +46906,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -47392,7 +47260,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -47452,8 +47319,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -47808,7 +47673,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -47868,8 +47732,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -48224,7 +48086,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -48284,8 +48145,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -48640,7 +48499,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -48700,8 +48558,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -49056,7 +48912,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -49116,8 +48971,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -49472,7 +49325,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -49532,8 +49384,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -49888,7 +49738,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -49948,8 +49797,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { @@ -50304,7 +50151,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -<<<<<<< HEAD "type_": "diagnostic", "body": { "v0": { @@ -50364,8 +50210,6 @@ "event": { "ext": "v0", "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 "type_": "contract", "body": { "v0": { diff --git a/contract/test_snapshots/test/test_subscriber_page_offset_beyond_count_returns_empty.1.json b/contract/test_snapshots/test/test_subscriber_page_offset_beyond_count_returns_empty.1.json index c046803a..e06fbe89 100644 --- a/contract/test_snapshots/test/test_subscriber_page_offset_beyond_count_returns_empty.1.json +++ b/contract/test_snapshots/test/test_subscriber_page_offset_beyond_count_returns_empty.1.json @@ -1315,6 +1315,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_subscription_struct_fields_match_input.1.json b/contract/test_snapshots/test/test_subscription_struct_fields_match_input.1.json index d8673bf0..4f5575fe 100644 --- a/contract/test_snapshots/test/test_subscription_struct_fields_match_input.1.json +++ b/contract/test_snapshots/test/test_subscription_struct_fields_match_input.1.json @@ -1313,6 +1313,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_ttl_extension.1.json b/contract/test_snapshots/test/test_ttl_extension.1.json index ff1f96dc..7c4bfcdd 100644 --- a/contract/test_snapshots/test/test_ttl_extension.1.json +++ b/contract/test_snapshots/test/test_ttl_extension.1.json @@ -296,93 +296,6 @@ "durability": "persistent", "val": { "u64": 2 -<<<<<<< HEAD -======= - } - } - }, - "ext": "v0" - }, - 4095 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndex" - }, - { - "u64": 0 - } - ] - }, - "durability": "persistent", - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - } - }, - "ext": "v0" - }, - 6307200 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M", - "key": { - "vec": [ - { - "symbol": "SubscriberIndexSize" - } - ] - }, - "durability": "persistent", - "val": { - "u64": 1 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } } }, @@ -1471,6 +1384,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -1634,6 +1606,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_upgrade_event_emitted.1.json b/contract/test_snapshots/test/test_upgrade_event_emitted.1.json index 100d64ca..02f3d300 100644 --- a/contract/test_snapshots/test/test_upgrade_event_emitted.1.json +++ b/contract/test_snapshots/test/test_upgrade_event_emitted.1.json @@ -22,48 +22,6 @@ "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", "key": "ledger_key_contract_instance", "durability": "persistent" - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", - "key": "ledger_key_contract_instance", - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM", - "key": "ledger_key_contract_instance", - "durability": "persistent", - "val": { - "contract_instance": { - "executable": { - "wasm": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" - }, - "storage": null - } - } - } - }, - "ext": "v0" - }, -<<<<<<< HEAD -======= - 100000 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 1033654523790656264 - } - }, - "durability": "temporary" } }, [ @@ -83,372 +41,10 @@ "storage": null } } - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "key": { - "ledger_key_nonce": { - "nonce": 1033654523790656264 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 4095 - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 2032731177588607455 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4", - "key": { - "ledger_key_nonce": { - "nonce": 4837995959683129791 - } - }, - "durability": "temporary", - "val": "void" - } - }, - "ext": "v0" - }, - 6311999 - ] - ], - [ - { - "contract_data": { - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Allowance" - }, - { - "map": [ - { - "key": { - "symbol": "from" - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - }, - { - "key": { - "symbol": "spender" - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" - } - } - ] - } - ] - }, - "durability": "temporary" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Allowance" - }, - { - "map": [ - { - "key": { - "symbol": "from" - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - }, - { - "key": { - "symbol": "spender" - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" - } - } - ] - } - ] - }, - "durability": "temporary", - "val": { - "map": [ - { - "key": { - "symbol": "amount" - }, - "val": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - }, - { - "key": { - "symbol": "live_until_ledger" - }, - "val": { - "u32": 200 - } - } - ] - } - } - }, - "ext": "v0" - }, - 201 - ] - ], - [ - { - "contract_data": { - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Balance" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ] - }, - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": { - "vec": [ - { - "symbol": "Balance" - }, - { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" - } - ] - }, - "durability": "persistent", - "val": { - "map": [ - { - "key": { - "symbol": "amount" - }, - "val": { - "i128": { - "hi": 0, - "lo": 100000000000 - } - } - }, - { - "key": { - "symbol": "authorized" - }, - "val": { - "bool": true - } - }, - { - "key": { - "symbol": "clawback" - }, - "val": { - "bool": false - } - } - ] - } - } - }, - "ext": "v0" - }, - 518400 - ] - ], - [ - { - "contract_data": { - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": "ledger_key_contract_instance", - "durability": "persistent" - } - }, - [ - { - "last_modified_ledger_seq": 0, - "data": { - "contract_data": { - "ext": "v0", - "contract": "CBEPDNVYXQGWB5YUBXKJWYJA7OXTZW5LFLNO5JRRGE6Z6C5OSUZPCCEL", - "key": "ledger_key_contract_instance", - "durability": "persistent", - "val": { - "contract_instance": { - "executable": "stellar_asset", - "storage": [ - { - "key": { - "symbol": "METADATA" - }, - "val": { - "map": [ - { - "key": { - "symbol": "decimal" - }, - "val": { - "u32": 7 - } - }, - { - "key": { - "symbol": "name" - }, - "val": { - "string": "aaa:GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEGWF" - } - }, - { - "key": { - "symbol": "symbol" - }, - "val": { - "string": "aaa" - } - } - ] - } - }, - { - "key": { - "vec": [ - { - "symbol": "Admin" - } - ] - }, - "val": { - "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM" - } - }, - { - "key": { - "vec": [ - { - "symbol": "AssetInfo" - } - ] - }, - "val": { - "vec": [ - { - "symbol": "AlphaNum4" - }, - { - "map": [ - { - "key": { - "symbol": "asset_code" - }, - "val": { - "string": "aaa\\0" - } - }, - { - "key": { - "symbol": "issuer" - }, - "val": { - "bytes": "0000000000000000000000000000000000000000000000000000000000000002" - } - } - ] - } - ] - } - } - ] - } - } } }, "ext": "v0" }, - 120960 ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 4095 ] ], diff --git a/contract/test_snapshots/test/test_user_can_switch_token.1.json b/contract/test_snapshots/test/test_user_can_switch_token.1.json index 82414c20..f8f69bdb 100644 --- a/contract/test_snapshots/test/test_user_can_switch_token.1.json +++ b/contract/test_snapshots/test/test_user_can_switch_token.1.json @@ -2179,6 +2179,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", @@ -2342,6 +2401,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "e5b28cd0e241aaecbaf638165ac920bb39ebd1485bf5220aa32aed300e130739", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_withdraw_merchant_revenue_succeeds.1.json b/contract/test_snapshots/test/test_withdraw_merchant_revenue_succeeds.1.json index 10d24fbe..44b50ef1 100644 --- a/contract/test_snapshots/test/test_withdraw_merchant_revenue_succeeds.1.json +++ b/contract/test_snapshots/test/test_withdraw_merchant_revenue_succeeds.1.json @@ -848,7 +848,7 @@ "val": { "i128": { "hi": 0, - "lo": 50000000 + "lo": 100000000 } } }, @@ -1942,6 +1942,65 @@ }, "failed_call": false }, + { + "event": { + "ext": "v0", + "contract_id": "0000000000000000000000000000000000000000000000000000000000000003", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_call" + }, + { + "bytes": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1" + }, + { + "symbol": "allowance" + } + ], + "data": { + "vec": [ + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4" + }, + { + "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M" + } + ] + } + } + } + }, + "failed_call": false + }, + { + "event": { + "ext": "v0", + "contract_id": "48f1b6b8bc0d60f7140dd49b6120fbaf3cdbab2adaeea631313d9f0bae9532f1", + "type_": "diagnostic", + "body": { + "v0": { + "topics": [ + { + "symbol": "fn_return" + }, + { + "symbol": "allowance" + } + ], + "data": { + "i128": { + "hi": 0, + "lo": 100000000000 + } + } + } + } + }, + "failed_call": false + }, { "event": { "ext": "v0", diff --git a/contract/test_snapshots/test/test_zero_interval.1.json b/contract/test_snapshots/test/test_zero_interval.1.json index 3b23eb38..058f0ea9 100644 --- a/contract/test_snapshots/test/test_zero_interval.1.json +++ b/contract/test_snapshots/test/test_zero_interval.1.json @@ -929,7 +929,7 @@ }, { "error": { - "contract": 19 + "contract": 3 } } ], @@ -939,7 +939,7 @@ "string": "failing with contract error" }, { - "u32": 19 + "u32": 3 } ] } @@ -961,7 +961,7 @@ }, { "error": { - "contract": 19 + "contract": 3 } } ], @@ -986,7 +986,7 @@ }, { "error": { - "contract": 19 + "contract": 3 } } ], @@ -1011,7 +1011,7 @@ }, { "error": { - "contract": 19 + "contract": 3 } } ], @@ -1067,7 +1067,7 @@ }, { "error": { - "contract": 19 + "contract": 3 } } ], diff --git a/frontend/src/__tests__/useNetworkCheck.test.tsx b/frontend/src/__tests__/useNetworkCheck.test.tsx index 54a364de..57a9c557 100644 --- a/frontend/src/__tests__/useNetworkCheck.test.tsx +++ b/frontend/src/__tests__/useNetworkCheck.test.tsx @@ -23,10 +23,6 @@ function mockFreighterNetwork(networkPassphrase: string) { network: "TESTNET", networkPassphrase, }), -<<<<<<< HEAD - signTransaction: vi.fn().mockResolvedValue({ signedTxXdr: "mock-xdr" }), -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } as unknown as typeof window.freighter; } diff --git a/frontend/src/components/PayPerUseForm.tsx b/frontend/src/components/PayPerUseForm.tsx index 41a69948..42ee1e7e 100644 --- a/frontend/src/components/PayPerUseForm.tsx +++ b/frontend/src/components/PayPerUseForm.tsx @@ -1,19 +1,7 @@ -<<<<<<< HEAD import React, { useState, forwardRef, useMemo, useEffect } from "react"; import Spinner from "./Spinner"; import { validateStroopAmount } from "../hooks/useFormValidation"; import { CONTRACT_LIMITS, STROOPS_PER_XLM, MIN_STROOPS, MAX_STROOPS } from "../constants"; -======= -import React, { useState, useEffect, useCallback, forwardRef, useMemo } from "react"; -import Spinner from "./Spinner"; -import { validateStroopAmount } from "../hooks/useFormValidation"; -import { CONTRACT_LIMITS } from "../constants"; -import { STROOPS_PER_XLM, MIN_STROOPS, MAX_STROOPS } from "../constants"; -import React, { useState, useEffect, forwardRef, useMemo } from "react"; -import Spinner from "./Spinner"; -import { validateStroopAmount } from "../hooks/useFormValidation"; -import { STROOPS_PER_XLM, MIN_STROOPS, MAX_STROOPS, CONTRACT_LIMITS } from "../constants"; ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 import { useDebounce } from "../hooks/useDebounce"; interface PayPerUseFormProps { diff --git a/frontend/src/components/SubscriptionHistory.tsx b/frontend/src/components/SubscriptionHistory.tsx index 84aa1360..5c446347 100644 --- a/frontend/src/components/SubscriptionHistory.tsx +++ b/frontend/src/components/SubscriptionHistory.tsx @@ -264,8 +264,6 @@ export default function SubscriptionHistory({ userKey }: Props) { ))} -<<<<<<< HEAD -======= {hasMore && (
)} - ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 {/* Pagination controls */} {totalPages > 1 && (
{ const retval = (result as { result?: { retval?: xdr.ScVal } }).result?.retval; if (!retval) return 0n; -<<<<<<< HEAD -======= - return ScValDecoder.decodeI128(retval); ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 try { return ScValDecoder.decodeI128(retval); } catch { @@ -311,13 +307,7 @@ export function getSubscription(user: string): Promise { if ("error" in result) throw new Error(result.error); const retval = (result as { result?: { retval?: xdr.ScVal } }).result?.retval; - if (!retval || retval.switch().name === "scvVoid") return null; -<<<<<<< HEAD - if (retval.switch().name === "scvVoid") return null; - -======= ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 const subscriptionData = ScValDecoder.decodeStruct(retval, { merchant: ScValDecoder.decodeAddress, amount: (v) => ScValDecoder.decodeI128(v).toString(), @@ -533,15 +523,11 @@ export function getMerchantRevenue(merchant: string): Promise { const retval = (result as { result?: { retval?: xdr.ScVal } }).result?.retval; if (!retval) return 0n; -<<<<<<< HEAD try { return ScValDecoder.decodeI128(retval); } catch { return 0n; } -======= - return ScValDecoder.decodeI128(retval); ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } catch { return 0n; } @@ -593,15 +579,11 @@ export function getAllowance(owner: string, tokenId = TOKEN_CONTRACT_ID): Promis const retval = (result as { result?: { retval?: xdr.ScVal } }).result?.retval; if (!retval) return 0n; -<<<<<<< HEAD try { return ScValDecoder.decodeI128(retval); } catch { return 0n; } -======= - return ScValDecoder.decodeI128(retval); ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 } catch { return 0n; } @@ -646,14 +628,9 @@ export async function fetchEvents( return { events, -<<<<<<< HEAD - nextCursor: response.events.length > 0 ? response.events[response.events.length - 1].pagingToken : undefined, -======= - nextCursor: undefined, nextCursor: response.latestLedger > 0 && response.events.length > 0 ? response.events[response.events.length - 1].pagingToken : undefined, ->>>>>>> 6d2bb0bdee2f908481093df56db7a244c0dd0e50 }; } catch { return { events: [] }; diff --git a/kiro-cli.deb b/kiro-cli.deb new file mode 100644 index 00000000..1669c398 Binary files /dev/null and b/kiro-cli.deb differ