@1sat/cli 0.0.105 → 0.0.106

package/dist/cli.js

@@ -3940,9 +3940,10 @@ async function sweepImport(args, opts) {
   if (!wif)
     fatal("Missing --wif <private-key>");
   let address;
+  let sweepKey;
   try {
-    const pk = PrivateKey4.fromWif(wif);
-    address = pk.toPublicKey().toAddress();
+    sweepKey = PrivateKey4.fromWif(wif);
+    address = sweepKey.toPublicKey().toAddress();
   } catch {
     fatal("Invalid WIF private key");
   }
@@ -3990,7 +3991,8 @@ async function sweepImport(args, opts) {
     const txids = [];
     if (hasFunding) {
       const inputs = await prepareSweepInputs(ctx, scan.funding);
-      const result = await sweepBsv.execute(ctx, { inputs, wif });
+      const keys = inputs.map(() => sweepKey);
+      const result = await sweepBsv.execute(ctx, { inputs, keys });
       if (result.error) {
         fatal(`BSV sweep failed: ${result.error}`);
       }
@@ -3999,7 +4001,8 @@ async function sweepImport(args, opts) {
     }
     if (hasOrdinals) {
       const inputs = await prepareSweepInputs(ctx, scan.ordinals);
-      const result = await sweepOrdinals.execute(ctx, { inputs, wif });
+      const keys = inputs.map(() => sweepKey);
+      const result = await sweepOrdinals.execute(ctx, { inputs, keys });
       if (result.error) {
         fatal(`Ordinals sweep failed: ${result.error}`);
       }
@@ -4010,12 +4013,14 @@ async function sweepImport(args, opts) {
       for (const token of scan.bsv21Tokens) {
         if (!token.isActive || token.outputs.length === 0)
           continue;
-        const inputs = token.outputs.map((out) => ({
-          outpoint: out.outpoint,
+        const base = await prepareSweepInputs(ctx, token.outputs);
+        const inputs = base.map((b) => ({
+          ...b,
           tokenId: token.tokenId,
-          amount: token.amounts.get(out.outpoint) ?? "0"
+          amount: token.amounts.get(b.outpoint) ?? "0"
         }));
-        const result = await sweepBsv21.execute(ctx, { inputs, wif });
+        const keys = inputs.map(() => sweepKey);
+        const result = await sweepBsv21.execute(ctx, { inputs, keys });
         if (result.error) {
           fatal(`Token sweep failed (${token.symbol ?? token.tokenId.slice(0, 12)}): ${result.error}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1sat/cli",
-  "version": "0.0.105",
+  "version": "0.0.106",
   "description": "CLI for 1Sat Ordinals SDK",
   "type": "module",
   "main": "./dist/cli.js",

package/src/commands/sweep.ts

@@ -135,9 +135,10 @@ async function sweepImport(args: string[], opts: GlobalFlags): Promise<void> {
 	if (!wif) fatal('Missing --wif <private-key>')
 
 	let address: string
+	let sweepKey: PrivateKey
 	try {
-		const pk = PrivateKey.fromWif(wif)
-		address = pk.toPublicKey().toAddress()
+		sweepKey = PrivateKey.fromWif(wif)
+		address = sweepKey.toPublicKey().toAddress()
 	} catch {
 		fatal('Invalid WIF private key')
 	}
@@ -200,7 +201,8 @@ async function sweepImport(args: string[], opts: GlobalFlags): Promise<void> {
 		// Sweep BSV funding UTXOs
 		if (hasFunding) {
 			const inputs = await prepareSweepInputs(ctx, scan.funding)
-			const result = await sweepBsv.execute(ctx, { inputs, wif })
+			const keys = inputs.map(() => sweepKey)
+			const result = await sweepBsv.execute(ctx, { inputs, keys })
 			if (result.error) {
 				fatal(`BSV sweep failed: ${result.error}`)
 			}
@@ -210,7 +212,8 @@ async function sweepImport(args: string[], opts: GlobalFlags): Promise<void> {
 		// Sweep ordinals
 		if (hasOrdinals) {
 			const inputs = await prepareSweepInputs(ctx, scan.ordinals)
-			const result = await sweepOrdinals.execute(ctx, { inputs, wif })
+			const keys = inputs.map(() => sweepKey)
+			const result = await sweepOrdinals.execute(ctx, { inputs, keys })
 			if (result.error) {
 				fatal(`Ordinals sweep failed: ${result.error}`)
 			}
@@ -222,13 +225,15 @@ async function sweepImport(args: string[], opts: GlobalFlags): Promise<void> {
 			for (const token of scan.bsv21Tokens) {
 				if (!token.isActive || token.outputs.length === 0) continue
 
-				const inputs = token.outputs.map((out) => ({
-					outpoint: out.outpoint,
+				const base = await prepareSweepInputs(ctx, token.outputs)
+				const inputs = base.map((b) => ({
+					...b,
 					tokenId: token.tokenId,
-					amount: token.amounts.get(out.outpoint) ?? '0',
+					amount: token.amounts.get(b.outpoint) ?? '0',
 				}))
+				const keys = inputs.map(() => sweepKey)
 
-				const result = await sweepBsv21.execute(ctx, { inputs, wif })
+				const result = await sweepBsv21.execute(ctx, { inputs, keys })
 				if (result.error) {
 					fatal(
 						`Token sweep failed (${token.symbol ?? token.tokenId.slice(0, 12)}): ${result.error}`,