@1sat/sweep-ui 0.0.96 → 0.0.98

package/dist/lib/sweeper.d.ts

@@ -3,6 +3,40 @@ import type { IndexedOutput } from '@1sat/types';
 import type { PrivateKey, WalletInterface } from '@bsv/sdk';
 import type { ScannedAssets, TokenBalance } from './scanner';
 export { SWEEP_BATCH_SIZE };
+/** Transferable sweep classes, same order and names as `1sat sweep import`. */
+export type SweepClass = 'bsv' | 'ordinals' | 'opns' | 'bsv20' | 'bsv21';
+/**
+ * Per-class sweep selection. Empty sets sweep nothing in that class;
+ * omit `selection` entirely to sweep every class (previous behavior).
+ */
+export interface SweepClassSelection {
+    sweepBsv: boolean;
+    /** Ordinals-class outpoints (`ordinals`, listed OrdLocks included). */
+    ordinalOutpoints: Set<string>;
+    /** OpNS-class outpoints. */
+    opnsOutpoints: Set<string>;
+    /** BSV-20 ticks. */
+    bsv20Ticks: Set<string>;
+    /** BSV-21 tokenIds. */
+    bsv21TokenIds: Set<string>;
+}
+/** Select every scanned asset, the default when no selection is passed. */
+export declare function selectAllSweepClasses(assets: ScannedAssets): SweepClassSelection;
+/**
+ * Sweep-all is disabled only when every *currently available* class is
+ * skipped. Comparing counts instead strands the button on stale skip ids
+ * after a refresh drops a class.
+ */
+export declare function isSweepAllDisabled(available: SweepClass[], skipped: Set<SweepClass>): boolean;
+/** Show class skip chips when there is a choice, or a skip to clear. */
+export declare function showClassSkips(available: SweepClass[], skipped: Set<SweepClass>): boolean;
+/** Per-step receipt, emitted via `onResult` as each class/batch completes. */
+export interface SweepStepResult {
+    sweepClass: SweepClass;
+    label: string;
+    txid?: string;
+    error?: string;
+}
 export interface SweepResult {
     bsvTxid?: string;
     ordinalTxids: string[];
@@ -11,6 +45,8 @@ export interface SweepResult {
     errors: string[];
     /** Outpoints successfully swept (ordinals/OpNS, including listed OrdLocks). */
     sweptOutpoints: string[];
+    /** Swept outpoints that were marketplace listings canceled into the wallet. */
+    cancelledListings: string[];
 }
 /**
  * Sweep BSV funding then ordinals into the connected wallet.
@@ -24,6 +60,10 @@ export declare function executeSweep(params: {
     ordinals: IndexedOutput[];
     amount?: number;
     onProgress: (stage: string) => void;
+    /** Outpoints to skip; successes are added (canonical `txid.vout` form). */
+    completed?: Set<string>;
+    signal?: AbortSignal;
+    onResult?: (result: SweepStepResult) => void;
 }): Promise<SweepResult>;
 /**
  * Sweep one BSV-21 token. Listed OrdLocks are each their own tx so one
@@ -34,27 +74,58 @@ export declare function sweepBsv21Token(params: {
     keys: Map<string, PrivateKey>;
     token: TokenBalance;
     onProgress: (stage: string) => void;
+    signal?: AbortSignal;
+    /** Outpoints to skip; successes are added (canonical `txid.vout` form). */
+    completed?: Set<string>;
+    onResult?: (result: SweepStepResult) => void;
 }): Promise<{
     txid?: string;
     txids: string[];
+    sweptOutpoints: string[];
+    cancelledListings: string[];
     error?: string;
 }>;
-/** Sweep one BSV-20 ticker into the connected wallet. */
+/**
+ * Sweep one BSV-20 ticker into the connected wallet. BSV-20 needs no per-tx
+ * overlay funding, so splitting listed outputs 1-per-tx is cheap — pass
+ * `splitListed` so one invalid listing cannot sink the rest of the tick.
+ */
 export declare function sweepBsv20Token(params: {
     wallet: WalletInterface;
     keys: Map<string, PrivateKey>;
     token: Bsv20Balance;
     onProgress: (stage: string) => void;
+    signal?: AbortSignal;
+    splitListed?: boolean;
+    /** Outpoints to skip; successes are added (canonical `txid.vout` form). */
+    completed?: Set<string>;
+    onResult?: (result: SweepStepResult) => void;
 }): Promise<{
     txid?: string;
+    txids: string[];
+    sweptOutpoints: string[];
+    cancelledListings: string[];
     error?: string;
 }>;
