@1sat/sweep-ui 0.0.75 → 0.0.77

package/src/components/opns-section.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
 import type { EnrichedOrdinal } from '../lib/scanner'
 import { getServices } from '../lib/services'
+import { SWEEP_BATCH_SIZE } from '../lib/sweeper'
 import { Button } from './ui/button'
 import { Input } from './ui/input'
 
@@ -8,9 +9,10 @@ export function OpnsSection({
 	opnsNames,
 	selectedOpns,
 	onToggle,
-	onSelectAll,
+	onSelectPage,
 	onDeselectAll,
 	onSweep,
+	onSweepAll,
 	onSend,
 	onBurn,
 	walletConnected,
@@ -18,13 +20,15 @@ export function OpnsSection({
 	opnsNames: EnrichedOrdinal[]
 	selectedOpns: 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
 }) {
+	const [page, setPage] = useState(0)
 	const [address, setAddress] = useState('')
 	const [resolvedNames, setResolvedNames] = useState<Map<string, string>>(
 		new Map(),
@@ -88,6 +92,14 @@ export function OpnsSection({
 
 	if (opnsNames.length === 0) return null
 
+	const totalPages = Math.ceil(opnsNames.length / SWEEP_BATCH_SIZE)
+	const safePage = Math.min(page, totalPages - 1)
+	const start = safePage * SWEEP_BATCH_SIZE
+	const pageItems = opnsNames.slice(start, start + SWEEP_BATCH_SIZE)
+	const pageOutpoints = pageItems.map((o) => o.outpoint)
+	const selectedCount = selectedOpns.size
+	const batchCount = Math.ceil(opnsNames.length / SWEEP_BATCH_SIZE)
+
 	return (
 		<div className="border border-orange-500/20 bg-orange-500/5 p-4 rounded-lg">
 			<div className="flex items-start justify-between mb-3">
@@ -100,11 +112,14 @@ export function OpnsSection({
 					</div>
 					<div className="text-xs text-muted-foreground">
 						{opnsNames.length} domain{opnsNames.length !== 1 ? 's' : ''}
-						{selectedOpns.size > 0 && (
+						{selectedCount > 0 && (
 							<span className="text-orange-400 ml-1">
-								({selectedOpns.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">
@@ -112,23 +127,23 @@ export function OpnsSection({
 						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={selectedOpns.size === 0}
+						disabled={selectedCount === 0}
 					>
 						Deselect
 					</Button>
 				</div>
 			</div>
 			<div className="space-y-1">
-				{opnsNames.map((item) => {
+				{pageItems.map((item) => {
 					const isSelected = selectedOpns.has(item.outpoint)
 					const displayName =
 						resolvedNames.get(item.outpoint) ??
@@ -162,60 +177,100 @@ export function OpnsSection({
 					)
 				})}
 			</div>
-			{selectedOpns.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"
-						/>
+			{totalPages > 1 && (
+				<div className="flex items-center justify-center gap-4 mt-2">
+					<Button
+						variant="ghost"
+						size="sm"
+						className="text-xs"
+						onClick={() => setPage(safePage - 1)}
+						disabled={safePage === 0}
+					>
+						Prev
+					</Button>
+					<span className="text-xs text-muted-foreground">
+						Page {safePage + 1} of {totalPages}
+					</span>
+					<Button
+						variant="ghost"
+						size="sm"
+						className="text-xs"
+						onClick={() => setPage(safePage + 1)}
+						disabled={safePage >= totalPages - 1}
+					>
+						Next
+					</Button>
+				</div>
+			)}
+			<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 {selectedOpns.size} Domain
-								{selectedOpns.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 ${selectedOpns.size} domain${selectedOpns.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} domain${selectedCount !== 1 ? 's' : ''}? This cannot be undone.`,
 									)
-										onBurn()
-								}}
-							>
-								Burn
-							</Button>
-						)}
-					</div>
+								)
+									onBurn()
+							}}
+						>
+							Burn
+						</Button>
+					)}
 				</div>
-			)}
+			</div>
 		</div>
 	)
 }

package/src/index.ts

@@ -50,7 +50,11 @@ export {
 	type TokenBalance,
 	type ScanProgress,
 } from './lib/scanner'
-export { executeSweep, type SweepResult } from './lib/sweeper'
+export {
+	executeSweep,
+	SWEEP_BATCH_SIZE,
+	type SweepResult,
+} from './lib/sweeper'
 export {
 	legacySendBsv,
 	legacySendOrdinals,

package/src/lib/sweeper.ts

@@ -10,11 +10,16 @@ import type { PrivateKey, WalletInterface } from '@bsv/sdk'
 import type { TokenBalance } from './scanner'
 import { getServices } from './services'
 
+/** Page size, select-page size, and createAction batch size for ordinal/OpNS sweeps. */
+export const SWEEP_BATCH_SIZE = 25
+
 export interface SweepResult {
 	bsvTxid?: string
 	ordinalTxids: string[]
 	bsv21Txids: string[]
 	errors: string[]
+	/** Outpoints successfully swept (ordinals/OpNS). */
+	sweptOutpoints: string[]
 }
 
 function getOwner(output: IndexedOutput): string | undefined {
@@ -34,8 +39,17 @@ function buildKeys(
 	})
 }
 
+function chunk<T>(items: T[], size: number): T[][] {
+	const batches: T[][] = []
+	for (let i = 0; i < items.length; i += size) {
+		batches.push(items.slice(i, i + size))
+	}
+	return batches
+}
+
 /**
  * Sweep BSV funding and ordinals into the connected wallet.
+ * Ordinals are processed in batches of {@link SWEEP_BATCH_SIZE}; stops on first batch error.
  */
 export async function executeSweep(params: {
 	wallet: WalletInterface
@@ -52,6 +66,7 @@ export async function executeSweep(params: {
 		ordinalTxids: [],
 		bsv21Txids: [],
 		errors: [],
+		sweptOutpoints: [],
 	}
 
 	if (funding.length > 0) {
@@ -71,23 +86,42 @@ export async function executeSweep(params: {
 	}
 
 	if (ordinals.length > 0) {
-		onProgress(`Sweeping ${ordinals.length} ordinals...`)
-		try {
-			const inputs = await prepareSweepInputs(ctx, ordinals)
-			const ordResult = await sweepOrdinals.execute(ctx, {
-				inputs,
-				keys: buildKeys(ordinals, keys),
-			})
-			if (ordResult.error) result.errors.push(`Ordinals: ${ordResult.error}`)
-			else if (ordResult.txid) result.ordinalTxids.push(ordResult.txid)
-		} catch (e) {
-			result.errors.push(
-				`Ordinals: ${e instanceof Error ? e.message : String(e)}`,
+		const batches = chunk(ordinals, SWEEP_BATCH_SIZE)
+		for (let b = 0; b < batches.length; b++) {
+			const batch = batches[b]
+			const from = b * SWEEP_BATCH_SIZE + 1
+			const to = b * SWEEP_BATCH_SIZE + batch.length
+			onProgress(
+				batches.length === 1
+					? `Sweeping ${batch.length} ordinal${batch.length !== 1 ? 's' : ''}...`
+					: `Sweeping ordinals ${from}–${to} of ${ordinals.length} (batch ${b + 1}/${batches.length})...`,
 			)
+			try {
+				const inputs = await prepareSweepInputs(ctx, batch)
+				const ordResult = await sweepOrdinals.execute(ctx, {
+					inputs,
+					keys: buildKeys(batch, keys),
+				})
+				if (ordResult.error) {
+					result.errors.push(
+						`Ordinals batch ${b + 1}/${batches.length}: ${ordResult.error}`,
+					)
+					break
+				}
+				if (ordResult.txid) result.ordinalTxids.push(ordResult.txid)
+				result.sweptOutpoints.push(...batch.map((o) => o.outpoint))
+			} catch (e) {
+				result.errors.push(
+					`Ordinals batch ${b + 1}/${batches.length}: ${e instanceof Error ? e.message : String(e)}`,
+				)
+				break
+			}
 		}
 	}
 
-	onProgress('Sweep complete')
+	onProgress(
+		result.errors.length > 0 ? 'Sweep stopped with errors' : 'Sweep complete',
+	)
 	return result
 }