Merge pull request #719 from boseshittu2323-design/fix/nft-contract-corrupted-merge

fix(nft-contract): repair corrupted merges in lib.rs and storage.rs

Author: Eniola3321

contracts/nft-contract/src/lib.rs

@@ -82,6 +82,9 @@ pub enum Error {
     /// The asset contract address is not on the admin-approved allow-list.
     UnsupportedAsset = 9,
     /// Provided WASM hash is all zeros — cannot upgrade to a no-op contract.
+    InvalidWasmHash = 19,
+    /// Clip signature verification failed — caller is not the clip owner.
+    InvalidSignature = 20,
     InvalidWasmHash = 10,
     /// Clip signature verification failed — caller is not the clip owner.
     InvalidSignature = 11,
@@ -109,7 +112,7 @@ pub enum Error {
     /// XLM token SAC address has not been configured (Issue #676).
     XlmTokenNotConfigured = 18,
     /// No royalties have accrued yet — nothing to claim.
-    InsufficientBalance = 15,
+    InsufficientBalance = 21,
 }
 
 #[contractimpl]
@@ -757,10 +760,16 @@ impl ClipsNftContract {
         let admin = storage::get_admin(&env).ok_or(Error::NotInitialized)?;
         admin.require_auth();
 
+        if bps > storage::ROYALTY_BPS_MAX {
+            return Err(Error::InvalidRoyaltyBps);
+        }
+
         storage::set_platform_fee(&env, &recipient, bps);
         Ok(())
     }
 
+    /// Record a royalty payment made off-chain (in stroops) for `token_id`,
+    /// emitting a `royalty_paid` event for indexers.
     /// Record the royalty payment owed on `token_id`. Emits `royalty_paid`
     /// with the amount in stroops. `payer` must authorize the call.
     pub fn pay_royalty(
@@ -787,6 +796,22 @@ impl ClipsNftContract {
         Ok(())
     }
 
+    pub fn set_token_royalty_bps(env: Env, token_id: u64, bps: u32) -> Result<(), Error> {
+        let admin = storage::get_admin(&env).ok_or(Error::NotInitialized)?;
+        admin.require_auth();
+
+        if !storage::has_token(&env, token_id) {
+            return Err(Error::TokenNotFound);
+        }
+
+        if bps > storage::ROYALTY_BPS_MAX {
+            return Err(Error::InvalidRoyaltyBps);
+        }
+
+        storage::set_token_royalty_bps(&env, token_id, bps);
+        Ok(())
+    }
+
     /// Return the currently configured default platform recipient + fee, if any.
     pub fn get_default_platform_fee(env: Env) -> Option<(Address, u32)> {
         storage::get_platform_fee(&env)
@@ -1038,6 +1063,8 @@ impl ClipsNftContract {
         admin.require_auth();
         storage::set_xlm_token_address(&env, &xlm_token);
         Ok(())
+    }
+
     /// Return a paginated slice of token IDs owned by `owner`.
     ///
     /// `limit`  – maximum number of token IDs to return (capped at 100).
@@ -1057,6 +1084,8 @@ impl ClipsNftContract {
             i += 1;
         }
         result
+    }
+
     /// Accumulate royalties for a token.  Called after each royalty payment so
     /// that the owed balance grows until the creator calls `claim_royalties`.
     ///

contracts/nft-contract/src/storage.rs

@@ -227,24 +227,6 @@ pub fn is_approved_for_all(env: &Env, owner: &Address, operator: &Address) -> bo
 }
 
 // ── Default royalty BPS ──────────────────────────────────────────────────────
-// ── Issue #675: Operator approvals ─────────────────────────────────────────
-
-/// Set operator approval for all tokens owned by `owner`.
-/// Allows `operator` to transfer any of owner's NFTs via `transfer_from`.
-pub fn set_approval_for_all(env: &Env, owner: &Address, operator: &Address, approved: bool) {
-    let key = (Symbol::new(env, "op_appr"), owner.clone(), operator.clone());
-    if approved {
-        env.storage().persistent().set(&key, &true);
-    } else {
-        env.storage().persistent().remove(&key);
-    }
-}
-
-/// Check whether `operator` is approved to manage all of `owner`'s NFTs.
-pub fn is_approved_for_all(env: &Env, owner: &Address, operator: &Address) -> bool {
-    let key = (Symbol::new(env, "op_appr"), owner.clone(), operator.clone());
-    env.storage().persistent().get(&key).unwrap_or(false)
-}
 
 pub fn set_default_royalty_bps(env: &Env, bps: u32) {
     env.storage()
@@ -537,48 +519,6 @@ pub fn get_xlm_token_address(env: &Env) -> Option<Address> {
         .get(&Symbol::new(env, XLM_TOKEN_KEY))
 }
 
-// ── Issue #676: Emergency withdraw timelock ─────────────────────────────────
-
-/// 24 hours expressed in seconds.
-pub const WITHDRAW_TIMELOCK_SECS: u64 = 86_400;
-
-const WITHDRAW_UNLOCK_KEY: &str = "wdraw_unlock";
-const XLM_TOKEN_KEY: &str = "xlm_token";
-
-/// Persist the timestamp after which `withdraw_xlm` may execute.
-pub fn set_withdraw_unlock_time(env: &Env, unlock_time: u64) {
-    env.storage()
-        .instance()
-        .set(&Symbol::new(env, WITHDRAW_UNLOCK_KEY), &unlock_time);
-}
-
-/// Retrieve the pending unlock timestamp, or `None` when not initiated.
-pub fn get_withdraw_unlock_time(env: &Env) -> Option<u64> {
-    env.storage()
-        .instance()
-        .get(&Symbol::new(env, WITHDRAW_UNLOCK_KEY))
-}
-
-/// Clear the timelock after a successful withdrawal so it cannot be
-/// re-used without a fresh `initiate_withdraw` call.
-pub fn clear_withdraw_unlock_time(env: &Env) {
-    env.storage()
-        .instance()
-        .remove(&Symbol::new(env, WITHDRAW_UNLOCK_KEY));
-}
-
-/// Persist the XLM Stellar Asset Contract (SAC) address.
-pub fn set_xlm_token_address(env: &Env, address: &Address) {
-    env.storage()
-        .instance()
-        .set(&Symbol::new(env, XLM_TOKEN_KEY), address);
-}
-
-/// Retrieve the configured XLM SAC address.
-pub fn get_xlm_token_address(env: &Env) -> Option<Address> {
-    env.storage()
-        .instance()
-        .get(&Symbol::new(env, XLM_TOKEN_KEY))
 // ── Royalty accumulation and claiming ───────────────────────────────────────
 
 /// Store accumulated royalties for a token (amount owed to creator).

contracts/nft-contract/src/test.rs

@@ -25,6 +25,28 @@ fn s(env: &Env, v: &str) -> String {
     String::from_str(env, v)
 }
 
+/// Batch-mint `count` tokens (IDs `1..=count`) to `owner` and return the
+/// minted token IDs, for tests exercising pagination over a large collection.
+fn batch_mint_n(
+    env: &Env,
+    client: &ClipsNftContractClient<'static>,
+    owner: &Address,
+    count: u64,
+) -> Vec<u64> {
+    let mut token_ids = Vec::new(env);
+    let mut clip_ids = Vec::new(env);
+    let mut uris = Vec::new(env);
+    let mut soulbound = Vec::new(env);
+    for i in 1..=count {
+        token_ids.push_back(i);
+        clip_ids.push_back(s(env, "clip"));
+        uris.push_back(s(env, "uri"));
+        soulbound.push_back(false);
+    }
+    client.batch_mint(owner, &token_ids, &clip_ids, &uris, &soulbound);
+    token_ids
+}
+
 // ─────────────────────────────────────────────────────────────
 // Initialization
 // ─────────────────────────────────────────────────────────────
@@ -1440,9 +1462,7 @@ fn test_get_user_tokens_pagination_first_page() {
 
     for i in 1..=5 {
         let token_id = i;
-        let clip_id = format!("clip_{}", i);
-        let uri = format!("uri_{}", i);
-        client.mint(&owner, &token_id, &s(&env, &clip_id), &s(&env, &uri), &false);
+        client.mint(&owner, &token_id, &s(&env, "clip"), &s(&env, "uri"), &false);
     }
 
     let page1 = client.get_user_tokens(&owner, &2, &0);
@@ -1462,9 +1482,7 @@ fn test_get_user_tokens_pagination_second_page() {
 
     for i in 1..=5 {
         let token_id = i;
-        let clip_id = format!("clip_{}", i);
-        let uri = format!("uri_{}", i);
-        client.mint(&owner, &token_id, &s(&env, &clip_id), &s(&env, &uri), &false);
+        client.mint(&owner, &token_id, &s(&env, "clip"), &s(&env, "uri"), &false);
     }
 
     let page2 = client.get_user_tokens(&owner, &2, &2);
@@ -1484,9 +1502,7 @@ fn test_get_user_tokens_pagination_last_page_partial() {
 
     for i in 1..=5 {
         let token_id = i;
-        let clip_id = format!("clip_{}", i);
-        let uri = format!("uri_{}", i);
-        client.mint(&owner, &token_id, &s(&env, &clip_id), &s(&env, &uri), &false);
+        client.mint(&owner, &token_id, &s(&env, "clip"), &s(&env, "uri"), &false);
     }
 
     let last_page = client.get_user_tokens(&owner, &2, &4);
@@ -1520,9 +1536,7 @@ fn test_get_user_tokens_limit_exceeds_total() {
 
     for i in 1..=3 {
         let token_id = i;
-        let clip_id = format!("clip_{}", i);
-        let uri = format!("uri_{}", i);
-        client.mint(&owner, &token_id, &s(&env, &clip_id), &s(&env, &uri), &false);
+        client.mint(&owner, &token_id, &s(&env, "clip"), &s(&env, "uri"), &false);
     }
 
     let result = client.get_user_tokens(&owner, &100, &0);
@@ -1554,11 +1568,7 @@ fn test_get_user_tokens_limit_capped_at_100() {
     client.initialize(&admin);
 
     // Mint 50 tokens (batch limit is 50)
-    let token_ids: Vec<u64> = (1..=50).collect();
-    let clip_ids: Vec<String> = (1..=50).map(|i| String::from_str(&env, &format!("clip_{}", i))).collect();
-    let uris: Vec<String> = (1..=50).map(|i| String::from_str(&env, &format!("uri_{}", i))).collect();
-    let soulbound: Vec<bool> = (1..=50).map(|_| false).collect();
-    client.batch_mint(&owner, &token_ids, &clip_ids, &uris, &soulbound);
+    batch_mint_n(&env, &client, &owner, 50);
 
     // Request 200 (should be capped to 100, but only 50 exist)
     let result = client.get_user_tokens(&owner, &200, &0);
@@ -1575,11 +1585,7 @@ fn test_get_user_tokens_large_collection_multi_page() {
     client.initialize(&admin);
 
     // Mint 50 tokens via batch
-    let token_ids: Vec<u64> = (1..=50).collect();
-    let clip_ids: Vec<String> = (1..=50).map(|i| String::from_str(&env, &format!("clip_{}", i))).collect();
-    let uris: Vec<String> = (1..=50).map(|i| String::from_str(&env, &format!("uri_{}", i))).collect();
-    let soulbound: Vec<bool> = (1..=50).map(|_| false).collect();
-    client.batch_mint(&owner, &token_ids, &clip_ids, &uris, &soulbound);
+    batch_mint_n(&env, &client, &owner, 50);
 
     // Page 1
     let page1 = client.get_user_tokens(&owner, &20, &0);

src/clips/nft-mint.service.spec.ts

@@ -132,6 +132,7 @@ const royaltyConfigMock = {
   getCreatorRoyaltyBps: jest.fn().mockReturnValue(1000),
   getPlatformWallet: jest.fn().mockReturnValue('GDV76E6XN6A3Q3WXVZ4KPRQ7L6E6XN6A3Q3WXVZ4KPRQ7L6E6XN6'),
   buildRoyaltyMap: jest.fn(),
+  getRoyaltyAsset: jest.fn().mockReturnValue({ code: 'native' }),
 };
 
 describe('NftMintService.uploadMetadataToIPFS', () => {

src/clips/nft-mint.service.ts

@@ -577,6 +577,8 @@ export class NftMintService {
       ? 'CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA'
       : 'CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC';
   }
+
+  private buildMetadata(clip: {
     id: number;
     title: string | null;
     caption: string | null;

src/nft/nft-ownership.service.ts

@@ -147,6 +147,9 @@ export class NftOwnershipService {
       this.logger.error(`Failed to check token existence for token ${tokenId}`, error);
       return false;
     }
+  }
+
+  /**
    * Get a paginated slice of token IDs owned by a wallet address.
    *
    * Uses offset-based pagination: `cursor` is the 0-based index into the