-/** Same class order as `1sat sweep import`. Continues later classes if one fails. */
+/**
+ * Same class order as `1sat sweep import`: BSV, ordinals, OpNS, BSV-20,
+ * BSV-21. Continues later classes if one fails. Pass `selection` to sweep
+ * only chosen classes/items (like `1sat sweep --only/--skip`); pass
+ * `completed` to skip already-swept outpoints and record new successes for
+ * retry; pass `signal` to abort between steps. Listed OrdLocks stay in their
+ * class and cancel in that spend.
+ */
 export declare function sweepAllClasses(params: {
     wallet: WalletInterface;
     keys: Map<string, PrivateKey>;
     assets: ScannedAssets;
     amount?: number;
     onProgress: (stage: string) => void;
+    selection?: SweepClassSelection;
+    completed?: Set<string>;
+    signal?: AbortSignal;
+    onResult?: (result: SweepStepResult) => void;
+    /** Split listed BSV-20 outputs 1-per-tx so one bad listing cannot sink the tick. */
+    splitListedBsv20?: boolean;
 }): 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":"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"}
+{"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../src/lib/sweeper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/sweep-ui",
-  "version": "0.0.96",
+  "version": "0.0.98",
   "description": "Sweep UI components for migrating legacy BSV assets",
   "type": "module",
   "main": "./src/index.ts",
@@ -29,11 +29,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.217",
-    "@1sat/client": "0.0.53",
-    "@1sat/connect": "0.0.93",
-    "@1sat/types": "0.0.46",
-    "@1sat/utils": "0.0.36",
+    "@1sat/actions": "0.0.220",
+    "@1sat/client": "0.0.54",
+    "@1sat/connect": "0.0.94",
+    "@1sat/types": "0.0.47",
+    "@1sat/utils": "0.0.37",
     "bitcoin-backup": "^0.0.11",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

package/src/components/SweepApp.tsx

@@ -14,7 +14,11 @@ import {
 	scanAddresses,
 } from '../lib/scanner'
 import {
+	type SweepClass,
 	executeSweep,
+	isSweepAllDisabled,
+	selectAllSweepClasses,
+	showClassSkips,
 	sweepAllClasses,
 	sweepBsv20Token,
 	sweepBsv21Token,
@@ -58,12 +62,17 @@ export function SweepApp({
 	const [sweeping, setSweeping] = useState(false)
 	const [sweepProgress, setSweepProgress] = useState('')
 	const [txHistory, setTxHistory] = useState<TxRecord[]>([])
+	const [cancelledListings, setCancelledListings] = useState(0)
 	const [selectedOrdinals, setSelectedOrdinals] = useState<Set<string>>(
 		new Set(),
 	)
 	const [selectedOpns, setSelectedOpns] = useState<Set<string>>(new Set())
 	const [sweepAmount, setSweepAmount] = useState<number | null>(null)
 	const [activeTab, setActiveTab] = useState<TabId>('ordinals')
+	/** Classes excluded from Sweep-all (CLI `--skip` equivalent). Empty = all. */
+	const [skippedClasses, setSkippedClasses] = useState<Set<SweepClass>>(
+		new Set(),
+	)
 
 	useEffect(() => {
 		setWalletConnected(!!externalWallet)
@@ -100,6 +109,10 @@ export function SweepApp({
 		])
 	}, [])
 
+	const addCancelled = useCallback((count: number) => {
+		if (count > 0) setCancelledListings((prev) => prev + count)
+	}, [])
+
 	const groupedBsv20 = useMemo(
 		() => (assets ? groupBsv20Tokens(assets.bsv20Tokens) : []),
 		[assets],
@@ -194,6 +207,7 @@ export function SweepApp({
 		setAssets(null)
 		setSelectedOrdinals(new Set())
 		setSelectedOpns(new Set())
+		setSkippedClasses(new Set())
 		setSweepAmount(null)
 		setLegacyKeys(keys)
 
@@ -284,6 +298,7 @@ export function SweepApp({
 				onProgress: setSweepProgress,
 			})
 			if (result.errors.length > 0) throw new Error(result.errors[0])
+			addCancelled(result.cancelledListings.length)
 			return result.bsvTxid ?? ''
 		})
 	}, [
@@ -294,6 +309,7 @@ export function SweepApp({
 		getSelectedFunding,
 		runOperation,
 		keyMap,
+		addCancelled,
 	])
 
 	const handleSendBsv = useCallback(
@@ -336,13 +352,22 @@ export function SweepApp({
 					if (result.sweptOutpoints.length > 0) await refreshAssets()
 					throw new Error(result.errors[0])
 				}
+				addCancelled(result.cancelledListings.length)
 				for (let i = 0; i < result.ordinalTxids.length - 1; i++) {
 					addTx(label, result.ordinalTxids[i])
 				}
 				return result.ordinalTxids[result.ordinalTxids.length - 1] ?? ''
 			})
 		},
-		[resolveWallet, legacyKeys, keyMap, runOperation, addTx, refreshAssets],
+		[
+			resolveWallet,
+			legacyKeys,
+			keyMap,
+			runOperation,
+			addTx,
+			addCancelled,
+			refreshAssets,
+		],
 	)
 
 	const handleSweepOrdinals = useCallback(async () => {
@@ -431,13 +456,22 @@ export function SweepApp({
 					if (result.sweptOutpoints.length > 0) await refreshAssets()
 					throw new Error(result.errors[0])
 				}
+				addCancelled(result.cancelledListings.length)
 				for (let i = 0; i < result.ordinalTxids.length - 1; i++) {
 					addTx(label, result.ordinalTxids[i])
 				}
 				return result.ordinalTxids[result.ordinalTxids.length - 1] ?? ''
 			})
 		},
-		[resolveWallet, legacyKeys, keyMap, runOperation, addTx, refreshAssets],
+		[
+			resolveWallet,
+			legacyKeys,
+			keyMap,
+			runOperation,
+			addTx,
+			addCancelled,
+			refreshAssets,
+		],
 	)
 
 	const handleSweepOpns = useCallback(async () => {
@@ -519,11 +553,12 @@ export function SweepApp({
 					})
 					for (const txid of result.txids.slice(0, -1)) addTx('BSV-21', txid)
 					if (result.error) throw new Error(result.error)
+					addCancelled(result.cancelledListings.length)
 					return result.txid ?? ''
 				},
 			)
 		},
-		[resolveWallet, assets, keyMap, runOperation, addTx],
+		[resolveWallet, assets, keyMap, runOperation, addTx, addCancelled],
 	)
 
 	const handleSweepBsv20Token = useCallback(
@@ -540,27 +575,90 @@ export function SweepApp({
 					onProgress: setSweepProgress,
 				})
 				if (result.error) throw new Error(result.error)
+				addCancelled(result.cancelledListings.length)
 				return result.txid ?? ''
 			})
 		},
