@1sat/sweep-ui 0.0.6 → 0.0.7

package/dist/components/SweepApp.d.ts

@@ -1,5 +1,5 @@
 import type { LegacyKeys } from "../types";
-import type { WalletInterface } from "@bsv/sdk";
+import { type WalletInterface } from "@bsv/sdk";
 export interface SweepAppProps {
     legacyKeys?: LegacyKeys;
     wallet?: WalletInterface | null;

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,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAIhD,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,QAAQ,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,aAAa,2CAiQrG"}
+{"version":3,"file":"SweepApp.d.ts","sourceRoot":"","sources":["../../src/components/SweepApp.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAI5D,MAAM,WAAW,aAAa;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,QAAQ,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE,aAAa,2CA4QrG"}

package/dist/index.js

@@ -1800,8 +1800,20 @@ import {
   sweepOrdinals,
   sweepBsv21
 } from "@1sat/actions";
+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);
+    const key = owner ? keyMap.get(owner) : undefined;
+    if (!key)
+      throw new Error(`No key for output ${output.outpoint} (owner: ${owner})`);
+    return key;
+  });
+}
 async function executeSweep(params) {
-  const { wallet, wif, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
+  const { wallet, keys, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
   const ctx = createContext2(wallet, { services: getServices(), chain: "main" });
   const result = {
     ordinalTxids: [],
@@ -1812,7 +1824,7 @@ async function executeSweep(params) {
     onProgress(`Sweeping ${funding.length} BSV UTXOs...`);
     try {
       const inputs = await prepareSweepInputs(ctx, funding);
-      const bsvResult = await sweepBsv.execute(ctx, { inputs, wif, amount });
+      const bsvResult = await sweepBsv.execute(ctx, { inputs, keys: buildKeys(funding, keys), amount });
       if (bsvResult.error)
         result.errors.push(`BSV: ${bsvResult.error}`);
       else if (bsvResult.txid)
@@ -1825,7 +1837,7 @@ async function executeSweep(params) {
     onProgress(`Sweeping ${ordinals.length} ordinals...`);
     try {
       const inputs = await prepareSweepInputs(ctx, ordinals);
-      const ordResult = await sweepOrdinals.execute(ctx, { inputs, wif });
+      const ordResult = await sweepOrdinals.execute(ctx, { inputs, keys: buildKeys(ordinals, keys) });
       if (ordResult.error)
         result.errors.push(`Ordinals: ${ordResult.error}`);
       else if (ordResult.txid)
@@ -1853,7 +1865,7 @@ async function executeSweep(params) {
             tokenId,
             amount: "0"
           })),
-          wif
+          keys: buildKeys(tokens, keys)
         });
         if (tokenResult.error)
           result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${tokenResult.error}`);
@@ -2052,6 +2064,7 @@ async function legacyBurnOrdinals(params) {
 }
 
 // src/components/SweepApp.tsx
+import { PrivateKey as PrivateKey3 } from "@bsv/sdk";
 import { jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
 function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }) {
   const [walletConnected, setWalletConnected] = useState5(!!externalWallet);
@@ -2072,6 +2085,17 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
   const resolveWallet = useCallback2(() => {
     return externalWallet ?? getWallet();
   }, [externalWallet]);
+  const keyMap = useMemo(() => {
+    if (!legacyKeys)
+      return new Map;
+    const map = new Map;
+    map.set(deriveAddress(legacyKeys.payPk), PrivateKey3.fromWif(legacyKeys.payPk));
+    map.set(deriveAddress(legacyKeys.ordPk), PrivateKey3.fromWif(legacyKeys.ordPk));
+    if (legacyKeys.identityPk) {
+      map.set(deriveAddress(legacyKeys.identityPk), PrivateKey3.fromWif(legacyKeys.identityPk));
+    }
+    return map;
+  }, [legacyKeys]);
   const addTx = useCallback2((label, txid, error) => {
     setTxHistory((prev) => [...prev, { label, txid, timestamp: new Date, error }]);
   }, []);
@@ -2202,7 +2226,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (!wallet || !legacyKeys || !assets)
       return;
     await runOperation("Sweep BSV", async () => {
-      const result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.bsvTxid ?? "";
@@ -2224,7 +2248,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (selected.length === 0)
       return;
     await runOperation(`Sweep ${selected.length} ordinal${selected.length !== 1 ? "s" : ""}`, async () => {
-      const result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.ordinalTxids[0] ?? "";
@@ -2260,7 +2284,7 @@ function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, sweepOnly }
     if (selected.length === 0)
       return;
     await runOperation(`Sweep ${selected.length} domain${selected.length !== 1 ? "s" : ""}`, async () => {
-      const result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+      const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
       if (result.errors.length > 0)
         throw new Error(result.errors[0]);
       return result.ordinalTxids[0] ?? "";

package/dist/lib/sweeper.d.ts

@@ -1,5 +1,5 @@
 import type { IndexedOutput } from "@1sat/types";
-import type { WalletInterface } from "@bsv/sdk";
+import { PrivateKey, type WalletInterface } from "@bsv/sdk";
 export interface SweepResult {
     bsvTxid?: string;
     ordinalTxids: string[];
@@ -8,7 +8,7 @@ export interface SweepResult {
 }
 export declare function executeSweep(params: {
     wallet: WalletInterface;
-    wif: string;
+    keys: Map<string, PrivateKey>;
     funding: IndexedOutput[];
     ordinals: IndexedOutput[];
     bsv21Tokens: IndexedOutput[];

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,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAGhD,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,CAAC,CAkEvB"}
+{"version":3,"file":"sweeper.d.ts","sourceRoot":"","sources":["../../src/lib/sweeper.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAG5D,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CACjB;AAeD,wBAAsB,YAAY,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC9B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GAAG,OAAO,CAAC,WAAW,CAAC,CAkEvB"}

package/package.json

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

package/src/components/SweepApp.tsx

@@ -12,7 +12,7 @@ import { executeSweep } from "../lib/sweeper";
 import { legacySendBsv, legacySendOrdinals, legacyBurnOrdinals } from "../lib/legacy-send";
 import { getWallet } from "../lib/wallet";
 import type { LegacyKeys } from "../types";
-import type { WalletInterface } from "@bsv/sdk";
+import { PrivateKey, type WalletInterface } from "@bsv/sdk";
 
 type TabId = "ordinals" | "opns" | "bsv21" | "bsv20" | "locks";
 
@@ -44,6 +44,17 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		return externalWallet ?? getWallet();
 	}, [externalWallet]);
 
+	const keyMap = useMemo(() => {
+		if (!legacyKeys) return new Map<string, PrivateKey>();
+		const map = new Map<string, PrivateKey>();
+		map.set(deriveAddress(legacyKeys.payPk), PrivateKey.fromWif(legacyKeys.payPk));
+		map.set(deriveAddress(legacyKeys.ordPk), PrivateKey.fromWif(legacyKeys.ordPk));
+		if (legacyKeys.identityPk) {
+			map.set(deriveAddress(legacyKeys.identityPk), PrivateKey.fromWif(legacyKeys.identityPk));
+		}
+		return map;
+	}, [legacyKeys]);
+
 	const addTx = useCallback((label: string, txid: string, error?: string) => {
 		setTxHistory((prev) => [...prev, { label, txid, timestamp: new Date(), error }]);
 	}, []);
@@ -148,7 +159,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		const wallet = resolveWallet();
 		if (!wallet || !legacyKeys || !assets) return;
 		await runOperation("Sweep BSV", async () => {
-			const result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: getSelectedFunding(), ordinals: [], bsv21Tokens: [], amount: sweepAmount ?? undefined, onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.bsvTxid ?? "";
 		});
@@ -168,7 +179,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		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 result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.ordinalTxids[0] ?? "";
 		});
@@ -200,7 +211,7 @@ export function SweepApp({ legacyKeys: initialKeys, wallet: externalWallet, swee
 		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 result = await executeSweep({ wallet, wif: legacyKeys.payPk, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
+			const result = await executeSweep({ wallet, keys: keyMap, funding: [], ordinals: selected, bsv21Tokens: [], onProgress: setSweepProgress });
 			if (result.errors.length > 0) throw new Error(result.errors[0]);
 			return result.ordinalTxids[0] ?? "";
 		});

package/src/lib/sweeper.ts

@@ -6,7 +6,7 @@ import {
 	sweepBsv21,
 } from "@1sat/actions";
 import type { IndexedOutput } from "@1sat/types";
-import type { WalletInterface } from "@bsv/sdk";
+import { PrivateKey, type WalletInterface } from "@bsv/sdk";
 import { getServices } from "./services";
 
 export interface SweepResult {
@@ -16,16 +16,29 @@ export interface SweepResult {
 	errors: string[];
 }
 
+function getOwner(output: IndexedOutput): string | undefined {
+	return output.events?.find((e) => e.startsWith("own:"))?.slice(4);
+}
+
+function buildKeys(outputs: IndexedOutput[], keyMap: Map<string, PrivateKey>): PrivateKey[] {
+	return outputs.map((output) => {
+		const owner = getOwner(output);
+		const key = owner ? keyMap.get(owner) : undefined;
+		if (!key) throw new Error(`No key for output ${output.outpoint} (owner: ${owner})`);
+		return key;
+	});
+}
+
 export async function executeSweep(params: {
 	wallet: WalletInterface;
-	wif: string;
+	keys: Map<string, PrivateKey>;
 	funding: IndexedOutput[];
 	ordinals: IndexedOutput[];
 	bsv21Tokens: IndexedOutput[];
 	amount?: number;
 	onProgress: (stage: string) => void;
 }): Promise<SweepResult> {
-	const { wallet, wif, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
+	const { wallet, keys, funding, ordinals, bsv21Tokens, amount, onProgress } = params;
 	const ctx = createContext(wallet, { services: getServices(), chain: "main" });
 
 	const result: SweepResult = {
@@ -38,7 +51,7 @@ export async function executeSweep(params: {
 		onProgress(`Sweeping ${funding.length} BSV UTXOs...`);
 		try {
 			const inputs = await prepareSweepInputs(ctx, funding);
-			const bsvResult = await sweepBsv.execute(ctx, { inputs, wif, amount });
+			const bsvResult = await sweepBsv.execute(ctx, { inputs, keys: buildKeys(funding, keys), amount });
 			if (bsvResult.error) result.errors.push(`BSV: ${bsvResult.error}`);
 			else if (bsvResult.txid) result.bsvTxid = bsvResult.txid;
 		} catch (e) {
@@ -50,7 +63,7 @@ export async function executeSweep(params: {
 		onProgress(`Sweeping ${ordinals.length} ordinals...`);
 		try {
 			const inputs = await prepareSweepInputs(ctx, ordinals);
-			const ordResult = await sweepOrdinals.execute(ctx, { inputs, wif });
+			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) {
@@ -78,7 +91,7 @@ export async function executeSweep(params: {
 						tokenId,
 						amount: "0",
 					})),
-					wif,
+					keys: buildKeys(tokens, keys),
 				});
 				if (tokenResult.error) result.errors.push(`BSV-21 (${tokenId.slice(0, 8)}): ${tokenResult.error}`);
 				else if (tokenResult.txid) result.bsv21Txids.push(tokenResult.txid);