@arkade-os/sdk 0.4.57 → 0.4.58

package/dist/{chunk-NIZPFPUM.js → chunk-S3BFUTC5.js}

@@ -1,6 +1,6 @@
-import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-ASUJNZ63.js';
-import { witnessRefToBytes, validateProgram, toASM, stringifyArtifact, serializeArkadeContractParams, resolveAsm, parseArtifact, getOpcodeValue, getOpcodeName, fromASM, deserializeArkadeContractParams, computeArkadeScriptPublicKey, bytesToASM, asmToBytes, arkadeWitnessHash, arkadeScriptHash, SUPPORTED_PROGRAM_VERSION, OPCODE_VALUES, OPCODE_NAMES, bignum_exports, ArkadeScript, ArkadeProgramScript, ARKADE_OPS, ARKADE_OPCODE_VALUES, ARKADE_OPCODE_NAMES, ARKADE_OPCODES, ARKADE_OP, inputName, contractHandlers, isMainnetDescriptor, descriptorIsOurs, deriveDescriptorLeafPubKey, deriveDescriptorLeafCompressedPubKey, DefaultVtxo, speculativeReceiveMetadata, DelegateVtxo, WALLET_RECEIVE_SOURCE, BoardingContractHandler } from './chunk-P6L2W5IL.js';
-import { VtxoScript, Transaction, isRecoverable, CSVMultisigTapscript, DEFAULT_NETWORK, hasTerminalSpend, getNormalizedVtxos, setArkPsbtField, PrevArkTxField, ConditionWitness, craftToSpendTx, ArkAddress, isVirtualCoin, getArkPsbtFields, CosignerPublicKey, ServerResponseMismatchError, OP_RETURN_EMPTY_PKSCRIPT, sequenceToTimelock, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, VtxoTaprootTree, timelockToSequence, baseFetch, Intent, rateGate, DEFAULT_NETWORK_NAME, normalizeVtxo, getSequence, toBatchExpiry, maybeArkError, isArkError, ArkErrorName, toOffchainInputFeeParams, canRecoverOnchain, getNetwork, MultisigTapscript, isEventSourceError, isRetryableProviderError, getAllNormalizedVtxos, DEFAULT_PAGE_SIZE, RestArkProvider, canSpendOffchain, toVirtualStatus, ArkError, resolveTimeHeight, parseLegacyExpiry, isExpired, DEFAULT_ARKADE_SERVER_URL, ProviderUnavailableError, networks as networks$1, isPastExpiry, fetchVtxoCreatedAtByTxid } from './chunk-PUNBWFIV.js';
+import { AssetId, AssetGroup, AssetInput, AssetOutput, Metadata, Packet, BufferReader, BufferWriter, AssetRef, RestIndexerProvider } from './chunk-TV2RLVOB.js';
+import { witnessRefToBytes, validateProgram, toASM, stringifyArtifact, serializeArkadeContractParams, resolveAsm, parseArtifact, getOpcodeValue, getOpcodeName, fromASM, deserializeArkadeContractParams, computeArkadeScriptPublicKey, bytesToASM, asmToBytes, arkadeWitnessHash, arkadeScriptHash, SUPPORTED_PROGRAM_VERSION, OPCODE_VALUES, OPCODE_NAMES, bignum_exports, ArkadeScript, ArkadeProgramScript, ARKADE_OPS, ARKADE_OPCODE_VALUES, ARKADE_OPCODE_NAMES, ARKADE_OPCODES, ARKADE_OP, inputName, contractHandlers, isMainnetDescriptor, descriptorIsOurs, deriveDescriptorLeafPubKey, deriveDescriptorLeafCompressedPubKey, DefaultVtxo, speculativeReceiveMetadata, DelegateVtxo, WALLET_RECEIVE_SOURCE, BoardingContractHandler } from './chunk-IPPASJE5.js';
+import { VtxoScript, Transaction, isRecoverable, CSVMultisigTapscript, DEFAULT_NETWORK, hasTerminalSpend, getNormalizedVtxos, setArkPsbtField, PrevArkTxField, ConditionWitness, craftToSpendTx, ArkAddress, isVirtualCoin, getArkPsbtFields, CosignerPublicKey, ServerResponseMismatchError, OP_RETURN_EMPTY_PKSCRIPT, sequenceToTimelock, decodeTapscript, scriptFromTapLeafScript, CLTVMultisigTapscript, VtxoTaprootTree, timelockToSequence, baseFetch, Intent, rateGate, DEFAULT_NETWORK_NAME, normalizeVtxo, getSequence, toBatchExpiry, maybeArkError, isArkError, ArkErrorName, toOffchainInputFeeParams, canRecoverOnchain, getNetwork, MultisigTapscript, isEventSourceError, isRetryableProviderError, getAllNormalizedVtxos, DEFAULT_PAGE_SIZE, RestArkProvider, canSpendOffchain, toVirtualStatus, ArkError, resolveTimeHeight, parseLegacyExpiry, isExpired, DEFAULT_ARKADE_SERVER_URL, ProviderUnavailableError, networks as networks$1, isPastExpiry, fetchVtxoCreatedAtByTxid } from './chunk-VROHHJL4.js';
 import { __export } from './chunk-NSBPE2FW.js';
 import { sha256, equalBytes, hash160, sha256x2, concatBytes, randomPrivateKeyBytes, pubECDSA, pubSchnorr } from '@scure/btc-signer/utils.js';
 import { SigHash, Script, OP, OutScript, Address, RawWitness, p2tr, p2wpkh, TaprootControlBlock, DEFAULT_SEQUENCE, Transaction as Transaction$2 } from '@scure/btc-signer';
