Fix bad computation wallet state (#301)

* Fix bad computation wallet state

* remove unnused vars

Author: pablof7z

ndk-wallet/src/wallets/cashu/event-handlers/token.ts

@@ -6,7 +6,13 @@ export async function handleToken(this: NDKCashuWallet, event: NDKEvent) {
     if (this.state.tokens.has(event.id)) return;
 
     const token = await NDKCashuToken.from(event);
-    if (!token) return;
+    if (!token) {
+        return;
+    }
+
+    for (const deletedTokenId of token.deletedTokens) {
+        this.state.removeTokenId(deletedTokenId);
+    }
 
     this.state.addToken(token);
-}
+}

ndk-wallet/src/wallets/cashu/token.ts

@@ -1,5 +1,5 @@
 import { type Proof } from "@cashu/cashu-ts";
-import type { NDKRelay, NDKRelaySet, NostrEvent } from "@nostr-dev-kit/ndk";
+import type { NDKEventId, NDKRelay, NDKRelaySet, NostrEvent } from "@nostr-dev-kit/ndk";
 import type NDK from "@nostr-dev-kit/ndk";
 import { NDKEvent, NDKKind, normalizeUrl } from "@nostr-dev-kit/ndk";
 import type { NDKCashuWallet } from "./wallet/index.js";
@@ -24,6 +24,12 @@ export function proofsTotalBalance(proofs: Proof[]): number {
 export class NDKCashuToken extends NDKEvent {
     private _proofs: Proof[] = [];
     private _mint: string | undefined;
+
+    /**
+     * Tokens that this token superseeds
+     */
+    private _deletes: NDKEventId[] = [];
+
     private original: NDKEvent | undefined;
 
     constructor(ndk?: NDK, event?: NostrEvent | NDKEvent) {
@@ -45,6 +51,7 @@ export class NDKCashuToken extends NDKEvent {
             const content = JSON.parse(token.content);
             token.proofs = content.proofs;
             token.mint = content.mint ?? token.tagValue("mint");
+            token.deletedTokens = content.del ?? [];
             if (!Array.isArray(token.proofs)) return;
         } catch (e) {
             return;
@@ -88,10 +95,12 @@ export class NDKCashuToken extends NDKEvent {
     }
 
     async toNostrEvent(pubkey?: string): Promise<NostrEvent> {
-        this.content = JSON.stringify({
+        const payload = {
             proofs: this.proofs.map(this.cleanProof),
             mint: this.mint,
-        });
+            del: this.deletedTokens ?? []
+        };
+        this.content = JSON.stringify(payload);
 
         const user = await this.ndk!.signer!.user();
         await this.encrypt(user, undefined, "nip44");
@@ -118,6 +127,20 @@ export class NDKCashuToken extends NDKEvent {
         return this._mint;
     }
 
+    /**
+     * Tokens that were deleted by the creation of this token.
+     */
+    get deletedTokens(): NDKEventId[] {
+        return this._deletes;
+    }
+
+    /**
+     * Marks tokens that were deleted by the creation of this token.
+     */
+    set deletedTokens(tokenIds: NDKEventId[]) {
+        this._deletes = tokenIds;
+    }
+
     get amount(): number {
         return proofsTotalBalance(this.proofs);
     }

ndk-wallet/src/wallets/cashu/wallet/index.ts

@@ -221,15 +221,12 @@ export class NDKCashuWallet extends EventEmitter<NDKWalletEvents & {
         // if we have an event add it to the filter
         if (this.event) {
             filters[0] = { ...filters[0], ...this.event.filter(), since: opts?.since }; // add to CashuToken filter
-            filters[1] = { ...filters[1], ...this.event.filter(), since: opts?.since }; // add to WalletChange filter
-            filters[2] = { ...filters[2], ...this.event.filter(), since: opts?.since }; // add to CashuQuote filter
+            filters[1] = { ...filters[1], ...this.event.filter(), since: opts?.since }; // add to CashuQuote filter
         }
 
         opts ??= {};
         opts.subId ??= "cashu-wallet-state";
 
-        console.log('Wallet filter', JSON.stringify(filters));
-
         this.sub = this.ndk.subscribe(filters, opts, this.relaySet, false);
 
         this.sub.on("event:dup", eventDupHandler.bind(this));
@@ -554,7 +551,8 @@ export class NDKCashuWallet extends EventEmitter<NDKWalletEvents & {
         this.event.tags = [["d", this.walletId], ["deleted"]];
         if (publish) this.event.publishReplaceable();
 
-        return this.event.delete(reason, publish);
+        const deleteEvent = await this.event.delete(reason, publish);
+        return deleteEvent;
     }
 
 

ndk-wallet/src/wallets/cashu/wallet/state/token.ts

@@ -47,7 +47,6 @@ function maybeAssociateProofWithToken(
             timestamp: token.created_at!,
             proof: proof,
         });
-        // console.log("\tAdding new proof", proof.C, "with state", state);
         return true;
     } else {
         // already associated
@@ -58,15 +57,18 @@ function maybeAssociateProofWithToken(
             }
 
             // different token id, ensure the incoming token is newer
-            const existingToken = walletState.tokens.get(proofEntry.tokenId) as NDKCashuToken | undefined;
-            if (!existingToken) {
+            const existingTokenEntry = walletState.tokens.get(proofEntry.tokenId);
+            if (!existingTokenEntry) {
                 throw new Error("BUG: Token id " + proofEntry.tokenId + " not found, was expected to be associated with proof " + proofC);
             }
+            const existingToken = existingTokenEntry.token;
 
-            // existing token didnt have a timestamp or the incoming token is newer
-            if (existingToken.created_at && (!token.created_at || token.created_at < existingToken.created_at)) {
-                // either the incoming token is older or it doesnt have a timestamp
-                return false;
+            if (existingToken) {
+                // existing token didnt have a timestamp or the incoming token is newer
+                if (existingToken.created_at && (!token.created_at || token.created_at < existingToken.created_at)) {
+                    // either the incoming token is older or it doesnt have a timestamp
+                    return false;
+                }
             }
 
             // update the proof entry

ndk-wallet/src/wallets/cashu/wallet/state/update.ts

@@ -94,7 +94,11 @@ async function updateExternalState(
     // execute the state change
     const res: UpdateStateResult = {};
     if (newState.saveProofs.length > 0) {
-        const newToken = await createToken(walletState, stateChange.mint, newState);
+        const newToken = await createTokenEvent(
+            walletState,
+            stateChange.mint,
+            newState,
+        );
         res.created = newToken;
     }
 
@@ -145,7 +149,10 @@ async function publishWithRetry(
     }, retryTimeout);
 }
 
-async function createToken(walletState: WalletState, mint: MintUrl, newState: WalletTokenChange) {
+/**
+ * Creates a token event as part of a state transition.
+ */
+async function createTokenEvent(walletState: WalletState, mint: MintUrl, newState: WalletTokenChange) {
     const newToken = new NDKCashuToken(walletState.wallet.ndk);
     newToken.mint = mint;
     newToken.proofs = newState.saveProofs;
@@ -157,6 +164,9 @@ async function createToken(walletState: WalletState, mint: MintUrl, newState: Wa
     // immediately add the token to the wallet before signing it
     walletState.addToken(newToken);
 
+    // add the deleted tokens to the new token
+    newToken.deletedTokens = Array.from(newState.deletedTokenIds);
+
     // sign it
     await newToken.sign();