Feat: Escrow Search/Indexing

Author: devchant

craft-nexus-contract/src/lib.rs

@@ -53,6 +53,14 @@ const DEFAULT_PLATFORM_FEE_BPS: u32 = 500;
 /// Maximum platform fee in basis points (10000 = 100%)
 const MAX_PLATFORM_FEE_BPS: u32 = 1000; // 10% max
 
+#[contracttype]
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum DataKey {
+    Escrow(u32),
+    BuyerEscrows(Address),
+    SellerEscrows(Address),
+}
+
 #[contracttype]
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum EscrowStatus {
@@ -277,11 +285,22 @@ impl EscrowContract {
             metadata_hash: metadata_hash.clone(),
         };
 
-        // Store escrow by order_id
         env.storage()
             .persistent()
             .set(&(ESCROW, order_id), &escrow);
 
+        // Update buyer's escrow list for indexing
+        let buyer_key = DataKey::BuyerEscrows(buyer.clone());
+        let mut buyer_escrows: soroban_sdk::Vec<u64> = env.storage().persistent().get(&buyer_key).unwrap_or(soroban_sdk::Vec::new(&env));
+        buyer_escrows.push_back(order_id as u64);
+        env.storage().persistent().set(&buyer_key, &buyer_escrows);
+
+        // Update seller's escrow list for indexing
+        let seller_key = DataKey::SellerEscrows(seller.clone());
+        let mut seller_escrows: soroban_sdk::Vec<u64> = env.storage().persistent().get(&seller_key).unwrap_or(soroban_sdk::Vec::new(&env));
+        seller_escrows.push_back(order_id as u64);
+        env.storage().persistent().set(&seller_key, &seller_escrows);
+
         // Transfer funds from buyer to contract
         let client = token::Client::new(&env, &token);
         client.transfer(&buyer, &env.current_contract_address(), &amount);
@@ -301,6 +320,50 @@ impl EscrowContract {
         escrow
     }
 
+    /// Get escrows for a specific buyer with pagination.
+    pub fn get_escrows_by_buyer(
+        env: Env,
+        buyer: Address,
+        page: u32,
+        limit: u32,
+    ) -> Result<soroban_sdk::Vec<u64>, Error> {
+        let key = DataKey::BuyerEscrows(buyer);
+        let escrow_ids: soroban_sdk::Vec<u64> = env.storage().persistent().get(&key)
+            .unwrap_or(soroban_sdk::Vec::new(&env));
+        
+        let start = page * limit;
+        let len = escrow_ids.len();
+        
+        if start >= len {
+            return Ok(soroban_sdk::Vec::new(&env));
+        }
+        
+        let end = (start + limit).min(len);
+        Ok(escrow_ids.slice(start..end))
+    }
+
+    /// Get escrows for a specific seller with pagination.
+    pub fn get_escrows_by_seller(
+        env: Env,
+        seller: Address,
+        page: u32,
+        limit: u32,
+    ) -> Result<soroban_sdk::Vec<u64>, Error> {
+        let key = DataKey::SellerEscrows(seller);
+        let escrow_ids: soroban_sdk::Vec<u64> = env.storage().persistent().get(&key)
+            .unwrap_or(soroban_sdk::Vec::new(&env));
+        
+        let start = page * limit;
+        let len = escrow_ids.len();
+        
+        if start >= len {
+            return Ok(soroban_sdk::Vec::new(&env));
+        }
+        
+        let end = (start + limit).min(len);
+        Ok(escrow_ids.slice(start..end))
+    }
+
     /// Get platform configuration
     fn get_platform_config(env: &Env) -> PlatformConfig {
         let config = env.storage()

craft-nexus-contract/src/test.rs

@@ -700,3 +700,70 @@ fn test_create_escrow_with_invalid_cid_fails() {
         &None,
     );
 }
+// ===== Search and Pagination Tests =====
+
+#[test]
+fn test_escrow_search_by_buyer() {
+    let env = Env::default();
+    env.mock_all_auths();
+    let (client, buyer, seller, token_id, token_admin, _) = setup_test(&env);
+    
+    token_admin.mint(&buyer, &2000);
+    
+    // Create 3 escrows for the same buyer
+    client.create_escrow(&buyer, &seller, &token_id, &100, &1, &None);
+    client.create_escrow(&buyer, &seller, &token_id, &200, &2, &None);
+    client.create_escrow(&buyer, &seller, &token_id, &300, &3, &None);
+    
+    // Get all (limit 10)
+    let b1 = client.get_escrows_by_buyer(&buyer, &0, &10);
+    assert_eq!(b1.len(), 3);
+    assert_eq!(b1.get_unchecked(0), 1);
+    assert_eq!(b1.get_unchecked(1), 2);
+    assert_eq!(b1.get_unchecked(2), 3);
+    
+    // Pagination: page 0, limit 2
+    let b2 = client.get_escrows_by_buyer(&buyer, &0, &2);
+    assert_eq!(b2.len(), 2);
+    assert_eq!(b2.get_unchecked(0), 1);
+    assert_eq!(b2.get_unchecked(1), 2);
+    
+    // Pagination: page 1, limit 2
+    let b3 = client.get_escrows_by_buyer(&buyer, &1, &2);
+    assert_eq!(b3.len(), 1);
+    assert_eq!(b3.get_unchecked(0), 3);
+    
+    // Pagination: out of bounds
+    let b4 = client.get_escrows_by_buyer(&buyer, &2, &2);
+    assert_eq!(b4.len(), 0);
+}
+
+#[test]
+fn test_escrow_search_by_seller() {
+    let env = Env::default();
+    env.mock_all_auths();
+    let (client, buyer, seller, token_id, token_admin, _) = setup_test(&env);
+    
+    token_admin.mint(&buyer, &2000);
+    
+    // Create escrows for different sellers
+    let seller2 = Address::generate(&env);
+    client.create_escrow(&buyer, &seller, &token_id, &100, &1, &None);
+    client.create_escrow(&buyer, &seller2, &token_id, &200, &2, &None);
+    client.create_escrow(&buyer, &seller, &token_id, &300, &3, &None);
+    
+    // Check seller 1
+    let s1 = client.get_escrows_by_seller(&seller, &0, &10);
+    assert_eq!(s1.len(), 2);
+    assert_eq!(s1.get_unchecked(0), 1);
+    assert_eq!(s1.get_unchecked(1), 3);
+    
+    // Check seller 2
+    let s2 = client.get_escrows_by_seller(&seller2, &0, &10);
+    assert_eq!(s2.len(), 1);
+    assert_eq!(s2.get_unchecked(0), 2);
+    
+    // Check non-existent seller
+    let s3 = client.get_escrows_by_seller(&Address::generate(&env), &0, &10);
+    assert_eq!(s3.len(), 0);
+}

craft-nexus-contract/test_output.txt

@@ -0,0 +1,75 @@
+   Compiling craft-nexus-contract v0.1.0 (/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract)
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:719:59
+    |
+719 | ...0).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:726:58
+    |
+726 | ...2).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:732:58
+    |
+732 | ...2).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:737:58
+    |
+737 | ...2).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:756:61
+    |
+756 | ...0).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:762:62
+    |
+762 | ...0).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+error[E0599]: no method named `unwrap` found for struct `Vec<T>` in the current scope
+   --> src/test.rs:767:78
+    |
+767 | ...0).unwrap();
+    |       ^^^^^^ method not found in `Vec<u64>`
+    |
+    = note: the full name for the type has been written to '/Users/atec/Desktop/Work stuff/CraftNexus/craft-nexus-contract/target/debug/deps/craft_nexus_contract-ec1ace976eaf7145.long-type-18408171063992311396.txt'
+    = note: consider using `--verbose` to print the full type name to the console
+
+warning: unused variable: `token_contract`
+   --> src/test.rs:394:9
+    |
+394 | ...et token_contract = ...
+    |       ^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_token_contract`
+    |
+    = note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
+
+For more information about this error, try `rustc --explain E0599`.
+warning: `craft-nexus-contract` (lib test) generated 1 warning
+error: could not compile `craft-nexus-contract` (lib test) due to 7 previous errors; 1 warning emitted

craft-nexus-contract/test_snapshots/test/test_auto_release_at_exact_window_boundary.1.json

@@ -362,6 +362,55 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "BuyerEscrows"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "BuyerEscrows"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "vec": [
+                    {
+                      "u64": 1
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          4095
+        ]
+      ],
       [
         {
           "contract_data": {
@@ -487,6 +536,55 @@
           4095
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+            "key": {
+              "vec": [
+                {
+                  "symbol": "SellerEscrows"
+                },
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                }
+              ]
+            },
+            "durability": "persistent"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+                "key": {
+                  "vec": [
+                    {
+                      "symbol": "SellerEscrows"
+                    },
+                    {
+                      "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                    }
+                  ]
+                },
+                "durability": "persistent",
+                "val": {
+                  "vec": [
+                    {
+                      "u64": 1
+                    }
+                  ]
+                }
+              }
+            },
+            "ext": "v0"
+          },
+          4095
+        ]
+      ],
       [
         {
           "contract_data": {