@@ -3097,6 +3097,40 @@ function capSettlementBatch(sorted, maxAmount) {
   }
   return batch;
 }
+function priceSettlementInputs(vtxos, estimator) {
+  const payable = [];
+  const net = /* @__PURE__ */ new Map();
+  for (const vtxo of vtxos) {
+    const inputFee = estimator.evalOffchainInput(toOffchainInputFeeParams(vtxo));
+    if (inputFee.satoshis >= vtxo.value) {
+      continue;
+    }
+    payable.push(vtxo);
+    net.set(`${vtxo.txid}:${vtxo.vout}`, BigInt(vtxo.value - inputFee.satoshis));
+  }
+  return { payable, net };
+}
+function subtotalOf(vtxos, net) {
+  let subtotal = 0n;
+  for (const vtxo of vtxos) {
+    const priced = net.get(`${vtxo.txid}:${vtxo.vout}`);
+    if (priced === void 0) {
+      throw new Error(`Unpriced settlement input ${vtxo.txid}:${vtxo.vout}`);
+    }
+    subtotal += priced;
+  }
+  return subtotal;
+}
+function deductOffchainOutputFee(subtotal, estimator, arkAddress) {
+  if (!estimator.config.offchainOutput) {
+    return subtotal;
+  }
+  const outputFee = estimator.evalOffchainOutput({
+    amount: subtotal,
+    script: hex.encode(ArkAddress.decode(arkAddress).pkScript)
+  });
+  return subtotal - BigInt(outputFee.satoshis);
+}
 var DEFAULT_THRESHOLD_SECONDS = 259200;
 var DEFAULT_THRESHOLD_MS = DEFAULT_THRESHOLD_SECONDS * 1e3;
 var DEFAULT_RENEWAL_CONFIG = {
@@ -3304,19 +3338,27 @@ var VtxoManager = class _VtxoManager {
     });
     const dustAmount = getDustAmount(this.wallet);
     const now = await fetchTimeHeight(this.wallet);
-    let { vtxosToRecover, totalAmount } = getRecoverableWithSubdust(allVtxos, dustAmount, now);
+    let { vtxosToRecover } = getRecoverableWithSubdust(allVtxos, dustAmount, now);
     if (vtxosToRecover.length === 0) {
       throw new Error("No recoverable VTXOs found");
     }
     const info = await this.getInfoProvider()?.getInfo();
     const vtxoMaxAmount = info?.vtxoMaxAmount ?? -1n;
