fix PanIndustrial-Org/icrc_nft.mo#3

CHANGELOG.md

@@ -1,5 +1,11 @@
 #Changelog
 
+## v0.4.1
+
+- Fix indexing bug https://github.com/PanIndustrial-Org/icrc_nft.mo/issues/3
+- Add tests for tokens_of
+- Add maintenance method for reindexing owners
+
 ## v0.4.0
 
 - Breaking change: Owner is no longer handled in the metadata

mops.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icrc7-mo"
-version = "0.4.0"
+version = "0.4.1"
 description = "icrc7 for motoko"
 repository = "https://github.com/PanIndustrial-Org/icrc7.mo"
 keywords = [ "nft" ]

src/lib.mo

@@ -894,6 +894,16 @@ module {
     ///     Bool - A boolean value indicating if the owner was successfully unindexed from the token.
     private func unindex_owner(token_id : Nat, account : Account) : Bool {
 
+      switch(Map.get(state.indexes.nft_to_owner, Map.nhash, token_id)){
+        case(null){}; //already reindexed
+        case(?val){
+          if(account_eq(val, account)){
+            ignore Map.remove(state.indexes.nft_to_owner, Map.nhash, token_id);
+          };
+        };
+      };
+
+
       switch (Map.get(state.indexes.owner_to_nfts, ahash, account)) {
         case (null) { return false };
         case (?val) {
@@ -1002,7 +1012,7 @@ module {
         Vec.add(trxtop, ("ts", #Nat(Int.abs(environment.get_time()))));
 
         Vec.add(trxtop, ("from", accountToValue(current_owner)));
-        ignore unindex_owner(thisItem, current_owner);
+
 
         let to = switch (state.ledger_info.burn_account) {
           case (null) { null };
@@ -1881,6 +1891,25 @@ module {
       return #ok(nft_value);
     };
 
+    /// Indexes the owner of a token in the owner-to-token index.
+    /// Should only be used in emergencies or if indexes become corrupted.
+    public func maintenance_reindex_owners() : () {
+
+    Map.clear(state.indexes.nft_to_owner);
+    Map.clear(state.indexes.owner_to_nfts);
+    label proc for (thisItem in Map.entries(state.nfts)) {
+      let nft = thisItem.1;
+      let owner = switch (nft.owner) {
+        case (null) { {owner = environment.canister(); subaccount = null} };
+        case (?val) val;
+      };
+
+      ignore index_owner(thisItem.0, owner); 
+    };
+  };
+
   };
 
+
+
 };

test/lib.test.mo

@@ -499,6 +499,14 @@ testsys<system>("Transfer a token to another account", func<system>() {
   assert(ownerResponse.owner == toAccount.owner);
   assert(ownerResponse.subaccount == toAccount.subaccount);
 
+   let tokens_of = icrc7.tokens_of(toAccount, null, null);
+
+  assert(tokens_of[0] == 1);
+
+  let tokens_of2 = icrc7.tokens_of(testOwnerAccount, null, null);
+
+  assert(tokens_of2.size() == 0);
+
 
 
 });