@arkade-os/sdk 0.3.0-alpha.7 → 0.3.1-alpha.0

package/dist/cjs/wallet/wallet.js

@@ -38,8 +38,8 @@ exports.waitForIncomingFunds = waitForIncomingFunds;
 const base_1 = require("@scure/base");
 const bip68 = __importStar(require("bip68"));
 const payment_js_1 = require("@scure/btc-signer/payment.js");
-const transaction_js_1 = require("@scure/btc-signer/transaction.js");
-const psbt_js_1 = require("@scure/btc-signer/psbt.js");
+const btc_signer_1 = require("@scure/btc-signer");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const transactionHistory_1 = require("../utils/transactionHistory");
 const address_1 = require("../script/address");
 const default_1 = require("../script/default");
@@ -49,18 +49,19 @@ const ark_1 = require("../providers/ark");
 const forfeit_1 = require("../forfeit");
 const validation_1 = require("../tree/validation");
 const _1 = require(".");
-const utils_js_1 = require("@scure/btc-signer/utils.js");
 const base_2 = require("../script/base");
 const tapscript_1 = require("../script/tapscript");
 const arkTransaction_1 = require("../utils/arkTransaction");
+const vtxo_manager_1 = require("./vtxo-manager");
 const arknote_1 = require("../arknote");
-const bip322_1 = require("../bip322");
+const intent_1 = require("../intent");
 const indexer_1 = require("../providers/indexer");
 const txTree_1 = require("../tree/txTree");
+const unknownFields_1 = require("../utils/unknownFields");
 const inMemory_1 = require("../storage/inMemory");
 const walletRepository_1 = require("../repositories/walletRepository");
 const contractRepository_1 = require("../repositories/contractRepository");