-    const capped = capSettlementBatch(byValueDescending(vtxosToRecover), vtxoMaxAmount);
+    const estimator = new Estimator(info?.fees.intentFee ?? {});
+    const { payable, net } = priceSettlementInputs(vtxosToRecover, estimator);
+    const capped = capSettlementBatch(byValueDescending(payable), vtxoMaxAmount);
     if (capped.length < vtxosToRecover.length) {
       const recoverableCount = vtxosToRecover.length;
-      ({ vtxosToRecover, totalAmount } = getRecoverableWithSubdust(capped, dustAmount, now));
+      const cappedAway = capped.length < payable.length;
+      ({ vtxosToRecover } = getRecoverableWithSubdust(capped, dustAmount, now));
       if (vtxosToRecover.length === 0) {
+        if (!cappedAway) {
+          throw new Error(
+            `All ${recoverableCount} recoverable VTXOs that can pay their own intent fee total less than the dust threshold ${dustAmount}`
+          );
+        }
         throw new Error(
-          `Capped recovery batch (highest-value subset of ${recoverableCount} recoverable VTXOs within the ${MAX_VTXOS_PER_SETTLEMENT}-input and ${vtxoMaxAmount}-sat limits) is below the dust threshold ${dustAmount}`
+          `Capped recovery batch (highest-value subset of ${recoverableCount} recoverable VTXOs within the ${MAX_VTXOS_PER_SETTLEMENT}-input and ${vtxoMaxAmount}-sat limits, net of intent fees) is below the dust threshold ${dustAmount}`
         );
       }
     }
@@ -3324,6 +3366,16 @@ var VtxoManager = class _VtxoManager {
       await this.rotateForRecoverableInputs(vtxosToRecover, info);
     }
     const arkAddress = await this.wallet.getAddress();
