@1sat/sweep-ui 0.0.14 → 0.0.15

package/dist/index.js

@@ -398,15 +398,12 @@ async function groupBsv21Tokens(outputs) {
     const tokenId = getEvent(events, "bsv21:");
     if (!tokenId)
       continue;
-    const amtStr = getEvent(events, "amt:");
-    const amount = amtStr ? BigInt(amtStr) : 0n;
     let group = groups.get(tokenId);
     if (!group) {
-      group = { outputs: [], totalAmount: 0n };
+      group = [];
       groups.set(tokenId, group);
     }
-    group.outputs.push(out);
-    group.totalAmount += amount;
+    group.push(out);
   }
   if (groups.size === 0)
     return [];
@@ -418,17 +415,31 @@ async function groupBsv21Tokens(outputs) {
   } catch {}
   const detailMap = new Map(details.map((d) => [d.tokenId, d]));
   const balances = [];
-  for (const [tokenId, group] of groups) {
+  for (const [tokenId, outs] of groups) {
     const detail = detailMap.get(tokenId);
+    const isActive = detail?.status?.is_active ?? false;
     const iconOutpoint = resolveIconOutpoint(tokenId, detail?.token?.icon);
+    let totalAmount = 0n;
+    let validatedOutputs = outs;
+    if (isActive) {
+      try {
+        const outpoints = outs.map((o) => o.outpoint);
+        const validated = await services.bsv21.validateOutputs(tokenId, outpoints, { unspent: true });
+        totalAmount = validated.reduce((sum, v) => {
+          const bsv21 = v.data?.bsv21;
+          return sum + (bsv21?.amt ? BigInt(bsv21.amt) : 0n);
+        }, 0n);
+        validatedOutputs = validated;
+      } catch {}
+    }
     balances.push({
       tokenId,
       symbol: detail?.token?.sym,
       icon: iconOutpoint ? services.ordfs.getContentUrl(iconOutpoint) : "",
       decimals: Number(detail?.token?.dec ?? 0),
-      totalAmount: group.totalAmount,
-      outputs: group.outputs,
-      isActive: detail?.status?.is_active ?? false
+      totalAmount,
+      outputs: validatedOutputs,
+      isActive
     });
   }
   return balances;

package/dist/lib/scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAOjD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,WAAW,EAAE,YAAY,EAAE,CAAC;IAC5B,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,GAAG,EAAE,aAAa,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AAwJD,wBAAsB,WAAW,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CA0BxB;AAED,wBAAsB,aAAa,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAmBxB"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAOjD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,WAAW,EAAE,YAAY,EAAE,CAAC;IAC5B,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,GAAG,EAAE,aAAa,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AAyKD,wBAAsB,WAAW,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CA0BxB;AAED,wBAAsB,aAAa,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAmBxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@1sat/sweep-ui",
-	"version": "0.0.14",
+	"version": "0.0.15",
 	"description": "Sweep UI components for migrating legacy BSV assets",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -22,7 +22,7 @@
 		"@1sat/actions": "0.0.74",
 		"@1sat/client": "0.0.20",
 		"@1sat/connect": "0.0.27",
-		"@1sat/sweep-ui": "0.0.14",
+		"@1sat/sweep-ui": "0.0.15",
 		"@1sat/types": "0.0.14",
 		"@1sat/utils": "0.0.12",
 		"bitcoin-backup": "^0.0.11",

package/src/lib/scanner.ts

@@ -73,23 +73,20 @@ function resolveIconOutpoint(tokenId: string, icon?: string): string | undefined
 }
 
 async function groupBsv21Tokens(outputs: IndexedOutput[]): Promise<TokenBalance[]> {
-	const groups = new Map<string, { outputs: IndexedOutput[]; totalAmount: bigint }>();
+	// Group outputs by token ID from general indexer events
+	const groups = new Map<string, IndexedOutput[]>();
 
 	for (const out of outputs) {
 		const events = out.events ?? [];
 		const tokenId = getEvent(events, "bsv21:");
 		if (!tokenId) continue;
 
-		const amtStr = getEvent(events, "amt:");
-		const amount = amtStr ? BigInt(amtStr) : 0n;
-
 		let group = groups.get(tokenId);
 		if (!group) {
-			group = { outputs: [], totalAmount: 0n };
+			group = [];
 			groups.set(tokenId, group);
 		}
-		group.outputs.push(out);
-		group.totalAmount += amount;
+		group.push(out);
 	}
 
 	if (groups.size === 0) return [];
@@ -97,6 +94,7 @@ async function groupBsv21Tokens(outputs: IndexedOutput[]): Promise<TokenBalance[
 	const services = getServices();
 	const tokenIds = [...groups.keys()];
 
+	// Get token metadata and active status from overlay
 	let details: Array<{ tokenId: string; token?: { sym?: string; dec?: string; icon?: string }; status?: { is_active?: boolean } }> = [];
 	try {
 		details = await services.bsv21.lookupTokens(tokenIds);
@@ -107,18 +105,37 @@ async function groupBsv21Tokens(outputs: IndexedOutput[]): Promise<TokenBalance[
 	const detailMap = new Map(details.map((d) => [d.tokenId, d]));
 
 	const balances: TokenBalance[] = [];
-	for (const [tokenId, group] of groups) {
+	for (const [tokenId, outs] of groups) {
 		const detail = detailMap.get(tokenId);
+		const isActive = detail?.status?.is_active ?? false;
 		const iconOutpoint = resolveIconOutpoint(tokenId, detail?.token?.icon);
 
+		let totalAmount = 0n;
+		let validatedOutputs = outs;
+
+		// For active tokens, validate outputs against the overlay to get real amounts
+		if (isActive) {
+			try {
+				const outpoints = outs.map((o) => o.outpoint);
+				const validated = await services.bsv21.validateOutputs(tokenId, outpoints, { unspent: true });
+				totalAmount = validated.reduce((sum, v) => {
+					const bsv21 = v.data?.bsv21 as { amt?: string } | undefined;
+					return sum + (bsv21?.amt ? BigInt(bsv21.amt) : 0n);
+				}, 0n);
+				validatedOutputs = validated;
+			} catch {
+				// Validation failed — show outputs without amounts
+			}
+		}
+
 		balances.push({
 			tokenId,
 			symbol: detail?.token?.sym,
 			icon: iconOutpoint ? services.ordfs.getContentUrl(iconOutpoint) : "",
 			decimals: Number(detail?.token?.dec ?? 0),
-			totalAmount: group.totalAmount,
-			outputs: group.outputs,
-			isActive: detail?.status?.is_active ?? false,
+			totalAmount,
+			outputs: validatedOutputs,
+			isActive,
 		});
 	}
 	return balances;