@1sat/sweep-ui 0.0.75 → 0.0.78

package/package.json

@@ -1,54 +1,54 @@
 {
-	"name": "@1sat/sweep-ui",
-	"version": "0.0.75",
-	"description": "Sweep UI components for migrating legacy BSV assets",
-	"type": "module",
-	"main": "./src/index.ts",
-	"types": "./dist/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./src/index.ts"
-		}
-	},
-	"files": [
-		"dist",
-		"src"
-	],
-	"scripts": {
-		"build": "bun run build.ts && tsc --emitDeclarationOnly",
-		"dev": "tsc --watch"
-	},
-	"keywords": [
-		"1sat",
-		"bsv",
-		"ordinals",
-		"sweep",
-		"migration",
-		"react"
-	],
-	"license": "MIT",
-	"dependencies": {
-		"@1sat/actions": "0.0.187",
-		"@1sat/client": "0.0.43",
-		"@1sat/connect": "0.0.79",
-		"@1sat/types": "0.0.34",
-		"@1sat/utils": "0.0.27",
-		"bitcoin-backup": "^0.0.11",
-		"class-variance-authority": "^0.7.1",
-		"clsx": "^2.1.1",
-		"lucide-react": "^0.577.0",
-		"sonner": "^2.0.7",
-		"tailwind-merge": "^3.5.0"
-	},
-	"peerDependencies": {
-		"@bsv/sdk": "^2.1.6",
-		"react": "^18.0.0 || ^19.0.0"
-	},
-	"devDependencies": {
-		"@bsv/sdk": "^2.1.6",
-		"@types/react": "^19.0.0",
-		"react": "^19.0.0",
-		"typescript": "~5.7.0"
-	}
+  "name": "@1sat/sweep-ui",
+  "version": "0.0.78",
+  "description": "Sweep UI components for migrating legacy BSV assets",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./src/index.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "bun run build.ts && tsc --emitDeclarationOnly",
+    "dev": "tsc --watch"
+  },
+  "keywords": [
+    "1sat",
+    "bsv",
+    "ordinals",
+    "sweep",
+    "migration",
+    "react"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "@1sat/actions": "0.0.191",
+    "@1sat/client": "0.0.46",
+    "@1sat/connect": "0.0.82",
+    "@1sat/types": "0.0.37",
+    "@1sat/utils": "0.0.30",
+    "bitcoin-backup": "^0.0.11",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.577.0",
+    "sonner": "^2.0.7",
+    "tailwind-merge": "^3.5.0"
+  },
+  "peerDependencies": {
+    "@bsv/sdk": "^2.1.9",
+    "react": "^18.0.0 || ^19.0.0"
+  },
+  "devDependencies": {
+    "@bsv/sdk": "^2.1.9",
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0",
+    "typescript": "~5.7.0"
+  }
 }

package/src/components/SweepApp.tsx

@@ -7,6 +7,7 @@ import {
 	legacySendOrdinals,
 } from '../lib/legacy-send'
 import {
+	type EnrichedOrdinal,
 	type ScannedAssets,
 	deriveAddress,
 	scanAddresses,
@@ -122,10 +123,9 @@ export function SweepApp({
 			return next
 		})
 	}, [])
-	const handleSelectAllOrdinals = useCallback(() => {
-		if (assets)
-			setSelectedOrdinals(new Set(assets.ordinals.map((o) => o.outpoint)))
-	}, [assets])
+	const handleSelectOrdinalPage = useCallback((outpoints: string[]) => {
+		setSelectedOrdinals(new Set(outpoints))
+	}, [])
 	const handleDeselectAllOrdinals = useCallback(
 		() => setSelectedOrdinals(new Set()),
 		[],
@@ -139,10 +139,9 @@ export function SweepApp({
 			return next
 		})
 	}, [])