+    const totalAmount = deductOffchainOutputFee(
+      subtotalOf(vtxosToRecover, net),
+      estimator,
+      arkAddress
+    );
+    if (totalAmount < dustAmount) {
+      throw new Error(
+        `Recoverable amount ${totalAmount} net of intent fees is below dust threshold ${dustAmount}`
+      );
+    }
     return this.wallet.settle(
       {
         inputs: vtxosToRecover,
@@ -3342,6 +3394,17 @@ var VtxoManager = class _VtxoManager {
    *
    * Useful for displaying to users before they decide to recover funds.
    *
+   * Both amounts are net of the operator's intent fees, so `recoverable` is
+   * what {@link recoverVtxos} would actually hand back rather than the gross
+   * sum of the inputs. `subdust` is net of the per-input fees only — the
+   * output fee is charged on the batch as a whole and is not attributed per
+   * coin — so it reports what the subdust coins are worth once each has paid
+   * its own way, and is not strictly a slice of `recoverable`. It can exceed
+   * `recoverable` where a flat output fee meets a wholly subdust wallet.
+   *
+   * The batch size caps are not applied here: they defer the overflow to the
+   * next cycle rather than reducing what is recoverable.
+   *
    * @returns Object containing recoverable amounts and subdust information
    *
    * @example
@@ -3363,17 +3426,29 @@ var VtxoManager = class _VtxoManager {
       withUnrolled: false
     });
     const dustAmount = getDustAmount(this.wallet);
-    const { vtxosToRecover, includesSubdust, totalAmount } = getRecoverableWithSubdust(
+    const { vtxosToRecover, includesSubdust } = getRecoverableWithSubdust(
       allVtxos,
       dustAmount,
       await fetchTimeHeight(this.wallet)
     );
-    const subdustAmount = vtxosToRecover.filter((v) => BigInt(v.value) < dustAmount).reduce((sum, v) => sum + BigInt(v.value), 0n);
+    const info = await this.getInfoProvider()?.getInfo();
+    const estimator = new Estimator(info?.fees.intentFee ?? {});
+    const { payable, net } = priceSettlementInputs(vtxosToRecover, estimator);
+    const priced = deductOffchainOutputFee(
+      subtotalOf(payable, net),
+      estimator,
+      await this.wallet.getAddress()
+    );
+    const recoverable = priced > 0n ? priced : 0n;
+    const subdustAmount = subtotalOf(
+      payable.filter((v) => BigInt(v.value) < dustAmount),
+      net
+    );
     return {
-      recoverable: totalAmount,
+      recoverable,
       subdust: subdustAmount,
       includesSubdust,
-      vtxoCount: vtxosToRecover.length
+      vtxoCount: payable.length
     };
   }
   // ========== Renewal Methods ==========
@@ -3491,6 +3566,14 @@ var VtxoManager = class _VtxoManager {
       }
       const info = await this.getInfoProvider()?.getInfo();
       const vtxoMaxAmount = info?.vtxoMaxAmount ?? -1n;
+      const estimator = new Estimator(info?.fees.intentFee ?? {});
+      const { payable, net } = priceSettlementInputs(vtxos, estimator);
+      vtxos = payable;
+      if (vtxos.length === 0) {
+        throw new Error(
+          "No VTXOs available to renew: every expiring VTXO is worth less than its own intent fee"
+        );
+      }
       const capped = capSettlementBatch(byExpiryAscending(vtxos, now), vtxoMaxAmount);
       if (vtxoMaxAmount >= 0n) {
         const oversized = vtxos.filter((vtxo) => BigInt(vtxo.value) > vtxoMaxAmount);
@@ -3508,24 +3591,28 @@ var VtxoManager = class _VtxoManager {
           );
         }
       }
-      const totalAmount = vtxos.reduce((sum, vtxo) => sum + vtxo.value, 0);
       const dustAmount = getDustAmount(this.wallet);
-      if (BigInt(totalAmount) < dustAmount) {
-        throw new Error(
-          `Total amount ${totalAmount} is below dust threshold ${dustAmount}`
-        );
-      }
       if (info && isMigrationCapable(this.wallet)) {
         await this.rotateForRecoverableInputs(vtxos, info);
       }
       const arkAddress = await this.wallet.getAddress();
+      const totalAmount = deductOffchainOutputFee(
+        subtotalOf(vtxos, net),
+        estimator,
+        arkAddress
+      );
+      if (totalAmount < dustAmount) {
+        throw new Error(
+          `Total amount ${totalAmount} is below dust threshold ${dustAmount}`
+        );
+      }
       const txid = await this.wallet.settle(
         {
           inputs: vtxos,
           outputs: [
             {
               address: arkAddress,
-              amount: BigInt(totalAmount)
+              amount: totalAmount
             }
           ]
         },
@@ -14771,7 +14858,9 @@ var MessageBus = class {
         settlementConfig: config.settlementConfig,
         walletMode: config.walletMode,
         watcherConfig: config.watcherConfig,
-        lookAheadWindow: config.lookAheadWindow
+        lookAheadWindow: config.lookAheadWindow,
+        minBatchExpirySeconds: config.minBatchExpirySeconds,
+        minCheckpointExitDelaySeconds: config.minCheckpointExitDelaySeconds
       });
       return { wallet, arkProvider, readonlyWallet: wallet };
     }
@@ -17304,6 +17393,8 @@ var ServiceWorkerWallet = class _ServiceWorkerWallet extends ServiceWorkerReadon
       walletMode: options.walletMode,
       watcherConfig: options.watcherConfig,
       lookAheadWindow: options.lookAheadWindow,
