@1sat/sweep-ui 0.0.95 → 0.0.97

package/dist/lib/scanner.d.ts

@@ -7,10 +7,9 @@ export interface EnrichedOrdinal extends IndexedOutput {
     name?: string;
     contentUrl: string;
 }
-export interface ScannedAssets extends Omit<ScanResult, 'ordinals' | 'opnsNames'> {
+export interface ScannedAssets extends Omit<ScanResult, 'ordinals' | 'opnsNames' | 'listings'> {
     ordinals: EnrichedOrdinal[];
     opnsNames: EnrichedOrdinal[];
-    listings: EnrichedOrdinal[];
     bsv21Tokens: TokenBalance[];
     totalBsv: number;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAA;AAEtD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAChB,SAAQ,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC;IAClD,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AA2CD,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"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAA;AAEtD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAChB,SAAQ,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;IAC/D,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AA2CD,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,36 +1,33 @@
+import { type Bsv20Balance, SWEEP_BATCH_SIZE } from '@1sat/actions';
 import type { IndexedOutput } from '@1sat/types';
 import type { PrivateKey, WalletInterface } from '@bsv/sdk';
-import type { TokenBalance } from './scanner';
-/** Page size, select-page size, and createAction batch size for ordinal/OpNS sweeps. */
-export declare const SWEEP_BATCH_SIZE = 25;
+import type { ScannedAssets, TokenBalance } from './scanner';
+export { SWEEP_BATCH_SIZE };
 export interface SweepResult {
     bsvTxid?: string;
     ordinalTxids: string[];
-    listingTxids: string[];
+    bsv20Txids: string[];
     bsv21Txids: string[];
     errors: string[];
-    /** Outpoints successfully swept (ordinals/OpNS). */
+    /** Outpoints successfully swept (ordinals/OpNS, including listed OrdLocks). */
     sweptOutpoints: string[];
-    /** Listing outpoints cancelled into the BRC-100 wallet. */
-    cancelledListings: string[];
 }
 /**
- * Sweep BSV funding and ordinals into the connected wallet.
- * Ordinals are processed in batches of {@link SWEEP_BATCH_SIZE}; stops on first batch error.
+ * Sweep BSV funding then ordinals into the connected wallet.
+ * Same class order as `1sat sweep import` for these two classes.
+ * Listed OrdLocks belong in `ordinals` and cancel in that spend.
  */
 export declare function executeSweep(params: {
     wallet: WalletInterface;
     keys: Map<string, PrivateKey>;
     funding: IndexedOutput[];
     ordinals: IndexedOutput[];
-    /** OPL-4696: listed OrdLock UTXOs — cancelled into BRC-100 via sweepOrdinals. */
-    listings?: 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.
+ * Sweep one BSV-21 token. Listed OrdLocks are each their own tx so one
+ * invalid listing cannot sink the rest. Unlisted UTXOs of the token share a spend.
  */
 export declare function sweepBsv21Token(params: {
     wallet: WalletInterface;
@@ -39,6 +36,25 @@ export declare function sweepBsv21Token(params: {
     onProgress: (stage: string) => void;
 }): Promise<{
     txid?: string;
+    txids: string[];
     error?: string;
 }>;
+/** Sweep one BSV-20 ticker into the connected wallet. */
+export declare function sweepBsv20Token(params: {
+    wallet: WalletInterface;
+    keys: Map<string, PrivateKey>;
+    token: Bsv20Balance;
+    onProgress: (stage: string) => void;
+}): Promise<{
+    txid?: string;
+    error?: string;
+}>;
+/** Same class order as `1sat sweep import`. Continues later classes if one fails. */
+export declare function sweepAllClasses(params: {
+    wallet: WalletInterface;
+    keys: Map<string, PrivateKey>;
+    assets: ScannedAssets;
+    amount?: number;
+    onProgress: (stage: string) => void;
+}): Promise<SweepResult>;
 //# 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,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG7C,wFAAwF;AACxF,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAElC,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,oDAAoD;IACpD,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,2DAA2D;IAC3D,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC3B;AA8BD;;;GAGG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC,WAAW,CAAC,CAsGvB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,KAAK,EAAE,YAAY,CAAA;IACnB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4B7C"}
+{"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../src/lib/sweeper.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,gBAAgB,EAShB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG5D,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAE3B,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,EAAE,CAAA;CACxB;AA8BD;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAA;IACzB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC,WAAW,CAAC,CAiEvB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,KAAK,EAAE,YAAY,CAAA;IACnB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqC9D;AAED,yDAAyD;AACzD,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,KAAK,EAAE,YAAY,CAAA;IACnB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA6B7C;AAED,qFAAqF;AACrF,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC7C,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAC7B,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC,WAAW,CAAC,CAmEvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/sweep-ui",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "description": "Sweep UI components for migrating legacy BSV assets",
   "type": "module",
   "main": "./src/index.ts",
@@ -29,10 +29,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.216",
+    "@1sat/actions": "0.0.218",
     "@1sat/client": "0.0.53",
     "@1sat/connect": "0.0.93",
-    "@1sat/types": "0.0.45",
+    "@1sat/types": "0.0.46",
     "@1sat/utils": "0.0.36",
     "bitcoin-backup": "^0.0.11",
     "class-variance-authority": "^0.7.1",

package/src/components/SweepApp.tsx

@@ -1,3 +1,4 @@
+import { groupBsv20Tokens } from '@1sat/actions'
 import { PrivateKey, type WalletInterface } from '@bsv/sdk'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { Toaster, toast } from 'sonner'
@@ -12,14 +13,18 @@ import {
 	deriveAddress,
 	scanAddresses,
 } from '../lib/scanner'
-import { executeSweep, sweepBsv21Token } from '../lib/sweeper'
+import {
+	executeSweep,
+	sweepAllClasses,
+	sweepBsv20Token,
+	sweepBsv21Token,
+} from '../lib/sweeper'
 import { getWallet } from '../lib/wallet'
 import type { LegacyKeys } from '../types'
 import {
 	Bsv20Section,
 	Bsv21Section,
 	FundingSection,
-	ListingsSection,
 	LockedSection,
 	OrdinalsSection,
 	RunSection,
@@ -28,10 +33,11 @@ import { ConnectWallet } from './connect-wallet'
 import { OpnsSection } from './opns-section'
 import { TxHistory, type TxRecord } from './tx-history'
 import { Badge } from './ui/badge'
+import { Button } from './ui/button'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from './ui/tabs'
 import { WifInput } from './wif-input'
 
-type TabId = 'ordinals' | 'opns' | 'bsv21' | 'bsv20' | 'locks' | 'run'
+type TabId = 'ordinals' | 'opns' | 'bsv20' | 'bsv21' | 'locks' | 'run'
 
 export interface SweepAppProps {
 	legacyKeys?: LegacyKeys
@@ -94,6 +100,15 @@ export function SweepApp({
 		])
 	}, [])
 
+	const groupedBsv20 = useMemo(
+		() => (assets ? groupBsv20Tokens(assets.bsv20Tokens) : []),
+		[assets],
+	)
+	const unparsedBsv20 = assets
+		? assets.bsv20Tokens.length -
+			groupedBsv20.reduce((n, t) => n + t.outputs.length, 0)
+		: 0
+
 	const tabs = useMemo(() => {
 		if (!assets) return []
 		const t: { id: TabId; label: string; count: number }[] = []
@@ -105,16 +120,24 @@ export function SweepApp({
 			})
 		if (assets.opnsNames.length > 0)
 			t.push({ id: 'opns', label: 'OpNS', count: assets.opnsNames.length })
+		if (groupedBsv20.length > 0 || unparsedBsv20 > 0)
+			t.push({
+				id: 'bsv20',
+				label: 'BSV-20',
+				count: groupedBsv20.reduce((n, tok) => n + tok.outputs.length, 0),
+			})
 		if (assets.bsv21Tokens.length > 0)
-			t.push({ id: 'bsv21', label: 'BSV-21', count: assets.bsv21Tokens.length })
-		if (assets.bsv20Tokens.length > 0)
-			t.push({ id: 'bsv20', label: 'BSV-20', count: assets.bsv20Tokens.length })
+			t.push({
+				id: 'bsv21',
+				label: 'BSV-21',
+				count: assets.bsv21Tokens.reduce((n, tok) => n + tok.outputs.length, 0),
+			})
 		if (assets.locked.length > 0)
 			t.push({ id: 'locks', label: 'Locks', count: assets.locked.length })
 		if (assets.run.length > 0)
 			t.push({ id: 'run', label: 'RUN', count: assets.run.length })
 		return t
-	}, [assets])
+	}, [assets, groupedBsv20, unparsedBsv20])
 
 	const handleToggleOrdinal = useCallback((outpoint: string) => {
 		setSelectedOrdinals((prev) => {
@@ -187,21 +210,21 @@ export function SweepApp({
 			)
 			setAssets(result)
 
+			const grouped = groupBsv20Tokens(result.bsv20Tokens)
 			const total =
 				result.funding.length +
 				result.ordinals.length +
 				result.opnsNames.length +
 				result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) +
-				result.bsv20Tokens.length +
-				result.listings.length +
+				grouped.reduce((n, t) => n + t.outputs.length, 0) +
 				result.locked.length +
 				result.run.length
 			if (total === 0) toast.info('No assets found at legacy addresses')
 
 			if (result.ordinals.length > 0) setActiveTab('ordinals')
 			else if (result.opnsNames.length > 0) setActiveTab('opns')
+			else if (grouped.length > 0) setActiveTab('bsv20')
 			else if (result.bsv21Tokens.length > 0) setActiveTab('bsv21')
-			else if (result.bsv20Tokens.length > 0) setActiveTab('bsv20')
 			else if (result.locked.length > 0) setActiveTab('locks')
 		} catch (e) {
 			console.error('Scan failed:', e)
@@ -218,7 +241,7 @@ export function SweepApp({
 	const runOperation = useCallback(
 		async (label: string, op: () => Promise<string>) => {
 			setSweeping(true)
-			setSweepProgress(label + '...')
+			setSweepProgress(`${label}...`)
 			try {
 				const txid = await op()
 				if (txid) addTx(label, txid)
@@ -257,15 +280,10 @@ export function SweepApp({
 				keys: keyMap,
 				funding: getSelectedFunding(),
 				ordinals: [],
-				listings: assets.listings,
 				amount: sweepAmount ?? undefined,
 				onProgress: setSweepProgress,
 			})
-			for (const txid of result.listingTxids) addTx('Cancel listings', txid)
-			if (result.errors.length > 0) {
-				if (result.cancelledListings.length > 0) await refreshAssets()
-				throw new Error(result.errors[0])
-			}
+			if (result.errors.length > 0) throw new Error(result.errors[0])
 			return result.bsvTxid ?? ''
 		})
 	}, [
@@ -276,41 +294,6 @@ export function SweepApp({
 		getSelectedFunding,
 		runOperation,
 		keyMap,
-		addTx,
-		refreshAssets,
-	])
-
-	const handleCancelListings = useCallback(async () => {
-		const wallet = resolveWallet()
-		if (!wallet || !legacyKeys || !assets || assets.listings.length === 0)
-			return
-		await runOperation('Cancel listings', async () => {
-			const result = await executeSweep({
-				wallet,
-				keys: keyMap,
-				funding: [],
-				ordinals: [],
-				listings: assets.listings,
-				onProgress: setSweepProgress,
-			})
-			if (result.errors.length > 0) {
-				for (const txid of result.listingTxids) addTx('Cancel listings', txid)
-				if (result.cancelledListings.length > 0) await refreshAssets()
-				throw new Error(result.errors[0])
-			}
-			for (let i = 0; i < result.listingTxids.length - 1; i++) {
-				addTx('Cancel listings', result.listingTxids[i])
-			}
-			return result.listingTxids[result.listingTxids.length - 1] ?? ''
-		})
-	}, [
-		resolveWallet,
-		legacyKeys,
-		assets,
-		keyMap,
-		runOperation,
-		addTx,
-		refreshAssets,
 	])
 
 	const handleSendBsv = useCallback(
@@ -534,14 +517,69 @@ export function SweepApp({
 						token,
 						onProgress: setSweepProgress,
 					})
+					for (const txid of result.txids.slice(0, -1)) addTx('BSV-21', txid)
 					if (result.error) throw new Error(result.error)
 					return result.txid ?? ''
 				},
 			)
 		},
-		[resolveWallet, assets, keyMap, runOperation],
+		[resolveWallet, assets, keyMap, runOperation, addTx],
+	)
+
+	const handleSweepBsv20Token = useCallback(
+		async (tick: string) => {
+			const wallet = resolveWallet()
+			if (!wallet || !assets) return
+			const token = groupedBsv20.find((t) => t.tick === tick)
+			if (!token) return
+			await runOperation(`Sweep ${token.tick}`, async () => {
+				const result = await sweepBsv20Token({
+					wallet,
+					keys: keyMap,
+					token,
+					onProgress: setSweepProgress,
+				})
+				if (result.error) throw new Error(result.error)
+				return result.txid ?? ''
+			})
+		},
+		[resolveWallet, assets, groupedBsv20, keyMap, runOperation],
 	)
 
+	const handleSweepAll = useCallback(async () => {
+		const wallet = resolveWallet()
+		if (!wallet || !legacyKeys || !assets) return
+		await runOperation('Sweep all', async () => {
+			const result = await sweepAllClasses({
+				wallet,
+				keys: keyMap,
+				assets,
+				amount: sweepAmount ?? undefined,
+				onProgress: setSweepProgress,
+			})
+			if (result.bsvTxid) addTx('BSV', result.bsvTxid)
+			for (const txid of result.ordinalTxids) addTx('Ordinals', txid)
+			for (const txid of result.bsv20Txids) addTx('BSV-20', txid)
+			for (const txid of result.bsv21Txids) addTx('BSV-21', txid)
+			if (result.errors.length > 0) throw new Error(result.errors[0])
+			return (
+				result.bsvTxid ??
+				result.ordinalTxids.at(-1) ??
+				result.bsv20Txids.at(-1) ??
+				result.bsv21Txids.at(-1) ??
+				''
+			)
+		})
+	}, [
+		resolveWallet,
+		legacyKeys,
+		assets,
+		keyMap,
+		sweepAmount,
+		runOperation,
+		addTx,
+	])
+
 	return (
 		<div className="min-h-screen bg-background text-foreground">
 			<Toaster position="top-right" />
@@ -577,6 +615,16 @@ export function SweepApp({
 
 				{assets && !sweeping && (
 					<div className="space-y-3">
+						<Button
+							className="w-full"
+							disabled={!walletConnected}
+							onClick={handleSweepAll}
+							title={
+								walletConnected ? undefined : 'Connect BRC-100 wallet to sweep'
+							}
+						>
+							Sweep all to wallet
+						</Button>
 						<FundingSection
 							funding={assets.funding}
 							totalBsv={assets.totalBsv}
@@ -586,11 +634,6 @@ export function SweepApp({
 							onSend={sweepOnly ? undefined : handleSendBsv}
 							walletConnected={walletConnected}
 						/>
-						<ListingsSection
-							listings={assets.listings}
-							walletConnected={walletConnected}
-							onCancel={handleCancelListings}
-						/>
 
 						{tabs.length > 0 && (
 							<Tabs
@@ -642,6 +685,14 @@ export function SweepApp({
 										walletConnected={walletConnected}
 									/>
 								</TabsContent>
+								<TabsContent value="bsv20">
+									<Bsv20Section
+										tokens={groupedBsv20}
+										unparsedCount={unparsedBsv20}
+										onSweep={handleSweepBsv20Token}
+										walletConnected={walletConnected}
+									/>
+								</TabsContent>
 								<TabsContent value="bsv21">
 									<Bsv21Section
 										tokens={assets.bsv21Tokens}
@@ -649,9 +700,6 @@ export function SweepApp({
 										walletConnected={walletConnected}
 									/>
 								</TabsContent>
-								<TabsContent value="bsv20">
-									<Bsv20Section tokens={assets.bsv20Tokens} />
-								</TabsContent>
 								<TabsContent value="locks">
 									<LockedSection locked={assets.locked} />
 								</TabsContent>

package/src/components/asset-preview.tsx

@@ -1,3 +1,4 @@
+import { type Bsv20Balance, isListedOutput } from '@1sat/actions'
 import type { IndexedOutput } from '@1sat/types'
 import { useState } from 'react'
 import type { EnrichedOrdinal, TokenBalance } from '../lib/scanner'
@@ -53,6 +54,13 @@ function OrdinalCard({
 				)}
 			</div>
 			<div className="min-h-[2rem] flex flex-col justify-end">
+				{isListedOutput(ordinal) && (
+					<div className="mb-1">
+						<span className="inline-block px-1 py-0.5 text-[9px] rounded bg-amber-500/20 text-amber-400">
+							listed
+						</span>
+					</div>
+				)}
 				{subtype && (
 					<div className="mb-1">
 						<span className="inline-block max-w-full px-1 py-0.5 text-[9px] rounded bg-blue-500/20 text-blue-400 truncate">
@@ -388,6 +396,7 @@ function TokenRow({
 	onSweep?: (tokenId: string) => void
 	walletConnected: boolean
 }) {
+	const listed = tb.outputs.filter(isListedOutput).length
 	return (
 		<div
 			className={`flex items-center justify-between p-3 rounded-lg border ${tb.isActive ? 'bg-muted/30 border-purple-500/10' : 'bg-muted/20 border-muted/20 opacity-60'}`}
@@ -404,7 +413,7 @@ function TokenRow({
 				<div>
 					<div className="flex items-center gap-2">
 						<span className="font-medium text-foreground">
-							{tb.symbol || tb.tokenId.slice(0, 8) + '...'}
+							{tb.symbol || `${tb.tokenId.slice(0, 8)}...`}
 						</span>
 						{tb.isActive ? (
 							<span className="px-1.5 py-0.5 text-[9px] rounded bg-green-600/20 text-green-700 dark:text-green-400">
@@ -420,12 +429,13 @@ function TokenRow({
 						{formatTokenAmount(tb.totalAmount.toString(), tb.decimals)}{' '}
 						{tb.symbol || ''}
 						<span className="ml-2">
-							({tb.outputs.length} output{tb.outputs.length !== 1 ? 's' : ''})
+							({tb.outputs.length} output{tb.outputs.length !== 1 ? 's' : ''}
+							{listed ? `, ${listed} listed` : ''})
 						</span>
 					</div>
 				</div>
 			</div>
-			{tb.isActive && onSweep && (
+			{onSweep && (
 				<Button
 					size="sm"
 					onClick={() => onSweep(tb.tokenId)}
@@ -490,74 +500,69 @@ export function Bsv21Section({
 	)
 }
 
-export function Bsv20Section({ tokens }: { tokens: IndexedOutput[] }) {
-	if (tokens.length === 0) return null
+export function Bsv20Section({
+	tokens,
+	unparsedCount = 0,
+	onSweep,
+	walletConnected,
+}: {
+	tokens: Bsv20Balance[]
+	unparsedCount?: number
+	onSweep?: (tick: string) => void
+	walletConnected: boolean
+}) {
+	if (tokens.length === 0 && unparsedCount === 0) return null
 	return (
-		<div className="border border-muted/30 bg-muted/10 p-4 rounded-lg">
-			<div className="flex items-center gap-2 mb-2">
-				<span className="h-2 w-2 rounded-full bg-muted-foreground" />
-				<span className="text-sm font-semibold text-muted-foreground">
+		<div className="border border-teal-500/20 bg-teal-500/5 p-4 rounded-lg">
+			<div className="flex items-center gap-2 mb-3">
+				<span className="h-2 w-2 rounded-full bg-teal-500" />
+				<span className="text-sm font-semibold text-teal-500">
 					BSV-20 Tokens
 				</span>
 			</div>
-			<p className="text-xs text-muted-foreground mb-2">
-				Cannot be swept automatically.
-			</p>
-			<div className="flex flex-wrap gap-2">
-				{tokens.slice(0, 10).map((o) => {
-					const tickEvent = o.events?.find((e) => e.startsWith('tick:'))
-					const tick = tickEvent ? tickEvent.slice(5) : 'Token'
+			{unparsedCount > 0 && (
+				<p className="text-xs text-muted-foreground mb-3">
+					{unparsedCount} UTXO{unparsedCount !== 1 ? 's' : ''} with no parseable
+					tick/amt — leftover, not swept.
+				</p>
+			)}
+			<div className="space-y-3">
+				{tokens.map((tb) => {
+					const listed = tb.outputs.filter(isListedOutput).length
 					return (
-						<span
-							key={o.outpoint}
-							className="px-2 py-1 text-xs rounded bg-muted/30 text-muted-foreground"
+						<div
+							key={tb.tick}
+							className="flex items-center justify-between p-3 rounded-lg border bg-muted/30 border-teal-500/10"
 						>
-							{tick}
-						</span>
+							<div>
+								<div className="font-medium text-foreground">{tb.tick}</div>
+								<div className="text-xs text-muted-foreground">
+									{tb.totalAmount.toString()}
+									<span className="ml-2">
+										({tb.outputs.length} output
+										{tb.outputs.length !== 1 ? 's' : ''}
+										{listed ? `, ${listed} listed` : ''})
+									</span>
+								</div>
+							</div>
+							{onSweep && (
+								<Button
+									size="sm"
+									onClick={() => onSweep(tb.tick)}
+									disabled={!walletConnected}
+									title={
+										walletConnected
+											? undefined
+											: 'Connect BRC-100 wallet to sweep'
+									}
+								>
+									Sweep to Wallet
+								</Button>
+							)}
+						</div>
 					)
 				})}
-				{tokens.length > 10 && (
-					<span className="text-xs text-muted-foreground">
-						+{tokens.length - 10} more
-					</span>
-				)}
-			</div>
-		</div>
-	)
-}
-
-export function ListingsSection({
-	listings,
-	walletConnected,
-	onCancel,
-}: {
-	listings: EnrichedOrdinal[]
-	walletConnected?: boolean
-	onCancel?: () => void
-}) {
-	if (listings.length === 0) return null
-	return (
-		<div className="border border-primary/20 bg-primary/5 p-4 rounded-lg space-y-3">
-			<div className="flex items-center gap-2">
-				<span className="h-2 w-2 rounded-full bg-primary" />
-				<span className="text-sm font-semibold text-primary">
-					OrdLock Listings
-				</span>
 			</div>
-			<p className="text-xs text-muted-foreground">
-				{listings.length} listed UTXO{listings.length !== 1 ? 's' : ''}. These
-				are cancelled into your BRC-100 wallet on BSV sweep.
-			</p>
-			{onCancel && (
-				<Button
-					size="sm"
-					disabled={!walletConnected}
-					onClick={onCancel}
-					className="w-full"
-				>
-					Cancel listings into wallet
-				</Button>
-			)}
 		</div>
 	)
 }

package/src/components/opns-section.tsx

@@ -1,3 +1,4 @@
+import { isListedOutput } from '@1sat/actions'
 import { useEffect, useState } from 'react'
 import type { EnrichedOrdinal } from '../lib/scanner'
 import { getServices } from '../lib/services'
@@ -162,6 +163,11 @@ export function OpnsSection({
 							<span className="text-sm text-foreground truncate">
 								{displayName}
 							</span>
+							{isListedOutput(item) && (
+								<span className="shrink-0 text-[10px] font-medium px-1.5 py-0.5 rounded bg-amber-500/20 text-amber-400">
+									listed
+								</span>
+							)}
 							{!validating &&
 								overlayValid.has(item.outpoint) &&
 								(overlayValid.get(item.outpoint) ? (

package/src/index.ts

@@ -9,7 +9,6 @@ export {
 	OrdinalsSection,
 	Bsv21Section,
 	Bsv20Section,
-	ListingsSection,
 	LockedSection,
 	RunSection,
 } from './components/asset-preview'
@@ -53,6 +52,7 @@ export {
 } from './lib/scanner'
 export {
 	executeSweep,
+	sweepAllClasses,
 	SWEEP_BATCH_SIZE,
 	type SweepResult,
 } from './lib/sweeper'

package/src/lib/scanner.ts

@@ -18,10 +18,9 @@ export interface EnrichedOrdinal extends IndexedOutput {
 }
 
 export interface ScannedAssets
-	extends Omit<ScanResult, 'ordinals' | 'opnsNames'> {
+	extends Omit<ScanResult, 'ordinals' | 'opnsNames' | 'listings'> {
 	ordinals: EnrichedOrdinal[]
 	opnsNames: EnrichedOrdinal[]
-	listings: EnrichedOrdinal[]
 	bsv21Tokens: TokenBalance[]
 	totalBsv: number
 }
@@ -93,7 +92,6 @@ function toScannedAssets(result: ScanResult): ScannedAssets {
 		funding: result.funding,
 		ordinals: result.ordinals.map(enrichOrdinal),
 		opnsNames: result.opnsNames.map(enrichOrdinal),
-		listings: result.listings.map(enrichOrdinal),
 		bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
 		bsv20Tokens: result.bsv20Tokens,
 		locked: result.locked,