From b0a9d5e56c7c577d16f4904a94c7502af8d8a364 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 05:30:46 +0100 Subject: [PATCH 1/9] Add creator whitelist early access window --- creator-keys/src/lib.rs | 122 +++++++++++++- creator-keys/src/test.rs | 82 +++++----- creator-keys/src/test_issues.rs | 4 +- creator-keys/tests/buy_event_buyer_address.rs | 2 + creator-keys/tests/buy_key_event.rs | 2 + ...claim_locked_allocation_ledger_boundary.rs | 2 + ...m_locked_allocation_non_creator_reverts.rs | 1 + creator-keys/tests/contract_test_env/mod.rs | 2 + .../tests/creator_detail_read_consistency.rs | 4 +- creator-keys/tests/creator_details_view.rs | 2 +- creator-keys/tests/creator_fee_bps.rs | 3 + .../tests/creator_fee_bps_invalid_reads.rs | 1 + creator-keys/tests/creator_fee_config_view.rs | 12 +- creator-keys/tests/creator_fee_recipient.rs | 2 + creator-keys/tests/creator_registration.rs | 30 +++- creator-keys/tests/creator_supply.rs | 1 + creator-keys/tests/creator_treasury_share.rs | 2 + .../creator_treasury_share_invalid_reads.rs | 1 + creator-keys/tests/curve_preset_storage.rs | 3 + creator-keys/tests/emergency_pause.rs | 5 + .../empty_handle_registration_regression.rs | 10 +- creator-keys/tests/events.rs | 3 +- .../tests/flat_curve_symmetry_regression.rs | 1 + .../tests/get_locked_allocation_none.rs | 1 + .../tests/holder_count_multiple_buyers.rs | 1 + ...unt_unchanged_after_supply_cap_exceeded.rs | 1 + creator-keys/tests/holder_key_count_view.rs | 3 + creator-keys/tests/key_balance.rs | 7 + creator-keys/tests/key_name.rs | 2 +- creator-keys/tests/key_supply.rs | 6 + creator-keys/tests/key_symbol.rs | 2 +- .../tests/keys_transferred_event_fields.rs | 1 + .../locked_allocation_bonding_curve_supply.rs | 2 + .../tests/max_supply_zero_rejected.rs | 6 + creator-keys/tests/protocol_fee_bps_read.rs | 1 + creator-keys/tests/protocol_state_version.rs | 1 + .../tests/registration_event_details.rs | 4 +- .../tests/sell_event_seller_address.rs | 2 + creator-keys/tests/test_register_creator.rs | 4 +- creator-keys/tests/total_supply_overflow.rs | 1 + creator-keys/tests/transfer_keys.rs | 13 ++ .../transfer_keys_dividend_preservation.rs | 1 + creator-keys/tests/whitelist_window.rs | 152 ++++++++++++++++++ 43 files changed, 441 insertions(+), 67 deletions(-) create mode 100644 creator-keys/tests/whitelist_window.rs diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index 0b1af2b..b71b6ae 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] pub mod quote_view_errors; -use soroban_sdk::{contract, contracterror, contractimpl, contracttype, Address, Env, String}; +use soroban_sdk::{contract, contracterror, contractimpl, contracttype, Address, Env, String, Vec}; pub mod events; @@ -74,6 +74,8 @@ pub enum ContractError { InsufficientSupply = 25, SelfTransfer = 26, ZeroTransferAmount = 27, + WhitelistOnly = 28, + WhitelistTooLarge = 29, } pub mod fee { @@ -315,6 +317,10 @@ pub mod constants { pub fn max_supply(creator: &Address) -> DataKey { DataKey::MaxSupply(creator.clone()) } + + pub fn whitelist(creator: &Address) -> DataKey { + DataKey::Whitelist(creator.clone()) + } } fn creator_key(creator: &Address) -> DataKey { @@ -454,6 +460,7 @@ pub const KEY_DECIMALS: u32 = 7; pub const CREATOR_TTL_LEDGERS: u32 = 6311520; // ~2 years at 5s per ledger pub const HANDLE_LEN_MIN: u32 = 3; pub const HANDLE_LEN_MAX: u32 = 32; +pub const MAX_WHITELIST_SIZE: u32 = 500; #[derive(Clone, Copy, Debug, Eq, PartialEq)] #[contracttype] @@ -488,6 +495,24 @@ pub enum DataKey { MaxSupply(Address), CurveSlope, CurvePreset(Address), + Whitelist(Address), +} + +/// Immutable early-access whitelist configuration set at creator registration. +#[derive(Clone, Debug, PartialEq)] +#[contracttype] +pub struct WhitelistConfig { + pub addresses: Vec
, + pub window_ledgers: u32, +} + +/// Read-only whitelist window status for a creator. +#[derive(Clone, Debug, PartialEq)] +#[contracttype] +pub struct WhitelistStatus { + pub active: bool, + pub expires_at_ledger: u32, + pub remaining_ledgers: u32, } /// Time-locked key allocation for creator self-vesting. @@ -953,6 +978,48 @@ fn compute_claimable_dividend(env: &Env, creator: &Address, holder: &Address) -> /// This function extends the TTL of the creator's primary storage entries /// to prevent active creator state from expiring. Called after successful /// buy and sell operations. +fn read_whitelist_config(env: &Env, creator: &Address) -> Option { + env.storage() + .persistent() + .get(&constants::storage::whitelist(creator)) +} + +fn whitelist_expires_at(profile: &CreatorProfile, config: &WhitelistConfig) -> Option { + profile.registered_at.checked_add(config.window_ledgers) +} + +fn is_whitelist_window_active( + env: &Env, + profile: &CreatorProfile, + config: &WhitelistConfig, +) -> bool { + if config.window_ledgers == 0 { + return false; + } + whitelist_expires_at(profile, config) + .map(|expires_at| env.ledger().sequence() < expires_at) + .unwrap_or(false) +} + +fn assert_whitelist_buy_allowed( + env: &Env, + profile: &CreatorProfile, + buyer: &Address, +) -> Result<(), ContractError> { + let Some(config) = read_whitelist_config(env, &profile.creator) else { + return Ok(()); + }; + if !is_whitelist_window_active(env, profile, &config) { + return Ok(()); + } + for address in config.addresses.iter() { + if address == *buyer { + return Ok(()); + } + } + Err(ContractError::WhitelistOnly) +} + fn extend_creator_ttl(env: &Env, creator: &Address) { let current_ledger = env.ledger().sequence(); let extend_to = current_ledger + CREATOR_TTL_LEDGERS; @@ -991,6 +1058,13 @@ fn extend_creator_ttl(env: &Env, creator: &Address) { .extend_ttl(&max_supply_key, threshold, extend_to); } + let whitelist_key = constants::storage::whitelist(creator); + if env.storage().persistent().has(&whitelist_key) { + env.storage() + .persistent() + .extend_ttl(&whitelist_key, threshold, extend_to); + } + let curve_preset_key = constants::storage::curve_preset(creator); if env.storage().persistent().has(&curve_preset_key) { env.storage() @@ -1019,6 +1093,7 @@ impl CreatorKeysContract { /// - `locked_allocation`: optional time-locked key allocation for creator self-vesting. /// If provided, `unlock_ledger` must be strictly greater than current ledger. /// - `max_supply`: optional maximum supply cap. If provided, must be greater than zero. + /// - `whitelist_window`: optional immutable early-access address list and ledger duration. pub fn register_creator( env: Env, creator: Address, @@ -1026,6 +1101,7 @@ impl CreatorKeysContract { locked_allocation: Option, max_supply: Option, curve_preset: Option, + whitelist_window: Option, ) -> Result<(), ContractError> { creator.require_auth(); assert_not_paused(&env)?; @@ -1085,6 +1161,15 @@ impl CreatorKeysContract { .set(&constants::storage::max_supply(&creator), &cap); } + // Handle immutable whitelist window + let whitelist_key = constants::storage::whitelist(&creator); + if let Some(config) = whitelist_window { + if config.addresses.len() > MAX_WHITELIST_SIZE { + return Err(ContractError::WhitelistTooLarge); + } + env.storage().persistent().set(&whitelist_key, &config); + } + // Handle curve preset let preset = curve_preset.unwrap_or(CurvePreset::Linear); let preset_key = constants::storage::curve_preset(&creator); @@ -1115,6 +1200,11 @@ impl CreatorKeysContract { env.storage() .persistent() .extend_ttl(&preset_key, current_ledger, extend_to); + if env.storage().persistent().has(&whitelist_key) { + env.storage() + .persistent() + .extend_ttl(&whitelist_key, current_ledger, extend_to); + } env.events().publish( events::register_event_topics(&profile.creator), @@ -1154,6 +1244,7 @@ impl CreatorKeysContract { let mut profile: CreatorProfile = read_registered_creator_profile(&env, &creator)?; let price = compute_bonding_curve_price(&env, &creator, base_price, profile.supply)?; + assert_whitelist_buy_allowed(&env, &profile, &buyer)?; assert_buy_price_slippage(price, max_price)?; if payment < price { @@ -1440,6 +1531,35 @@ impl CreatorKeysContract { read_registered_creator_profile(&env, &creator) } + /// Read-only view: returns whitelist window status for a registered creator. + pub fn get_whitelist_status( + env: Env, + creator: Address, + ) -> Result { + let profile = read_registered_creator_profile(&env, &creator)?; + let Some(config) = read_whitelist_config(&env, &creator) else { + return Ok(WhitelistStatus { + active: false, + expires_at_ledger: profile.registered_at, + remaining_ledgers: 0, + }); + }; + let expires_at_ledger = + whitelist_expires_at(&profile, &config).ok_or(ContractError::Overflow)?; + let current = env.ledger().sequence(); + let active = config.window_ledgers > 0 && current < expires_at_ledger; + let remaining_ledgers = if active { + expires_at_ledger - current + } else { + 0 + }; + Ok(WhitelistStatus { + active, + expires_at_ledger, + remaining_ledgers, + }) + } + /// Read-only view: returns stable creator details. /// /// Returns a [`CreatorDetailsView`] regardless of registration status. diff --git a/creator-keys/src/test.rs b/creator-keys/src/test.rs index d39af64..8811800 100644 --- a/creator-keys/src/test.rs +++ b/creator-keys/src/test.rs @@ -19,7 +19,7 @@ fn test_register_creator_with_locked_allocation() { claimed: false, }; - client.register_creator(&creator, &handle, &Some(locked), &None, &None); + client.register_creator(&creator, &handle, &Some(locked), &None, &None, &None); let stored = client.get_locked_allocation(&creator).unwrap(); assert_eq!(stored.amount, 100); @@ -47,7 +47,7 @@ fn test_register_creator_locked_allocation_reverts_past_ledger() { claimed: false, }; - let result = client.try_register_creator(&creator, &handle, &Some(locked), &None, &None); + let result = client.try_register_creator(&creator, &handle, &Some(locked), &None, &None, &None); assert_eq!(result, Err(Ok(ContractError::AllocationLocked))); } @@ -68,7 +68,7 @@ fn test_claim_locked_allocation_success() { claimed: false, }; - client.register_creator(&creator, &handle, &Some(locked), &None, &None); + client.register_creator(&creator, &handle, &Some(locked), &None, &None, &None); // Advance ledger past unlock ledger_info.sequence_number = 250; @@ -100,7 +100,7 @@ fn test_claim_locked_allocation_reverts_early() { claimed: false, }; - client.register_creator(&creator, &handle, &Some(locked), &None, &None); + client.register_creator(&creator, &handle, &Some(locked), &None, &None, &None); // Try to claim before unlock let result = client.try_claim_locked_allocation(&creator); @@ -124,7 +124,7 @@ fn test_claim_locked_allocation_reverts_double_claim() { claimed: false, }; - client.register_creator(&creator, &handle, &Some(locked), &None, &None); + client.register_creator(&creator, &handle, &Some(locked), &None, &None, &None); // Advance ledger past unlock ledger_info.sequence_number = 250; @@ -162,7 +162,7 @@ fn test_get_locked_allocation_returns_allocation_when_set() { claimed: false, }; - client.register_creator(&creator, &handle, &Some(locked), &None, &None); + client.register_creator(&creator, &handle, &Some(locked), &None, &None, &None); let result = client.get_locked_allocation(&creator).unwrap(); assert_eq!(result.amount, 100); @@ -184,7 +184,7 @@ fn test_transfer_keys_basic() { let recipient = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); client.buy_key(&creator, &sender, &100i128, &None); client.buy_key(&creator, &sender, &100i128, &None); @@ -208,7 +208,7 @@ fn test_transfer_keys_sender_zeroed_out() { let recipient = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); client.transfer_keys(&creator, &sender, &recipient, &1); @@ -230,7 +230,7 @@ fn test_transfer_keys_new_recipient() { let recipient = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); let supply_before = client.get_total_key_supply(&creator); @@ -252,7 +252,7 @@ fn test_transfer_keys_self_transfer_reverts() { let sender = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); let result = client.try_transfer_keys(&creator, &sender, &sender, &1); @@ -271,7 +271,7 @@ fn test_transfer_keys_zero_amount_reverts() { let recipient = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); let result = client.try_transfer_keys(&creator, &sender, &recipient, &0); @@ -290,7 +290,7 @@ fn test_transfer_keys_insufficient_balance_reverts() { let recipient = Address::generate(&env); client.set_key_price(&admin, &100i128); - client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None); + client.register_creator(&creator, &String::from_str(&env, "alice"), &None, &None, &None, &None); client.buy_key(&creator, &sender, &100i128, &None); let result = client.try_transfer_keys(&creator, &sender, &recipient, &2); @@ -308,7 +308,7 @@ fn test_register_creator_with_max_supply() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &Some(1000), &None); + client.register_creator(&creator, &handle, &None, &Some(1000), &None, &None); let cap = client.get_max_supply(&creator).unwrap(); assert_eq!(cap, 1000); @@ -323,7 +323,7 @@ fn test_register_creator_max_supply_zero_reverts() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - let result = client.try_register_creator(&creator, &handle, &None, &Some(0), &None); + let result = client.try_register_creator(&creator, &handle, &None, &Some(0), &None, &None); assert_eq!(result, Err(Ok(ContractError::NotPositiveAmount))); } @@ -338,7 +338,7 @@ fn test_buy_exceeds_max_supply_reverts() { let admin = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &Some(5), &None); + client.register_creator(&creator, &handle, &None, &Some(5), &None, &None); client.set_key_price(&admin, &100); client.set_fee_config(&admin, &9000, &1000); @@ -363,7 +363,7 @@ fn test_buy_within_max_supply_succeeds() { let admin = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &Some(10), &None); + client.register_creator(&creator, &handle, &None, &Some(10), &None, &None); client.set_key_price(&admin, &100); client.set_fee_config(&admin, &9000, &1000); @@ -385,7 +385,7 @@ fn test_get_max_supply_returns_none_for_uncapped() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let cap = client.get_max_supply(&creator); assert_eq!(cap, None); @@ -484,7 +484,7 @@ fn test_update_creator_fee_recipient_success() { let new_recipient = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.update_creator_fee_recipient(&creator, &new_recipient); let profile = client.get_creator(&creator); @@ -502,7 +502,7 @@ fn test_update_creator_fee_recipient_unauthorized_reverts() { let new_recipient = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let result = client.try_update_creator_fee_recipient(&unauthorized, &new_recipient); // This should fail because unauthorized is not the current fee recipient @@ -552,7 +552,7 @@ fn test_sell_key_accepts_exact_min_proceeds_boundary() { client.set_key_price(&admin, &100); client.set_fee_config(&admin, &9000, &1000); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.buy_key(&creator, &seller, &100, &None); client.buy_key(&creator, &seller, &100, &None); @@ -580,7 +580,7 @@ fn test_sell_extends_creator_ttl_after_successful_sell() { client.set_key_price(&admin, &100); client.set_fee_config(&admin, &9000, &1000); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.buy_key(&creator, &seller, &100, &None); let creator_key = constants::storage::creator(&creator); @@ -619,7 +619,7 @@ fn test_failed_sell_does_not_extend_creator_ttl() { let handle = String::from_str(&env, "alice"); client.set_key_price(&admin, &100); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let creator_key = constants::storage::creator(&creator); let mut ledger_info = env.ledger().get(); @@ -651,7 +651,7 @@ fn test_register_creator_without_optional_params_succeeds() { let handle = String::from_str(&env, "alice"); // Registration with None for both optional params should work (backwards compatible) - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let profile = client.get_creator(&creator); assert_eq!(profile.supply, 0); @@ -777,7 +777,7 @@ fn test_get_fee_config_persists_across_repeated_reads() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Repeatedly read the fee config and verify stability for _ in 0..5 { @@ -803,7 +803,7 @@ fn test_register_creator() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let profile = client.get_creator(&creator); assert_eq!(profile.handle, handle); @@ -823,7 +823,7 @@ fn test_register_creator_persists_registration_metadata() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let profile = client.get_creator(&creator); assert_eq!(profile.creator, creator); @@ -843,10 +843,10 @@ fn test_duplicate_registration_fails() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Second registration should fail with AlreadyRegistered error - let result = client.try_register_creator(&creator, &handle, &None, &None, &None); + let result = client.try_register_creator(&creator, &handle, &None, &None, &None, &None); assert_eq!(result, Err(Ok(ContractError::AlreadyRegistered))); assert_no_events(&env); } @@ -881,7 +881,7 @@ fn test_buy_key_success() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let buyer = Address::generate(&env); let supply = client.buy_key(&creator, &buyer, &100, &None); @@ -904,7 +904,7 @@ fn test_get_creator_holder_count_counts_unique_holders() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let holder_one = Address::generate(&env); let holder_two = Address::generate(&env); @@ -945,7 +945,7 @@ fn test_buy_key_insufficient_payment() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let buyer = Address::generate(&env); let result = client.try_buy_key(&creator, &buyer, &99, &None); @@ -1016,7 +1016,7 @@ fn test_get_key_balance_returns_zero_for_unregistered_wallet() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let unregistered_wallet = Address::generate(&env); @@ -1115,7 +1115,7 @@ fn test_get_buy_quote_success() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let quote = client.get_buy_quote(&creator); assert_eq!(quote.price, 1000); @@ -1137,7 +1137,7 @@ fn test_get_sell_quote_success() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let buyer = Address::generate(&env); client.buy_key(&creator, &buyer, &1000, &None); @@ -1162,7 +1162,7 @@ fn test_get_sell_quote_fails_if_insufficient_balance() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let holder = Address::generate(&env); // Zero balance let result = client.try_get_sell_quote(&creator, &holder); @@ -1197,7 +1197,7 @@ fn test_get_quote_fails_if_fee_not_set() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let result = client.try_get_buy_quote(&creator); assert_eq!(result, Err(Ok(ContractError::FeeConfigNotSet))); @@ -1227,7 +1227,7 @@ fn test_get_creator_fee_recipient_success() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let recipient = client.get_creator_fee_recipient(&creator); assert_eq!(recipient, creator); @@ -1259,7 +1259,7 @@ fn test_quote_overflow_guards() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Buy quote: price + fees (will overflow) let result = client.try_get_buy_quote(&creator); @@ -1336,7 +1336,7 @@ fn test_register_event_field_order_is_stable() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let all_events = env.events().all(); assert_eq!( @@ -1398,7 +1398,7 @@ fn test_buy_event_topic_and_data_order_is_stable() { let creator = Address::generate(&env); let handle = String::from_str(&env, "bob"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let buyer = Address::generate(&env); client.buy_key(&creator, &buyer, &500, &None); @@ -1464,7 +1464,7 @@ fn test_register_event_fee_adjacent_fields_are_zero_and_ordered_after_identity_f let creator = Address::generate(&env); let handle = String::from_str(&env, "carol"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let all_events = env.events().all(); let (_contract_id, _topics, data): ( diff --git a/creator-keys/src/test_issues.rs b/creator-keys/src/test_issues.rs index 68359ff..1188ecd 100644 --- a/creator-keys/src/test_issues.rs +++ b/creator-keys/src/test_issues.rs @@ -21,10 +21,10 @@ mod issue_tests { let handle = String::from_str(env, "alice"); match cap { Some(c) => { - client.register_creator(&creator, &handle, &None, &Some(c), &None); + client.register_creator(&creator, &handle, &None, &Some(c), &None, &None); } None => { - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); } } creator diff --git a/creator-keys/tests/buy_event_buyer_address.rs b/creator-keys/tests/buy_event_buyer_address.rs index 0094022..ceb0535 100644 --- a/creator-keys/tests/buy_event_buyer_address.rs +++ b/creator-keys/tests/buy_event_buyer_address.rs @@ -31,6 +31,7 @@ fn test_buy_event_buyer_address_matches_caller() { &None, &None, &None, + &None, ); // Clear any prior events then perform the buy @@ -88,6 +89,7 @@ fn test_buy_event_buyer_address_field_is_non_zero() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer, &KEY_PRICE, &None); diff --git a/creator-keys/tests/buy_key_event.rs b/creator-keys/tests/buy_key_event.rs index 83c93f8..7484c64 100644 --- a/creator-keys/tests/buy_key_event.rs +++ b/creator-keys/tests/buy_key_event.rs @@ -22,6 +22,7 @@ fn test_buy_key_event_includes_payment_amount() { &None, &None, &None, + &None, ); let supply = client.buy_key(&creator, &buyer, &150i128, &None); assert_eq!(supply, 1); @@ -54,6 +55,7 @@ fn test_buy_key_event_topics_include_creator_and_buyer() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer, &200i128, &None); diff --git a/creator-keys/tests/claim_locked_allocation_ledger_boundary.rs b/creator-keys/tests/claim_locked_allocation_ledger_boundary.rs index 366a353..c85c72e 100644 --- a/creator-keys/tests/claim_locked_allocation_ledger_boundary.rs +++ b/creator-keys/tests/claim_locked_allocation_ledger_boundary.rs @@ -31,6 +31,7 @@ fn test_claim_locked_allocation_reverts_at_every_ledger_before_unlock() { }), &None, &None, + &None, ); // Immediately after registration — must revert. @@ -77,6 +78,7 @@ fn test_claim_locked_allocation_succeeds_at_unlock_ledger() { }), &None, &None, + &None, ); // Advance to exactly unlock_ledger. diff --git a/creator-keys/tests/claim_locked_allocation_non_creator_reverts.rs b/creator-keys/tests/claim_locked_allocation_non_creator_reverts.rs index 4759c70..b65f71a 100644 --- a/creator-keys/tests/claim_locked_allocation_non_creator_reverts.rs +++ b/creator-keys/tests/claim_locked_allocation_non_creator_reverts.rs @@ -33,6 +33,7 @@ fn setup_creator_with_locked_allocation( }), &None, &None, + &None, ); creator } diff --git a/creator-keys/tests/contract_test_env/mod.rs b/creator-keys/tests/contract_test_env/mod.rs index 4542624..bfbfbf5 100644 --- a/creator-keys/tests/contract_test_env/mod.rs +++ b/creator-keys/tests/contract_test_env/mod.rs @@ -111,6 +111,7 @@ pub fn register_test_creator( &None, &None, &None, + &None, ); creator } @@ -142,6 +143,7 @@ pub fn register_test_creator_with_fee_config( &None, &None, &None, + &None, ); creator } diff --git a/creator-keys/tests/creator_detail_read_consistency.rs b/creator-keys/tests/creator_detail_read_consistency.rs index ddc6427..48a1ff5 100644 --- a/creator-keys/tests/creator_detail_read_consistency.rs +++ b/creator-keys/tests/creator_detail_read_consistency.rs @@ -23,7 +23,7 @@ fn test_creator_details_identical_across_three_consecutive_reads() { let handle = String::from_str(&env, "alice"); // Register creator to establish initial state - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Perform three consecutive reads with NO state changes between them let read1 = client.get_creator_details(&creator); @@ -131,7 +131,7 @@ fn test_creator_details_no_storage_writes_during_reads() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "charlie"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Use a sentinel holder address — no keys held, so balance stays 0. let sentinel = soroban_sdk::Address::generate(&env); diff --git a/creator-keys/tests/creator_details_view.rs b/creator-keys/tests/creator_details_view.rs index aaa2d3e..e7ba28b 100644 --- a/creator-keys/tests/creator_details_view.rs +++ b/creator-keys/tests/creator_details_view.rs @@ -29,7 +29,7 @@ fn test_get_creator_details_registered_returns_correct_data() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let details = client.get_creator_details(&creator); assert!(details.is_registered); diff --git a/creator-keys/tests/creator_fee_bps.rs b/creator-keys/tests/creator_fee_bps.rs index 21d0fdb..3e5109d 100644 --- a/creator-keys/tests/creator_fee_bps.rs +++ b/creator-keys/tests/creator_fee_bps.rs @@ -19,6 +19,7 @@ fn test_get_creator_fee_bps_returns_configured_value() { &None, &None, &None, + &None, ); client.set_fee_config(&admin, &9000u32, &1000u32); @@ -41,6 +42,7 @@ fn test_get_creator_fee_bps_is_read_only() { &None, &None, &None, + &None, ); client.set_fee_config(&admin, &7500u32, &2500u32); @@ -66,6 +68,7 @@ fn test_get_creator_fee_bps_tracks_fee_config_updates() { &None, &None, &None, + &None, ); client.set_fee_config(&admin, &9000u32, &1000u32); diff --git a/creator-keys/tests/creator_fee_bps_invalid_reads.rs b/creator-keys/tests/creator_fee_bps_invalid_reads.rs index 05c6add..4e78167 100644 --- a/creator-keys/tests/creator_fee_bps_invalid_reads.rs +++ b/creator-keys/tests/creator_fee_bps_invalid_reads.rs @@ -48,6 +48,7 @@ fn test_get_creator_fee_bps_fails_when_fee_config_not_set() { &None, &None, &None, + &None, ); let result = client.try_get_creator_fee_bps(&creator); diff --git a/creator-keys/tests/creator_fee_config_view.rs b/creator-keys/tests/creator_fee_config_view.rs index f29b362..711a629 100644 --- a/creator-keys/tests/creator_fee_config_view.rs +++ b/creator-keys/tests/creator_fee_config_view.rs @@ -28,7 +28,7 @@ fn test_get_creator_fee_config_registered_no_fee_config() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "test_creator"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let view = client.get_creator_fee_config(&creator); @@ -50,7 +50,7 @@ fn test_get_creator_fee_config_registered_with_fee_config() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "test_creator"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.set_fee_config(&admin, &9000u32, &1000u32); let view = client.get_creator_fee_config(&creator); @@ -73,7 +73,7 @@ fn test_get_creator_fee_config_is_read_only() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "test_creator"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.set_fee_config(&admin, &8000u32, &2000u32); let v1 = client.get_creator_fee_config(&creator); @@ -97,7 +97,7 @@ fn test_get_creator_fee_config_updates_after_fee_reconfiguration() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "test_creator"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); client.set_fee_config(&admin, &9000u32, &1000u32); let v1 = client.get_creator_fee_config(&creator); @@ -124,8 +124,8 @@ fn test_get_creator_fee_config_multiple_creators_independent() { let handle1 = String::from_str(&env, "creator_one"); let handle2 = String::from_str(&env, "creator_two"); - client.register_creator(&creator1, &handle1, &None, &None, &None); - client.register_creator(&creator2, &handle2, &None, &None, &None); + client.register_creator(&creator1, &handle1, &None, &None, &None, &None); + client.register_creator(&creator2, &handle2, &None, &None, &None, &None); client.set_fee_config(&admin, &9000u32, &1000u32); let view1 = client.get_creator_fee_config(&creator1); diff --git a/creator-keys/tests/creator_fee_recipient.rs b/creator-keys/tests/creator_fee_recipient.rs index 8410aac..9563488 100644 --- a/creator-keys/tests/creator_fee_recipient.rs +++ b/creator-keys/tests/creator_fee_recipient.rs @@ -19,6 +19,7 @@ fn test_get_creator_fee_recipient_returns_creator_address() { &None, &None, &None, + &None, ); assert_eq!(client.get_creator_fee_recipient(&creator), creator); @@ -39,6 +40,7 @@ fn test_get_creator_fee_recipient_is_read_only() { &None, &None, &None, + &None, ); let first_read = client.get_creator_fee_recipient(&creator); diff --git a/creator-keys/tests/creator_registration.rs b/creator-keys/tests/creator_registration.rs index 80ffb85..d16c0b9 100644 --- a/creator-keys/tests/creator_registration.rs +++ b/creator-keys/tests/creator_registration.rs @@ -32,6 +32,7 @@ fn test_is_creator_registered_returns_true_after_registration() { &None, &None, &None, + &None, ); assert!(client.is_creator_registered(&creator)); @@ -52,6 +53,7 @@ fn test_is_creator_registered_is_read_only() { &None, &None, &None, + &None, ); // Multiple calls should return the same result without mutating state @@ -79,6 +81,7 @@ fn test_is_creator_registered_different_creators_independent() { &None, &None, &None, + &None, ); assert!(client.is_creator_registered(&alice)); @@ -98,9 +101,9 @@ fn test_register_creator_duplicate_fails() { let creator = Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // Second registration with the same address should fail with error - let result = client.try_register_creator(&creator, &handle, &None, &None, &None); + let result = client.try_register_creator(&creator, &handle, &None, &None, &None, &None); assert_eq!(result, Err(Ok(ContractError::AlreadyRegistered))); } @@ -120,6 +123,7 @@ fn test_register_creator_duplicate_different_handle_fails() { &None, &None, &None, + &None, ); // Re-registering with a different handle should still fail let result = client.try_register_creator( @@ -128,6 +132,7 @@ fn test_register_creator_duplicate_different_handle_fails() { &None, &None, &None, + &None, ); assert_eq!(result, Err(Ok(ContractError::AlreadyRegistered))); } @@ -149,8 +154,16 @@ fn test_register_creator_different_addresses_succeeds() { &None, &None, &None, + &None, + ); + client.register_creator( + &bob, + &String::from_str(&env, "bob"), + &None, + &None, + &None, + &None, ); - client.register_creator(&bob, &String::from_str(&env, "bob"), &None, &None, &None); assert!(client.is_creator_registered(&alice)); assert!(client.is_creator_registered(&bob)); @@ -172,6 +185,7 @@ fn test_register_creator_accepts_min_handle_length() { &None, &None, &None, + &None, ); assert!(client.is_creator_registered(&creator)); @@ -193,6 +207,7 @@ fn test_register_creator_accepts_max_handle_length() { &None, &None, &None, + &None, ); assert!(client.is_creator_registered(&creator)); @@ -214,6 +229,7 @@ fn test_register_creator_rejects_handle_shorter_than_min() { &None, &None, &None, + &None, ); assert_eq!(result, Err(Ok(ContractError::HandleTooShort))); } @@ -234,6 +250,7 @@ fn test_register_creator_rejects_handle_longer_than_max() { &None, &None, &None, + &None, ); assert_eq!(result, Err(Ok(ContractError::HandleTooLong))); } @@ -248,7 +265,7 @@ fn test_register_creator_rejects_invalid_characters_in_handle() { let creator = Address::generate(&env); let invalid_handle = String::from_str(&env, "Alice-01"); - let result = client.try_register_creator(&creator, &invalid_handle, &None, &None, &None); + let result = client.try_register_creator(&creator, &invalid_handle, &None, &None, &None, &None); assert_eq!(result, Err(Ok(ContractError::InvalidHandleCharacter))); } @@ -264,7 +281,7 @@ fn test_register_creator_max_length_handle_succeeds() { let creator = Address::generate(&env); let max_handle = String::from_str(&env, &"a".repeat(HANDLE_LEN_MAX as usize)); - client.register_creator(&creator, &max_handle, &None, &None, &None); + client.register_creator(&creator, &max_handle, &None, &None, &None, &None); assert!(client.is_creator_registered(&creator)); } @@ -279,7 +296,8 @@ fn test_register_creator_handle_one_over_max_rejected() { let creator = Address::generate(&env); let over_max_handle = String::from_str(&env, &"a".repeat((HANDLE_LEN_MAX + 1) as usize)); - let result = client.try_register_creator(&creator, &over_max_handle, &None, &None, &None); + let result = + client.try_register_creator(&creator, &over_max_handle, &None, &None, &None, &None); assert_eq!(result, Err(Ok(ContractError::HandleTooLong))); } diff --git a/creator-keys/tests/creator_supply.rs b/creator-keys/tests/creator_supply.rs index 758d579..6ede717 100644 --- a/creator-keys/tests/creator_supply.rs +++ b/creator-keys/tests/creator_supply.rs @@ -17,6 +17,7 @@ fn setup(env: &Env) -> (CreatorKeysContractClient<'_>, Address, Address) { &None, &None, &None, + &None, ); (client, admin, creator) diff --git a/creator-keys/tests/creator_treasury_share.rs b/creator-keys/tests/creator_treasury_share.rs index 604ac95..76433c3 100644 --- a/creator-keys/tests/creator_treasury_share.rs +++ b/creator-keys/tests/creator_treasury_share.rs @@ -19,6 +19,7 @@ fn test_get_creator_treasury_share_returns_configured_value() { &None, &None, &None, + &None, ); client.set_fee_config(&admin, &9000u32, &1000u32); @@ -41,6 +42,7 @@ fn test_get_creator_treasury_share_is_read_only() { &None, &None, &None, + &None, ); client.set_fee_config(&admin, &8000u32, &2000u32); diff --git a/creator-keys/tests/creator_treasury_share_invalid_reads.rs b/creator-keys/tests/creator_treasury_share_invalid_reads.rs index 8c9140f..7379c00 100644 --- a/creator-keys/tests/creator_treasury_share_invalid_reads.rs +++ b/creator-keys/tests/creator_treasury_share_invalid_reads.rs @@ -48,6 +48,7 @@ fn test_get_creator_treasury_share_fails_when_fee_config_not_set() { &None, &None, &None, + &None, ); let result = client.try_get_creator_treasury_share(&creator); diff --git a/creator-keys/tests/curve_preset_storage.rs b/creator-keys/tests/curve_preset_storage.rs index 960a349..36270d5 100644 --- a/creator-keys/tests/curve_preset_storage.rs +++ b/creator-keys/tests/curve_preset_storage.rs @@ -22,6 +22,7 @@ fn test_curve_preset_variants_and_error_handling() { &None, &None, &Some(CurvePreset::Linear), + &None, ); // Register creator with Quadratic preset @@ -31,6 +32,7 @@ fn test_curve_preset_variants_and_error_handling() { &None, &None, &Some(CurvePreset::Quadratic), + &None, ); // Register creator with Flat preset @@ -40,6 +42,7 @@ fn test_curve_preset_variants_and_error_handling() { &None, &None, &Some(CurvePreset::Flat), + &None, ); // Assert each returns the correct variant diff --git a/creator-keys/tests/emergency_pause.rs b/creator-keys/tests/emergency_pause.rs index 46d124f..9027894 100644 --- a/creator-keys/tests/emergency_pause.rs +++ b/creator-keys/tests/emergency_pause.rs @@ -150,6 +150,7 @@ fn test_register_creator_reverts_when_paused() { &None, &None, &None, + &None, ); assert_eq!(result, Err(Ok(ContractError::ProtocolPaused))); } @@ -203,6 +204,8 @@ fn test_pause_blocks_registration_not_reads() { &soroban_sdk::String::from_str(&env, "creatorb"), &None, &None, + &None, + &None, ); assert_eq!(result, Err(Ok(ContractError::ProtocolPaused))); @@ -220,6 +223,8 @@ fn test_pause_blocks_registration_not_reads() { &soroban_sdk::String::from_str(&env, "creatorb"), &None, &None, + &None, + &None, ) .unwrap(); } diff --git a/creator-keys/tests/empty_handle_registration_regression.rs b/creator-keys/tests/empty_handle_registration_regression.rs index 9efe6cb..ec5f9ed 100644 --- a/creator-keys/tests/empty_handle_registration_regression.rs +++ b/creator-keys/tests/empty_handle_registration_regression.rs @@ -15,8 +15,14 @@ fn test_register_creator_rejects_empty_handle() { let client = CreatorKeysContractClient::new(&env, &contract_id); let creator = Address::generate(&env); - let result = - client.try_register_creator(&creator, &String::from_str(&env, ""), &None, &None, &None); + let result = client.try_register_creator( + &creator, + &String::from_str(&env, ""), + &None, + &None, + &None, + &None, + ); assert_eq!(result, Err(Ok(ContractError::HandleTooShort))); assert!(!client.is_creator_registered(&creator)); diff --git a/creator-keys/tests/events.rs b/creator-keys/tests/events.rs index 577ecc7..519ae9a 100644 --- a/creator-keys/tests/events.rs +++ b/creator-keys/tests/events.rs @@ -47,6 +47,7 @@ impl<'a> EventFixture<'a> { &None, &None, &None, + &None, ); } @@ -234,7 +235,7 @@ fn test_register_creator_event_data_is_indexer_friendly() { fixture .client - .register_creator(&fixture.creator, &handle, &None, &None, &None); + .register_creator(&fixture.creator, &handle, &None, &None, &None, &None); let events = env.events().all(); let last = events.last().unwrap(); diff --git a/creator-keys/tests/flat_curve_symmetry_regression.rs b/creator-keys/tests/flat_curve_symmetry_regression.rs index 68d1c91..2f3077d 100644 --- a/creator-keys/tests/flat_curve_symmetry_regression.rs +++ b/creator-keys/tests/flat_curve_symmetry_regression.rs @@ -92,6 +92,7 @@ fn test_flat_curve_symmetry() { &None, &None, &Some(CurvePreset::Flat), + &None, ); let buyer = Address::generate(&env); diff --git a/creator-keys/tests/get_locked_allocation_none.rs b/creator-keys/tests/get_locked_allocation_none.rs index a4422b4..854e3ed 100644 --- a/creator-keys/tests/get_locked_allocation_none.rs +++ b/creator-keys/tests/get_locked_allocation_none.rs @@ -47,6 +47,7 @@ fn test_get_locked_allocation_returns_some_when_set() { }), &None, &None, + &None, ); let result = client.get_locked_allocation(&creator); diff --git a/creator-keys/tests/holder_count_multiple_buyers.rs b/creator-keys/tests/holder_count_multiple_buyers.rs index bb794a2..93e90ae 100644 --- a/creator-keys/tests/holder_count_multiple_buyers.rs +++ b/creator-keys/tests/holder_count_multiple_buyers.rs @@ -23,6 +23,7 @@ fn holder_count_tracks_distinct_buyers_and_decrements_on_exit() { &None, &None, &None, + &None, ); let buyer_a = Address::generate(&env); diff --git a/creator-keys/tests/holder_count_unchanged_after_supply_cap_exceeded.rs b/creator-keys/tests/holder_count_unchanged_after_supply_cap_exceeded.rs index 15fe931..6429254 100644 --- a/creator-keys/tests/holder_count_unchanged_after_supply_cap_exceeded.rs +++ b/creator-keys/tests/holder_count_unchanged_after_supply_cap_exceeded.rs @@ -24,6 +24,7 @@ fn test_holder_count_unchanged_after_failed_buy_supply_cap_exceeded() { &None, &Some(10u32), &None, + &None, ); // First wallet buys 10 keys to fill the cap. diff --git a/creator-keys/tests/holder_key_count_view.rs b/creator-keys/tests/holder_key_count_view.rs index 85042a1..46849ab 100644 --- a/creator-keys/tests/holder_key_count_view.rs +++ b/creator-keys/tests/holder_key_count_view.rs @@ -15,6 +15,7 @@ fn setup_with_creator(env: &Env) -> (CreatorKeysContractClient<'_>, Address, Add &None, &None, &None, + &None, ); (client, creator, admin) } @@ -184,6 +185,7 @@ fn test_holder_key_count_view_zero_keys_different_creators() { &None, &None, &None, + &None, ); client.register_creator( &creator_b, @@ -191,6 +193,7 @@ fn test_holder_key_count_view_zero_keys_different_creators() { &None, &None, &None, + &None, ); // Holder buys keys only from creator A diff --git a/creator-keys/tests/key_balance.rs b/creator-keys/tests/key_balance.rs index fbbbe29..bb4ff2e 100644 --- a/creator-keys/tests/key_balance.rs +++ b/creator-keys/tests/key_balance.rs @@ -36,6 +36,7 @@ fn test_key_balance_increments_on_buy() { &None, &None, &None, + &None, ); assert_eq!(client.get_key_balance(&creator, &buyer), 0); @@ -67,6 +68,7 @@ fn test_key_balance_is_per_buyer() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer_a, &100i128, &None); @@ -97,6 +99,7 @@ fn test_key_balance_is_per_creator() { &None, &None, &None, + &None, ); client.register_creator( &creator_b, @@ -104,6 +107,7 @@ fn test_key_balance_is_per_creator() { &None, &None, &None, + &None, ); client.buy_key(&creator_a, &buyer, &100i128, &None); @@ -132,6 +136,7 @@ fn test_key_balance_zero_for_unregistered_creator_even_when_other_balances_exist &None, &None, &None, + &None, ); client.buy_key(®istered_creator, &buyer, &100i128, &None); @@ -158,6 +163,7 @@ fn test_key_balance_zero_for_registered_creator_and_unseen_wallet() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer_with_balance, &100i128, &None); @@ -185,6 +191,7 @@ fn test_key_balance_returns_zero_for_uninitialized_holder() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer_a, &100i128, &None); client.buy_key(&creator, &buyer_a, &100i128, &None); diff --git a/creator-keys/tests/key_name.rs b/creator-keys/tests/key_name.rs index 2675495..f0f6b06 100644 --- a/creator-keys/tests/key_name.rs +++ b/creator-keys/tests/key_name.rs @@ -13,7 +13,7 @@ fn test_get_key_name_success() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let name = client.get_key_name(&creator); assert_eq!(name, handle); diff --git a/creator-keys/tests/key_supply.rs b/creator-keys/tests/key_supply.rs index 471393b..225cf98 100644 --- a/creator-keys/tests/key_supply.rs +++ b/creator-keys/tests/key_supply.rs @@ -26,6 +26,7 @@ fn test_get_total_key_supply_returns_zero_for_new_creator() { &None, &None, &None, + &None, ); assert_eq!(client.get_total_key_supply(&creator), 0); @@ -55,6 +56,7 @@ fn test_get_total_key_supply_increments_after_buy() { &None, &None, &None, + &None, ); assert_eq!(client.get_total_key_supply(&creator), 0); @@ -80,6 +82,7 @@ fn test_get_total_key_supply_is_read_only() { &None, &None, &None, + &None, ); // Call multiple times — should not change state @@ -106,6 +109,7 @@ fn test_buy_key_zero_payment_fails() { &None, &None, &None, + &None, ); let result = client.try_buy_key(&creator, &buyer, &0_i128, &None); @@ -126,6 +130,7 @@ fn test_buy_key_negative_payment_fails() { &None, &None, &None, + &None, ); let result = client.try_buy_key(&creator, &buyer, &-50_i128, &None); @@ -146,6 +151,7 @@ fn test_buy_key_positive_payment_succeeds() { &None, &None, &None, + &None, ); let supply = client.buy_key(&creator, &buyer, &100_i128, &None); diff --git a/creator-keys/tests/key_symbol.rs b/creator-keys/tests/key_symbol.rs index d2e024f..b9e3233 100644 --- a/creator-keys/tests/key_symbol.rs +++ b/creator-keys/tests/key_symbol.rs @@ -13,7 +13,7 @@ fn test_get_key_symbol_success() { let creator = soroban_sdk::Address::generate(&env); let handle = String::from_str(&env, "alice"); - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); let symbol = client.get_key_symbol(&creator); assert_eq!(symbol, handle); diff --git a/creator-keys/tests/keys_transferred_event_fields.rs b/creator-keys/tests/keys_transferred_event_fields.rs index 7040522..f177326 100644 --- a/creator-keys/tests/keys_transferred_event_fields.rs +++ b/creator-keys/tests/keys_transferred_event_fields.rs @@ -41,6 +41,7 @@ fn setup_transfer( &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &KEY_PRICE, &None); client.transfer_keys(&creator, &sender, &recipient, &TRANSFER_AMOUNT); diff --git a/creator-keys/tests/locked_allocation_bonding_curve_supply.rs b/creator-keys/tests/locked_allocation_bonding_curve_supply.rs index f2ccb35..27fe019 100644 --- a/creator-keys/tests/locked_allocation_bonding_curve_supply.rs +++ b/creator-keys/tests/locked_allocation_bonding_curve_supply.rs @@ -51,6 +51,7 @@ fn setup( }), &None, &None, + &None, ); let creator_no_alloc = Address::generate(env); @@ -60,6 +61,7 @@ fn setup( &None, &None, &None, + &None, ); (client, creator_with_alloc, creator_no_alloc) diff --git a/creator-keys/tests/max_supply_zero_rejected.rs b/creator-keys/tests/max_supply_zero_rejected.rs index c31a451..fd6805f 100644 --- a/creator-keys/tests/max_supply_zero_rejected.rs +++ b/creator-keys/tests/max_supply_zero_rejected.rs @@ -28,6 +28,7 @@ fn test_max_supply_zero_reverts_at_registration() { &None, &Some(0), &None, + &None, ); assert_eq!( result, @@ -53,6 +54,7 @@ fn test_no_creator_state_written_after_zero_supply_cap_rejection() { &None, &Some(0), &None, + &None, ); // Creator must not appear as registered @@ -86,6 +88,7 @@ fn test_max_supply_one_accepted_as_minimum() { &None, &Some(1), &None, + &None, ); assert!( result.is_ok(), @@ -119,6 +122,7 @@ fn test_max_supply_none_accepted_no_cap() { &None, &None, &None, + &None, ); assert!(result.is_ok(), "max_supply: None must be accepted (no cap)"); assert!(client.is_creator_registered(&creator)); @@ -146,6 +150,7 @@ fn test_max_supply_two_accepted() { &None, &Some(2), &None, + &None, ); assert!(result.is_ok(), "max_supply: Some(2) must be accepted"); assert_eq!(client.get_max_supply(&creator), Some(2)); @@ -164,6 +169,7 @@ fn test_max_supply_large_value_accepted() { &None, &Some(1_000_000), &None, + &None, ); assert!( result.is_ok(), diff --git a/creator-keys/tests/protocol_fee_bps_read.rs b/creator-keys/tests/protocol_fee_bps_read.rs index bfb6035..7d05a7d 100644 --- a/creator-keys/tests/protocol_fee_bps_read.rs +++ b/creator-keys/tests/protocol_fee_bps_read.rs @@ -85,6 +85,7 @@ fn test_get_protocol_fee_bps_persists_across_operations() { &None, &None, &None, + &None, ); client.set_key_price(&admin, &100); client.buy_key(&creator, &buyer, &100, &None); diff --git a/creator-keys/tests/protocol_state_version.rs b/creator-keys/tests/protocol_state_version.rs index 2d4f36b..551d7db 100644 --- a/creator-keys/tests/protocol_state_version.rs +++ b/creator-keys/tests/protocol_state_version.rs @@ -108,6 +108,7 @@ fn test_get_protocol_state_version_increments_only_on_config_updates() { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer, &100i128, &None); client.set_treasury_address(&admin, &Address::generate(&env)); diff --git a/creator-keys/tests/registration_event_details.rs b/creator-keys/tests/registration_event_details.rs index d403310..6eab4e5 100644 --- a/creator-keys/tests/registration_event_details.rs +++ b/creator-keys/tests/registration_event_details.rs @@ -26,7 +26,7 @@ fn test_register_creator_event_field_values_match_fixtures() { client.set_fee_config(&admin, &expected_creator_bps, &expected_protocol_bps); // 3. Trigger registration - client.register_creator(&creator, &handle, &None, &None, &None); + client.register_creator(&creator, &handle, &None, &None, &None, &None); // 4. Capture the emitted event let all_events = env.events().all(); @@ -90,6 +90,7 @@ fn test_register_creator_event_fields_update_with_fee_config() { &None, &None, &None, + &None, ); let event1: events::CreatorRegisteredEvent = @@ -106,6 +107,7 @@ fn test_register_creator_event_fields_update_with_fee_config() { &None, &None, &None, + &None, ); let event2: events::CreatorRegisteredEvent = diff --git a/creator-keys/tests/sell_event_seller_address.rs b/creator-keys/tests/sell_event_seller_address.rs index 87232b5..265851d 100644 --- a/creator-keys/tests/sell_event_seller_address.rs +++ b/creator-keys/tests/sell_event_seller_address.rs @@ -32,6 +32,7 @@ fn test_sell_event_seller_address_matches_caller() { &None, &None, &None, + &None, ); // Buyer purchases keys @@ -92,6 +93,7 @@ fn test_sell_event_seller_address_field_is_non_zero() { &None, &None, &None, + &None, ); client.buy_key(&creator, &seller, &KEY_PRICE, &None); client.sell_key(&creator, &seller, &None); diff --git a/creator-keys/tests/test_register_creator.rs b/creator-keys/tests/test_register_creator.rs index a2d07ce..0c38979 100644 --- a/creator-keys/tests/test_register_creator.rs +++ b/creator-keys/tests/test_register_creator.rs @@ -13,7 +13,7 @@ fn test_register_creator_minimum_handle_length_success() { let min_handle = "a".repeat(HANDLE_LEN_MIN as usize); let handle = String::from_str(&env, &min_handle); - let result = client.try_register_creator(&creator, &handle, &None, &None, &None); + let result = client.try_register_creator(&creator, &handle, &None, &None, &None, &None); // Happy path: the function succeeds assert_eq!(result, Ok(Ok(()))); @@ -34,7 +34,7 @@ fn test_register_creator_below_minimum_handle_length_fails() { let short_handle = "a".repeat((HANDLE_LEN_MIN - 1) as usize); let handle = String::from_str(&env, &short_handle); - let result = client.try_register_creator(&creator, &handle, &None, &None, &None); + let result = client.try_register_creator(&creator, &handle, &None, &None, &None, &None); // Error case: expected failure assert_eq!(result, Err(Ok(ContractError::HandleTooShort))); diff --git a/creator-keys/tests/total_supply_overflow.rs b/creator-keys/tests/total_supply_overflow.rs index f563232..fcc2150 100644 --- a/creator-keys/tests/total_supply_overflow.rs +++ b/creator-keys/tests/total_supply_overflow.rs @@ -25,6 +25,7 @@ fn buy_at_max_supply_is_rejected_with_overflow_and_no_state_corruption() { &None, &None, &None, + &None, ); // Seed supply at the ceiling to simulate "many sequential buys" cheaply. diff --git a/creator-keys/tests/transfer_keys.rs b/creator-keys/tests/transfer_keys.rs index 26f98d7..fcae9b8 100644 --- a/creator-keys/tests/transfer_keys.rs +++ b/creator-keys/tests/transfer_keys.rs @@ -23,6 +23,7 @@ fn test_transfer_keys_sender_balance_decreases() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -53,6 +54,7 @@ fn test_transfer_keys_recipient_balance_increases() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); @@ -81,6 +83,7 @@ fn test_transfer_keys_total_supply_unchanged() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -108,6 +111,7 @@ fn test_transfer_keys_buy_quote_unchanged_after_transfer() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -142,6 +146,7 @@ fn test_transfer_keys_sell_quote_unchanged_after_transfer() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -172,6 +177,7 @@ fn test_transfer_keys_holder_count_unaffected_when_sender_zero_but_recipient_new &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); @@ -207,6 +213,7 @@ fn test_transfer_keys_holder_count_increments_when_recipient_new() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender_a, &100, &None); client.buy_key(&creator, &sender_b, &100, &None); @@ -239,6 +246,7 @@ fn test_transfer_keys_self_transfer_reverts() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); @@ -266,6 +274,7 @@ fn test_transfer_keys_zero_amount_reverts() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); @@ -293,6 +302,7 @@ fn test_transfer_keys_exceeding_balance_reverts() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); @@ -336,6 +346,7 @@ fn test_transfer_keys_self_transfer_sender_balance_unchanged() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -370,6 +381,7 @@ fn test_transfer_keys_self_transfer_total_supply_unchanged() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &sender, &100, &None); @@ -406,6 +418,7 @@ fn test_transfer_keys_preserves_other_holders() { &None, &None, &None, + &None, ); client.buy_key(&creator, &sender, &100, &None); client.buy_key(&creator, &bystander, &100, &None); diff --git a/creator-keys/tests/transfer_keys_dividend_preservation.rs b/creator-keys/tests/transfer_keys_dividend_preservation.rs index 0dd8d29..745b521 100644 --- a/creator-keys/tests/transfer_keys_dividend_preservation.rs +++ b/creator-keys/tests/transfer_keys_dividend_preservation.rs @@ -26,6 +26,7 @@ fn test_transfer_keys_preserves_claimable_dividends() { &None, &None, &Some(CurvePreset::Flat), + &None, ); let wallet_a = Address::generate(&env); diff --git a/creator-keys/tests/whitelist_window.rs b/creator-keys/tests/whitelist_window.rs new file mode 100644 index 0000000..cd34519 --- /dev/null +++ b/creator-keys/tests/whitelist_window.rs @@ -0,0 +1,152 @@ +mod contract_test_env; + +use contract_test_env::{ + compute_expected_buy_price, register_creator_keys, set_key_price_for_tests, test_env_with_auths, +}; +use creator_keys::{ContractError, WhitelistConfig, MAX_WHITELIST_SIZE}; +use soroban_sdk::{ + testutils::{Address as _, Ledger}, + vec, Address, String, Vec, +}; + +fn register_whitelisted_creator( + env: &soroban_sdk::Env, + client: &creator_keys::CreatorKeysContractClient<'_>, + whitelist: Vec
, + window_ledgers: u32, +) -> Address { + let creator = Address::generate(env); + client.register_creator( + &creator, + &String::from_str(env, "alice"), + &None, + &None, + &None, + &Some(WhitelistConfig { + addresses: whitelist, + window_ledgers, + }), + ); + creator +} + +fn advance_ledgers(env: &soroban_sdk::Env, ledgers: u32) { + let mut ledger = env.ledger().get(); + ledger.sequence_number += ledgers; + env.ledger().set(ledger); +} + +#[test] +fn test_non_whitelisted_wallet_cannot_buy_during_window() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + set_key_price_for_tests(&env, &client, 100); + let approved = Address::generate(&env); + let creator = register_whitelisted_creator(&env, &client, vec![&env, approved], 10); + let buyer = Address::generate(&env); + + let result = client.try_buy_key(&creator, &buyer, &100, &None); + + assert_eq!(result, Err(Ok(ContractError::WhitelistOnly))); + assert_eq!(client.get_total_key_supply(&creator), 0); +} + +#[test] +fn test_whitelisted_wallet_can_buy_during_window() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + set_key_price_for_tests(&env, &client, 100); + let buyer = Address::generate(&env); + let creator = register_whitelisted_creator(&env, &client, vec![&env, buyer.clone()], 10); + + let supply = client.buy_key(&creator, &buyer, &100, &None); + + assert_eq!(supply, 1); + assert_eq!(client.get_key_balance(&creator, &buyer), 1); +} + +#[test] +fn test_anyone_can_buy_after_window_expires() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + set_key_price_for_tests(&env, &client, 100); + let approved = Address::generate(&env); + let creator = register_whitelisted_creator(&env, &client, vec![&env, approved], 5); + advance_ledgers(&env, 5); + let public_buyer = Address::generate(&env); + + let supply = client.buy_key(&creator, &public_buyer, &100, &None); + + assert_eq!(supply, 1); +} + +#[test] +fn test_get_whitelist_status_tracks_active_and_expired_state() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + let buyer = Address::generate(&env); + let registered_at = env.ledger().sequence(); + let creator = register_whitelisted_creator(&env, &client, vec![&env, buyer], 7); + + let active = client.get_whitelist_status(&creator); + assert!(active.active); + assert_eq!(active.expires_at_ledger, registered_at + 7); + assert_eq!(active.remaining_ledgers, 7); + + advance_ledgers(&env, 7); + let expired = client.get_whitelist_status(&creator); + assert!(!expired.active); + assert_eq!(expired.expires_at_ledger, registered_at + 7); + assert_eq!(expired.remaining_ledgers, 0); +} + +#[test] +fn test_whitelist_over_500_addresses_reverts_at_registration() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + let creator = Address::generate(&env); + let mut addresses = Vec::new(&env); + for _ in 0..=MAX_WHITELIST_SIZE { + addresses.push_back(Address::generate(&env)); + } + + let result = client.try_register_creator( + &creator, + &String::from_str(&env, "alice"), + &None, + &None, + &None, + &Some(WhitelistConfig { + addresses, + window_ledgers: 10, + }), + ); + + assert_eq!(result, Err(Ok(ContractError::WhitelistTooLarge))); + assert!(!client.is_creator_registered(&creator)); +} + +#[test] +fn test_none_whitelist_allows_public_buy_immediately() { + let env = test_env_with_auths(); + let (client, _) = register_creator_keys(&env); + set_key_price_for_tests(&env, &client, 100); + let creator = Address::generate(&env); + client.register_creator( + &creator, + &String::from_str(&env, "alice"), + &None, + &None, + &None, + &None, + ); + let buyer = Address::generate(&env); + + let quote = compute_expected_buy_price(0, 100); + let supply = client.buy_key(&creator, &buyer, "e, &None); + let status = client.get_whitelist_status(&creator); + + assert_eq!(supply, 1); + assert!(!status.active); + assert_eq!(status.remaining_ledgers, 0); +} From 2bbfbf459456fe3aa1b78f6ccfefb3a0583ae9b2 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 08:57:06 +0100 Subject: [PATCH 2/9] Fix formatting and cleanup in emergency_pause tests --- creator-keys/tests/emergency_pause.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/creator-keys/tests/emergency_pause.rs b/creator-keys/tests/emergency_pause.rs index e419423..517cfa5 100644 --- a/creator-keys/tests/emergency_pause.rs +++ b/creator-keys/tests/emergency_pause.rs @@ -205,10 +205,7 @@ fn test_pause_blocks_registration_not_reads() { &None, &None, &None, - &None, - - ); assert_eq!(result, Err(Ok(ContractError::ProtocolPaused))); @@ -220,6 +217,7 @@ fn test_pause_blocks_registration_not_reads() { // Unpause — creator_b registration must now succeed client.unpause(&admin); assert!(!client.get_is_paused()); + let _ = client .try_register_creator( &creator_b, @@ -227,9 +225,7 @@ fn test_pause_blocks_registration_not_reads() { &None, &None, &None, - &None, - ) .unwrap(); } From 14d4a92faff95bf560776ddfc52fe5e9a2725715 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 10:25:17 +0100 Subject: [PATCH 3/9] Fix governance poll registration tests --- creator-keys/tests/governance_polls.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/creator-keys/tests/governance_polls.rs b/creator-keys/tests/governance_polls.rs index cf5675f..ed65a67 100644 --- a/creator-keys/tests/governance_polls.rs +++ b/creator-keys/tests/governance_polls.rs @@ -26,6 +26,7 @@ fn creator_can_create_poll_and_view_empty_result() { &None, &None, &None, + &None, ); let question = String::from_str(&env, "Should we launch premium content?"); @@ -59,6 +60,7 @@ fn holder_vote_uses_liquid_key_balance_as_weight() { &None, &None, &None, + &None, ); let holder = Address::generate(&env); @@ -96,6 +98,7 @@ fn changing_vote_before_expiry_updates_tally() { &None, &None, &None, + &None, ); let holder = Address::generate(&env); @@ -136,6 +139,7 @@ fn vote_after_expiry_reverts_with_poll_expired() { &None, &None, &None, + &None, ); let holder = Address::generate(&env); @@ -173,6 +177,7 @@ fn non_holder_vote_reverts_with_not_a_holder() { &None, &None, &None, + &None, ); let non_holder = Address::generate(&env); @@ -204,6 +209,7 @@ fn invalid_vote_option_reverts() { &None, &None, &None, + &None, ); let holder = Address::generate(&env); From d81197c553a46a956c7a85e0ecda24b714071cab Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 14:00:45 +0100 Subject: [PATCH 4/9] Fix creator keys contract compilation --- creator-keys/src/lib.rs | 6 +++--- creator-keys/tests/treasury_withdrawal.rs | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index f823c15..3c1101f 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -76,8 +76,8 @@ pub enum ContractError { ZeroTransferAmount = 27, WhitelistOnly = 28, WhitelistTooLarge = 29, - InsufficientTreasuryBalance = 28, - BatchClaimExceedsLimit = 29, + InsufficientTreasuryBalance = 30, + BatchClaimExceedsLimit = 31, } pub mod fee { @@ -499,6 +499,7 @@ pub enum DataKey { CurveSlope, CurvePreset(Address), Whitelist(Address), + TreasuryBalance, } /// Immutable early-access whitelist configuration set at creator registration. @@ -516,7 +517,6 @@ pub struct WhitelistStatus { pub active: bool, pub expires_at_ledger: u32, pub remaining_ledgers: u32, - TreasuryBalance, } /// Time-locked key allocation for creator self-vesting. diff --git a/creator-keys/tests/treasury_withdrawal.rs b/creator-keys/tests/treasury_withdrawal.rs index cb9fec4..da6fcbb 100644 --- a/creator-keys/tests/treasury_withdrawal.rs +++ b/creator-keys/tests/treasury_withdrawal.rs @@ -37,6 +37,7 @@ fn buy_one_key(env: &Env, client: &CreatorKeysContractClient<'_>) -> i128 { &None, &None, &None, + &None, ); client.buy_key(&creator, &buyer, &100i128, &None); // 10% of 100 = 10 stroops @@ -73,6 +74,7 @@ fn get_treasury_balance_accumulates_across_multiple_buys() { &None, &None, &None, + &None, ); let buyer1 = Address::generate(&env); @@ -203,6 +205,7 @@ fn withdraw_treasury_multiple_partial_withdrawals_track_correctly() { &None, &None, &None, + &None, ); let buyer = Address::generate(&env); From 10233a8edf96b78a63a7a09f4efb705cf7114067 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 18:52:33 +0100 Subject: [PATCH 5/9] Document creator registration merge boundaries --- creator-keys/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index 3c1101f..0c8f0a1 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1225,6 +1225,8 @@ impl CreatorKeysContract { // Persist profile before event publication so indexers reading contract state // after this tx observe the same registration payload that was emitted. + // Keep the registration TTL and event emission in this block so merge conflict + // resolutions do not accidentally splice registration state writes into trading flows. env.storage().persistent().set(&key, &profile); // Set initial TTL for creator storage let extend_to = current_ledger + CREATOR_TTL_LEDGERS; From 977399d40a336997ed800da98f8709b25b441bd6 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Mon, 29 Jun 2026 20:13:08 +0100 Subject: [PATCH 6/9] Fix CI regression coverage --- creator-keys/src/lib.rs | 3 +- ...flat_curve_lower_than_linear_regression.rs | 46 +++++++++---------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index 0c8f0a1..ad2fcf6 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1226,7 +1226,8 @@ impl CreatorKeysContract { // Persist profile before event publication so indexers reading contract state // after this tx observe the same registration payload that was emitted. // Keep the registration TTL and event emission in this block so merge conflict - // resolutions do not accidentally splice registration state writes into trading flows. + // resolutions do not accidentally splice registration state writes into trading flows + // or leave the `register_creator` implementation with an unclosed delimiter. env.storage().persistent().set(&key, &profile); // Set initial TTL for creator storage let extend_to = current_ledger + CREATOR_TTL_LEDGERS; diff --git a/creator-keys/tests/flat_curve_lower_than_linear_regression.rs b/creator-keys/tests/flat_curve_lower_than_linear_regression.rs index eece476..5ddbf0f 100644 --- a/creator-keys/tests/flat_curve_lower_than_linear_regression.rs +++ b/creator-keys/tests/flat_curve_lower_than_linear_regression.rs @@ -14,45 +14,45 @@ use contract_test_env::{ register_creator_keys, register_test_creator, set_curve_slope, set_pricing_and_fees, test_env_with_auths, }; -use soroban_sdk::{testutils::Address as _, Address}; +use creator_keys::constants; +use soroban_sdk::Address; const KEY_PRICE: i128 = 1_000; const CREATOR_BPS: u32 = 9_000; const PROTOCOL_BPS: u32 = 1_000; const LINEAR_SLOPE: i128 = 1; -// Covers price + fees at any supply ≤ 10_000 with slope=1 (max price = 11_000) -const SAFE_PAYMENT: i128 = KEY_PRICE * 30; - -fn advance_supply_to( +fn set_registered_supply( + env: &soroban_sdk::Env, + contract_id: &Address, client: &creator_keys::CreatorKeysContractClient<'_>, creator: &Address, - buyer: &Address, target: u32, ) { - let current = client.get_total_key_supply(creator); - for _ in current..target { - client.buy_key(creator, buyer, &SAFE_PAYMENT, &None); - } + let mut profile = client.get_creator(creator); + profile.supply = target; + env.as_contract(contract_id, || { + env.storage() + .persistent() + .set(&constants::storage::creator(creator), &profile); + }); } #[test] fn test_flat_buy_price_lower_than_linear_at_supply_100() { let env = test_env_with_auths(); - let (client, _) = register_creator_keys(&env); + let (client, contract_id) = register_creator_keys(&env); set_pricing_and_fees(&env, &client, KEY_PRICE, CREATOR_BPS, PROTOCOL_BPS); - let buyer = Address::generate(&env); - // Flat curve: slope = 0 → price stays at KEY_PRICE regardless of supply set_curve_slope(&env, &client, 0); let creator_flat = register_test_creator(&env, &client, "flat"); - advance_supply_to(&client, &creator_flat, &buyer, 100); + set_registered_supply(&env, &contract_id, &client, &creator_flat, 100); let flat_quote = client.get_buy_quote(&creator_flat); // Linear curve: slope > 0 → price grows with supply set_curve_slope(&env, &client, LINEAR_SLOPE); let creator_linear = register_test_creator(&env, &client, "linear"); - advance_supply_to(&client, &creator_linear, &buyer, 100); + set_registered_supply(&env, &contract_id, &client, &creator_linear, 100); let linear_quote = client.get_buy_quote(&creator_linear); assert!( @@ -66,19 +66,17 @@ fn test_flat_buy_price_lower_than_linear_at_supply_100() { #[test] fn test_flat_buy_price_lower_than_linear_at_supply_1000() { let env = test_env_with_auths(); - let (client, _) = register_creator_keys(&env); + let (client, contract_id) = register_creator_keys(&env); set_pricing_and_fees(&env, &client, KEY_PRICE, CREATOR_BPS, PROTOCOL_BPS); - let buyer = Address::generate(&env); - set_curve_slope(&env, &client, 0); let creator_flat = register_test_creator(&env, &client, "flat"); - advance_supply_to(&client, &creator_flat, &buyer, 1000); + set_registered_supply(&env, &contract_id, &client, &creator_flat, 1000); let flat_quote = client.get_buy_quote(&creator_flat); set_curve_slope(&env, &client, LINEAR_SLOPE); let creator_linear = register_test_creator(&env, &client, "linear"); - advance_supply_to(&client, &creator_linear, &buyer, 1000); + set_registered_supply(&env, &contract_id, &client, &creator_linear, 1000); let linear_quote = client.get_buy_quote(&creator_linear); assert!( @@ -92,19 +90,17 @@ fn test_flat_buy_price_lower_than_linear_at_supply_1000() { #[test] fn test_flat_buy_price_lower_than_linear_at_supply_10000() { let env = test_env_with_auths(); - let (client, _) = register_creator_keys(&env); + let (client, contract_id) = register_creator_keys(&env); set_pricing_and_fees(&env, &client, KEY_PRICE, CREATOR_BPS, PROTOCOL_BPS); - let buyer = Address::generate(&env); - set_curve_slope(&env, &client, 0); let creator_flat = register_test_creator(&env, &client, "flat"); - advance_supply_to(&client, &creator_flat, &buyer, 10_000); + set_registered_supply(&env, &contract_id, &client, &creator_flat, 10_000); let flat_quote = client.get_buy_quote(&creator_flat); set_curve_slope(&env, &client, LINEAR_SLOPE); let creator_linear = register_test_creator(&env, &client, "linear"); - advance_supply_to(&client, &creator_linear, &buyer, 10_000); + set_registered_supply(&env, &contract_id, &client, &creator_linear, 10_000); let linear_quote = client.get_buy_quote(&creator_linear); assert!( From 4ef5ea04517d1854350d76f37646c8e714a6bc68 Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Tue, 30 Jun 2026 05:31:34 +0100 Subject: [PATCH 7/9] Stabilize creator registration TTL handling --- creator-keys/src/lib.rs | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index ad2fcf6..3f4e253 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1054,6 +1054,27 @@ fn assert_whitelist_buy_allowed( Err(ContractError::WhitelistOnly) } +fn extend_creator_registration_ttl( + env: &Env, + creator_key: &DataKey, + preset_key: &DataKey, + whitelist_key: &DataKey, + current_ledger: u32, +) { + let extend_to = current_ledger + CREATOR_TTL_LEDGERS; + env.storage() + .persistent() + .extend_ttl(creator_key, current_ledger, extend_to); + env.storage() + .persistent() + .extend_ttl(preset_key, current_ledger, extend_to); + if env.storage().persistent().has(whitelist_key) { + env.storage() + .persistent() + .extend_ttl(whitelist_key, current_ledger, extend_to); + } +} + fn extend_creator_ttl(env: &Env, creator: &Address) { let current_ledger = env.ledger().sequence(); let extend_to = current_ledger + CREATOR_TTL_LEDGERS; @@ -1225,23 +1246,8 @@ impl CreatorKeysContract { // Persist profile before event publication so indexers reading contract state // after this tx observe the same registration payload that was emitted. - // Keep the registration TTL and event emission in this block so merge conflict - // resolutions do not accidentally splice registration state writes into trading flows - // or leave the `register_creator` implementation with an unclosed delimiter. env.storage().persistent().set(&key, &profile); - // Set initial TTL for creator storage - let extend_to = current_ledger + CREATOR_TTL_LEDGERS; - env.storage() - .persistent() - .extend_ttl(&key, current_ledger, extend_to); - env.storage() - .persistent() - .extend_ttl(&preset_key, current_ledger, extend_to); - if env.storage().persistent().has(&whitelist_key) { - env.storage() - .persistent() - .extend_ttl(&whitelist_key, current_ledger, extend_to); - } + extend_creator_registration_ttl(&env, &key, &preset_key, &whitelist_key, current_ledger); env.events().publish( events::register_event_topics(&profile.creator), From be000b206bbd19118d0f17d987639c3981567a3d Mon Sep 17 00:00:00 2001 From: Okoli Johnpaul Sochimaobi <132228270+Johnpii1@users.noreply.github.com> Date: Tue, 30 Jun 2026 06:06:59 +0100 Subject: [PATCH 8/9] Document registration TTL delimiter guard --- creator-keys/src/lib.rs | 43 ++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index ad2fcf6..cbbdee7 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1054,6 +1054,32 @@ fn assert_whitelist_buy_allowed( Err(ContractError::WhitelistOnly) } +/// Extends all storage entries written during creator registration in one place. +/// +/// Keeping this outside `register_creator` avoids another nested storage block in +/// the registration method, which makes delimiter issues easier to spot during +/// merge conflict resolution and keeps `cargo fmt --all -- --check` reliable. +fn extend_creator_registration_ttl( + env: &Env, + creator_key: &DataKey, + preset_key: &DataKey, + whitelist_key: &DataKey, + current_ledger: u32, +) { + let extend_to = current_ledger + CREATOR_TTL_LEDGERS; + env.storage() + .persistent() + .extend_ttl(creator_key, current_ledger, extend_to); + env.storage() + .persistent() + .extend_ttl(preset_key, current_ledger, extend_to); + if env.storage().persistent().has(whitelist_key) { + env.storage() + .persistent() + .extend_ttl(whitelist_key, current_ledger, extend_to); + } +} + fn extend_creator_ttl(env: &Env, creator: &Address) { let current_ledger = env.ledger().sequence(); let extend_to = current_ledger + CREATOR_TTL_LEDGERS; @@ -1225,23 +1251,8 @@ impl CreatorKeysContract { // Persist profile before event publication so indexers reading contract state // after this tx observe the same registration payload that was emitted. - // Keep the registration TTL and event emission in this block so merge conflict - // resolutions do not accidentally splice registration state writes into trading flows - // or leave the `register_creator` implementation with an unclosed delimiter. env.storage().persistent().set(&key, &profile); - // Set initial TTL for creator storage - let extend_to = current_ledger + CREATOR_TTL_LEDGERS; - env.storage() - .persistent() - .extend_ttl(&key, current_ledger, extend_to); - env.storage() - .persistent() - .extend_ttl(&preset_key, current_ledger, extend_to); - if env.storage().persistent().has(&whitelist_key) { - env.storage() - .persistent() - .extend_ttl(&whitelist_key, current_ledger, extend_to); - } + extend_creator_registration_ttl(&env, &key, &preset_key, &whitelist_key, current_ledger); env.events().publish( events::register_event_topics(&profile.creator), From dffbcd3d47f824d2b154c77eff4bf844cf105881 Mon Sep 17 00:00:00 2001 From: Johnpii1 Date: Tue, 30 Jun 2026 08:47:45 +0100 Subject: [PATCH 9/9] fixed build error --- creator-keys/src/lib.rs | 148 +--------------------------------------- 1 file changed, 2 insertions(+), 146 deletions(-) diff --git a/creator-keys/src/lib.rs b/creator-keys/src/lib.rs index 2b3be76..a50d994 100644 --- a/creator-keys/src/lib.rs +++ b/creator-keys/src/lib.rs @@ -1,7 +1,7 @@ #![no_std] pub mod quote_view_errors; -use soroban_sdk::{contract, contracterror, contractimpl, contracttype, Address, Env, String, Vec}; +use soroban_sdk::{contract, contracterror, contractimpl, contracttype, Address, Env, String}; pub mod events; @@ -74,14 +74,9 @@ pub enum ContractError { InsufficientSupply = 25, SelfTransfer = 26, ZeroTransferAmount = 27, - WhitelistOnly = 28, - WhitelistTooLarge = 29, - InsufficientTreasuryBalance = 30, - BatchClaimExceedsLimit = 31, InsufficientTreasuryBalance = 28, BatchClaimExceedsLimit = 29, InvalidCoCreatorShare = 30, - } pub mod fee { @@ -345,10 +340,6 @@ pub mod constants { pub fn max_supply(creator: &Address) -> DataKey { DataKey::MaxSupply(creator.clone()) } - - pub fn whitelist(creator: &Address) -> DataKey { - DataKey::Whitelist(creator.clone()) - } } fn creator_key(creator: &Address) -> DataKey { @@ -490,7 +481,6 @@ pub const KEY_DECIMALS: u32 = 7; pub const CREATOR_TTL_LEDGERS: u32 = 6311520; // ~2 years at 5s per ledger pub const HANDLE_LEN_MIN: u32 = 3; pub const HANDLE_LEN_MAX: u32 = 32; -pub const MAX_WHITELIST_SIZE: u32 = 500; #[derive(Clone, Copy, Debug, Eq, PartialEq)] #[contracttype] @@ -525,29 +515,11 @@ pub enum DataKey { MaxSupply(Address), CurveSlope, CurvePreset(Address), - Whitelist(Address), TreasuryBalance, CoCreator(Address), CoCreatorFeeBalance(Address, Address), } -/// Immutable early-access whitelist configuration set at creator registration. -#[derive(Clone, Debug, PartialEq)] -#[contracttype] -pub struct WhitelistConfig { - pub addresses: Vec
, - pub window_ledgers: u32, -} - -/// Read-only whitelist window status for a creator. -#[derive(Clone, Debug, PartialEq)] -#[contracttype] -pub struct WhitelistStatus { - pub active: bool, - pub expires_at_ledger: u32, - pub remaining_ledgers: u32, -} - /// Time-locked key allocation for creator self-vesting. /// /// When a creator registers, they may optionally lock a portion of keys @@ -1122,69 +1094,6 @@ fn compute_claimable_dividend(env: &Env, creator: &Address, holder: &Address) -> /// This function extends the TTL of the creator's primary storage entries /// to prevent active creator state from expiring. Called after successful /// buy and sell operations. -fn read_whitelist_config(env: &Env, creator: &Address) -> Option { - env.storage() - .persistent() - .get(&constants::storage::whitelist(creator)) -} - -fn whitelist_expires_at(profile: &CreatorProfile, config: &WhitelistConfig) -> Option { - profile.registered_at.checked_add(config.window_ledgers) -} - -fn is_whitelist_window_active( - env: &Env, - profile: &CreatorProfile, - config: &WhitelistConfig, -) -> bool { - if config.window_ledgers == 0 { - return false; - } - whitelist_expires_at(profile, config) - .map(|expires_at| env.ledger().sequence() < expires_at) - .unwrap_or(false) -} - -fn assert_whitelist_buy_allowed( - env: &Env, - profile: &CreatorProfile, - buyer: &Address, -) -> Result<(), ContractError> { - let Some(config) = read_whitelist_config(env, &profile.creator) else { - return Ok(()); - }; - if !is_whitelist_window_active(env, profile, &config) { - return Ok(()); - } - for address in config.addresses.iter() { - if address == *buyer { - return Ok(()); - } - } - Err(ContractError::WhitelistOnly) -} - -fn extend_creator_registration_ttl( - env: &Env, - creator_key: &DataKey, - preset_key: &DataKey, - whitelist_key: &DataKey, - current_ledger: u32, -) { - let extend_to = current_ledger + CREATOR_TTL_LEDGERS; - env.storage() - .persistent() - .extend_ttl(creator_key, current_ledger, extend_to); - env.storage() - .persistent() - .extend_ttl(preset_key, current_ledger, extend_to); - if env.storage().persistent().has(whitelist_key) { - env.storage() - .persistent() - .extend_ttl(whitelist_key, current_ledger, extend_to); - } -} - fn extend_creator_ttl(env: &Env, creator: &Address) { let current_ledger = env.ledger().sequence(); let extend_to = current_ledger + CREATOR_TTL_LEDGERS; @@ -1223,13 +1132,6 @@ fn extend_creator_ttl(env: &Env, creator: &Address) { .extend_ttl(&max_supply_key, threshold, extend_to); } - let whitelist_key = constants::storage::whitelist(creator); - if env.storage().persistent().has(&whitelist_key) { - env.storage() - .persistent() - .extend_ttl(&whitelist_key, threshold, extend_to); - } - let curve_preset_key = constants::storage::curve_preset(creator); if env.storage().persistent().has(&curve_preset_key) { env.storage() @@ -1277,7 +1179,6 @@ impl CreatorKeysContract { /// - `locked_allocation`: optional time-locked key allocation for creator self-vesting. /// If provided, `unlock_ledger` must be strictly greater than current ledger. /// - `max_supply`: optional maximum supply cap. If provided, must be greater than zero. - /// - `whitelist_window`: optional immutable early-access address list and ledger duration. /// - `co_creator`: optional immutable collaborator split. If provided, `share_bps` /// must be in the inclusive range `1..=9999`. pub fn register_creator( @@ -1287,9 +1188,7 @@ impl CreatorKeysContract { locked_allocation: Option, max_supply: Option, curve_preset: Option, - whitelist_window: Option, co_creator: Option, - ) -> Result<(), ContractError> { creator.require_auth(); assert_not_paused(&env)?; @@ -1352,15 +1251,6 @@ impl CreatorKeysContract { .set(&constants::storage::max_supply(&creator), &cap); } - // Handle immutable whitelist window - let whitelist_key = constants::storage::whitelist(&creator); - if let Some(config) = whitelist_window { - if config.addresses.len() > MAX_WHITELIST_SIZE { - return Err(ContractError::WhitelistTooLarge); - } - env.storage().persistent().set(&whitelist_key, &config); - } - // Handle curve preset let preset = curve_preset.unwrap_or(CurvePreset::Linear); let preset_key = constants::storage::curve_preset(&creator); @@ -1389,8 +1279,6 @@ impl CreatorKeysContract { // Persist profile before event publication so indexers reading contract state // after this tx observe the same registration payload that was emitted. env.storage().persistent().set(&key, &profile); - extend_creator_registration_ttl(&env, &key, &preset_key, &whitelist_key, current_ledger); - // Set initial TTL for creator storage let extend_to = current_ledger + CREATOR_TTL_LEDGERS; env.storage() @@ -1406,8 +1294,6 @@ impl CreatorKeysContract { .extend_ttl(&co_creator_key, current_ledger, extend_to); } - - env.events().publish( events::register_event_topics(&profile.creator), events::CreatorRegisteredEvent { @@ -1446,7 +1332,6 @@ impl CreatorKeysContract { let mut profile: CreatorProfile = read_registered_creator_profile(&env, &creator)?; let price = compute_bonding_curve_price(&env, &creator, base_price, profile.supply)?; - assert_whitelist_buy_allowed(&env, &profile, &buyer)?; assert_buy_price_slippage(price, max_price)?; if payment < price { @@ -1734,35 +1619,6 @@ impl CreatorKeysContract { read_registered_creator_profile(&env, &creator) } - /// Read-only view: returns whitelist window status for a registered creator. - pub fn get_whitelist_status( - env: Env, - creator: Address, - ) -> Result { - let profile = read_registered_creator_profile(&env, &creator)?; - let Some(config) = read_whitelist_config(&env, &creator) else { - return Ok(WhitelistStatus { - active: false, - expires_at_ledger: profile.registered_at, - remaining_ledgers: 0, - }); - }; - let expires_at_ledger = - whitelist_expires_at(&profile, &config).ok_or(ContractError::Overflow)?; - let current = env.ledger().sequence(); - let active = config.window_ledgers > 0 && current < expires_at_ledger; - let remaining_ledgers = if active { - expires_at_ledger - current - } else { - 0 - }; - Ok(WhitelistStatus { - active, - expires_at_ledger, - remaining_ledgers, - }) - } - /// Read-only view: returns stable creator details. /// /// Returns a [`CreatorDetailsView`] regardless of registration status. @@ -3245,4 +3101,4 @@ mod tests { } #[cfg(test)] -mod test_issues; +mod test_issues; \ No newline at end of file