+      minBatchExpirySeconds: options.minBatchExpirySeconds,
+      minCheckpointExitDelaySeconds: options.minCheckpointExitDelaySeconds,
       messageTimeouts
     };
     await initializeMessageBus(
@@ -21012,5 +21103,5 @@ function isArkContract(str) {
 }
 
 export { ARKADE_MAGIC, ActivityRegistry, AmbiguousRouteError, ArkNote, ArkadeCash, ArkadeCashCreateError, AssetManager, BIP21, BIP21Error, BIP322, Batch, ChainedTxType, ContractManager, ContractRepositoryImpl, ContractWatcher, DB_VERSION, DEFAULT_MESSAGE_TIMEOUTS, DEFAULT_MIN_BATCH_EXPIRY_SECONDS, DEFAULT_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, DelegateManagerImpl, DelegateNotConfiguredError, DelegatorManagerImpl, DelegatorNotConfiguredError, DescriptorIdentity, DescriptorSigningProviderMissingError, DustChangeError, ELECTRUM_TCP_HOST, ELECTRUM_WS_URL, ESPLORA_URL, ElectrumOnchainProvider, EmulatorPacket, EsploraProvider, Estimator, Extension, ExtensionNotFoundError, HDDescriptorProvider, INTENT_TERMINAL_STATES, InMemoryContractRepository, InMemoryIntentRepository, InMemoryVirtualTxRepository, InMemoryWalletRepository, IndexedDBContractRepository, IndexedDBIntentRepository, IndexedDBVirtualTxRepository, IndexedDBWalletRepository, MESSAGE_BUS_INITIALIZING, MESSAGE_BUS_NOT_INITIALIZED, MIGRATION_KEY, MessageBus, MessageBusInitializingError, MessageBusNotInitializedError, MissingSigningDescriptorError, MnemonicIdentity, OnchainWallet, P2A, PaymentRouter, REGTEST_MIN_BATCH_EXPIRY_SECONDS, REGTEST_MIN_CHECKPOINT_EXIT_DELAY_SECONDS, Ramps, ReadonlyAssetManager, ReadonlyDescriptorIdentity, ReadonlySingleKey, ReadonlyWallet, ReadonlyWalletError, RestDelegateProvider, RestDelegatorProvider, RestEmulatorProvider, SeedIdentity, ServiceWorkerReadonlyWallet, ServiceWorkerTimeoutError, ServiceWorkerWallet, SingleKey, TxTree, TxType, TxWeightEstimator, UnilateralExit, UnknownPacket, Unroll, VtxoManager, Wallet2 as Wallet, WalletMessageHandler, WalletNotInitializedError, WalletRepositoryImpl, WsElectrumChainSource, arkRail, arkTarget, arkade_exports, assertFinalCommitmentMatchesValidated, assertIntentIdUnique, assertSendableAmount, assertSubmittedArkTxid, assertValidBatchExpiry, assertValidServerUnrollScript, assetMintResolver, boardingResolver, btcTarget, buildForfeitTx, buildOffchainTx, classifyAgainstSignerSet, classifyContractSigner, closeDatabase, collabExitResolver, combineTapscriptSigs, contractFromArkContract, contractFromArkContractWithAddress, createAssetPacket, createDefaultActivityRegistry, createDefaultPaymentRouter, createExitChainResolver, decodeArkContract, defaultBatchExpiryPolicy, defaultCheckpointExitDelayPolicy, deserializeAssets, deserializeExitPackage, deserializeUtxo, deserializeVtxo, encodeArkContract, extendVirtualCoinForContract, getMigrationStatus, getRandomId, hasBoardingTxExpired, hasCandidates, intentMatchesFilter, intentPageBounds, invoiceTarget, isArkContract, isBatchSignable, isBtcAddress, isCooperativelyMigratable, isDiscoverable, isHDDeterministicSignCapable, isHDWalletCapable, isLightningInvoice, isLnurl, isMessageBusInitializingError, isMessageBusNotInitializedError, isSubdust, isTerminalIntentState, isValidArkAddress, isVtxoExpiringSoon, isVtxoForScript, makeHandle, matchServerCheckpoints, mergeChainedTxType, migrateWalletRepository, onchainRail, openDatabase, requiresMigration, resolveBatchExpiryPolicy, resolveCheckpointExitDelayPolicy, resolveSendAmount, rollbackMigration, saveVtxosForContract, scriptFromArkAddress, selectCoinsWithAsset, selectVirtualCoins, serializeAssets, serializeExitPackage, serializeUtxo, serializeVtxo, setupServiceWorker, signerSetFromInfo, toXOnlySignerHex, tryResolveSendAmount, validateBatchRecipients, validateConnectorsTxGraph, validateVtxoTxGraph, verifyTapscriptSignatures, waitForIncomingFunds, warnAndFilterVtxosForScript };
-//# sourceMappingURL=chunk-NIZPFPUM.js.map
-//# sourceMappingURL=chunk-NIZPFPUM.js.map
+//# sourceMappingURL=chunk-S3BFUTC5.js.map
+//# sourceMappingURL=chunk-S3BFUTC5.js.map