-	const handleSelectAllOpns = useCallback(() => {
-		if (assets)
-			setSelectedOpns(new Set(assets.opnsNames.map((o) => o.outpoint)))
-	}, [assets])
+	const handleSelectOpnsPage = useCallback((outpoints: string[]) => {
+		setSelectedOpns(new Set(outpoints))
+	}, [])
 	const handleDeselectAllOpns = useCallback(
 		() => setSelectedOpns(new Set()),
 		[],
@@ -287,28 +286,58 @@ export function SweepApp({
 		[legacyKeys, assets, sweepAmount, getSelectedFunding, runOperation],
 	)
 
-	const handleSweepOrdinals = useCallback(async () => {
-		const wallet = resolveWallet()
-		if (!wallet || !legacyKeys || !assets) return
-		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 sweepOrdinalList = useCallback(
+		async (list: EnrichedOrdinal[], label: string) => {
+			const wallet = resolveWallet()
+			if (!wallet || !legacyKeys || list.length === 0) return
+			await runOperation(label, async () => {
 				const result = await executeSweep({
 					wallet,
 					keys: keyMap,
 					funding: [],
-					ordinals: selected,
+					ordinals: list,
 					onProgress: setSweepProgress,
 				})
-				if (result.errors.length > 0) throw new Error(result.errors[0])
-				return result.ordinalTxids[0] ?? ''
-			},
+				if (result.sweptOutpoints.length > 0) {
+					setSelectedOrdinals((prev) => {
+						const next = new Set(prev)
+						for (const op of result.sweptOutpoints) next.delete(op)
+						return next
+					})
+				}
+				if (result.errors.length > 0) {
+					for (const txid of result.ordinalTxids) addTx(label, txid)
+					if (result.sweptOutpoints.length > 0) await refreshAssets()
+					throw new Error(result.errors[0])
+				}
+				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],
+	)
+
+	const handleSweepOrdinals = useCallback(async () => {
+		if (!assets) return
+		const selected = assets.ordinals.filter((o) =>
+			selectedOrdinals.has(o.outpoint),
+		)
+		if (selected.length === 0) return
+		await sweepOrdinalList(
+			selected,
+			`Sweep ${selected.length} ordinal${selected.length !== 1 ? 's' : ''}`,
 		)
-	}, [resolveWallet, legacyKeys, assets, selectedOrdinals, runOperation])
+	}, [assets, selectedOrdinals, sweepOrdinalList])
+
+	const handleSweepAllOrdinals = useCallback(async () => {
+		if (!assets || assets.ordinals.length === 0) return
+		await sweepOrdinalList(
+			assets.ordinals,
+			`Sweep all ${assets.ordinals.length} ordinal${assets.ordinals.length !== 1 ? 's' : ''}`,
+		)
+	}, [assets, sweepOrdinalList])
 
 	const handleSendOrdinals = useCallback(
 		async (destination: string) => {
@@ -352,28 +381,58 @@ export function SweepApp({
 		)
 	}, [legacyKeys, assets, selectedOrdinals, runOperation])
 
-	const handleSweepOpns = useCallback(async () => {
-		const wallet = resolveWallet()
-		if (!wallet || !legacyKeys || !assets) return
-		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 sweepOpnsList = useCallback(
+		async (list: EnrichedOrdinal[], label: string) => {
+			const wallet = resolveWallet()
+			if (!wallet || !legacyKeys || list.length === 0) return
+			await runOperation(label, async () => {
 				const result = await executeSweep({
 					wallet,
 					keys: keyMap,
 					funding: [],
-					ordinals: selected,
+					ordinals: list,
 					onProgress: setSweepProgress,
 				})
-				if (result.errors.length > 0) throw new Error(result.errors[0])
-				return result.ordinalTxids[0] ?? ''
-			},
+				if (result.sweptOutpoints.length > 0) {
+					setSelectedOpns((prev) => {
+						const next = new Set(prev)
+						for (const op of result.sweptOutpoints) next.delete(op)
+						return next
+					})
+				}
+				if (result.errors.length > 0) {
+					for (const txid of result.ordinalTxids) addTx(label, txid)
+					if (result.sweptOutpoints.length > 0) await refreshAssets()
+					throw new Error(result.errors[0])
+				}
+				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],
+	)
+
+	const handleSweepOpns = useCallback(async () => {
+		if (!assets) return
+		const selected = assets.opnsNames.filter((o) =>
+			selectedOpns.has(o.outpoint),
+		)
+		if (selected.length === 0) return
+		await sweepOpnsList(
+			selected,
+			`Sweep ${selected.length} domain${selected.length !== 1 ? 's' : ''}`,
+		)
+	}, [assets, selectedOpns, sweepOpnsList])
+
+	const handleSweepAllOpns = useCallback(async () => {
+		if (!assets || assets.opnsNames.length === 0) return
+		await sweepOpnsList(
+			assets.opnsNames,
+			`Sweep all ${assets.opnsNames.length} domain${assets.opnsNames.length !== 1 ? 's' : ''}`,
 		)
-	}, [resolveWallet, legacyKeys, assets, selectedOpns, runOperation])
+	}, [assets, sweepOpnsList])
 
 	const handleSendOpns = useCallback(
 		async (destination: string) => {
@@ -512,9 +571,10 @@ export function SweepApp({
 										ordinals={assets.ordinals}
 										selectedOrdinals={selectedOrdinals}
 										onToggle={handleToggleOrdinal}
-										onSelectAll={handleSelectAllOrdinals}
+										onSelectPage={handleSelectOrdinalPage}
 										onDeselectAll={handleDeselectAllOrdinals}
 										onSweep={handleSweepOrdinals}
+										onSweepAll={handleSweepAllOrdinals}
 										onSend={sweepOnly ? undefined : handleSendOrdinals}
 										onBurn={sweepOnly ? undefined : handleBurnOrdinals}
 										walletConnected={walletConnected}
@@ -525,9 +585,10 @@ export function SweepApp({
 										opnsNames={assets.opnsNames}
 										selectedOpns={selectedOpns}
 										onToggle={handleToggleOpns}
-										onSelectAll={handleSelectAllOpns}
+										onSelectPage={handleSelectOpnsPage}
 										onDeselectAll={handleDeselectAllOpns}
 										onSweep={handleSweepOpns}
+										onSweepAll={handleSweepAllOpns}
 										onSend={sweepOnly ? undefined : handleSendOpns}
 										onBurn={sweepOnly ? undefined : handleBurnOpns}
 										walletConnected={walletConnected}

package/src/components/asset-preview.tsx

@@ -1,13 +1,12 @@
 import type { IndexedOutput } from '@1sat/types'
 import { useState } from 'react'
 import type { EnrichedOrdinal, TokenBalance } from '../lib/scanner'
+import { SWEEP_BATCH_SIZE } from '../lib/sweeper'
 import { formatSats, formatTokenAmount } from '../lib/utils'
 import { Badge } from './ui/badge'
 import { Button } from './ui/button'
 import { Input } from './ui/input'
 
-const ORDINALS_PER_PAGE = 20
-
 function isImageType(ct: string): boolean {
 	return ct.startsWith('image/') && ct !== 'image/svg+xml'
 }
@@ -200,9 +199,10 @@ export function OrdinalsSection({
 	ordinals,
 	selectedOrdinals,
 	onToggle,
-	onSelectAll,
+	onSelectPage,
 	onDeselectAll,
 	onSweep,
+	onSweepAll,
 	onSend,
 	onBurn,
 	walletConnected,
@@ -210,9 +210,10 @@ export function OrdinalsSection({
 	ordinals: EnrichedOrdinal[]
 	selectedOrdinals: Set<string>
 	onToggle: (outpoint: string) => void
-	onSelectAll: () => void
+	onSelectPage: (outpoints: string[]) => void
 	onDeselectAll: () => void
 	onSweep: () => void
+	onSweepAll: () => void
 	onSend?: (destination: string) => void
 	onBurn?: () => void
 	walletConnected: boolean
@@ -220,9 +221,13 @@ export function OrdinalsSection({
 	const [page, setPage] = useState(0)
 	const [address, setAddress] = useState('')
 	if (ordinals.length === 0) return null
-	const totalPages = Math.ceil(ordinals.length / ORDINALS_PER_PAGE)
-	const start = page * ORDINALS_PER_PAGE
-	const pageItems = ordinals.slice(start, start + ORDINALS_PER_PAGE)
+	const totalPages = Math.ceil(ordinals.length / SWEEP_BATCH_SIZE)
+	const safePage = Math.min(page, totalPages - 1)
+	const start = safePage * SWEEP_BATCH_SIZE
+	const pageItems = ordinals.slice(start, start + SWEEP_BATCH_SIZE)
+	const pageOutpoints = pageItems.map((o) => o.outpoint)
+	const selectedCount = selectedOrdinals.size
+	const batchCount = Math.ceil(ordinals.length / SWEEP_BATCH_SIZE)
 
 	return (
 		<div className="border border-blue-500/20 bg-blue-500/5 p-4 rounded-lg">
@@ -236,11 +241,14 @@ export function OrdinalsSection({
 					</div>
 					<div className="text-xs text-muted-foreground">
 						{ordinals.length} inscription{ordinals.length !== 1 ? 's' : ''}
-						{selectedOrdinals.size > 0 && (
+						{selectedCount > 0 && (
 							<span className="text-blue-400 ml-1">
-								({selectedOrdinals.size} selected)
+								({selectedCount} selected)
 							</span>
 						)}
+						<span className="ml-1 text-muted-foreground/80">
+							· {SWEEP_BATCH_SIZE}/page
+						</span>
 					</div>
 				</div>
 				<div className="flex gap-2">
@@ -248,16 +256,16 @@ export function OrdinalsSection({
 						variant="outline"
 						size="sm"
 						className="h-7 text-[11px]"
-						onClick={onSelectAll}
+						onClick={() => onSelectPage(pageOutpoints)}
 					>
-						Select All
+						Select page
 					</Button>
 					<Button
 						variant="outline"
 						size="sm"
 						className="h-7 text-[11px]"
 						onClick={onDeselectAll}
-						disabled={selectedOrdinals.size === 0}
+						disabled={selectedCount === 0}
 					>
 						Deselect
 					</Button>
@@ -279,79 +287,94 @@ export function OrdinalsSection({
 						variant="ghost"
 						size="sm"
 						className="text-xs"
-						onClick={() => setPage(page - 1)}
-						disabled={page === 0}
+						onClick={() => setPage(safePage - 1)}
+						disabled={safePage === 0}
 					>
 						Prev
 					</Button>
 					<span className="text-xs text-muted-foreground">
-						Page {page + 1} of {totalPages}
+						Page {safePage + 1} of {totalPages}
 					</span>
 					<Button
 						variant="ghost"
 						size="sm"
 						className="text-xs"
-						onClick={() => setPage(page + 1)}
-						disabled={page >= totalPages - 1}
+						onClick={() => setPage(safePage + 1)}
+						disabled={safePage >= totalPages - 1}
 					>
 						Next
 					</Button>
 				</div>
 			)}
-			{selectedOrdinals.size > 0 && (
-				<div className="mt-3 space-y-2">
-					{onSend && (
-						<Input
-							type="text"
-							placeholder="Destination address..."
-							value={address}
-							onChange={(e) => setAddress(e.target.value)}
-							className="font-mono text-xs"
-						/>
+			<div className="mt-3 space-y-2">
+				{selectedCount > 0 && onSend && (
+					<Input
+						type="text"
+						placeholder="Destination address..."
+						value={address}
+						onChange={(e) => setAddress(e.target.value)}
+						className="font-mono text-xs"
+					/>
+				)}
+				<div className="flex flex-wrap gap-2">
+					{selectedCount > 0 && onSend && (
+						<Button
+							variant="outline"
+							size="sm"
+							className="flex-1 min-w-[6rem]"
+							disabled={!address.trim()}
+							onClick={() => onSend(address.trim())}
+						>
+							Send {selectedCount}
+						</Button>
 					)}
-					<div className="flex gap-2">
-						{onSend && (
-							<Button
-								variant="outline"
-								size="sm"
-								className="flex-1"
-								disabled={!address.trim()}
-								onClick={() => onSend(address.trim())}
-							>
-								Send {selectedOrdinals.size} Ordinal
-								{selectedOrdinals.size !== 1 ? 's' : ''}
-							</Button>
-						)}
+					{selectedCount > 0 && (
 						<Button
 							size="sm"
-							className="flex-1"
+							className="flex-1 min-w-[6rem]"
 							onClick={onSweep}
 							disabled={!walletConnected}
 							title={
 								walletConnected ? undefined : 'Connect BRC-100 wallet to sweep'
 							}
 						>
-							Sweep to Wallet
+							Sweep {selectedCount}
+							{selectedCount > SWEEP_BATCH_SIZE
+								? ` (${Math.ceil(selectedCount / SWEEP_BATCH_SIZE)} batches)`
+								: ''}
 						</Button>
-						{onBurn && (
-							<Button
-								size="sm"
-								className="bg-red-600 hover:bg-red-700 text-white"
-								onClick={() => {
-									if (
-										window.confirm(
-											`Permanently burn ${selectedOrdinals.size} ordinal${selectedOrdinals.size !== 1 ? 's' : ''}? This cannot be undone.`,
-										)
+					)}
+					<Button
+						variant={selectedCount > 0 ? 'outline' : 'default'}
+						size="sm"
+						className="flex-1 min-w-[6rem]"
+						onClick={onSweepAll}
+						disabled={!walletConnected}
+						title={
+							walletConnected ? undefined : 'Connect BRC-100 wallet to sweep'
+						}
+					>
+						Sweep all
+						{batchCount > 1 ? ` (${batchCount} batches)` : ''}
+					</Button>
+					{selectedCount > 0 && onBurn && (
+						<Button
+							size="sm"
+							className="bg-red-600 hover:bg-red-700 text-white"
+							onClick={() => {
+								if (
+									window.confirm(
+										`Permanently burn ${selectedCount} ordinal${selectedCount !== 1 ? 's' : ''}? This cannot be undone.`,
 									)
-										onBurn()
-								}}
-							>
-								Burn
-							</Button>
-						)}
-					</div>
+								)
+									onBurn()
+							}}
+						>
+							Burn
+						</Button>
+					)}
 				</div>
-			)}
+			</div>
 		</div>
 	)
 }