-		[resolveWallet, assets, groupedBsv20, keyMap, runOperation],
+		[resolveWallet, assets, groupedBsv20, keyMap, runOperation, addCancelled],
 	)
 
+	const toggleSweepClass = useCallback((sweepClass: SweepClass) => {
+		setSkippedClasses((prev) => {
+			const next = new Set(prev)
+			if (next.has(sweepClass)) next.delete(sweepClass)
+			else next.add(sweepClass)
+			return next
+		})
+	}, [])
+
+	const sweepClasses = useMemo(() => {
+		if (!assets) return []
+		const classes: { id: SweepClass; label: string; count: number }[] = []
+		if (assets.funding.length > 0)
+			classes.push({ id: 'bsv', label: 'BSV', count: assets.funding.length })
+		if (assets.ordinals.length > 0)
+			classes.push({
+				id: 'ordinals',
+				label: 'Ordinals',
+				count: assets.ordinals.length,
+			})
+		if (assets.opnsNames.length > 0)
+			classes.push({
+				id: 'opns',
+				label: 'OpNS',
+				count: assets.opnsNames.length,
+			})
+		if (groupedBsv20.length > 0)
+			classes.push({
+				id: 'bsv20',
+				label: 'BSV-20',
+				count: groupedBsv20.reduce((n, t) => n + t.outputs.length, 0),
+			})
+		if (assets.bsv21Tokens.some((t) => t.outputs.length > 0))
+			classes.push({
+				id: 'bsv21',
+				label: 'BSV-21',
+				count: assets.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0),
+			})
+		return classes
+	}, [assets, groupedBsv20])
+
 	const handleSweepAll = useCallback(async () => {
 		const wallet = resolveWallet()
 		if (!wallet || !legacyKeys || !assets) return
-		await runOperation('Sweep all', async () => {
+		await runOperation('Sweep selected', async () => {
+			const all = selectAllSweepClasses(assets)
 			const result = await sweepAllClasses({
 				wallet,
 				keys: keyMap,
 				assets,
 				amount: sweepAmount ?? undefined,
 				onProgress: setSweepProgress,
+				selection: {
+					sweepBsv: !skippedClasses.has('bsv') && all.sweepBsv,
+					ordinalOutpoints: skippedClasses.has('ordinals')
+						? new Set<string>()
+						: selectedOrdinals.size > 0
+							? selectedOrdinals
+							: all.ordinalOutpoints,
+					opnsOutpoints: skippedClasses.has('opns')
+						? new Set<string>()
+						: selectedOpns.size > 0
+							? selectedOpns
+							: all.opnsOutpoints,
+					bsv20Ticks: skippedClasses.has('bsv20')
+						? new Set<string>()
+						: all.bsv20Ticks,
+					bsv21TokenIds: skippedClasses.has('bsv21')
+						? new Set<string>()
+						: all.bsv21TokenIds,
+				},
 			})
 			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)
+			addCancelled(result.cancelledListings.length)
 			if (result.errors.length > 0) throw new Error(result.errors[0])
 			return (
 				result.bsvTxid ??
@@ -578,6 +676,10 @@ export function SweepApp({
 		sweepAmount,
 		runOperation,
 		addTx,
+		addCancelled,
+		skippedClasses,
+		selectedOrdinals,
+		selectedOpns,
 	])
 
 	return (
@@ -615,15 +717,55 @@ export function SweepApp({
 
 				{assets && !sweeping && (
 					<div className="space-y-3">
+						{showClassSkips(
+							sweepClasses.map((c) => c.id),
+							skippedClasses,
+						) && (
+							<div className="flex flex-wrap gap-1.5">
+								{sweepClasses.map((sweepClass) => {
+									const skipped = skippedClasses.has(sweepClass.id)
+									return (
+										<Button
+											key={sweepClass.id}
+											variant={skipped ? 'outline' : 'secondary'}
+											size="sm"
+											className="gap-1.5"
+											onClick={() => toggleSweepClass(sweepClass.id)}
+											title={
+												skipped
+													? `Include ${sweepClass.label} in Sweep-selected`
+													: `Skip ${sweepClass.label} in Sweep-selected`
+											}
+										>
+											{sweepClass.label}
+											<Badge
+												variant="secondary"
+												className="text-[10px] px-1.5 py-0"
+											>
+												{sweepClass.count}
+											</Badge>
+										</Button>
+									)
+								})}
+							</div>
+						)}
 						<Button
 							className="w-full"
-							disabled={!walletConnected}
+							disabled={
+								!walletConnected ||
+								isSweepAllDisabled(
+									sweepClasses.map((c) => c.id),
+									skippedClasses,
+								)
+							}
 							onClick={handleSweepAll}
 							title={
 								walletConnected ? undefined : 'Connect BRC-100 wallet to sweep'
 							}
 						>
-							Sweep all to wallet
+							{skippedClasses.size > 0
+								? 'Sweep selected to wallet'
+								: 'Sweep all to wallet'}
 						</Button>
 						<FundingSection
 							funding={assets.funding}
@@ -715,6 +857,7 @@ export function SweepApp({
 					sweeping={sweeping}
 					progress={sweepProgress}
 					history={txHistory}
+					cancelledListings={cancelledListings}
 				/>
 			</div>
 		</div>

package/src/components/tx-history.tsx

@@ -13,9 +13,16 @@ interface Props {
 	sweeping: boolean
 	progress: string
 	history: TxRecord[]
+	/** Marketplace listings canceled into the wallet across this session. */
+	cancelledListings?: number
 }
 
-export function TxHistory({ sweeping, progress, history }: Props) {
+export function TxHistory({
+	sweeping,
+	progress,
+	history,
+	cancelledListings = 0,
+}: Props) {
 	return (
 		<>
 			{sweeping && (
@@ -32,6 +39,13 @@ export function TxHistory({ sweeping, progress, history }: Props) {
 				<div className="border border-border/50 rounded-lg p-3 space-y-2">
 					<div className="text-xs font-medium text-muted-foreground">
 						Transactions ({history.length})
+						{cancelledListings > 0 && (
+							<span>
+								{' '}
+								· {cancelledListings} listing
+								{cancelledListings !== 1 ? 's' : ''} canceled
+							</span>
+						)}
 					</div>
 					<div className="space-y-2 max-h-48 overflow-y-auto">
 						{[...history].reverse().map((tx, i) => (

package/src/index.ts

@@ -53,8 +53,16 @@ export {
 export {
 	executeSweep,
 	sweepAllClasses,
+	sweepBsv20Token,
+	sweepBsv21Token,
+	selectAllSweepClasses,
+	isSweepAllDisabled,
+	showClassSkips,
 	SWEEP_BATCH_SIZE,
+	type SweepClass,
+	type SweepClassSelection,
 	type SweepResult,
+	type SweepStepResult,
 } from './lib/sweeper'
 export {
 	legacySendBsv,