@arkade-os/sdk 0.4.23 → 0.4.24

package/dist/esm/worker/expo/processors/contractPollProcessor.js

@@ -1,3 +1,4 @@
+import { warnAndFilterVtxosForScript } from '../../../contracts/vtxoOwnership.js';
 export const CONTRACT_POLL_TASK_TYPE = "contract-poll";
 /**
  * Polls the indexer for the latest VTXO state of every contract and
@@ -40,8 +41,12 @@ export const contractPollProcessor = {
                 hasMore = page ? vtxos.length === pageSize : false;
                 pageIndex++;
             }
-            await walletRepository.saveVtxos(contract.address, allVtxos);
-            vtxosSaved += allVtxos.length;
+            // Skip wrong-script rows (legacy duplicates or indexer drift)
+            // before persisting; the loop must keep going for the remaining
+            // contracts even when one row is rejected.
+            const filtered = warnAndFilterVtxosForScript(allVtxos, contract.script, "contractPollProcessor");
+            await walletRepository.saveVtxos(contract.address, filtered);
+            vtxosSaved += filtered.length;
             contractsProcessed++;
         }
         return {

package/dist/types/contracts/handlers/helpers.d.ts

@@ -1,13 +1,4 @@
-import { RelativeTimelock } from "../../script/tapscript";
 import { Contract, PathContext } from "../types";
-/**
- * Convert RelativeTimelock to BIP68 sequence number.
- */
-export declare function timelockToSequence(timelock: RelativeTimelock): number;
-/**
- * Convert BIP68 sequence number back to RelativeTimelock.
- */
-export declare function sequenceToTimelock(sequence: number): RelativeTimelock;
 /**
  * Resolve wallet's role from explicit role or by matching descriptor/pubkey.
  */

package/dist/types/contracts/vtxoOwnership.d.ts

@@ -0,0 +1,25 @@
+import type { VirtualCoin } from "../wallet";
+/**
+ * Tier 1 helpers that enforce VTXO ownership at call sites that already know
+ * the intended contract script. Address-keyed repositories may still hand back
+ * legacy duplicate rows under the wrong bucket; these helpers gate reads and
+ * writes so a wrong-script row never wins.
+ *
+ * `script` is the authoritative ownership key. Equality is strict: a missing
+ * or empty `vtxo.script` never matches.
+ */
+export declare function vtxoOutpoint(vtxo: Pick<VirtualCoin, "txid" | "vout">): string;
+export declare function isVtxoForScript(vtxo: Pick<VirtualCoin, "script">, script: string): boolean;
+export declare function filterVtxosForScript<T extends Pick<VirtualCoin, "script">>(vtxos: T[], script: string): T[];
+/**
+ * Background/indexer sync flavour: drop wrong-script rows and log enough
+ * context to identify each rejection. Returns only matching rows so the
+ * caller can keep going.
+ */
+export declare function warnAndFilterVtxosForScript<T extends Pick<VirtualCoin, "txid" | "vout" | "script">>(vtxos: T[], script: string, context: string): T[];
+/**
+ * User-initiated transaction/signing flavour: throw before persisting or
+ * signing inconsistent ownership state. Silently skipping here would hide a
+ * serious bug in the wallet's spend path.
+ */
+export declare function validateVtxosForScript(vtxos: Array<Pick<VirtualCoin, "txid" | "vout" | "script">>, script: string, context: string): void;

package/dist/types/index.d.ts

@@ -51,7 +51,7 @@ export * as asset from "./extension/asset";
 import { ContractManager, ContractWatcher, contractHandlers, DefaultContractHandler, DelegateContractHandler, VHTLCContractHandler, encodeArkContract, decodeArkContract, contractFromArkContract, contractFromArkContractWithAddress, isArkContract } from "./contracts";
 import type { Contract, ContractVtxo, ContractState, ContractEvent, ContractEventCallback, ContractBalance, ContractWithVtxos, ContractHandler, PathSelection, PathContext, ContractManagerConfig, CreateContractParams, ContractWatcherConfig, ParsedArkContract, DefaultContractParams, DelegateContractParams, VHTLCContractParams } from "./contracts";
 import { IContractManager } from "./contracts/contractManager";