-const utils_1 = require("./serviceWorker/utils");
+const utils_1 = require("./utils");
 /**
  * Main wallet implementation for Bitcoin transactions with Ark protocol support.
  * The wallet does not store any data locally and relies on Ark and onchain
@@ -68,13 +69,21 @@ const utils_1 = require("./serviceWorker/utils");
  *
  * @example
  * ```typescript
- * // Create a wallet
+ * // Create a wallet with URL configuration
  * const wallet = await Wallet.create({
  *   identity: SingleKey.fromHex('your_private_key'),
  *   arkServerUrl: 'https://ark.example.com',
  *   esploraUrl: 'https://mempool.space/api'
  * });
  *
+ * // Or with custom provider instances (e.g., for Expo/React Native)
+ * const wallet = await Wallet.create({
+ *   identity: SingleKey.fromHex('your_private_key'),
+ *   arkProvider: new ExpoArkProvider('https://ark.example.com'),
+ *   indexerProvider: new ExpoIndexerProvider('https://ark.example.com'),
+ *   esploraUrl: 'https://mempool.space/api'
+ * });
+ *
  * // Get addresses
  * const arkAddress = await wallet.getAddress();
  * const boardingAddress = await wallet.getBoardingAddress();
@@ -87,7 +96,7 @@ const utils_1 = require("./serviceWorker/utils");
  * ```
  */
 class Wallet {
-    constructor(identity, network, networkName, onchainProvider, arkProvider, indexerProvider, arkServerPublicKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, dustAmount, walletRepository, contractRepository) {
+    constructor(identity, network, networkName, onchainProvider, arkProvider, indexerProvider, arkServerPublicKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, forfeitPubkey, dustAmount, walletRepository, contractRepository, renewalConfig) {
         this.identity = identity;
         this.network = network;
         this.networkName = networkName;
@@ -99,20 +108,45 @@ class Wallet {
         this.boardingTapscript = boardingTapscript;
         this.serverUnrollScript = serverUnrollScript;
         this.forfeitOutputScript = forfeitOutputScript;
+        this.forfeitPubkey = forfeitPubkey;
         this.dustAmount = dustAmount;
         this.walletRepository = walletRepository;
         this.contractRepository = contractRepository;
+        this.renewalConfig = {
+            enabled: renewalConfig?.enabled ?? false,
+            ...vtxo_manager_1.DEFAULT_RENEWAL_CONFIG,
+            ...renewalConfig,
+        };
     }
     static async create(config) {
         const pubkey = await config.identity.xOnlyPublicKey();
         if (!pubkey) {
             throw new Error("Invalid configured public key");
         }
-        const arkProvider = new ark_1.RestArkProvider(config.arkServerUrl);
-        const indexerProvider = new indexer_1.RestIndexerProvider(config.arkServerUrl);
+        // Use provided arkProvider instance or create a new one from arkServerUrl
+        const arkProvider = config.arkProvider ||
+            (() => {
+                if (!config.arkServerUrl) {
+                    throw new Error("Either arkProvider or arkServerUrl must be provided");
+                }
+                return new ark_1.RestArkProvider(config.arkServerUrl);
+            })();
+        // Extract arkServerUrl from provider if not explicitly provided
+        const arkServerUrl = config.arkServerUrl || arkProvider.serverUrl;
+        if (!arkServerUrl) {
+            throw new Error("Could not determine arkServerUrl from provider");
+        }
+        // Use provided indexerProvider instance or create a new one
+        // indexerUrl defaults to arkServerUrl if not provided
+        const indexerUrl = config.indexerUrl || arkServerUrl;
+        const indexerProvider = config.indexerProvider || new indexer_1.RestIndexerProvider(indexerUrl);
         const info = await arkProvider.getInfo();
         const network = (0, networks_1.getNetwork)(info.network);
-        const onchainProvider = new onchain_1.EsploraProvider(config.esploraUrl || onchain_1.ESPLORA_URL[info.network]);
+        // Extract esploraUrl from provider if not explicitly provided
+        const esploraUrl = config.esploraUrl || onchain_1.ESPLORA_URL[info.network];
+        // Use provided onchainProvider instance or create a new one
+        const onchainProvider = config.onchainProvider || new onchain_1.EsploraProvider(esploraUrl);
+        // Generate timelocks
         const exitTimelock = {
             value: info.unilateralExitDelay,
             type: info.unilateralExitDelay < 512n ? "blocks" : "seconds",
@@ -136,17 +170,24 @@ class Wallet {
         // Save tapscripts
         const offchainTapscript = bareVtxoTapscript;
         // the serverUnrollScript is the one used to create output scripts of the checkpoint transactions
-        const rawCheckpointExitClosure = base_1.hex.decode(info.checkpointExitClosure);
-        const serverUnrollScript = tapscript_1.CSVMultisigTapscript.decode(rawCheckpointExitClosure);
+        let serverUnrollScript;
+        try {
+            const raw = base_1.hex.decode(info.checkpointTapscript);
+            serverUnrollScript = tapscript_1.CSVMultisigTapscript.decode(raw);
+        }
+        catch (e) {
+            throw new Error("Invalid checkpointTapscript from server");
+        }
         // parse the server forfeit address
         // server is expecting funds to be sent to this address
-        const forfeitAddress = (0, payment_js_1.Address)(network).decode(info.forfeitAddress);
-        const forfeitOutputScript = payment_js_1.OutScript.encode(forfeitAddress);
+        const forfeitPubkey = base_1.hex.decode(info.forfeitPubkey).slice(1);
+        const forfeitAddress = (0, btc_signer_1.Address)(network).decode(info.forfeitAddress);
+        const forfeitOutputScript = btc_signer_1.OutScript.encode(forfeitAddress);
         // Set up storage and repositories
         const storage = config.storage || new inMemory_1.InMemoryStorageAdapter();
         const walletRepository = new walletRepository_1.WalletRepositoryImpl(storage);
         const contractRepository = new contractRepository_1.ContractRepositoryImpl(storage);
-        return new Wallet(config.identity, network, info.network, onchainProvider, arkProvider, indexerProvider, serverPubKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, info.dust, walletRepository, contractRepository);
+        return new Wallet(config.identity, network, info.network, onchainProvider, arkProvider, indexerProvider, serverPubKey, offchainTapscript, boardingTapscript, serverUnrollScript, forfeitOutputScript, forfeitPubkey, info.dust, walletRepository, contractRepository, config.renewalConfig);
     }
     get arkAddress() {
         return this.offchainTapscript.address(this.network.hrp, this.arkServerPublicKey);
@@ -208,40 +249,24 @@ class Wallet {
         // if (cachedVtxos.length) return cachedVtxos;
         // For now, always fetch fresh data from provider and update cache
         // In future, we can add cache invalidation logic based on timestamps
-        const spendableVtxos = await this.getVirtualCoins(filter);
-        const encodedOffchainTapscript = this.offchainTapscript.encode();
-        const forfeit = this.offchainTapscript.forfeit();
-        const exit = this.offchainTapscript.exit();
-        const extendedVtxos = spendableVtxos.map((vtxo) => ({
-            ...vtxo,
-            forfeitTapLeafScript: forfeit,
-            intentTapLeafScript: exit,
-            tapTree: encodedOffchainTapscript,
-        }));
+        const vtxos = await this.getVirtualCoins(filter);
+        const extendedVtxos = vtxos.map((vtxo) => (0, utils_1.extendVirtualCoin)(this, vtxo));
         // Update cache with fresh data
         await this.walletRepository.saveVtxos(address, extendedVtxos);
         return extendedVtxos;
     }
     async getVirtualCoins(filter = { withRecoverable: true, withUnrolled: false }) {
         const scripts = [base_1.hex.encode(this.offchainTapscript.pkScript)];
-        const response = await this.indexerProvider.getVtxos({
-            scripts,
-            spendableOnly: true,
-        });
-        const vtxos = response.vtxos;
-        if (filter.withRecoverable) {
-            const response = await this.indexerProvider.getVtxos({
-                scripts,
-                recoverableOnly: true,
-            });
-            vtxos.push(...response.vtxos);
+        const response = await this.indexerProvider.getVtxos({ scripts });
+        const allVtxos = response.vtxos;
+        let vtxos = allVtxos.filter(_1.isSpendable);
+        // all recoverable vtxos are spendable by definition
+        if (!filter.withRecoverable) {
+            vtxos = vtxos.filter((vtxo) => !(0, _1.isRecoverable)(vtxo));
         }
         if (filter.withUnrolled) {
-            const response = await this.indexerProvider.getVtxos({
-                scripts,
-                spentOnly: true,
-            });
-            vtxos.push(...response.vtxos.filter((vtxo) => vtxo.isUnrolled));
+            const spentVtxos = allVtxos.filter((vtxo) => !(0, _1.isSpendable)(vtxo));
+            vtxos.push(...spentVtxos.filter((vtxo) => vtxo.isUnrolled));
         }
         return vtxos;
     }
@@ -279,10 +304,10 @@ class Wallet {
         return txs;
     }
     async getBoardingTxs() {
-        const boardingAddress = await this.getBoardingAddress();
-        const txs = await this.onchainProvider.getTransactions(boardingAddress);
         const utxos = [];
         const commitmentsToIgnore = new Set();
+        const boardingAddress = await this.getBoardingAddress();
+        const txs = await this.onchainProvider.getTransactions(boardingAddress);
         for (const tx of txs) {
             for (let i = 0; i < tx.vout.length; i++) {
                 const vout = tx.vout[i];
@@ -402,7 +427,7 @@ class Wallet {
         // TODO persist final virtual tx and checkpoints to repository
         // sign the checkpoints
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {
-            const tx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(c));
+            const tx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(c));
             const signedCheckpoint = await this.identity.sign(tx);
             return base_1.base64.encode(signedCheckpoint.toPSBT());
         }));
@@ -423,13 +448,15 @@ class Wallet {
                 }
             }
         }
-        // if no params are provided, use all boarding and offchain utxos as inputs
+        // if no params are provided, use all non expired boarding utxos and offchain vtxos as inputs
         // and send all to the offchain address
         if (!params) {
             let amount = 0;
-            const boardingUtxos = await this.getBoardingUtxos();
+            const exitScript = tapscript_1.CSVMultisigTapscript.decode(base_1.hex.decode(this.boardingTapscript.exitScript));
+            const boardingTimelock = exitScript.params.timelock;
+            const boardingUtxos = (await this.getBoardingUtxos()).filter((utxo) => !(0, arkTransaction_1.hasBoardingTxExpired)(utxo, boardingTimelock));
             amount += boardingUtxos.reduce((sum, input) => sum + input.value, 0);
-            const vtxos = await this.getVtxos();
+            const vtxos = await this.getVtxos({ withRecoverable: true });
             amount += vtxos.reduce((sum, input) => sum + input.value, 0);
             const inputs = [...boardingUtxos, ...vtxos];
             if (inputs.length === 0) {
@@ -458,8 +485,8 @@ class Wallet {
             }
             catch {
                 // onchain
-                const addr = (0, payment_js_1.Address)(this.network).decode(output.address);
-                script = payment_js_1.OutScript.encode(addr);
+                const addr = (0, btc_signer_1.Address)(this.network).decode(output.address);
+                script = btc_signer_1.OutScript.encode(addr);
                 onchainOutputIndexes.push(index);
             }
             outputs.push({
@@ -472,7 +499,7 @@ class Wallet {
         const signingPublicKeys = [];
         if (hasOffchainOutputs) {
             session = this.identity.signerSession();
-            signingPublicKeys.push(base_1.hex.encode(session.getPublicKey()));
+            signingPublicKeys.push(base_1.hex.encode(await session.getPublicKey()));
         }
         const [intent, deleteIntent] = await Promise.all([
             this.makeRegisterIntentSignature(params.inputs, outputs, onchainOutputIndexes, signingPublicKeys),
@@ -511,7 +538,7 @@ class Wallet {
                         if (step !== undefined) {
                             continue;
                         }
-                        const res = await this.handleBatchStartedEvent(event, intentId, this.arkServerPublicKey, this.forfeitOutputScript);
+                        const res = await this.handleBatchStartedEvent(event, intentId, this.forfeitPubkey, this.forfeitOutputScript);
                         if (!res.skip) {
                             step = event.type;
                             sweepTapTreeRoot = res.sweepTapTreeRoot;
@@ -639,22 +666,22 @@ class Wallet {
         let onchainStopFunc;
         let indexerStopFunc;
         if (this.onchainProvider && boardingAddress) {
+            const findVoutOnTx = (tx) => {
+                return tx.vout.findIndex((v) => v.scriptpubkey_address === boardingAddress);
+            };
             onchainStopFunc = await this.onchainProvider.watchAddresses([boardingAddress], (txs) => {
+                // find all utxos belonging to our boarding address
                 const coins = txs
+                    // filter txs where address is in output
+                    .filter((tx) => findVoutOnTx(tx) !== -1)
+                    // return utxo as Coin
                     .map((tx) => {
-                    const vout = tx.vout.findIndex((v) => v.scriptpubkey_address === boardingAddress);
-                    if (vout === -1) {
-                        console.warn(`No vout found for address ${boardingAddress} in transaction ${tx.txid}`);
-                        return null;
-                    }
-                    return {
-                        txid: tx.txid,
-                        vout,
-                        value: Number(tx.vout[vout].value),
-                        status: tx.status,
-                    };
-                })
-                    .filter((coin) => coin !== null);
+                    const { txid, status } = tx;
+                    const vout = findVoutOnTx(tx);
+                    const value = Number(tx.vout[vout].value);
+                    return { txid, vout, value, status };
+                });
+                // and notify via callback
                 eventCallback({
                     type: "utxo",
                     coins,
@@ -696,10 +723,10 @@ class Wallet {
         };
         return stopFunc;
     }
-    async handleBatchStartedEvent(event, intentId, serverPubKey, forfeitOutputScript) {
+    async handleBatchStartedEvent(event, intentId, forfeitPubKey, forfeitOutputScript) {
         const utf8IntentId = new TextEncoder().encode(intentId);
         const intentIdHash = (0, utils_js_1.sha256)(utf8IntentId);
-        const intentIdHashStr = base_1.hex.encode(new Uint8Array(intentIdHash));
+        const intentIdHashStr = base_1.hex.encode(intentIdHash);
         let skip = true;
         // check if our intent ID hash matches any in the event
         for (const idHash of event.intentIdHashes) {
@@ -719,7 +746,7 @@ class Wallet {
                 value: event.batchExpiry,
                 type: event.batchExpiry >= 512n ? "seconds" : "blocks",
             },
-            pubkeys: [serverPubKey],
+            pubkeys: [forfeitPubKey],
         }).script;
         const sweepTapTreeRoot = (0, payment_js_1.tapLeafHash)(sweepTapscript);
         return {
@@ -732,7 +759,7 @@ class Wallet {
     // validates the vtxo tree, creates a signing session and generates the musig2 nonces
     async handleSettlementSigningEvent(event, sweepTapTreeRoot, session, vtxoGraph) {
         // validate the unsigned vtxo tree
-        const commitmentTx = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(event.unsignedCommitmentTx));
+        const commitmentTx = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.unsignedCommitmentTx));
         (0, validation_1.validateVtxoTxGraph)(vtxoGraph, commitmentTx, sweepTapTreeRoot);
         // TODO check if our registered outputs are in the vtxo tree
         const sharedOutput = commitmentTx.getOutput(0);
@@ -740,18 +767,21 @@ class Wallet {
             throw new Error("Shared output not found");
         }
         session.init(vtxoGraph, sweepTapTreeRoot, sharedOutput.amount);
-        await this.arkProvider.submitTreeNonces(event.id, base_1.hex.encode(session.getPublicKey()), session.getNonces());
+        const pubkey = base_1.hex.encode(await session.getPublicKey());
+        const nonces = await session.getNonces();
+        await this.arkProvider.submitTreeNonces(event.id, pubkey, nonces);
     }
     async handleSettlementSigningNoncesGeneratedEvent(event, session) {
         session.setAggregatedNonces(event.treeNonces);
-        const signatures = session.sign();
-        await this.arkProvider.submitTreeSignatures(event.id, base_1.hex.encode(session.getPublicKey()), signatures);
+        const signatures = await session.sign();
+        const pubkey = base_1.hex.encode(await session.getPublicKey());
+        await this.arkProvider.submitTreeSignatures(event.id, pubkey, signatures);
     }
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
         const vtxos = await this.getVirtualCoins();
-        let settlementPsbt = transaction_js_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
+        let settlementPsbt = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
         const connectorsLeaves = connectorsGraph?.leaves() || [];
@@ -793,7 +823,7 @@ class Wallet {
                 throw new Error("not enough connectors received");
             }
             const connectorLeaf = connectorsLeaves[connectorIndex];
-            const connectorTxId = base_1.hex.encode((0, utils_js_1.sha256x2)(connectorLeaf.toBytes(true)).reverse());
+            const connectorTxId = connectorLeaf.id;
             const connectorOutput = connectorLeaf.getOutput(0);
             if (!connectorOutput) {
                 throw new Error("connector output not found");
@@ -812,7 +842,7 @@ class Wallet {
                         amount: BigInt(vtxo.value),
                         script: base_2.VtxoScript.decode(input.tapTree).pkScript,
                     },
-                    sighashType: transaction_js_1.SigHash.DEFAULT,
+                    sighashType: btc_signer_1.SigHash.DEFAULT,
                     tapLeafScript: [input.forfeitTapLeafScript],
                 },
                 {
@@ -834,112 +864,69 @@ class Wallet {
                 : undefined);
         }
     }
-    async makeRegisterIntentSignature(bip322Inputs, outputs, onchainOutputsIndexes, cosignerPubKeys) {
+    async makeRegisterIntentSignature(coins, outputs, onchainOutputsIndexes, cosignerPubKeys) {
         const nowSeconds = Math.floor(Date.now() / 1000);
-        const { inputs, inputTapTrees, finalizer } = this.prepareBIP322Inputs(bip322Inputs);
+        const inputs = this.prepareIntentProofInputs(coins);
         const message = {
             type: "register",
-            input_tap_trees: inputTapTrees,
             onchain_output_indexes: onchainOutputsIndexes,
             valid_at: nowSeconds,
             expire_at: nowSeconds + 2 * 60, // valid for 2 minutes
             cosigners_public_keys: cosignerPubKeys,
         };
         const encodedMessage = JSON.stringify(message, null, 0);
-        const signature = await this.makeBIP322Signature(encodedMessage, inputs, finalizer, outputs);
+        const proof = intent_1.Intent.create(encodedMessage, inputs, outputs);
+        const signedProof = await this.identity.sign(proof);
         return {
-            signature,
+            proof: base_1.base64.encode(signedProof.toPSBT()),
             message: encodedMessage,
         };
     }
-    async makeDeleteIntentSignature(bip322Inputs) {
+    async makeDeleteIntentSignature(coins) {
         const nowSeconds = Math.floor(Date.now() / 1000);
-        const { inputs, finalizer } = this.prepareBIP322Inputs(bip322Inputs);
+        const inputs = this.prepareIntentProofInputs(coins);
         const message = {
             type: "delete",
             expire_at: nowSeconds + 2 * 60, // valid for 2 minutes
         };
         const encodedMessage = JSON.stringify(message, null, 0);
-        const signature = await this.makeBIP322Signature(encodedMessage, inputs, finalizer);
+        const proof = intent_1.Intent.create(encodedMessage, inputs, []);
+        const signedProof = await this.identity.sign(proof);
         return {
-            signature,
+            proof: base_1.base64.encode(signedProof.toPSBT()),
             message: encodedMessage,
         };
     }
-    prepareBIP322Inputs(bip322Inputs) {
+    prepareIntentProofInputs(coins) {
         const inputs = [];
-        const inputTapTrees = [];
-        const inputExtraWitnesses = [];
-        for (const bip322Input of bip322Inputs) {
-            const vtxoScript = base_2.VtxoScript.decode(bip322Input.tapTree);
-            const sequence = getSequence(bip322Input);
+        for (const input of coins) {
+            const vtxoScript = base_2.VtxoScript.decode(input.tapTree);
+            const sequence = getSequence(input);
+            const unknown = [unknownFields_1.VtxoTaprootTree.encode(input.tapTree)];
+            if (input.extraWitness) {
+                unknown.push(unknownFields_1.ConditionWitness.encode(input.extraWitness));
+            }
             inputs.push({
-                txid: base_1.hex.decode(bip322Input.txid),
-                index: bip322Input.vout,
+                txid: base_1.hex.decode(input.txid),
+                index: input.vout,
                 witnessUtxo: {
-                    amount: BigInt(bip322Input.value),
+                    amount: BigInt(input.value),
                     script: vtxoScript.pkScript,
                 },
                 sequence,
-                tapLeafScript: [bip322Input.intentTapLeafScript],
+                tapLeafScript: [input.intentTapLeafScript],
+                unknown,
             });
-            inputTapTrees.push(base_1.hex.encode(bip322Input.tapTree));
-            inputExtraWitnesses.push(bip322Input.extraWitness || []);
         }
-        return {
-            inputs,
-            inputTapTrees,
-            finalizer: finalizeWithExtraWitnesses(inputExtraWitnesses),
-        };
-    }
-    async makeBIP322Signature(message, inputs, finalizer, outputs) {
-        const proof = bip322_1.BIP322.create(message, inputs, outputs);
-        const signedProof = await this.identity.sign(proof);
-        return bip322_1.BIP322.signature(signedProof, finalizer);
+        return inputs;
     }
 }
 exports.Wallet = Wallet;
 Wallet.MIN_FEE_RATE = 1; // sats/vbyte
-function finalizeWithExtraWitnesses(inputExtraWitnesses) {
-    return function (tx) {
-        for (let i = 0; i < tx.inputsLength; i++) {
-            try {
-                tx.finalizeIdx(i);
-            }
-            catch (e) {
-                // handle empty witness error
-                if (e instanceof Error &&
-                    e.message.includes("finalize/taproot: empty witness")) {
-                    const tapLeaves = tx.getInput(i).tapLeafScript;
-                    if (!tapLeaves || tapLeaves.length <= 0)
-                        throw e;
-                    const [cb, s] = tapLeaves[0];
-                    const script = s.slice(0, -1);
-                    tx.updateInput(i, {
-                        finalScriptWitness: [
-                            script,
-                            psbt_js_1.TaprootControlBlock.encode(cb),
-                        ],
-                    });
-                }
-            }
-            const finalScriptWitness = tx.getInput(i).finalScriptWitness;
-            if (!finalScriptWitness)
-                throw new Error("input not finalized");
-            // input 0 and 1 spend the same pkscript
-            const extra = inputExtraWitnesses[i === 0 ? 0 : i - 1];
-            if (extra && extra.length > 0) {
-                tx.updateInput(i, {
-                    finalScriptWitness: [...extra, ...finalScriptWitness],
-                });
-            }
-        }
-    };
-}
-function getSequence(bip322Input) {
+function getSequence(coin) {
     let sequence = undefined;
     try {
-        const scriptWithLeafVersion = bip322Input.intentTapLeafScript[1];
+        const scriptWithLeafVersion = coin.intentTapLeafScript[1];
         const script = scriptWithLeafVersion.subarray(0, scriptWithLeafVersion.length - 1);
         const params = tapscript_1.CSVMultisigTapscript.decode(script).params;
         sequence = bip68.encode(params.timelock.type === "blocks"

package/dist/esm/adapters/expo.js

@@ -0,0 +1,3 @@
+// Expo adapter for React Native/Expo environments
+export { ExpoArkProvider } from '../providers/expoArk.js';
+export { ExpoIndexerProvider } from '../providers/expoIndexer.js';

package/dist/esm/arknote/index.js

@@ -1,7 +1,7 @@
 import { base58, hex } from "@scure/base";
-import { VtxoScript } from '../script/base.js';
 import { sha256 } from "@scure/btc-signer/utils.js";
-import { Script } from "@scure/btc-signer/script.js";
+import { Script } from "@scure/btc-signer";
+import { VtxoScript } from '../script/base.js';
 /**
  * ArkNotes are special virtual coins in the Ark protocol that can be created
  * and spent without requiring any transactions. The server mints them, and they

package/dist/esm/forfeit.js

@@ -1,9 +1,12 @@
-import { Transaction } from "@scure/btc-signer/transaction.js";
+import { Transaction } from "@scure/btc-signer";
 import { P2A } from './utils/anchor.js';
 export function buildForfeitTx(inputs, forfeitPkScript, txLocktime) {
     const tx = new Transaction({
         version: 3,
         lockTime: txLocktime,
+        allowUnknownOutputs: true,
+        allowUnknown: true,
+        allowUnknownInputs: true,
     });
     let amount = 0n;
     for (const input of inputs) {

package/dist/esm/identity/singleKey.js

@@ -1,8 +1,8 @@
-import { pubECDSA, pubSchnorr, randomPrivateKeyBytes, sha256, } from "@scure/btc-signer/utils.js";
-import { hex } from "@scure/base";
+import { pubECDSA, pubSchnorr, randomPrivateKeyBytes, } from "@scure/btc-signer/utils.js";
 import { SigHash } from "@scure/btc-signer/transaction.js";
+import { hex } from "@scure/base";
 import { TreeSignerSession } from '../tree/signingSession.js';
-import { schnorr } from "@noble/secp256k1";
+import { schnorr, sign } from "@noble/secp256k1";
 const ZERO_32 = new Uint8Array(32).fill(0);
 const ALL_SIGHASH = Object.values(SigHash).filter((x) => typeof x === "number");
 /**
@@ -79,8 +79,9 @@ export class SingleKey {
     signerSession() {
         return TreeSignerSession.random();
     }
-    async signMessage(message) {
-        const msgBytes = new TextEncoder().encode(message);
-        return schnorr.sign(sha256(msgBytes), this.key);
+    async signMessage(message, signatureType = "schnorr") {
+        if (signatureType === "ecdsa")
+            return sign(message, this.key, { prehash: false });
+        return schnorr.sign(message, this.key);
     }
 }

package/dist/esm/index.js

@@ -8,6 +8,7 @@ import { TxType, } from './wallet/index.js';
 import { Wallet, waitForIncomingFunds } from './wallet/wallet.js';
 import { TxTree } from './tree/txTree.js';
 import { Ramps } from './wallet/ramps.js';
+import { VtxoManager } from './wallet/vtxo-manager.js';
 import { ServiceWorkerWallet } from './wallet/serviceWorker/wallet.js';
 import { OnchainWallet } from './wallet/onchain.js';
 import { setupServiceWorker } from './wallet/serviceWorker/utils.js';
@@ -17,9 +18,9 @@ import { Response } from './wallet/serviceWorker/response.js';
 import { ESPLORA_URL, EsploraProvider, } from './providers/onchain.js';
 import { RestArkProvider, SettlementEventType, } from './providers/ark.js';
 import { CLTVMultisigTapscript, ConditionCSVMultisigTapscript, ConditionMultisigTapscript, CSVMultisigTapscript, decodeTapscript, MultisigTapscript, } from './script/tapscript.js';
-import { buildOffchainTx, } from './utils/arkTransaction.js';
+import { hasBoardingTxExpired, buildOffchainTx, verifyTapscriptSignatures, } from './utils/arkTransaction.js';
 import { VtxoTaprootTree, ConditionWitness, getArkPsbtFields, setArkPsbtField, ArkPsbtFieldKey, ArkPsbtFieldKeyType, CosignerPublicKey, VtxoTreeExpiry, } from './utils/unknownFields.js';
-import { BIP322 } from './bip322/index.js';
+import { Intent } from './intent/index.js';
 import { ArkNote } from './arknote/index.js';
 import { networks } from './networks.js';
 import { RestIndexerProvider, IndexerTxType, ChainTxType, } from './providers/indexer.js';
@@ -29,7 +30,7 @@ import { WalletRepositoryImpl } from './repositories/walletRepository.js';
 import { ContractRepositoryImpl } from './repositories/contractRepository.js';
 export { 
 // Wallets
-Wallet, SingleKey, OnchainWallet, Ramps, 
+Wallet, SingleKey, OnchainWallet, Ramps, VtxoManager, 
 // Providers
 ESPLORA_URL, EsploraProvider, RestArkProvider, RestIndexerProvider, 
 // Script-related
@@ -43,15 +44,15 @@ decodeTapscript, MultisigTapscript, CSVMultisigTapscript, ConditionCSVMultisigTa
 // Ark PSBT fields
 ArkPsbtFieldKey, ArkPsbtFieldKeyType, setArkPsbtField, getArkPsbtFields, CosignerPublicKey, VtxoTreeExpiry, VtxoTaprootTree, ConditionWitness, 
 // Utils
-buildOffchainTx, waitForIncomingFunds, 
+buildOffchainTx, verifyTapscriptSignatures, waitForIncomingFunds, hasBoardingTxExpired, 
 // Arknote
 ArkNote, 
 // Network
 networks, 
 // Repositories
 WalletRepositoryImpl, ContractRepositoryImpl, 
-// BIP322
-BIP322, 
+// Intent proof
+Intent, 
 // TxTree
 TxTree, 
 // Anchor