@1sat/sweep-ui 0.0.92 → 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;AAkB1C,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,+BAqkBf"}
+{"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/components/asset-preview.d.ts

@@ -29,6 +29,11 @@ export declare function Bsv21Section({ tokens, onSweep, walletConnected, }: {
 export declare function Bsv20Section({ tokens }: {
     tokens: IndexedOutput[];
 }): import("react").JSX.Element | null;
+export declare function ListingsSection({ listings, walletConnected, onCancel, }: {
+    listings: EnrichedOrdinal[];
+    walletConnected?: boolean;
+    onCancel?: () => void;
+}): import("react").JSX.Element | null;
 export declare function LockedSection({ locked }: {
     locked: IndexedOutput[];
 }): import("react").JSX.Element | null;

package/dist/components/asset-preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"asset-preview.d.ts","sourceRoot":"","sources":["../../src/components/asset-preview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAuFnE,wBAAgB,cAAc,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,eAAe,GACf,EAAE;IACF,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IACpD,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,eAAe,EAAE,OAAO,CAAA;CACxB,sCA0FA;AAED,wBAAgB,eAAe,CAAC,EAC/B,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,OAAO,EACP,UAAU,EACV,MAAM,EACN,MAAM,EACN,eAAe,GACf,EAAE;IACF,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAC3C,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,eAAe,EAAE,OAAO,CAAA;CACxB,sCAgKA;AAgED,wBAAgB,YAAY,CAAC,EAC5B,MAAM,EACN,OAAO,EACP,eAAe,GACf,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,eAAe,EAAE,OAAO,CAAA;CACxB,sCAuCA;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,sCAkCnE;AAED,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,sCAgBpE;AAED,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,aAAa,EAAE,CAAA;CAAE,sCAkB3D"}
+{"version":3,"file":"asset-preview.d.ts","sourceRoot":"","sources":["../../src/components/asset-preview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAuFnE,wBAAgB,cAAc,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,eAAe,GACf,EAAE;IACF,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;IACpD,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,eAAe,EAAE,OAAO,CAAA;CACxB,sCA0FA;AAED,wBAAgB,eAAe,CAAC,EAC/B,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,OAAO,EACP,UAAU,EACV,MAAM,EACN,MAAM,EACN,eAAe,GACf,EAAE;IACF,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7B,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAC3C,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,OAAO,EAAE,MAAM,IAAI,CAAA;IACnB,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;IACnB,eAAe,EAAE,OAAO,CAAA;CACxB,sCAgKA;AAgED,wBAAgB,YAAY,CAAC,EAC5B,MAAM,EACN,OAAO,EACP,eAAe,GACf,EAAE;IACF,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,eAAe,EAAE,OAAO,CAAA;CACxB,sCAuCA;AAED,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,sCAkCnE;AAED,wBAAgB,eAAe,CAAC,EAC/B,QAAQ,EACR,eAAe,EACf,QAAQ,GACR,EAAE;IACF,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,sCA0BA;AAED,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,sCAgBpE;AAED,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,aAAa,EAAE,CAAA;CAAE,sCAkB3D"}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { SweepApp, type SweepAppProps } from './components/SweepApp';
 export { ConnectWallet } from './components/connect-wallet';
 export { WifInput } from './components/wif-input';
-export { FundingSection, OrdinalsSection, Bsv21Section, Bsv20Section, LockedSection, RunSection, } from './components/asset-preview';
+export { FundingSection, OrdinalsSection, Bsv21Section, Bsv20Section, ListingsSection, LockedSection, RunSection, } from './components/asset-preview';
 export { OpnsSection } from './components/opns-section';
 export { TxHistory, type TxRecord } from './components/tx-history';
 export { SweepProgress } from './components/sweep-progress';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGpE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EACN,cAAc,EACd,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,UAAU,GACV,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAG3D,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EACN,IAAI,EACJ,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EACf,WAAW,GACX,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAG/E,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EACN,aAAa,EACb,SAAS,EACT,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,WAAW,GACX,MAAM,cAAc,CAAA;AACrB,OAAO,EACN,aAAa,EACb,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,YAAY,GACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EACN,YAAY,EACZ,gBAAgB,EAChB,KAAK,WAAW,GAChB,MAAM,eAAe,CAAA;AACtB,OAAO,EACN,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,KAAK,gBAAgB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGzE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGpE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EACN,cAAc,EACd,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,aAAa,EACb,UAAU,GACV,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAG3D,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EACN,IAAI,EACJ,UAAU,EACV,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EACf,WAAW,GACX,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAG/E,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EACN,aAAa,EACb,SAAS,EACT,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,WAAW,GACX,MAAM,cAAc,CAAA;AACrB,OAAO,EACN,aAAa,EACb,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,YAAY,GACjB,MAAM,eAAe,CAAA;AACtB,OAAO,EACN,YAAY,EACZ,gBAAgB,EAChB,KAAK,WAAW,GAChB,MAAM,eAAe,CAAA;AACtB,OAAO,EACN,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,KAAK,gBAAgB,GACrB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGzE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA"}

package/dist/index.js

@@ -84,6 +84,7 @@ function toScannedAssets(result) {
     funding: result.funding,
     ordinals: result.ordinals.map(enrichOrdinal),
     opnsNames: result.opnsNames.map(enrichOrdinal),
+    listings: result.listings.map(enrichOrdinal),
     bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
     bsv20Tokens: result.bsv20Tokens,
     locked: result.locked,
@@ -285,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;
   });
 }
@@ -302,27 +304,64 @@ function chunk(items, size) {
   return batches;
 }
 async function executeSweep(params) {
-  const { wallet, keys, funding, ordinals, amount, onProgress } = params;
+  const {
+    wallet,
+    keys,
+    funding,
+    ordinals,
+    listings = [],
+    amount,
+    onProgress
+  } = params;
   const ctx = createContext(wallet, { services: getServices(), chain: "main" });
   const result = {
     ordinalTxids: [],
+    listingTxids: [],
     bsv21Txids: [],
     errors: [],
-    sweptOutpoints: []
+    sweptOutpoints: [],
+    cancelledListings: []
   };
+  if (listings.length > 0) {
+    const batches = chunk(listings, SWEEP_BATCH_SIZE);
+    for (let b = 0;b < batches.length; b++) {
+      const batch = batches[b];
+      onProgress(`Cancelling ${batch.length} OrdLock listing${batch.length !== 1 ? "s" : ""} into wallet...`);
+      try {
+        const inputs = await prepareSweepInputs(ctx, batch);
+        const cancelResult = await sweepOrdinals.execute(ctx, {
+          inputs,
+          keys: buildKeys(batch, keys, inputs)
+        });
+        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)}`);
+        onProgress("Sweep stopped with errors");
+        return result;
+      }
+    }
+  }
   if (funding.length > 0) {
     onProgress(`Sweeping ${funding.length} BSV UTXOs...`);
     try {
       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)}`);
     }
@@ -338,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)}`);
@@ -1089,6 +1128,47 @@ function Bsv20Section({ tokens }) {
     ]
   });
 }
+function ListingsSection({
+  listings,
+  walletConnected,
+  onCancel
+}) {
+  if (listings.length === 0)
+    return null;
+  return /* @__PURE__ */ jsxs("div", {
+    className: "border border-primary/20 bg-primary/5 p-4 rounded-lg space-y-3",
+    children: [
+      /* @__PURE__ */ jsxs("div", {
+        className: "flex items-center gap-2",
+        children: [
+          /* @__PURE__ */ jsx4("span", {
+            className: "h-2 w-2 rounded-full bg-primary"
+          }),
+          /* @__PURE__ */ jsx4("span", {
+            className: "text-sm font-semibold text-primary",
+            children: "OrdLock Listings"
+          })
+        ]
+      }),
+      /* @__PURE__ */ jsxs("p", {
+        className: "text-xs text-muted-foreground",
+        children: [
+          listings.length,
+          " listed UTXO",
+          listings.length !== 1 ? "s" : "",
+          ". These are cancelled into your BRC-100 wallet on BSV sweep."
+        ]
+      }),
+      onCancel && /* @__PURE__ */ jsx4(Button, {
+        size: "sm",
+        disabled: !walletConnected,
+        onClick: onCancel,
+        className: "w-full",
+        children: "Cancel listings into wallet"
+      })
+    ]
+  });
+}
 function LockedSection({ locked }) {
   if (locked.length === 0)
     return null;
@@ -2320,7 +2400,7 @@ function SweepApp({
       ];
       const result = await scanAddresses(addresses, (p) => setScanProgress(p.detail ?? p.phase));
       setAssets(result);
-      const total = result.funding.length + result.ordinals.length + result.opnsNames.length + result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) + result.bsv20Tokens.length + result.locked.length + result.run.length;
+      const total = result.funding.length + result.ordinals.length + result.opnsNames.length + result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) + result.bsv20Tokens.length + result.listings.length + result.locked.length + result.run.length;
       if (total === 0)
         toast.info("No assets found at legacy addresses");
       if (result.ordinals.length > 0)
@@ -2385,12 +2465,18 @@ function SweepApp({
         keys: keyMap,
         funding: getSelectedFunding(),
         ordinals: [],
+        listings: assets.listings,
         amount: sweepAmount ?? undefined,
         onProgress: setSweepProgress
       });
-      if (result.errors.length > 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 ?? "";
+      }
+      return result.bsvTxid ?? result.listingTxids[0] ?? "";
     });
   }, [
     resolveWallet,
@@ -2398,7 +2484,44 @@ function SweepApp({
     assets,
     sweepAmount,
     getSelectedFunding,
-    runOperation
+    runOperation,
+    keyMap,
+    addTx,
+    refreshAssets
+  ]);
+  const handleCancelListings = useCallback2(async () => {
+    const wallet = resolveWallet();
+    if (!wallet || !legacyKeys || !assets || assets.listings.length === 0)
+      return;
+    await runOperation("Cancel listings", async () => {
+      const result = await executeSweep({
+        wallet,
+        keys: keyMap,
+        funding: [],
+        ordinals: [],
+        listings: assets.listings,
+        onProgress: setSweepProgress
+      });
+      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,
+    addTx,
+    refreshAssets
   ]);
   const handleSendBsv = useCallback2(async (destination) => {
     if (!legacyKeys || !assets)
@@ -2634,6 +2757,11 @@ function SweepApp({
                 onSend: sweepOnly ? undefined : handleSendBsv,
                 walletConnected
               }),
+              /* @__PURE__ */ jsx11(ListingsSection, {
+                listings: assets.listings,
+                walletConnected,
+                onCancel: handleCancelListings
+              }),
               tabs.length > 0 && /* @__PURE__ */ jsxs6(Tabs, {
                 value: activeTab,
                 onValueChange: (v) => setActiveTab(v),
@@ -2841,6 +2969,7 @@ export {
   ConnectWallet,
   FundingSection,
   Input,
+  ListingsSection,
   LockedSection,
   OpnsSection,
   OrdinalsSection,

package/dist/lib/scanner.d.ts

@@ -10,6 +10,7 @@ export interface EnrichedOrdinal extends IndexedOutput {
 export interface ScannedAssets extends Omit<ScanResult, 'ordinals' | 'opnsNames'> {
     ordinals: EnrichedOrdinal[];
     opnsNames: EnrichedOrdinal[];
+    listings: EnrichedOrdinal[];
     bsv21Tokens: TokenBalance[];
     totalBsv: number;
 }

package/dist/lib/scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAA;AAEtD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAChB,SAAQ,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC;IAClD,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AA2CD,wBAAsB,WAAW,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAGxB;AAED,wBAAsB,aAAa,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAIxB"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../src/lib/scanner.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EAEjB,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAIhD,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAA;AAEtD,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,aAChB,SAAQ,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC;IAClD,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,SAAS,EAAE,eAAe,EAAE,CAAA;IAC5B,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,WAAW,EAAE,YAAY,EAAE,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD;AA2CD,wBAAsB,WAAW,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAGxB;AAED,wBAAsB,aAAa,CAClC,SAAS,EAAE,MAAM,EAAE,EACnB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,GACpC,OAAO,CAAC,aAAa,CAAC,CAIxB"}

package/dist/lib/sweeper.d.ts

@@ -6,10 +6,13 @@ export declare const SWEEP_BATCH_SIZE = 25;
 export interface SweepResult {
     bsvTxid?: string;
     ordinalTxids: string[];
+    listingTxids: string[];
     bsv21Txids: string[];
     errors: string[];
     /** Outpoints successfully swept (ordinals/OpNS). */
     sweptOutpoints: string[];
+    /** Listing outpoints cancelled into the BRC-100 wallet. */
+    cancelledListings: string[];
 }
 /**
  * Sweep BSV funding and ordinals into the connected wallet.
@@ -20,6 +23,8 @@ export declare function executeSweep(params: {
     keys: Map<string, PrivateKey>;
     funding: IndexedOutput[];
     ordinals: IndexedOutput[];
+    /** OPL-4696: listed OrdLock UTXOs — cancelled into BRC-100 via sweepOrdinals. */
+    listings?: IndexedOutput[];
     amount?: number;
     onProgress: (stage: string) => void;
 }): Promise<SweepResult>;

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,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,oDAAoD;IACpD,cAAc,EAAE,MAAM,EAAE,CAAA;CACxB;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,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;CACnC,GAAG,OAAO,CAAC,WAAW,CAAC,CAiEvB;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.92",
+  "version": "0.0.94",
   "description": "Sweep UI components for migrating legacy BSV assets",
   "type": "module",
   "main": "./src/index.ts",
@@ -29,11 +29,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@1sat/actions": "0.0.208",
-    "@1sat/client": "0.0.51",
-    "@1sat/connect": "0.0.91",
-    "@1sat/types": "0.0.41",
-    "@1sat/utils": "0.0.34",
+    "@1sat/actions": "0.0.214",
+    "@1sat/client": "0.0.52",
+    "@1sat/connect": "0.0.92",
+    "@1sat/types": "0.0.44",
+    "@1sat/utils": "0.0.35",
     "bitcoin-backup": "^0.0.11",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -42,11 +42,11 @@
     "tailwind-merge": "^3.5.0"
   },
   "peerDependencies": {
-    "@bsv/sdk": "^2.1.9",
+    "@bsv/sdk": "^2.5.0",
     "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@bsv/sdk": "^2.1.9",
+    "@bsv/sdk": "^2.5.0",
     "@types/react": "^19.0.0",
     "react": "^19.0.0",
     "typescript": "~5.7.0"

package/src/components/SweepApp.tsx

@@ -19,6 +19,7 @@ import {
 	Bsv20Section,
 	Bsv21Section,
 	FundingSection,
+	ListingsSection,
 	LockedSection,
 	OrdinalsSection,
 	RunSection,
@@ -192,6 +193,7 @@ export function SweepApp({
 				result.opnsNames.length +
 				result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) +
 				result.bsv20Tokens.length +
+				result.listings.length +
 				result.locked.length +
 				result.run.length
 			if (total === 0) toast.info('No assets found at legacy addresses')
@@ -255,11 +257,16 @@ export function SweepApp({
 				keys: keyMap,
 				funding: getSelectedFunding(),
 				ordinals: [],
+				listings: assets.listings,
 				amount: sweepAmount ?? undefined,
 				onProgress: setSweepProgress,
 			})
-			if (result.errors.length > 0) throw new Error(result.errors[0])
-			return result.bsvTxid ?? ''
+			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] ?? ''
 		})
 	}, [
 		resolveWallet,
@@ -268,6 +275,42 @@ export function SweepApp({
 		sweepAmount,
 		getSelectedFunding,
 		runOperation,
+		keyMap,
+		addTx,
+		refreshAssets,
+	])
+
+	const handleCancelListings = useCallback(async () => {
+		const wallet = resolveWallet()
+		if (!wallet || !legacyKeys || !assets || assets.listings.length === 0)
+			return
+		await runOperation('Cancel listings', async () => {
+			const result = await executeSweep({
+				wallet,
+				keys: keyMap,
+				funding: [],
+				ordinals: [],
+				listings: assets.listings,
+				onProgress: setSweepProgress,
+			})
+			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,
+		addTx,
+		refreshAssets,
 	])
 
 	const handleSendBsv = useCallback(
@@ -543,6 +586,11 @@ export function SweepApp({
 							onSend={sweepOnly ? undefined : handleSendBsv}
 							walletConnected={walletConnected}
 						/>
+						<ListingsSection
+							listings={assets.listings}
+							walletConnected={walletConnected}
+							onCancel={handleCancelListings}
+						/>
 
 						{tabs.length > 0 && (
 							<Tabs

package/src/components/asset-preview.tsx

@@ -526,6 +526,42 @@ export function Bsv20Section({ tokens }: { tokens: IndexedOutput[] }) {
 	)
 }
 
+export function ListingsSection({
+	listings,
+	walletConnected,
+	onCancel,
+}: {
+	listings: EnrichedOrdinal[]
+	walletConnected?: boolean
+	onCancel?: () => void
+}) {
+	if (listings.length === 0) return null
+	return (
+		<div className="border border-primary/20 bg-primary/5 p-4 rounded-lg space-y-3">
+			<div className="flex items-center gap-2">
+				<span className="h-2 w-2 rounded-full bg-primary" />
+				<span className="text-sm font-semibold text-primary">
+					OrdLock Listings
+				</span>
+			</div>
+			<p className="text-xs text-muted-foreground">
+				{listings.length} listed UTXO{listings.length !== 1 ? 's' : ''}. These
+				are cancelled into your BRC-100 wallet on BSV sweep.
+			</p>
+			{onCancel && (
+				<Button
+					size="sm"
+					disabled={!walletConnected}
+					onClick={onCancel}
+					className="w-full"
+				>
+					Cancel listings into wallet
+				</Button>
+			)}
+		</div>
+	)
+}
+
 export function LockedSection({ locked }: { locked: IndexedOutput[] }) {
 	if (locked.length === 0) return null
 	return (

package/src/index.ts

@@ -9,6 +9,7 @@ export {
 	OrdinalsSection,
 	Bsv21Section,
 	Bsv20Section,
+	ListingsSection,
 	LockedSection,
 	RunSection,
 } from './components/asset-preview'

package/src/lib/scanner.ts

@@ -21,6 +21,7 @@ export interface ScannedAssets
 	extends Omit<ScanResult, 'ordinals' | 'opnsNames'> {
 	ordinals: EnrichedOrdinal[]
 	opnsNames: EnrichedOrdinal[]
+	listings: EnrichedOrdinal[]
 	bsv21Tokens: TokenBalance[]
 	totalBsv: number
 }
@@ -92,6 +93,7 @@ function toScannedAssets(result: ScanResult): ScannedAssets {
 		funding: result.funding,
 		ordinals: result.ordinals.map(enrichOrdinal),
 		opnsNames: result.opnsNames.map(enrichOrdinal),
+		listings: result.listings.map(enrichOrdinal),
 		bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
 		bsv20Tokens: result.bsv20Tokens,
 		locked: result.locked,

package/src/lib/sweeper.ts

@@ -16,10 +16,13 @@ export const SWEEP_BATCH_SIZE = 25
 export interface SweepResult {
 	bsvTxid?: string
 	ordinalTxids: string[]
+	listingTxids: string[]
 	bsv21Txids: string[]
 	errors: string[]
 	/** Outpoints successfully swept (ordinals/OpNS). */
 	sweptOutpoints: string[]
+	/** Listing outpoints cancelled into the BRC-100 wallet. */
+	cancelledListings: string[]
 }
 
 function getOwner(output: IndexedOutput): string | undefined {
@@ -29,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
 	})
 }
@@ -56,17 +62,57 @@ export async function executeSweep(params: {
 	keys: Map<string, PrivateKey>
 	funding: IndexedOutput[]
 	ordinals: IndexedOutput[]
+	/** OPL-4696: listed OrdLock UTXOs — cancelled into BRC-100 via sweepOrdinals. */
+	listings?: IndexedOutput[]
 	amount?: number
 	onProgress: (stage: string) => void
 }): Promise<SweepResult> {
-	const { wallet, keys, funding, ordinals, amount, onProgress } = params
+	const {
+		wallet,
+		keys,
+		funding,
+		ordinals,
+		listings = [],
+		amount,
+		onProgress,
+	} = params
 	const ctx = createContext(wallet, { services: getServices(), chain: 'main' })
 
 	const result: SweepResult = {
 		ordinalTxids: [],
+		listingTxids: [],
 		bsv21Txids: [],
 		errors: [],
 		sweptOutpoints: [],
+		cancelledListings: [],
+	}
+
+	if (listings.length > 0) {
+		const batches = chunk(listings, SWEEP_BATCH_SIZE)
+		for (let b = 0; b < batches.length; b++) {
+			const batch = batches[b]
+			onProgress(
+				`Cancelling ${batch.length} OrdLock listing${batch.length !== 1 ? 's' : ''} into wallet...`,
+			)
+			try {
+				const inputs = await prepareSweepInputs(ctx, batch)
+				const cancelResult = await sweepOrdinals.execute(ctx, {
+					inputs,
+					keys: buildKeys(batch, keys, inputs),
+				})
+				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)}`,
+				)
+				onProgress('Sweep stopped with errors')
+				return result
+			}
+		}
 	}
 
 	if (funding.length > 0) {
@@ -75,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)}`)
 		}
@@ -100,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(