Merge branch 'feat/max-buy-quantity-per-tx-828' of https://github.com/dedukpe/accesslayer-contracts into feat/max-buy-quantity-per-tx-828

# Conflicts:
#	creator-keys/src/lib.rs
#	creator-keys/test_snapshots/test_sell_slippage_succeeds_when_proceeds_meet_or_exceed_min_proceeds.1.json

Author: dedukpe

creator-keys/src/events.rs

@@ -32,9 +32,61 @@ use soroban_sdk::{
 /// Event name for protocol trade fee collected on a buy or sell.
 pub const FEE_COLLECTED_EVENT_NAME: Symbol = symbol_short!("fee_coll");
 
+/// Stable fee collection event payload for downstream indexers.
+///
+/// Event shape:
+/// - topics: `(FEE_COLLECTED_EVENT_NAME, treasury)`
+/// - data: `FeeCollectedEvent`
+///
+/// Emitted on every buy and sell once the protocol trade fee is configured,
+/// carrying the deducted amount and the treasury address that received it.
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[contracttype]
+pub struct FeeCollectedEvent {
+    /// Treasury address that received the fee.
+    pub treasury: Address,
+    /// Fee amount deducted from the trade.
+    pub amount: i128,
+    /// Ledger sequence number at the time of the trade.
+    pub ledger: u32,
+}
+
+/// Shared fee collected event topics tuple.
+pub fn fee_collected_topics(treasury: &Address) -> (Symbol, Address) {
+    (FEE_COLLECTED_EVENT_NAME, treasury.clone())
+}
+
 /// Event name for a sell rejected by the anti-flash-trade lockup window.
 pub const LOCKUP_BLOCKED_EVENT_NAME: Symbol = symbol_short!("lck_blk");
 
+/// Stable lockup-blocked event payload for downstream indexers.
+///
+/// Event shape:
+/// - topics: `(LOCKUP_BLOCKED_EVENT_NAME, creator_id, seller)`
+/// - data: `LockupBlockedEvent`
+///
+/// Emitted when a sell is rejected because the seller's most recent buy for
+/// this creator falls inside the configured lockup window.
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[contracttype]
+pub struct LockupBlockedEvent {
+    /// Creator whose keys the seller attempted to sell.
+    pub creator_id: Address,
+    /// Seller whose sale was rejected.
+    pub seller: Address,
+    /// Ledger timestamp of the seller's most recent buy.
+    pub last_buy_timestamp: u64,
+    /// Timestamp at which the lockup expires (exclusive).
+    pub unlock_at: u64,
+    /// Ledger timestamp at rejection.
+    pub current_timestamp: u64,
+}
+
+/// Shared lockup blocked event topics tuple.
+pub fn lockup_blocked_topics(creator: &Address, seller: &Address) -> (Symbol, Address, Address) {
+    (LOCKUP_BLOCKED_EVENT_NAME, creator.clone(), seller.clone())
+}
+
 /// Event name for quorum threshold update.
 pub const QUORUM_UPDATED_EVENT_NAME: Symbol = symbol_short!("qrm_upd");
 
@@ -1237,57 +1289,48 @@ pub struct RoyaltyUpdatedEvent {
 pub fn royalty_updated_topics(creator: &Address) -> (Symbol, Address) {
     (ROYALTY_UPDATED_EVENT_NAME, creator.clone())
 }
-/// Stable fee collection event payload for downstream indexers.
-///
-/// Event shape:
-/// - topics: `(FEE_COLLECTED_EVENT_NAME, treasury)`
-/// - data: `FeeCollectedEvent`
-///
-/// Emitted on every buy and sell once the protocol trade fee is configured,
-/// carrying the deducted amount and the treasury address that received it.
+
+// --- Auction events ---
+
+/// Event name for auction purchase.
+pub const AUCTION_PURCHASE_EVENT_NAME: Symbol = symbol_short!("auc_buy");
+
+/// Stable auction purchase event payload.
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[contracttype]
-pub struct FeeCollectedEvent {
-    /// Treasury address that received the fee.
-    pub treasury: Address,
-    /// Fee amount deducted from the trade.
-    pub amount: i128,
-    /// Ledger sequence number at the time of the trade.
+pub struct AuctionPurchaseEvent {
+    pub buyer: Address,
+    pub creator_id: Address,
+    pub quantity: u32,
+    pub price_paid: i128,
+    pub new_supply: u32,
+    pub auction_sold: u32,
     pub ledger: u32,
 }
 
-/// Shared fee collected event topics tuple.
-pub fn fee_collected_topics(treasury: &Address) -> (Symbol, Address) {
-    (FEE_COLLECTED_EVENT_NAME, treasury.clone())
+/// Shared auction purchase event topics tuple.
+pub fn auction_purchase_topics(creator: &Address, buyer: &Address) -> (Symbol, Address, Address) {
+    (AUCTION_PURCHASE_EVENT_NAME, creator.clone(), buyer.clone())
 }
 
-/// Stable lockup-blocked event payload for downstream indexers.
-///
-/// Event shape:
-/// - topics: `(LOCKUP_BLOCKED_EVENT_NAME, creator_id, seller)`
-/// - data: `LockupBlockedEvent`
-///
-/// Emitted when a sell is rejected because the seller's most recent buy for
-/// this creator falls inside the configured lockup window.
+/// Event name for auction configured.
+pub const AUCTION_CONFIGURED_EVENT_NAME: Symbol = symbol_short!("auc_cfg");
+
+/// Stable auction configured event payload.
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[contracttype]
-pub struct LockupBlockedEvent {
-    /// Creator whose keys the seller attempted to sell.
+pub struct AuctionConfiguredEvent {
     pub creator_id: Address,
-    /// Seller whose sale was rejected.
-    pub seller: Address,
-    /// Ledger timestamp of the seller's most recent buy.
-    pub last_buy_timestamp: u64,
-    /// Timestamp at which the lockup expires (exclusive).
-    pub unlock_at: u64,
-    /// Ledger timestamp at rejection.
-    pub current_timestamp: u64,
+    pub auction_supply: u32,
+    pub auction_price: i128,
+    pub ledger: u32,
 }
 
-/// Shared lockup blocked event topics tuple.
-pub fn lockup_blocked_topics(creator: &Address, seller: &Address) -> (Symbol, Address, Address) {
-    (LOCKUP_BLOCKED_EVENT_NAME, creator.clone(), seller.clone())
+/// Shared auction configured event topics tuple.
+pub fn auction_configured_topics(creator: &Address) -> (Symbol, Address) {
+    (AUCTION_CONFIGURED_EVENT_NAME, creator.clone())
 }
+
 /// Event name for a new staking position created via `stake_keys_locked`.
 pub const STAKE_EVENT_NAME: Symbol = symbol_short!("stake");
 
@@ -1525,33 +1568,6 @@ pub fn cooldown_blocked_topics(creator: &Address, wallet: &Address) -> (Symbol,
     (COOLDOWN_BLOCKED_EVENT_NAME, creator.clone(), wallet.clone())
 }
 
-// ============================================================================
-// Pre-launch auction (#FeatureError)
-// ============================================================================
-
-/// Event name for a key purchased during a pre-launch auction.
-pub const AUCTION_PURCHASE_EVENT_NAME: Symbol = symbol_short!("auc_buy");
-
-/// Stable auction purchase event payload for downstream indexers.
-///
-/// Emitted inside `buy_key` when the purchase is fulfilled at the fixed
-/// auction price rather than the bonding curve price.
-#[derive(Clone, Debug, Eq, PartialEq)]
-#[contracttype]
-pub struct AuctionPurchaseEvent {
-    pub buyer: Address,
-    pub creator_id: Address,
-    pub quantity: u32,
-    pub price_paid: i128,
-    pub new_supply: u32,
-    pub auction_sold: u32,
-    pub ledger: u32,
-}
-
-/// Shared auction purchase event topics tuple.
-pub fn auction_purchase_topics(creator: &Address, buyer: &Address) -> (Symbol, Address, Address) {
-    (AUCTION_PURCHASE_EVENT_NAME, creator.clone(), buyer.clone())
-}
 // ============================================================================
 // Co-creator removal (#791)
 // ============================================================================
@@ -1616,32 +1632,6 @@ pub fn dividend_reinvested_topics(
 // Pre-launch auction configuration (#790)
 // ============================================================================
 
-/// Event name for an auction being configured.
-pub const AUCTION_CONFIGURED_EVENT_NAME: Symbol = symbol_short!("auc_cfg");
-
-/// Stable auction configured event payload for downstream indexers.
-///
-/// Event shape:
-/// - topics: `(AUCTION_CONFIGURED_EVENT_NAME, creator_id)`
-/// - data: `AuctionConfiguredEvent`
-///
-/// Emitted inside `configure_auction` when a creator sets up a pre-launch auction.
-#[derive(Clone, Debug, Eq, PartialEq)]
-#[contracttype]
-pub struct AuctionConfiguredEvent {
-    /// Address of the creator configuring the auction.
-    pub creator_id: Address,
-    /// Fixed price per key during the auction.
-    pub auction_price: i128,
-    /// Number of keys available in the auction.
-    pub auction_supply: u32,
-}
-
-/// Shared auction configured event topics tuple.
-pub fn auction_configured_topics(creator: &Address) -> (Symbol, Address) {
-    (AUCTION_CONFIGURED_EVENT_NAME, creator.clone())
-}
-
 /// Event name for an auction being cancelled.
 pub const AUCTION_CANCELLED_EVENT_NAME: Symbol = symbol_short!("auc_cxl");
 

creator-keys/src/lib.rs

@@ -2995,7 +2995,7 @@ impl CreatorKeysContract {
 
             if total_price
                 .checked_add(key_price)
-                .map_or(true, |t| t > payment)
+                .is_none_or(|t| t > payment)
             {
                 break;
             }
@@ -3543,6 +3543,15 @@ impl CreatorKeysContract {
         Ok(profile.supply)
     }
 
+    /// Purchase multiple keys in a single transaction.
+    ///
+    /// The buyer pays `payment` (total across all keys) and receives `quantity`
+    /// keys. Each key is priced along the bonding curve (or at the auction
+    /// price when in auction phase), and all per-key side-effects (fees,
+    /// dividends, TTL extension, events) are applied per key.
+    ///
+    /// # Limits
+    ///
     /// Validates that `client_schema_version` is compatible with this deployment.
     ///
     /// Returns `Ok(())` when the version matches the contract's current schema.
@@ -4845,6 +4854,7 @@ impl CreatorKeysContract {
                 creator_id: creator,
                 auction_price,
                 auction_supply,
+                ledger: env.ledger().sequence(),
             },
         );
         Ok(())