@1sat/sweep-ui 0.0.93 → 0.0.94

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,EAAc,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AAgB3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAmB1C,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,wBAAgB,QAAQ,CAAC,EACxB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,cAAc,EACtB,SAAS,GACT,EAAE,aAAa,+BAimBf"}
+{"version":3,"file":"SweepApp.d.ts","sourceRoot":"","sources":["../../src/components/SweepApp.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,UAAU,CAAA;AAgB3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAmB1C,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,wBAAgB,QAAQ,CAAC,EACxB,UAAU,EAAE,WAAW,EACvB,MAAM,EAAE,cAAc,EACtB,SAAS,GACT,EAAE,aAAa,+BAonBf"}

package/dist/index.js

@@ -286,12 +286,13 @@ var SWEEP_BATCH_SIZE = 25;
 function getOwner(output) {
   return output.events?.find((e) => e.startsWith("own:"))?.slice(4);
 }
-function buildKeys(outputs, keyMap) {
-  return outputs.map((output) => {
-    const owner = getOwner(output);
+function buildKeys(outputs, keyMap, inputs = outputs) {
+  const owners = new Map(outputs.map((output) => [output.outpoint, getOwner(output)]));
+  return inputs.map(({ outpoint }) => {
+    const owner = owners.get(outpoint);
     const key = owner ? keyMap.get(owner) : undefined;
     if (!key)
-      throw new Error(`No key for output ${output.outpoint} (owner: ${owner})`);
+      throw new Error(`No key for output ${outpoint} (owner: ${owner})`);
     return key;
   });
 }
@@ -330,18 +331,19 @@ async function executeSweep(params) {
         const inputs = await prepareSweepInputs(ctx, batch);
         const cancelResult = await sweepOrdinals.execute(ctx, {
           inputs,
-          keys: buildKeys(batch, keys)
+          keys: buildKeys(batch, keys, inputs)
         });
-        if (cancelResult.error) {
-          result.errors.push(`Listings batch ${b + 1}: ${cancelResult.error}`);
-          break;
-        }
-        if (cancelResult.txid)
-          result.listingTxids.push(cancelResult.txid);
+        if (cancelResult.error)
+          throw new Error(cancelResult.error);
+        const txid = cancelResult.txid?.trim();
+        if (!txid)
+          throw new Error("Cancellation returned no transaction ID");
+        result.listingTxids.push(txid);
         result.cancelledListings.push(...batch.map((o) => o.outpoint));
       } catch (e) {
         result.errors.push(`Listings batch ${b + 1}: ${e instanceof Error ? e.message : String(e)}`);
-        break;
+        onProgress("Sweep stopped with errors");
+        return result;
       }
     }
   }
@@ -351,13 +353,15 @@ async function executeSweep(params) {
       const inputs = await prepareSweepInputs(ctx, funding);
       const bsvResult = await sweepBsv.execute(ctx, {
         inputs,
-        keys: buildKeys(funding, keys),
+        keys: buildKeys(funding, keys, inputs),
         amount
       });
       if (bsvResult.error)
-        result.errors.push(`BSV: ${bsvResult.error}`);
-      else if (bsvResult.txid)
-        result.bsvTxid = bsvResult.txid;
+        throw new Error(bsvResult.error);
+      const txid = bsvResult.txid?.trim();
+      if (!txid)
+        throw new Error("Sweep returned no transaction ID");
+      result.bsvTxid = txid;
     } catch (e) {
       result.errors.push(`BSV: ${e instanceof Error ? e.message : String(e)}`);
     }
@@ -373,14 +377,14 @@ async function executeSweep(params) {
         const inputs = await prepareSweepInputs(ctx, batch);
         const ordResult = await sweepOrdinals.execute(ctx, {
           inputs,
-          keys: buildKeys(batch, keys)
+          keys: buildKeys(batch, keys, inputs)
         });
-        if (ordResult.error) {
-          result.errors.push(`Ordinals batch ${b + 1}/${batches.length}: ${ordResult.error}`);
-          break;
-        }
-        if (ordResult.txid)
-          result.ordinalTxids.push(ordResult.txid);
+        if (ordResult.error)
+          throw new Error(ordResult.error);
+        const txid = ordResult.txid?.trim();
+        if (!txid)
+          throw new Error("Sweep returned no transaction ID");
+        result.ordinalTxids.push(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)}`);
@@ -2465,10 +2469,13 @@ function SweepApp({
         amount: sweepAmount ?? undefined,
         onProgress: setSweepProgress
       });
-      if (result.errors.length > 0)
-        throw new Error(result.errors[0]);
       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]);
+      }
       return result.bsvTxid ?? result.listingTxids[0] ?? "";
     });
   }, [
@@ -2479,7 +2486,8 @@ function SweepApp({
     getSelectedFunding,
     runOperation,
     keyMap,
-    addTx
+    addTx,
+    refreshAssets
   ]);
   const handleCancelListings = useCallback2(async () => {
     const wallet = resolveWallet();
@@ -2494,11 +2502,27 @@ function SweepApp({
         listings: assets.listings,
         onProgress: setSweepProgress
       });
-      if (result.errors.length > 0)
+      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]);
-      return result.listingTxids[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]);
+  }, [
+    resolveWallet,
+    legacyKeys,
+    assets,
+    keyMap,
+    runOperation,
+    addTx,
+    refreshAssets
+  ]);
   const handleSendBsv = useCallback2(async (destination) => {
     if (!legacyKeys || !assets)
       return;

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;AA2BD;;;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,CAuGvB;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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/sweep-ui",
-  "version": "0.0.93",
+  "version": "0.0.94",
   "description": "Sweep UI components for migrating legacy BSV assets",
   "type": "module",
   "main": "./src/index.ts",

package/src/components/SweepApp.tsx

@@ -261,8 +261,11 @@ export function SweepApp({
 				amount: sweepAmount ?? undefined,
 				onProgress: setSweepProgress,
 			})
-			if (result.errors.length > 0) throw new Error(result.errors[0])
 			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])
+			}
 			return result.bsvTxid ?? result.listingTxids[0] ?? ''
 		})
 	}, [
@@ -274,6 +277,7 @@ export function SweepApp({
 		runOperation,
 		keyMap,
 		addTx,
+		refreshAssets,
 	])
 
 	const handleCancelListings = useCallback(async () => {
@@ -289,10 +293,25 @@ export function SweepApp({
 				listings: assets.listings,
 				onProgress: setSweepProgress,
 			})
-			if (result.errors.length > 0) throw new Error(result.errors[0])
-			return result.listingTxids[0] ?? ''
+			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])
+	}, [
+		resolveWallet,
+		legacyKeys,
+		assets,
+		keyMap,
+		runOperation,
+		addTx,
+		refreshAssets,
+	])
 
 	const handleSendBsv = useCallback(
 		async (destination: string) => {

package/src/lib/sweeper.ts

@@ -32,12 +32,15 @@ function getOwner(output: IndexedOutput): string | undefined {
 function buildKeys(
 	outputs: IndexedOutput[],
 	keyMap: Map<string, PrivateKey>,
+	inputs: Pick<IndexedOutput, 'outpoint'>[] = outputs,
 ): PrivateKey[] {
-	return outputs.map((output) => {
-		const owner = getOwner(output)
+	const owners = new Map(
+		outputs.map((output) => [output.outpoint, getOwner(output)]),
+	)
+	return inputs.map(({ outpoint }) => {
+		const owner = owners.get(outpoint)
 		const key = owner ? keyMap.get(owner) : undefined
-		if (!key)
-			throw new Error(`No key for output ${output.outpoint} (owner: ${owner})`)
+		if (!key) throw new Error(`No key for output ${outpoint} (owner: ${owner})`)
 		return key
 	})
 }
@@ -95,19 +98,19 @@ export async function executeSweep(params: {
 				const inputs = await prepareSweepInputs(ctx, batch)
 				const cancelResult = await sweepOrdinals.execute(ctx, {
 					inputs,
-					keys: buildKeys(batch, keys),
+					keys: buildKeys(batch, keys, inputs),
 				})
-				if (cancelResult.error) {
-					result.errors.push(`Listings batch ${b + 1}: ${cancelResult.error}`)
-					break
-				}
-				if (cancelResult.txid) result.listingTxids.push(cancelResult.txid)
+				if (cancelResult.error) throw new Error(cancelResult.error)
+				const txid = cancelResult.txid?.trim()
+				if (!txid) throw new Error('Cancellation returned no transaction ID')
+				result.listingTxids.push(txid)
 				result.cancelledListings.push(...batch.map((o) => o.outpoint))
 			} catch (e) {
 				result.errors.push(
 					`Listings batch ${b + 1}: ${e instanceof Error ? e.message : String(e)}`,
 				)
-				break
+				onProgress('Sweep stopped with errors')
+				return result
 			}
 		}
 	}
@@ -118,11 +121,13 @@ export async function executeSweep(params: {
 			const inputs = await prepareSweepInputs(ctx, funding)
 			const bsvResult = await sweepBsv.execute(ctx, {
 				inputs,
-				keys: buildKeys(funding, keys),
+				keys: buildKeys(funding, keys, inputs),
 				amount,
 			})
-			if (bsvResult.error) result.errors.push(`BSV: ${bsvResult.error}`)
-			else if (bsvResult.txid) result.bsvTxid = bsvResult.txid
+			if (bsvResult.error) throw new Error(bsvResult.error)
+			const txid = bsvResult.txid?.trim()
+			if (!txid) throw new Error('Sweep returned no transaction ID')
+			result.bsvTxid = txid
 		} catch (e) {
 			result.errors.push(`BSV: ${e instanceof Error ? e.message : String(e)}`)
 		}
@@ -143,15 +148,12 @@ export async function executeSweep(params: {
 				const inputs = await prepareSweepInputs(ctx, batch)
 				const ordResult = await sweepOrdinals.execute(ctx, {
 					inputs,
-					keys: buildKeys(batch, keys),
+					keys: buildKeys(batch, keys, inputs),
 				})
-				if (ordResult.error) {
-					result.errors.push(
-						`Ordinals batch ${b + 1}/${batches.length}: ${ordResult.error}`,
-					)
-					break
-				}
-				if (ordResult.txid) result.ordinalTxids.push(ordResult.txid)
+				if (ordResult.error) throw new Error(ordResult.error)
+				const txid = ordResult.txid?.trim()
+				if (!txid) throw new Error('Sweep returned no transaction ID')
+				result.ordinalTxids.push(txid)
 				result.sweptOutpoints.push(...batch.map((o) => o.outpoint))
 			} catch (e) {
 				result.errors.push(