-import { timelockToSequence, sequenceToTimelock } from "./contracts/handlers/helpers";
+import { timelockToSequence, sequenceToTimelock } from "./utils/timelock";
 import { closeDatabase, openDatabase } from "./repositories/indexedDB/manager";
 import { WalletMessageHandler, WalletNotInitializedError, ReadonlyWalletError, DelegatorNotConfiguredError } from "./wallet/serviceWorker/wallet-message-handler";
 import { MESSAGE_BUS_NOT_INITIALIZED, MessageBusNotInitializedError, ServiceWorkerTimeoutError } from "./worker/errors";

package/dist/types/script/tapscript.d.ts

@@ -90,6 +90,7 @@ export declare namespace CSVMultisigTapscript {
     function decode(script: Uint8Array): Type;
     /** Return true when the tapscript is a CSV multisig tapscript. */
     function is(tapscript: ArkTapscript<any, any>): tapscript is Type;
+    function isScriptValid(script: Uint8Array): true | Error;
 }
 /**
  * Combines a condition script with an exit closure. The resulting script requires
@@ -114,6 +115,7 @@ export declare namespace ConditionCSVMultisigTapscript {
     function decode(script: Uint8Array): Type;
     /** Return true when the tapscript is a condition + CSV multisig tapscript. */
     function is(tapscript: ArkTapscript<any, any>): tapscript is Type;
+    function isScriptValid(script: Uint8Array): true | Error;
 }
 /**
  * Combines a condition script with a forfeit closure. The resulting script requires
@@ -138,6 +140,7 @@ export declare namespace ConditionMultisigTapscript {
     function decode(script: Uint8Array): Type;
     /** Return true when the tapscript is a condition + multisig tapscript. */
     function is(tapscript: ArkTapscript<any, any>): tapscript is Type;
+    function isScriptValid(script: Uint8Array): true | Error;
 }
 /**
  * Implements an absolute timelock (CLTV) script combined with a forfeit closure.
@@ -162,4 +165,5 @@ export declare namespace CLTVMultisigTapscript {
     function decode(script: Uint8Array): Type;
     /** Return true when the tapscript is a CLTV multisig tapscript. */
     function is(tapscript: ArkTapscript<any, any>): tapscript is Type;
+    function isScriptValid(script: Uint8Array): true | Error;
 }

package/dist/types/utils/timelock.d.ts

@@ -0,0 +1,9 @@
+import type { RelativeTimelock } from "../script/tapscript";
+/**
+ * Convert RelativeTimelock to BIP68 sequence number.
+ */
+export declare function timelockToSequence(timelock: RelativeTimelock): number;
+/**
+ * Convert BIP68 sequence number back to RelativeTimelock.
+ */
+export declare function sequenceToTimelock(sequence: number): RelativeTimelock;

package/dist/types/wallet/unroll.d.ts

@@ -15,6 +15,7 @@ export declare namespace Unroll {
      */
     type UnrollStep = {
         tx: Transaction;
+        pkg: [parent: string, child: string];
     };
     /**
      * Wait step where the transaction has to be confirmed onchain
@@ -102,3 +103,12 @@ export declare namespace Unroll {
      */
     function completeUnroll(wallet: Wallet, vtxoTxids: string[], outputAddress: string): Promise<string>;
 }
+/**
+ * Prepares the transaction that spends the CSV path to complete unrolling a VTXO.
+ * @param wallet the wallet owning the VTXO(s)
+ * @param vtxoTxIds the txids of the VTXO(s) to complete unroll
+ * @param outputAddress the address to send the unrolled funds to
+ * @throws if the VTXO(s) are not fully unrolled, if the txids are not found, if the tx is not confirmed, if no exit path is found or not available
+ * @returns the transaction spending the unrolled funds
+ */
+export declare function prepareUnrollTransaction(wallet: Wallet, vtxoTxIds: string[], outputAddress: string): Promise<Transaction>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.4.23",
+  "version": "0.4.24",
   "description": "TypeScript SDK for building Bitcoin wallets using the Arkade protocol",
   "type": "module",
   "main": "./dist/cjs/index.js",