@1sat/sweep-ui 0.0.15 → 0.0.17

package/dist/components/SweepApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SweepApp.d.ts","sourceRoot":"","sources":["../../src/components/SweepApp.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,QAAQ,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,aAAa,2CA8QrG"}
+{"version":3,"file":"SweepApp.d.ts","sourceRoot":"","sources":["../../src/components/SweepApp.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,QAAQ,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,aAAa,2CA0RrG"}

package/dist/components/asset-preview.d.ts

@@ -20,8 +20,10 @@ export declare function OrdinalsSection({ ordinals, selectedOrdinals, onToggle,
     onBurn?: () => void;
     walletConnected: boolean;
 }): import("react/jsx-runtime").JSX.Element | null;
-export declare function Bsv21Section({ tokens }: {
+export declare function Bsv21Section({ tokens, onSweep, walletConnected }: {
     tokens: TokenBalance[];
+    onSweep?: (tokenId: string) => void;
+    walletConnected: boolean;
 }): import("react/jsx-runtime").JSX.Element | null;
 export declare function Bsv20Section({ tokens }: {
     tokens: IndexedOutput[];

package/dist/components/asset-preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asset-preview.d.ts","sourceRoot":"","sources":["../../src/components/asset-preview.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA8CjD,wBAAgB,cAAc,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE;IACzH,OAAO,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;CACpN,kDAqCA;AAED,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE;IAC/I,QAAQ,EAAE,eAAe,EAAE,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;CACjQ,kDAsDA;AA0BD,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,YAAY,EAAE,CAAA;CAAE,kDAsBlE;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,kDAmBnE;AAED,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,kDAapE;AAED,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,aAAa,EAAE,CAAA;CAAE,kDAc3D"}
+{"version":3,"file":"asset-preview.d.ts","sourceRoot":"","sources":["../../src/components/asset-preview.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA8CjD,wBAAgB,cAAc,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE;IACzH,OAAO,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;CACpN,kDAqCA;AAED,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE;IAC/I,QAAQ,EAAE,eAAe,EAAE,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC;CACjQ,kDAsDA;AA+BD,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,EAAE;IAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,kDAsB3J;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,kDAmBnE;AAED,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,kDAapE;AAED,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,aAAa,EAAE,CAAA;CAAE,kDAc3D"}

package/dist/index.js

@@ -341,7 +341,9 @@ import {
 
 // src/lib/scanner.ts
 import { PrivateKey } from "@bsv/sdk";
-import { parseOutpoint } from "@1sat/utils";
+import {
+  scanAddresses as coreScanAddresses
+} from "@1sat/actions";
 
 // src/lib/services.ts
 import { OneSatServices } from "@1sat/client";
@@ -362,12 +364,11 @@ function getServices() {
 }
 
 // src/lib/scanner.ts
-var RUN_PREFIX = Uint8Array.from([0, 106, 3, 114, 117, 110]);
 function deriveAddress(wif) {
   return PrivateKey.fromWif(wif.trim()).toPublicKey().toAddress();
 }
 function getEvent(events, prefix) {
-  const e = events.find((e2) => e2.startsWith(prefix));
+  const e = events.find((ev) => ev.startsWith(prefix));
   return e ? e.slice(prefix.length) : undefined;
 }
 function getEvents(events, prefix) {
@@ -382,198 +383,44 @@ function enrichOrdinal(out) {
   const contentUrl = getServices().ordfs.getContentUrl(origin ?? out.outpoint, { raw: true });
   return { ...out, origin, contentType, name, contentUrl };
 }
-function resolveIconOutpoint(tokenId, icon) {
+function resolveIconUrl(tokenId, icon) {
   if (!icon)
-    return;
+    return "";
+  let outpoint = icon;
   if (icon.startsWith("_")) {
     const txid = tokenId.split("_")[0];
-    return `${txid}${icon}`;
-  }
-  return icon;
-}
-async function groupBsv21Tokens(outputs) {
-  const groups = new Map;
-  for (const out of outputs) {
-    const events = out.events ?? [];
-    const tokenId = getEvent(events, "bsv21:");
-    if (!tokenId)
-      continue;
-    let group = groups.get(tokenId);
-    if (!group) {
-      group = [];
-      groups.set(tokenId, group);
-    }
-    group.push(out);
-  }
-  if (groups.size === 0)
-    return [];
-  const services = getServices();
-  const tokenIds = [...groups.keys()];
-  let details = [];
-  try {
-    details = await services.bsv21.lookupTokens(tokenIds);
-  } catch {}
-  const detailMap = new Map(details.map((d) => [d.tokenId, d]));
-  const balances = [];
-  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,
-      outputs: validatedOutputs,
-      isActive
-    });
-  }
-  return balances;
-}
-async function categorizeOutputs(outputs) {
-  const funding = [];
-  const rawOrdinals = [];
-  const opnsRaw = [];
-  const bsv21Raw = [];
-  const bsv20Tokens = [];
-  const locked = [];
-  for (const out of outputs) {
-    const events = out.events ?? [];
-    const sats = out.satoshis ?? 0;
-    if (events.some((e) => e.startsWith("bsv21:"))) {
-      bsv21Raw.push(out);
-      continue;
-    }
-    if (events.some((e) => e.startsWith("lock:"))) {
-      locked.push(out);
-      continue;
-    }
-    if (events.some((e) => e === "type:application/bsv-20" || e === "type:Token")) {
-      bsv20Tokens.push(out);
-      continue;
-    }
-    if (sats === 1) {
-      if (events.some((e) => e === "type:application/op-ns")) {
-        opnsRaw.push(out);
-      } else {
-        rawOrdinals.push(out);
-      }
-      continue;
-    }
-    if (sats > 1) {
-      funding.push(out);
-    }
-  }
-  const run = [];
-  const cleanFunding = [];
-  if (funding.length > 0) {
-    const runTxids = await detectRunTransactions(funding);
-    for (const f of funding) {
-      const { txid } = parseOutpoint(f.outpoint);
-      if (runTxids.has(txid)) {
-        run.push(f);
-      } else {
-        cleanFunding.push(f);
-      }
-    }
+    outpoint = `${txid}${icon}`;
   }
-  return {
-    funding: cleanFunding,
-    ordinals: rawOrdinals.map(enrichOrdinal),
-    opnsNames: opnsRaw.map(enrichOrdinal),
-    bsv21Tokens: await groupBsv21Tokens(bsv21Raw),
-    bsv20Tokens,
-    locked,
-    run,
-    totalBsv: cleanFunding.reduce((sum, o) => sum + (o.satoshis ?? 0), 0)
-  };
+  return getServices().ordfs.getContentUrl(outpoint);
+}
+function enrichTokenBalances(tokens) {
+  return tokens.map((t) => ({
+    ...t,
+    icon: resolveIconUrl(t.tokenId, t.icon)
+  }));
 }
 async function scanAddress(address, onProgress) {
-  const services = getServices();
-  onProgress?.({ phase: "sync", detail: "Syncing address..." });
-  for await (const event of services.owner.getTxos(address, { refresh: true, limit: 1 })) {
-    if (event.type === "sync") {
-      const p = event.data;
-      onProgress?.({
-        phase: "sync",
-        detail: `${p.phase}: ${p.processed ?? 0}/${p.total ?? "?"}`
-      });
-    } else if (event.type === "done" || event.type === "error") {
-      break;
-    }
-  }
-  onProgress?.({ phase: "search", detail: "Searching for assets..." });
-  const allOutputs = await services.txo.search(`own:${address}`, {
-    unspent: true,
-    events: true,
-    sats: true,
-    limit: 0
-  });
-  onProgress?.({ phase: "categorize", detail: "Loading token details..." });
-  return await categorizeOutputs(allOutputs ?? []);
+  const result = await coreScanAddresses(getServices(), [address], onProgress);
+  return toScannedAssets(result);
 }
 async function scanAddresses(addresses, onProgress) {
   const unique = [...new Set(addresses)];
-  const allResults = [];
-  for (const addr of unique) {
-    onProgress?.({ phase: "sync", detail: `Scanning ${addr.slice(0, 8)}...` });
-    allResults.push(await scanAddress(addr, onProgress));
-  }
+  const result = await coreScanAddresses(getServices(), unique, onProgress);
+  return toScannedAssets(result);
+}
+function toScannedAssets(result) {
   return {
-    funding: allResults.flatMap((r) => r.funding),
-    ordinals: allResults.flatMap((r) => r.ordinals),
-    opnsNames: allResults.flatMap((r) => r.opnsNames),
-    bsv21Tokens: allResults.flatMap((r) => r.bsv21Tokens),
-    bsv20Tokens: allResults.flatMap((r) => r.bsv20Tokens),
-    locked: allResults.flatMap((r) => r.locked),
-    run: allResults.flatMap((r) => r.run),
-    totalBsv: allResults.reduce((sum, r) => sum + r.totalBsv, 0)
+    funding: result.funding,
+    ordinals: result.ordinals.map(enrichOrdinal),
+    opnsNames: result.opnsNames.map(enrichOrdinal),
+    bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
+    bsv20Tokens: result.bsv20Tokens,
+    locked: result.locked,
+    run: result.run,
+    totalFundingSats: result.totalFundingSats,
+    totalBsv: result.totalFundingSats
   };
 }
-async function detectRunTransactions(funding) {
-  const services = getServices();
-  const txids = [...new Set(funding.map((f) => parseOutpoint(f.outpoint).txid))];
-  const runTxids = new Set;
-  for (const txid of txids) {
-    try {
-      const beef = await services.getBeefForTxid(txid);
-      const beefTx = beef.findTxid(txid);
-      if (!beefTx?.tx)
-        continue;
-      for (const output of beefTx.tx.outputs) {
-        const script = output.lockingScript?.toBinary();
-        if (script && hasRunPrefix(script)) {
-          runTxids.add(txid);
-          break;
-        }
-      }
-    } catch {}
-  }
-  return runTxids;
-}
-function hasRunPrefix(script) {
-  if (script.length < RUN_PREFIX.length)
-    return false;
-  for (let i = 0;i < RUN_PREFIX.length; i++) {
-    if (script[i] !== RUN_PREFIX[i])
-      return false;
-  }
-  return true;
-}
 
 // src/components/wif-input.tsx
 import { deriveIdentityKey } from "@1sat/utils";
@@ -1395,63 +1242,72 @@ function OrdinalsSection({ ordinals, selectedOrdinals, onToggle, onSelectAll, on
     ]
   });
 }
-function TokenRow({ tb }) {
-  return /* @__PURE__ */ jsx8("div", {
+function TokenRow({ tb, onSweep, walletConnected }) {
+  return /* @__PURE__ */ jsxs3("div", {
     className: `flex items-center justify-between p-3 rounded-lg border ${tb.isActive ? "bg-black/20 border-purple-500/10" : "bg-black/10 border-muted/20 opacity-60"}`,
-    children: /* @__PURE__ */ jsxs3("div", {
-      className: "flex items-center gap-3",
-      children: [
-        /* @__PURE__ */ jsx8("img", {
-          src: tb.icon,
-          alt: tb.symbol || "Token",
-          className: "w-8 h-8 rounded-full object-cover",
-          onError: (e) => {
-            e.target.style.display = "none";
-          }
-        }),
-        /* @__PURE__ */ jsxs3("div", {
-          children: [
-            /* @__PURE__ */ jsxs3("div", {
-              className: "flex items-center gap-2",
-              children: [
-                /* @__PURE__ */ jsx8("span", {
-                  className: "font-medium text-foreground",
-                  children: tb.symbol || tb.tokenId.slice(0, 8) + "..."
-                }),
-                tb.isActive ? /* @__PURE__ */ jsx8("span", {
-                  className: "px-1.5 py-0.5 text-[9px] rounded bg-green-600/20 text-green-700 dark:text-green-400",
-                  children: "active"
-                }) : /* @__PURE__ */ jsx8("span", {
-                  className: "px-1.5 py-0.5 text-[9px] rounded bg-muted text-muted-foreground",
-                  children: "inactive"
-                })
-              ]
-            }),
-            /* @__PURE__ */ jsxs3("div", {
-              className: "text-xs text-muted-foreground",
-              children: [
-                formatTokenAmount(tb.totalAmount.toString(), tb.decimals),
-                " ",
-                tb.symbol || "",
-                /* @__PURE__ */ jsxs3("span", {
-                  className: "ml-2",
-                  children: [
-                    "(",
-                    tb.outputs.length,
-                    " output",
-                    tb.outputs.length !== 1 ? "s" : "",
-                    ")"
-                  ]
-                })
-              ]
-            })
-          ]
-        })
-      ]
-    })
+    children: [
+      /* @__PURE__ */ jsxs3("div", {
+        className: "flex items-center gap-3",
+        children: [
+          /* @__PURE__ */ jsx8("img", {
+            src: tb.icon,
+            alt: tb.symbol || "Token",
+            className: "w-8 h-8 rounded-full object-cover",
+            onError: (e) => {
+              e.target.style.display = "none";
+            }
+          }),
+          /* @__PURE__ */ jsxs3("div", {
+            children: [
+              /* @__PURE__ */ jsxs3("div", {
+                className: "flex items-center gap-2",
+                children: [
+                  /* @__PURE__ */ jsx8("span", {
+                    className: "font-medium text-foreground",
+                    children: tb.symbol || tb.tokenId.slice(0, 8) + "..."
+                  }),
+                  tb.isActive ? /* @__PURE__ */ jsx8("span", {
+                    className: "px-1.5 py-0.5 text-[9px] rounded bg-green-600/20 text-green-700 dark:text-green-400",
+                    children: "active"
+                  }) : /* @__PURE__ */ jsx8("span", {
+                    className: "px-1.5 py-0.5 text-[9px] rounded bg-muted text-muted-foreground",
+                    children: "inactive"
+                  })
+                ]
+              }),
+              /* @__PURE__ */ jsxs3("div", {
+                className: "text-xs text-muted-foreground",
+                children: [
+                  formatTokenAmount(tb.totalAmount.toString(), tb.decimals),
+                  " ",
+                  tb.symbol || "",
+                  /* @__PURE__ */ jsxs3("span", {
+                    className: "ml-2",
+                    children: [
+                      "(",
+                      tb.outputs.length,
+                      " output",
+                      tb.outputs.length !== 1 ? "s" : "",
+                      ")"
+                    ]
+                  })
+                ]
+              })
+            ]
+          })
+        ]
+      }),
+      tb.isActive && onSweep && /* @__PURE__ */ jsx8(Button, {
+        size: "sm",
+        onClick: () => onSweep(tb.tokenId),
+        disabled: !walletConnected,
+        title: walletConnected ? undefined : "Connect BRC-100 wallet to sweep",
+        children: "Sweep to Wallet"
+      })
+    ]
   });
 }
-function Bsv21Section({ tokens }) {
+function Bsv21Section({ tokens, onSweep, walletConnected }) {
   if (tokens.length === 0)
     return null;
   const active = tokens.filter((t) => t.isActive);
@@ -1475,7 +1331,9 @@ function Bsv21Section({ tokens }) {
         className: "space-y-3",
         children: [
           active.map((tb) => /* @__PURE__ */ jsx8(TokenRow, {
-            tb
+            tb,
+            onSweep,
+            walletConnected
           }, tb.tokenId)),
           inactive.length > 0 && active.length > 0 && /* @__PURE__ */ jsx8("div", {
             className: "border-t border-purple-500/10 pt-3 mt-3",
@@ -1489,7 +1347,8 @@ function Bsv21Section({ tokens }) {
             })
           }),
           inactive.map((tb) => /* @__PURE__ */ jsx8(TokenRow, {
-            tb
+            tb,
+            walletConnected
           }, tb.tokenId))
         ]
       })
@@ -1904,7 +1763,7 @@ function buildKeys(outputs, keyMap) {
   });
 }
 async function executeSweep(params) {
-  const { wallet, keys, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
+  const { wallet, keys, funding, ordinals, amount, onProgress } = params;
   const ctx = createContext2(wallet, { services: getServices(), chain: "main" });
   const result = {
     ordinalTxids: [],
@@ -1937,42 +1796,31 @@ async function executeSweep(params) {
       result.errors.push(`Ordinals: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
-  if (bsv21Tokens.length > 0) {
-    const groups = new Map;
-    for (const token of bsv21Tokens) {
-      const tokenEvent = token.events?.find((e) => e.startsWith("tokenId:"));
-      const tokenId = tokenEvent?.slice(8) ?? "unknown";
-      const group = groups.get(tokenId) ?? [];
-      group.push(token);
-      groups.set(tokenId, group);
-    }
-    for (const [tokenId, tokens] of groups) {
-      onProgress(`Sweeping ${tokens.length} tokens (${tokenId.slice(0, 8)}...)...`);
-      try {
-        const inputs = await prepareSweepInputs(ctx, tokens);
-        const tokenResult = await sweepBsv21.execute(ctx, {
-          inputs: inputs.map((inp) => ({
-            ...inp,
-            tokenId,
-            amount: "0"
-          })),
-          keys: buildKeys(tokens, keys)
-        });
-        if (tokenResult.error)
-          result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${tokenResult.error}`);
-        else if (tokenResult.txid)
-          result.bsv21Txids.push(tokenResult.txid);
-      } catch (e) {
-        result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${e instanceof Error ? e.message : String(e)}`);
-      }
-    }
-  }
   onProgress("Sweep complete");
   return result;
 }
+async function sweepBsv21Token(params) {
+  const { wallet, keys, token, onProgress } = params;
+  const ctx = createContext2(wallet, { services: getServices(), chain: "main" });
+  onProgress(`Sweeping ${token.symbol ?? token.tokenId.slice(0, 8)}...`);
+  try {
+    const inputs = token.outputs.map((out) => ({
+      outpoint: out.outpoint,
+      tokenId: token.tokenId,
+      amount: token.amounts.get(out.outpoint) ?? "0"
+    }));
+    const tokenKeys = buildKeys(token.outputs, keys);
+    const result = await sweepBsv21.execute(ctx, { inputs, keys: tokenKeys });
+    if (result.error)
+      return { error: result.error };
+    return { txid: result.txid };
+  } catch (e) {
+    return { error: e instanceof Error ? e.message : String(e) };
+  }
+}
 
 // src/lib/legacy-send.ts
-import { parseOutpoint as parseOutpoint2 } from "@1sat/utils";
+import { parseOutpoint } from "@1sat/utils";
 import { MAP_PREFIX } from "@1sat/types";
 import { OP, P2PKH, PrivateKey as PrivateKey2, Script, Transaction, Utils } from "@bsv/sdk";
 async function fetchSourceTx(txid) {
@@ -2019,7 +1867,7 @@ async function legacySendBsv(params) {
   const p2pkh = new P2PKH;
   const tx = new Transaction;
   for (const utxo of funding) {
-    const { txid, vout } = parseOutpoint2(utxo.outpoint);
+    const { txid, vout } = parseOutpoint(utxo.outpoint);
     const key = keyForOutput(utxo, keyMap, payKey);
     tx.addInput({
       sourceTXID: txid,
@@ -2067,7 +1915,7 @@ async function legacySendOrdinals(params) {
   const p2pkh = new P2PKH;
   const tx = new Transaction;
   for (const ord of ordinals) {
-    const { txid, vout } = parseOutpoint2(ord.outpoint);
+    const { txid, vout } = parseOutpoint(ord.outpoint);
     const key = keyForOutput(ord, keyMap, payKey);
     tx.addInput({
       sourceTXID: txid,
@@ -2084,7 +1932,7 @@ async function legacySendOrdinals(params) {
     });
   }
   for (const utxo of funding) {
-    const { txid, vout } = parseOutpoint2(utxo.outpoint);
+    const { txid, vout } = parseOutpoint(utxo.outpoint);
     const key = keyForOutput(utxo, keyMap, payKey);
     tx.addInput({
       sourceTXID: txid,
@@ -2117,7 +1965,7 @@ async function legacyBurnOrdinals(params) {
   const p2pkh = new P2PKH;
   const tx = new Transaction;
   for (const ord of ordinals) {
-    const { txid, vout } = parseOutpoint2(ord.outpoint);
+    const { txid, vout } = parseOutpoint(ord.outpoint);
     const key = keyForOutput(ord, keyMap, payKey);
     tx.addInput({
       sourceTXID: txid,
@@ -2128,7 +1976,7 @@ async function legacyBurnOrdinals(params) {
     });
   }
   for (const utxo of funding) {
-    const { txid, vout } = parseOutpoint2(utxo.outpoint);
+    const { txid, vout } = parseOutpoint(utxo.outpoint);
     const key = keyForOutput(utxo, keyMap, payKey);
     tx.addInput({
       sourceTXID: txid,
@@ -2319,7 +2167,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (!wallet || !legacyKeys || !assets)
       return;
     await runOperation("Sweep BSV", async () => {
-      const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.bsvTxid ?? "";
@@ -2341,7 +2189,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (selected.length === 0)
       return;
     await runOperation(`Sweep ${selected.length} ordinal${selected.length !== 1 ? "s" : ""}`, async () => {
-      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.ordinalTxids[0] ?? "";
@@ -2377,7 +2225,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (selected.length === 0)
       return;
     await runOperation(`Sweep ${selected.length} domain${selected.length !== 1 ? "s" : ""}`, async () => {
-      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.ordinalTxids[0] ?? "";
@@ -2405,6 +2253,20 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
       return result.txid;
     });
   }, [legacyKeys, assets, selectedOpns, runOperation]);
+  const handleSweepBsv21Token = useCallback2(async (tokenId) => {
+    const wallet = resolveWallet();
+    if (!wallet || !assets)
+      return;
+    const token = assets.bsv21Tokens.find((t) => t.tokenId === tokenId);
+    if (!token)
+      return;
+    await runOperation(`Sweep ${token.symbol ?? tokenId.slice(0, 8)}`, async () => {
+      const result = await sweepBsv21Token({ wallet, keys: keyMap, token, onProgress: setSweepProgress });
+      if (result.error)
+        throw new Error(result.error);
+      return result.txid ?? "";
+    });
+  }, [resolveWallet, assets, keyMap, runOperation]);
   return /* @__PURE__ */ jsxs6("div", {
     className: "min-h-screen bg-background text-foreground",
     children: [
@@ -2503,7 +2365,9 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
                   /* @__PURE__ */ jsx11(TabsContent, {
                     value: "bsv21",
                     children: /* @__PURE__ */ jsx11(Bsv21Section, {
-                      tokens: assets.bsv21Tokens
+                      tokens: assets.bsv21Tokens,
+                      onSweep: handleSweepBsv21Token,
+                      walletConnected
                     })
                   }),
                   /* @__PURE__ */ jsx11(TabsContent, {

package/dist/lib/scanner.d.ts

@@ -1,33 +1,18 @@
 import type { IndexedOutput } from "@1sat/types";
+import { type ScanResult, type ScanProgress, type TokenBalance } from "@1sat/actions";
+export type { TokenBalance, ScanProgress, ScanResult };
 export interface EnrichedOrdinal extends IndexedOutput {
     origin?: string;
     contentType?: string;
     name?: string;
     contentUrl: string;
 }
-export interface TokenBalance {
-    tokenId: string;
-    symbol?: string;
-    icon: string;
-    decimals: number;
-    totalAmount: bigint;
-    outputs: IndexedOutput[];
-    isActive: boolean;
-}
-export interface ScannedAssets {
-    funding: IndexedOutput[];
+export interface ScannedAssets extends Omit<ScanResult, "ordinals" | "opnsNames"> {
     ordinals: EnrichedOrdinal[];
     opnsNames: EnrichedOrdinal[];
     bsv21Tokens: TokenBalance[];
-    bsv20Tokens: IndexedOutput[];
-    locked: IndexedOutput[];
-    run: IndexedOutput[];
     totalBsv: number;
 }
-export interface ScanProgress {
-    phase: string;
-    detail?: string;
-}
 export declare function deriveAddress(wif: string): string;
 export declare function scanAddress(address: string, onProgress?: (p: ScanProgress) => void): Promise<ScannedAssets>;
 export declare function scanAddresses(addresses: string[], onProgress?: (p: ScanProgress) => void): Promise<ScannedAssets>;

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;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"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAEN,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,MAAM,eAAe,CAAC;AAGvB,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AAEvD,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,aAAc,SAAQ,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC;IAChF,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,WAAW,EAAE,YAAY,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AAuCD,wBAAsB,WAAW,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAGxB;AAED,wBAAsB,aAAa,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAIxB"}

package/dist/lib/sweeper.d.ts

@@ -1,18 +1,34 @@
 import type { IndexedOutput } from "@1sat/types";
 import { PrivateKey, type WalletInterface } from "@bsv/sdk";
+import type { TokenBalance } from "./scanner";
 export interface SweepResult {
     bsvTxid?: string;
     ordinalTxids: string[];
     bsv21Txids: string[];
     errors: string[];
 }
+/**
+ * Sweep BSV funding and ordinals into the connected wallet.
+ */
 export declare function executeSweep(params: {
     wallet: WalletInterface;
     keys: Map<string, PrivateKey>;
     funding: IndexedOutput[];
     ordinals: IndexedOutput[];
-    bsv21Tokens: IndexedOutput[];
     amount?: number;
     onProgress: (stage: string) => void;
 }): Promise<SweepResult>;
+/**
+ * Sweep a single BSV-21 token into the connected wallet.
+ * Each token requires its own transaction since all inputs must share a tokenId.
+ */
+export declare function sweepBsv21Token(params: {
+    wallet: WalletInterface;
+    keys: Map<string, PrivateKey>;
+    token: TokenBalance;
+    onProgress: (stage: string) => void;
+}): Promise<{
+    txid?: string;
+    error?: string;
+}>;
 //# sourceMappingURL=sweeper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../src/lib/sweeper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAG5D,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CACjB;AAeD,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,CAAC,CAkEvB"}
+{"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../src/lib/sweeper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CACjB;AAeD;;GAEG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,CAAC,CAoCvB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqB7C"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@1sat/sweep-ui",
-	"version": "0.0.15",
+	"version": "0.0.17",
 	"description": "Sweep UI components for migrating legacy BSV assets",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -19,10 +19,10 @@
 	"keywords": ["1sat", "bsv", "ordinals", "sweep", "migration", "react"],
 	"license": "MIT",
 	"dependencies": {
-		"@1sat/actions": "0.0.74",
+		"@1sat/actions": "0.0.79",
 		"@1sat/client": "0.0.20",
 		"@1sat/connect": "0.0.27",
-		"@1sat/sweep-ui": "0.0.15",
+		"@1sat/sweep-ui": "0.0.17",
 		"@1sat/types": "0.0.14",
 		"@1sat/utils": "0.0.12",
 		"bitcoin-backup": "^0.0.11",

package/src/components/SweepApp.tsx

@@ -8,7 +8,7 @@ import { FundingSection, OrdinalsSection, Bsv21Section, Bsv20Section, LockedSect
 import { OpnsSection } from "./opns-section";
 import { TxHistory, type TxRecord } from "./tx-history";
 import { deriveAddress, scanAddresses, type ScannedAssets } from "../lib/scanner";
-import { executeSweep } from "../lib/sweeper";
+import { executeSweep, sweepBsv21Token } from "../lib/sweeper";
 import { legacySendBsv, legacySendOrdinals, legacyBurnOrdinals } from "../lib/legacy-send";
 import { getWallet } from "../lib/wallet";
 import type { LegacyKeys } from "../types";
@@ -160,7 +160,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		const wallet = resolveWallet();
 		if (!wallet || !legacyKeys || !assets) return;
 		await runOperation("Sweep BSV", async () => {
-			const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.bsvTxid ?? "";
 		});
@@ -180,7 +180,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		const selected = assets.ordinals.filter((o) => selectedOrdinals.has(o.outpoint));
 		if (selected.length === 0) return;
 		await runOperation(`Sweep ${selected.length} ordinal${selected.length !== 1 ? "s" : ""}`, async () => {
-			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.ordinalTxids[0] ?? "";
 		});
@@ -212,7 +212,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		const selected = assets.opnsNames.filter((o) => selectedOpns.has(o.outpoint));
 		if (selected.length === 0) return;
 		await runOperation(`Sweep ${selected.length} domain${selected.length !== 1 ? "s" : ""}`, async () => {
-			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.ordinalTxids[0] ?? "";
 		});
@@ -238,6 +238,18 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		});
 	}, [legacyKeys, assets, selectedOpns, runOperation]);
 
+	const handleSweepBsv21Token = useCallback(async (tokenId: string) => {
+		const wallet = resolveWallet();
+		if (!wallet || !assets) return;
+		const token = assets.bsv21Tokens.find((t) => t.tokenId === tokenId);
+		if (!token) return;
+		await runOperation(`Sweep ${token.symbol ?? tokenId.slice(0, 8)}`, async () => {
+			const result = await sweepBsv21Token({ wallet, keys: keyMap, token, onProgress: setSweepProgress });
+			if (result.error) throw new Error(result.error);
+			return result.txid ?? "";
+		});
+	}, [resolveWallet, assets, keyMap, runOperation]);
+
 	return (
 		<div className="min-h-screen bg-background text-foreground">
 			<Toaster position="top-right" />
@@ -279,7 +291,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 								<TabsContent value="opns">
 									<OpnsSection opnsNames={assets.opnsNames} selectedOpns={selectedOpns} onToggle={handleToggleOpns} onSelectAll={handleSelectAllOpns} onDeselectAll={handleDeselectAllOpns} onSweep={handleSweepOpns} onSend={sweepOnly ? undefined : handleSendOpns} onBurn={sweepOnly ? undefined : handleBurnOpns} walletConnected={walletConnected} />
 								</TabsContent>
-								<TabsContent value="bsv21"><Bsv21Section tokens={assets.bsv21Tokens} /></TabsContent>
+								<TabsContent value="bsv21"><Bsv21Section tokens={assets.bsv21Tokens} onSweep={handleSweepBsv21Token} walletConnected={walletConnected} /></TabsContent>
 								<TabsContent value="bsv20"><Bsv20Section tokens={assets.bsv20Tokens} /></TabsContent>
 								<TabsContent value="locks"><LockedSection locked={assets.locked} /></TabsContent>
 								<TabsContent value="run"><RunSection run={assets.run} /></TabsContent>

package/src/components/asset-preview.tsx

@@ -149,7 +149,7 @@ export function OrdinalsSection({ ordinals, selectedOrdinals, onToggle, onSelect
 	);
 }
 
-function TokenRow({ tb }: { tb: TokenBalance }) {
+function TokenRow({ tb, onSweep, walletConnected }: { tb: TokenBalance; onSweep?: (tokenId: string) => void; walletConnected: boolean }) {
 	return (
 		<div className={`flex items-center justify-between p-3 rounded-lg border ${tb.isActive ? "bg-black/20 border-purple-500/10" : "bg-black/10 border-muted/20 opacity-60"}`}>
 			<div className="flex items-center gap-3">
@@ -169,11 +169,16 @@ function TokenRow({ tb }: { tb: TokenBalance }) {
 					</div>
 				</div>
 			</div>
+			{tb.isActive && onSweep && (
+				<Button size="sm" onClick={() => onSweep(tb.tokenId)} disabled={!walletConnected} title={walletConnected ? undefined : "Connect BRC-100 wallet to sweep"}>
+					Sweep to Wallet
+				</Button>
+			)}
 		</div>
 	);
 }
 
-export function Bsv21Section({ tokens }: { tokens: TokenBalance[] }) {
+export function Bsv21Section({ tokens, onSweep, walletConnected }: { tokens: TokenBalance[]; onSweep?: (tokenId: string) => void; walletConnected: boolean }) {
 	if (tokens.length === 0) return null;
 	const active = tokens.filter((t) => t.isActive);
 	const inactive = tokens.filter((t) => !t.isActive);
@@ -185,13 +190,13 @@ export function Bsv21Section({ tokens }: { tokens: TokenBalance[] }) {
 				<span className="text-sm font-semibold text-purple-500">BSV-21 Tokens</span>
 			</div>
 			<div className="space-y-3">
-				{active.map((tb) => (<TokenRow key={tb.tokenId} tb={tb} />))}
+				{active.map((tb) => (<TokenRow key={tb.tokenId} tb={tb} onSweep={onSweep} walletConnected={walletConnected} />))}
 				{inactive.length > 0 && active.length > 0 && (
 					<div className="border-t border-purple-500/10 pt-3 mt-3">
 						<div className="text-xs text-muted-foreground mb-2">Inactive overlays ({inactive.length}) — cannot be swept</div>
 					</div>
 				)}
-				{inactive.map((tb) => (<TokenRow key={tb.tokenId} tb={tb} />))}
+				{inactive.map((tb) => (<TokenRow key={tb.tokenId} tb={tb} walletConnected={walletConnected} />))}
 			</div>
 		</div>
 	);

package/src/lib/scanner.ts

@@ -1,10 +1,14 @@
 import { PrivateKey } from "@bsv/sdk";
 import type { IndexedOutput } from "@1sat/types";
-import { parseOutpoint } from "@1sat/utils";
+import {
+	scanAddresses as coreScanAddresses,
+	type ScanResult,
+	type ScanProgress,
+	type TokenBalance,
+} from "@1sat/actions";
 import { getServices } from "./services";
 
-/** RUN protocol OP_RETURN prefix: OP_FALSE OP_RETURN OP_PUSH3 "run" */
-const RUN_PREFIX = Uint8Array.from([0x00, 0x6a, 0x03, 0x72, 0x75, 0x6e]);
+export type { TokenBalance, ScanProgress, ScanResult };
 
 export interface EnrichedOrdinal extends IndexedOutput {
 	origin?: string;
@@ -13,38 +17,19 @@ export interface EnrichedOrdinal extends IndexedOutput {
 	contentUrl: string;
 }
 
-export interface TokenBalance {
-	tokenId: string;
-	symbol?: string;
-	icon: string;
-	decimals: number;
-	totalAmount: bigint;
-	outputs: IndexedOutput[];
-	isActive: boolean;
-}
-
-export interface ScannedAssets {
-	funding: IndexedOutput[];
+export interface ScannedAssets extends Omit<ScanResult, "ordinals" | "opnsNames"> {
 	ordinals: EnrichedOrdinal[];
 	opnsNames: EnrichedOrdinal[];
 	bsv21Tokens: TokenBalance[];
-	bsv20Tokens: IndexedOutput[];
-	locked: IndexedOutput[];
-	run: IndexedOutput[];
 	totalBsv: number;
 }
 
-export interface ScanProgress {
-	phase: string;
-	detail?: string;
-}
-
 export function deriveAddress(wif: string): string {
 	return PrivateKey.fromWif(wif.trim()).toPublicKey().toAddress();
 }
 
 function getEvent(events: string[], prefix: string): string | undefined {
-	const e = events.find((e) => e.startsWith(prefix));
+	const e = events.find((ev) => ev.startsWith(prefix));
 	return e ? e.slice(prefix.length) : undefined;
 }
 
@@ -63,182 +48,29 @@ function enrichOrdinal(out: IndexedOutput): EnrichedOrdinal {
 	return { ...out, origin, contentType, name, contentUrl };
 }
 
-function resolveIconOutpoint(tokenId: string, icon?: string): string | undefined {
-	if (!icon) return undefined;
+function resolveIconUrl(tokenId: string, icon?: string): string {
+	if (!icon) return "";
+	let outpoint = icon;
 	if (icon.startsWith("_")) {
 		const txid = tokenId.split("_")[0];
-		return `${txid}${icon}`;
-	}
-	return icon;
-}
-
-async function groupBsv21Tokens(outputs: IndexedOutput[]): Promise<TokenBalance[]> {
-	// 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;
-
-		let group = groups.get(tokenId);
-		if (!group) {
-			group = [];
-			groups.set(tokenId, group);
-		}
-		group.push(out);
-	}
-
-	if (groups.size === 0) return [];
-
-	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);
-	} catch {
-		// BSV21 service may not be available
-	}
-
-	const detailMap = new Map(details.map((d) => [d.tokenId, d]));
-
-	const balances: TokenBalance[] = [];
-	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,
-			outputs: validatedOutputs,
-			isActive,
-		});
+		outpoint = `${txid}${icon}`;
 	}
-	return balances;
+	return getServices().ordfs.getContentUrl(outpoint);
 }
 
-async function categorizeOutputs(outputs: IndexedOutput[]): Promise<ScannedAssets> {
-	const funding: IndexedOutput[] = [];
-	const rawOrdinals: IndexedOutput[] = [];
-	const opnsRaw: IndexedOutput[] = [];
-	const bsv21Raw: IndexedOutput[] = [];
-	const bsv20Tokens: IndexedOutput[] = [];
-	const locked: IndexedOutput[] = [];
-
-	for (const out of outputs) {
-		const events = out.events ?? [];
-		const sats = out.satoshis ?? 0;
-
-		if (events.some((e) => e.startsWith("bsv21:"))) {
-			bsv21Raw.push(out);
-			continue;
-		}
-
-		if (events.some((e) => e.startsWith("lock:"))) {
-			locked.push(out);
-			continue;
-		}
-
-		if (events.some((e) => e === "type:application/bsv-20" || e === "type:Token")) {
-			bsv20Tokens.push(out);
-			continue;
-		}
-
-		if (sats === 1) {
-			if (events.some((e) => e === "type:application/op-ns")) {
-				opnsRaw.push(out);
-			} else {
-				rawOrdinals.push(out);
-			}
-			continue;
-		}
-
-		if (sats > 1) {
-			funding.push(out);
-		}
-	}
-
-	// Check funding outputs for RUN token transactions
-	const run: IndexedOutput[] = [];
-	const cleanFunding: IndexedOutput[] = [];
-
-	if (funding.length > 0) {
-		const runTxids = await detectRunTransactions(funding);
-		for (const f of funding) {
-			const { txid } = parseOutpoint(f.outpoint);
-			if (runTxids.has(txid)) {
-				run.push(f);
-			} else {
-				cleanFunding.push(f);
-			}
-		}
-	}
-
-	return {
-		funding: cleanFunding,
-		ordinals: rawOrdinals.map(enrichOrdinal),
-		opnsNames: opnsRaw.map(enrichOrdinal),
-		bsv21Tokens: await groupBsv21Tokens(bsv21Raw),
-		bsv20Tokens,
-		locked,
-		run,
-		totalBsv: cleanFunding.reduce((sum, o) => sum + (o.satoshis ?? 0), 0),
-	};
+function enrichTokenBalances(tokens: TokenBalance[]): TokenBalance[] {
+	return tokens.map((t) => ({
+		...t,
+		icon: resolveIconUrl(t.tokenId, t.icon),
+	}));
 }
 
 export async function scanAddress(
 	address: string,
 	onProgress?: (p: ScanProgress) => void,
 ): Promise<ScannedAssets> {
-	const services = getServices();
-
-	onProgress?.({ phase: "sync", detail: "Syncing address..." });
-	for await (const event of services.owner.getTxos(address, { refresh: true, limit: 1 })) {
-		if (event.type === "sync") {
-			const p = event.data;
-			onProgress?.({
-				phase: "sync",
-				detail: `${p.phase}: ${p.processed ?? 0}/${p.total ?? "?"}`,
-			});
-		} else if (event.type === "done" || event.type === "error") {
-			break;
-		}
-	}
-
-	onProgress?.({ phase: "search", detail: "Searching for assets..." });
-	const allOutputs = await services.txo.search(`own:${address}`, {
-		unspent: true,
-		events: true,
-		sats: true,
-		limit: 0,
-	});
-
-	onProgress?.({ phase: "categorize", detail: "Loading token details..." });
-	return await categorizeOutputs(allOutputs ?? []);
+	const result = await coreScanAddresses(getServices(), [address], onProgress);
+	return toScannedAssets(result);
 }
 
 export async function scanAddresses(
@@ -246,59 +78,20 @@ export async function scanAddresses(
 	onProgress?: (p: ScanProgress) => void,
 ): Promise<ScannedAssets> {
 	const unique = [...new Set(addresses)];
-	const allResults: ScannedAssets[] = [];
-
-	for (const addr of unique) {
-		onProgress?.({ phase: "sync", detail: `Scanning ${addr.slice(0, 8)}...` });
-		allResults.push(await scanAddress(addr, onProgress));
-	}
+	const result = await coreScanAddresses(getServices(), unique, onProgress);
+	return toScannedAssets(result);
+}
 
+function toScannedAssets(result: ScanResult): ScannedAssets {
 	return {
-		funding: allResults.flatMap((r) => r.funding),
-		ordinals: allResults.flatMap((r) => r.ordinals),
-		opnsNames: allResults.flatMap((r) => r.opnsNames),
-		bsv21Tokens: allResults.flatMap((r) => r.bsv21Tokens),
-		bsv20Tokens: allResults.flatMap((r) => r.bsv20Tokens),
-		locked: allResults.flatMap((r) => r.locked),
-		run: allResults.flatMap((r) => r.run),
-		totalBsv: allResults.reduce((sum, r) => sum + r.totalBsv, 0),
+		funding: result.funding,
+		ordinals: result.ordinals.map(enrichOrdinal),
+		opnsNames: result.opnsNames.map(enrichOrdinal),
+		bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
+		bsv20Tokens: result.bsv20Tokens,
+		locked: result.locked,
+		run: result.run,
+		totalFundingSats: result.totalFundingSats,
+		totalBsv: result.totalFundingSats,
 	};
 }
-
-/**
- * Check source transactions for the RUN protocol OP_RETURN pattern.
- * Returns the set of txids that contain a RUN OP_RETURN output.
- */
-async function detectRunTransactions(funding: IndexedOutput[]): Promise<Set<string>> {
-	const services = getServices();
-	const txids = [...new Set(funding.map((f) => parseOutpoint(f.outpoint).txid))];
-	const runTxids = new Set<string>();
-
-	for (const txid of txids) {
-		try {
-			const beef = await services.getBeefForTxid(txid);
-			const beefTx = beef.findTxid(txid);
-			if (!beefTx?.tx) continue;
-
-			for (const output of beefTx.tx.outputs) {
-				const script = output.lockingScript?.toBinary();
-				if (script && hasRunPrefix(script)) {
-					runTxids.add(txid);
-					break;
-				}
-			}
-		} catch {
-			// If we can't fetch the tx, leave the output in funding
-		}
-	}
-
-	return runTxids;
-}
-
-function hasRunPrefix(script: number[]): boolean {
-	if (script.length < RUN_PREFIX.length) return false;
-	for (let i = 0; i < RUN_PREFIX.length; i++) {
-		if (script[i] !== RUN_PREFIX[i]) return false;
-	}
-	return true;
-}

package/src/lib/sweeper.ts

@@ -7,6 +7,7 @@ import {
 } from "@1sat/actions";
 import type { IndexedOutput } from "@1sat/types";
 import { PrivateKey, type WalletInterface } from "@bsv/sdk";
+import type { TokenBalance } from "./scanner";
 import { getServices } from "./services";
 
 export interface SweepResult {
@@ -29,16 +30,18 @@ function buildKeys(outputs: IndexedOutput[], keyMap: Map<string, PrivateKey>): P
 	});
 }
 
+/**
+ * Sweep BSV funding and ordinals into the connected wallet.
+ */
 export async function executeSweep(params: {
 	wallet: WalletInterface;
 	keys: Map<string, PrivateKey>;
 	funding: IndexedOutput[];
 	ordinals: IndexedOutput[];
-	bsv21Tokens: IndexedOutput[];
 	amount?: number;
 	onProgress: (stage: string) => void;
 }): Promise<SweepResult> {
-	const { wallet, keys, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
+	const { wallet, keys, funding, ordinals, amount, onProgress } = params;
 	const ctx = createContext(wallet, { services: getServices(), chain: "main" });
 
 	const result: SweepResult = {
@@ -71,36 +74,38 @@ export async function executeSweep(params: {
 		}
 	}
 
-	if (bsv21Tokens.length > 0) {
-		const groups = new Map<string, IndexedOutput[]>();
-		for (const token of bsv21Tokens) {
-			const tokenEvent = token.events?.find((e) => e.startsWith("tokenId:"));
-			const tokenId = tokenEvent?.slice(8) ?? "unknown";
-			const group = groups.get(tokenId) ?? [];
-			group.push(token);
-			groups.set(tokenId, group);
-		}
-
-		for (const [tokenId, tokens] of groups) {
-			onProgress(`Sweeping ${tokens.length} tokens (${tokenId.slice(0, 8)}...)...`);
-			try {
-				const inputs = await prepareSweepInputs(ctx, tokens);
-				const tokenResult = await sweepBsv21.execute(ctx, {
-					inputs: inputs.map((inp) => ({
-						...inp,
-						tokenId,
-						amount: "0",
-					})),
-					keys: buildKeys(tokens, keys),
-				});
-				if (tokenResult.error) result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${tokenResult.error}`);
-				else if (tokenResult.txid) result.bsv21Txids.push(tokenResult.txid);
-			} catch (e) {
-				result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${e instanceof Error ? e.message : String(e)}`);
-			}
-		}
-	}
-
 	onProgress("Sweep complete");
 	return result;
 }
+
+/**
+ * Sweep a single BSV-21 token into the connected wallet.
+ * Each token requires its own transaction since all inputs must share a tokenId.
+ */
+export async function sweepBsv21Token(params: {
+	wallet: WalletInterface;
+	keys: Map<string, PrivateKey>;
+	token: TokenBalance;
+	onProgress: (stage: string) => void;
+}): Promise<{ txid?: string; error?: string }> {
+	const { wallet, keys, token, onProgress } = params;
+	const ctx = createContext(wallet, { services: getServices(), chain: "main" });
+
+	onProgress(`Sweeping ${token.symbol ?? token.tokenId.slice(0, 8)}...`);
+
+	try {
+		const inputs = token.outputs.map((out) => ({
+			outpoint: out.outpoint,
+			tokenId: token.tokenId,
+			amount: token.amounts.get(out.outpoint) ?? "0",
+		}));
+
+		const tokenKeys = buildKeys(token.outputs, keys);
+
+		const result = await sweepBsv21.execute(ctx, { inputs, keys: tokenKeys });
+		if (result.error) return { error: result.error };
+		return { txid: result.txid };
+	} catch (e) {
+		return { error: e instanceof Error ? e.message : String(e) };
+	}
+}