@argonprotocol/mainchain 1.3.3 → 1.3.5

package/browser/index.d.ts

@@ -8,7 +8,6 @@ import { Percent, AccountId32, H256, MultiAddress, Call, Hash, SignedBlock, Bloc
 export { AccountId, AccountId32, Block, Call, H160, H256, Header, MultiAddress, Permill } from '@polkadot/types/interfaces/runtime';
 import { FrameSupportPalletId, FrameSystemLimitsBlockLength, FrameSystemLimitsBlockWeights, SpWeightsRuntimeDbWeight, SpVersionRuntimeVersion, FrameSupportTokensMiscBalanceStatus, SpRuntimeDispatchError, ArgonPrimitivesBitcoinUtxoRef, ArgonPrimitivesBitcoinBitcoinRejectedReason, ArgonPrimitivesBlockSealBlockPayout, PalletDomainsDomainRegistration, ArgonPrimitivesDomainZoneRecord, ArgonRuntimeOriginCaller, SpConsensusGrandpaAppPublic, PalletHyperbridgeVersionedHostParams, PalletIsmpErrorsHandlingError, IsmpEventsRequestResponseHandled, IsmpEventsTimeoutHandled, IsmpHostStateMachine, IsmpConsensusStateMachineHeight, IsmpConsensusStateMachineId, ArgonPrimitivesBlockSealMiningRegistration, PalletMintMintType, PalletMultisigTimepoint, ArgonPrimitivesNotaryNotaryRecord, ArgonPrimitivesNotaryNotaryMeta, ArgonNotaryAuditErrorVerifyError, PalletProxyDepositKind, ArgonRuntimeProxyType, FrameSystemDispatchEventInfo, PalletBalancesAccountData, FrameSupportTokensMiscIdAmountRuntimeFreezeReason, FrameSupportTokensMiscIdAmountRuntimeHoldReason, PalletBalancesBalanceLock, PalletBalancesReserveData, PalletBitcoinLocksLockedBitcoin, PalletBitcoinLocksLockReleaseRequest, ArgonPrimitivesBitcoinBitcoinNetwork, ArgonPrimitivesBitcoinBitcoinBlock, ArgonPrimitivesBitcoinUtxoValue, ArgonPrimitivesForkPower, ArgonPrimitivesProvidersBlockSealerInfo, ArgonPrimitivesInherentsBlockSealInherent, ArgonPrimitivesDigestsBlockVoteDigest, ArgonPrimitivesNotaryNotaryNotebookVoteDigestDetails, PalletChainTransferQueuedTransferOut, ArgonPrimitivesDigestsDigestset, PalletGrandpaStoredPendingChange, PalletGrandpaStoredState, IsmpConsensusStateCommitment, PalletLiquidityPoolsLiquidityPoolCapital, PalletLiquidityPoolsPrebondedArgons, PalletLiquidityPoolsLiquidityPool, ArgonPrimitivesBlockSealMiningBidStats, ArgonPrimitivesBlockSealMiningSlotConfig, PalletMintMintAction, PalletMultisigMultisig, ArgonPrimitivesBalanceChangeAccountOrigin, ArgonPrimitivesDigestsNotebookDigest, ArgonPrimitivesNotaryNotaryNotebookKeyDetails, PalletPriceIndexPriceIndex, PalletProxyAnnouncement, PalletProxyProxyDefinition, FrameSystemAccountInfo, FrameSystemCodeUpgradeAuthorization, FrameSupportDispatchPerDispatchClassWeight, SpRuntimeDigest, FrameSystemEventRecord, FrameSystemPhase, SpWeightsWeightV2Weight, FrameSystemLastRuntimeUpgradeInfo, ArgonPrimitivesTickTicker, PalletTransactionPaymentReleases, PalletVaultsVaultFrameFeeRevenue, ArgonPrimitivesVault, ArgonPrimitivesBitcoinBitcoinXPub, PalletBalancesAdjustmentDirection, ArgonPrimitivesBitcoinCompressedBitcoinPubkey, ArgonPrimitivesBitcoinH256Le, ArgonPrimitivesInherentsBitcoinUtxoSync, SpConsensusGrandpaEquivocationProof, SpCoreVoid, IsmpMessagingCreateConsensusState, PalletIsmpUtilsFundMessageParams, IsmpMessagingMessage, PalletIsmpUtilsUpdateConsensusState, IsmpGrandpaAddStateMachine, ArgonRuntimeSessionKeys, ArgonPrimitivesNotebookSignedNotebookHeader, PalletTokenGatewayAssetRegistration, PalletTokenGatewayTeleportParams, PalletTokenGatewayPrecisionUpdate, TokenGatewayPrimitivesGatewayAssetUpdate, PalletVaultsVaultConfig, ArgonPrimitivesVaultVaultTerms, ArgonPrimitivesBitcoinOpaqueBitcoinXpub } from '@polkadot/types/lookup';
 export * from '@polkadot/types/lookup';
-import * as _polkadot_types_types from '@polkadot/types/types';
 import { Observable, IExtrinsic } from '@polkadot/types/types';
 import { AugmentedRpc } from '@polkadot/rpc-core/types';
 import { StorageKey, Metadata, Data, GenericEvent as GenericEvent$1 } from '@polkadot/types';
@@ -90,13 +89,15 @@ export { Keyring } from '@polkadot/api';
 export { decodeAddress, mnemonicGenerate } from '@polkadot/util-crypto';
 export { InterfaceTypes as interfaces } from '@polkadot/types/types/registry';
 export { KeypairType } from '@polkadot/util-crypto/types';
+import * as _polkadot_types_types_extrinsic from '@polkadot/types/types/extrinsic';
 import { ISubmittableResult } from '@polkadot/types/types/extrinsic';
+export { IExtrinsic, ISignerPayload, ISubmittableResult, Signer, SignerResult } from '@polkadot/types/types/extrinsic';
 import { SubmittableExtrinsic as SubmittableExtrinsic$1 } from '@polkadot/api/promise/types';
 import { SignerOptions, ApiDecoration } from '@polkadot/api/types';
 import { GenericEvent } from '@polkadot/types/generic';
 export { GenericAddress, GenericBlock, GenericEvent } from '@polkadot/types/generic';
 import BigNumber from 'bignumber.js';
-import { DispatchError as DispatchError$1, Header as Header$1, ExtrinsicStatus as ExtrinsicStatus$1 } from '@polkadot/types/interfaces';
+import { DispatchError as DispatchError$1, Header as Header$1 } from '@polkadot/types/interfaces';
 export { hexToU8a, u8aEq, u8aToHex } from '@polkadot/util';
 
 declare module '@polkadot/api-base/types/consts' {
@@ -11254,9 +11255,10 @@ declare class TxSubmitter {
         logResults?: boolean;
         waitForBlock?: boolean;
         useLatestNonce?: boolean;
-        onResultCallback?: (result: ISubmittableResult) => void;
+        txProgressCallback?: ITxProgressCallback;
     }): Promise<TxResult>;
 }
+type ITxProgressCallback = (progressToInBlock: number, result: TxResult) => void;
 declare class TxResult {
     private readonly client;
     private shouldLog;
@@ -11277,7 +11279,7 @@ declare class TxResult {
      * The fee tip paid for the transaction.
      */
     finalFeeTip?: bigint;
-    onResultCallback?: (result: ISubmittableResult) => void;
+    txProgressCallback?: ITxProgressCallback;
     private inBlockResolve;
     private inBlockReject;
     private finalizedResolve;
@@ -11297,7 +11299,7 @@ declare class AccountRegistry {
 }
 
 declare const MICROGONS_PER_ARGON = 1000000;
-declare function formatArgons(x: bigint | number): string;
+declare function formatArgons(microgons: bigint | number): string;
 declare function formatPercent(x: BigNumber | undefined): string;
 type NonNullableProps<T> = {
     [K in keyof T]-?: Exclude<T[K], undefined | null>;
@@ -11613,9 +11615,8 @@ declare class MiningBids {
 }
 
 declare class Vault {
-    private tickDuration;
+    tickDuration: number;
     securitization: bigint;
-    securitizationRatio: BigNumber;
     argonsLocked: bigint;
     argonsPendingActivation: bigint;
     argonsScheduledForRelease: Map<number, bigint>;
@@ -11627,10 +11628,12 @@ declare class Vault {
     pendingTermsChangeTick?: number;
     openedDate: Date;
     openedTick: number;
+    securitizationRatio: number;
     constructor(id: number, vault: ArgonPrimitivesVault, tickDuration: number);
     load(vault: ArgonPrimitivesVault): void;
     availableBitcoinSpace(): bigint;
     getRelockCapacity(): bigint;
+    securitizationRatioBN(): BigNumber;
     recoverySecuritization(): bigint;
     minimumSecuritization(): bigint;
     activatedSecuritization(): bigint;
@@ -11649,7 +11652,7 @@ declare class Vault {
         liquidityPoolProfitSharing: number;
         tip?: bigint;
         doNotExceedBalance?: bigint;
-        progressCallback?: (progressPct: number, status: ExtrinsicStatus$1) => void;
+        txProgressCallback?: ITxProgressCallback;
     }, config?: {
         tickDurationMillis?: number;
     }): Promise<{
@@ -11840,6 +11843,7 @@ declare class BitcoinLocks {
         utxoId: number;
         vaultSignature: Uint8Array;
         argonKeyring: KeyringPair;
+        txProgressCallback?: ITxProgressCallback;
     }): Promise<TxResult>;
     getBitcoinLock(utxoId: number): Promise<IBitcoinLock | undefined>;
     /**
@@ -11862,7 +11866,7 @@ declare class BitcoinLocks {
         reducedBalanceBy?: bigint;
         tip?: bigint;
     }): Promise<{
-        tx: _polkadot_api_base_types.SubmittableExtrinsic<"promise", _polkadot_types_types.ISubmittableResult>;
+        tx: _polkadot_api_base_types.SubmittableExtrinsic<"promise", _polkadot_types_types_extrinsic.ISubmittableResult>;
         securityFee: bigint;
         txFee: bigint;
     }>;
@@ -11872,6 +11876,7 @@ declare class BitcoinLocks {
         argonKeyring: KeyringPair;
         satoshis: bigint;
         tip?: bigint;
+        txProgressCallback?: ITxProgressCallback;
     }): Promise<{
         lock: IBitcoinLock;
         createdAtHeight: number;
@@ -11884,6 +11889,7 @@ declare class BitcoinLocks {
         releaseRequest: IReleaseRequest;
         argonKeyring: KeyringPair;
         tip?: bigint;
+        txProgressCallback?: ITxProgressCallback;
     }): Promise<{
         blockHash: Uint8Array;
         blockHeight: number;
@@ -11899,6 +11905,7 @@ declare class BitcoinLocks {
         argonKeyring: KeyringPair;
         tip?: bigint;
         vault: Vault;
+        txProgressCallback?: ITxProgressCallback;
     }): Promise<{
         securityFee: bigint;
         txFee: bigint;
@@ -11926,6 +11933,7 @@ declare class BitcoinLocks {
 }
 interface IBitcoinLockConfig {
     releaseExpirationBlocks: number;
+    pendingConfirmationExpirationBlocks: number;
     tickDurationMillis: number;
     bitcoinNetwork: ArgonPrimitivesBitcoinBitcoinNetwork;
 }
@@ -11987,4 +11995,4 @@ declare function waitForLoad(): Promise<void>;
  */
 declare function getClient(host: string): Promise<ArgonClient>;
 
-export { AccountMiners, AccountRegistry, Accountset, type ArgonClient, type ArgonClientConfig, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError, FrameCalculator, type IBitcoinLock, type IBitcoinLockConfig, type IMiningIndex, type IReleaseRequest, type IReleaseRequestDetails, type ISubaccountMiner, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };
+export { AccountMiners, AccountRegistry, Accountset, type ArgonClient, type ArgonClientConfig, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError, FrameCalculator, type IBitcoinLock, type IBitcoinLockConfig, type IMiningIndex, type IReleaseRequest, type IReleaseRequestDetails, type ISubaccountMiner, type ITxProgressCallback, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };

package/browser/index.js

@@ -13,7 +13,7 @@ import { mnemonicGenerate, cryptoWaitReady } from '@polkadot/util-crypto';
 export { decodeAddress, mnemonicGenerate } from '@polkadot/util-crypto';
 import * as BigNumber from 'bignumber.js';
 import BigNumber__default from 'bignumber.js';
-import { hexToU8a, u8aToHex } from '@polkadot/util';
+import { u8aToHex, hexToU8a } from '@polkadot/util';
 export { hexToU8a, u8aEq, u8aToHex } from '@polkadot/util';
 import { printTable, Table } from 'console-table-printer';
 import bs58check from 'bs58check';
@@ -121,20 +121,21 @@ var TxSubmitter = class {
     const { tip, unavailableBalance } = options;
     const account = await this.client.query.system.account(this.pair.address);
     let availableBalance = account.data.free.toBigInt();
+    const userBalance = availableBalance;
     if (unavailableBalance) {
       availableBalance -= unavailableBalance;
     }
     const existentialDeposit = options.includeExistentialDeposit ? this.client.consts.balances.existentialDeposit.toBigInt() : 0n;
     const fees = await this.feeEstimate(tip);
     const totalCharge = fees + (tip ?? 0n);
-    const canAfford = availableBalance > totalCharge + existentialDeposit;
-    return { canAfford, availableBalance, txFee: fees };
+    const canAfford = availableBalance >= totalCharge + existentialDeposit;
+    return { canAfford, availableBalance: userBalance, txFee: fees };
   }
   async submit(options = {}) {
     const { logResults, waitForBlock, useLatestNonce, ...apiOptions } = options;
     await waitForLoad();
     const result = new TxResult(this.client, logResults);
-    result.onResultCallback = options.onResultCallback;
+    result.txProgressCallback = options.txProgressCallback;
     let toHuman = this.tx.toHuman().method;
     let txString = [];
     let api = formatCall(toHuman);
@@ -187,7 +188,7 @@ var TxResult = class {
      * The fee tip paid for the transaction.
      */
     __publicField(this, "finalFeeTip");
-    __publicField(this, "onResultCallback");
+    __publicField(this, "txProgressCallback");
     __publicField(this, "inBlockResolve");
     __publicField(this, "inBlockReject");
     __publicField(this, "finalizedResolve");
@@ -238,7 +239,15 @@ var TxResult = class {
     if (isFinalized) {
       this.finalizedResolve(status.asFinalized);
     }
-    this.onResultCallback?.(result);
+    if (this.txProgressCallback) {
+      let percent = 0;
+      if (result.status.isBroadcast) {
+        percent = 50;
+      } else if (result.status.isInBlock) {
+        percent = 100;
+      }
+      this.txProgressCallback(percent, this);
+    }
   }
   reject(error) {
     this.inBlockReject(error);
@@ -247,10 +256,10 @@ var TxResult = class {
 };
 var { ROUND_FLOOR } = BigNumber;
 var MICROGONS_PER_ARGON = 1e6;
-function formatArgons(x) {
-  if (x === void 0 || x === null) return "na";
-  const isNegative = x < 0;
-  let format = BigNumber__default(x.toString()).abs().div(MICROGONS_PER_ARGON).toFormat(2, ROUND_FLOOR);
+function formatArgons(microgons) {
+  if (microgons === void 0 || microgons === null) return "na";
+  const isNegative = microgons < 0;
+  let format = BigNumber__default(microgons.toString()).abs().div(MICROGONS_PER_ARGON).toFormat(2, ROUND_FLOOR);
   if (format.endsWith(".00")) {
     format = format.slice(0, -3);
   }
@@ -394,7 +403,7 @@ var JsonExt = class {
         return BigInt(v.slice(0, -1));
       }
       if (typeof v === "object" && v !== null && v.type === "Buffer" && Array.isArray(v.data)) {
-        return hexToU8a(v.data);
+        return Uint8Array.from(v.data);
       }
       return v;
     });
@@ -1289,10 +1298,9 @@ var Vault = class _Vault {
   constructor(id, vault, tickDuration) {
     this.tickDuration = tickDuration;
     __publicField(this, "securitization");
-    __publicField(this, "securitizationRatio");
     __publicField(this, "argonsLocked");
     __publicField(this, "argonsPendingActivation");
-    __publicField(this, "argonsScheduledForRelease", /* @__PURE__ */ new Map());
+    __publicField(this, "argonsScheduledForRelease");
     __publicField(this, "terms");
     __publicField(this, "operatorAccountId");
     __publicField(this, "isClosed");
@@ -1301,14 +1309,18 @@ var Vault = class _Vault {
     __publicField(this, "pendingTermsChangeTick");
     __publicField(this, "openedDate");
     __publicField(this, "openedTick");
+    __publicField(this, "securitizationRatio");
     this.vaultId = id;
-    this.load(vault);
     this.openedTick = vault.openedTick.toNumber();
     this.openedDate = new Date(this.openedTick * this.tickDuration);
+    this.argonsScheduledForRelease = /* @__PURE__ */ new Map();
+    this.load(vault);
   }
   load(vault) {
     this.securitization = vault.securitization.toBigInt();
-    this.securitizationRatio = convertFixedU128ToBigNumber(vault.securitizationRatio.toBigInt());
+    this.securitizationRatio = convertFixedU128ToBigNumber(
+      vault.securitizationRatio.toBigInt()
+    ).toNumber();
     this.argonsLocked = vault.argonsLocked.toBigInt();
     this.argonsPendingActivation = vault.argonsPendingActivation.toBigInt();
     if (vault.argonsScheduledForRelease.size > 0) {
@@ -1350,21 +1362,21 @@ var Vault = class _Vault {
   getRelockCapacity() {
     return [...this.argonsScheduledForRelease.values()].reduce((acc, val) => acc + val, 0n);
   }
+  securitizationRatioBN() {
+    return new BigNumber__default(this.securitizationRatio);
+  }
   recoverySecuritization() {
-    const reserved = new BigNumber__default(1).div(this.securitizationRatio);
+    const reserved = new BigNumber__default(1).div(this.securitizationRatioBN());
     return this.securitization - BigInt(reserved.multipliedBy(this.securitization.toString()).toFixed(0, ROUND_FLOOR2));
   }
   minimumSecuritization() {
     return BigInt(
-      this.securitizationRatio.multipliedBy(this.argonsLocked.toString()).decimalPlaces(0, BigNumber__default.ROUND_CEIL).toString()
+      this.securitizationRatioBN().multipliedBy(this.argonsLocked.toString()).decimalPlaces(0, BigNumber__default.ROUND_CEIL).toString()
     );
   }
   activatedSecuritization() {
     const activated = this.argonsLocked - this.argonsPendingActivation;
-    let maxRatio = this.securitizationRatio;
-    if (this.securitizationRatio.toNumber() > 2) {
-      maxRatio = BigNumber__default(2);
-    }
+    const maxRatio = BigNumber__default(Math.min(this.securitizationRatio, 2));
     return BigInt(maxRatio.multipliedBy(activated.toString()).toFixed(0, ROUND_FLOOR2));
   }
   /**
@@ -1395,7 +1407,7 @@ var Vault = class _Vault {
       bitcoinXpub,
       tip,
       doNotExceedBalance,
-      progressCallback
+      txProgressCallback
     } = args;
     let xpubBytes = hexToU8a(bitcoinXpub);
     if (xpubBytes.length !== 78) {
@@ -1438,21 +1450,7 @@ var Vault = class _Vault {
       tip,
       useLatestNonce: true,
       waitForBlock: true,
-      onResultCallback(result2) {
-        let percent = 0;
-        if (result2.status.isInvalid || result2.status.isDropped || result2.status.isUsurped || result2.status.isRetracted) {
-          percent = 1;
-        } else if (result2.status.isReady) {
-          percent = 0;
-        } else if (result2.status.isBroadcast) {
-          percent = 0.5;
-        } else if (result2.status.isInBlock) {
-          percent = 1;
-        } else if (result2.status.isFinalized) {
-          percent = 1.1;
-        }
-        progressCallback?.(percent, result2.status);
-      }
+      txProgressCallback
     });
     await result.inBlockPromise;
     let vaultId;
@@ -1557,7 +1555,7 @@ var VaultMonitor = class {
         id: vaultId,
         btcSpace: `${formatArgons(vault.availableBitcoinSpace())} (${formatArgons(vault.argonsPendingActivation)} pending)`,
         btcDeal: `${formatArgons(vault.terms.bitcoinBaseFee)} + ${formatPercent(vault.terms.bitcoinAnnualPercentRate)}`,
-        securitization: `${formatArgons(vault.securitization)} at ${vault.securitizationRatio.toFormat(1)}x`,
+        securitization: `${formatArgons(vault.securitization)} at ${vault.securitizationRatio}x`,
         securActivated: `${formatArgons(vault.activatedSecuritizationPerSlot())}/slot`,
         liquidPoolDeal: `${formatPercent(vault.terms.liquidityPoolProfitSharing)} sharing`,
         operator: `${this.accountset.namedAccounts.has(vault.operatorAccountId) ? ` (${this.accountset.namedAccounts.get(vault.operatorAccountId)})` : vault.operatorAccountId}`,
@@ -2271,6 +2269,7 @@ var BitcoinLocks = class _BitcoinLocks {
     const bitcoinNetwork = await client.query.bitcoinUtxos.bitcoinNetwork();
     return {
       releaseExpirationBlocks: client.consts.bitcoinLocks.lockReleaseCosignDeadlineBlocks.toNumber(),
+      pendingConfirmationExpirationBlocks: client.consts.bitcoinUtxos.maxPendingConfirmationBlocks.toNumber(),
       tickDurationMillis: await client.query.ticks.genesisTicker().then((x) => x.tickDurationMillis.toNumber()),
       bitcoinNetwork
     };
@@ -2325,7 +2324,7 @@ var BitcoinLocks = class _BitcoinLocks {
     return void 0;
   }
   async submitVaultSignature(args) {
-    const { utxoId, vaultSignature, argonKeyring } = args;
+    const { utxoId, vaultSignature, argonKeyring, txProgressCallback } = args;
     const client = await this.client;
     if (!vaultSignature || vaultSignature.byteLength < 70 || vaultSignature.byteLength > 73) {
       throw new Error(
@@ -2335,7 +2334,7 @@ var BitcoinLocks = class _BitcoinLocks {
     const signature = u8aToHex(vaultSignature);
     const tx = client.tx.bitcoinLocks.cosignRelease(utxoId, signature);
     const submitter = new TxSubmitter(client, tx, argonKeyring);
-    return await submitter.submit();
+    return await submitter.submit({ txProgressCallback });
   }
   async getBitcoinLock(utxoId) {
     const client = await this.client;
@@ -2506,11 +2505,16 @@ var BitcoinLocks = class _BitcoinLocks {
     return { tx, securityFee, txFee };
   }
   async initializeLock(args) {
-    const { argonKeyring, tip = 0n } = args;
+    const { argonKeyring, tip = 0n, txProgressCallback } = args;
     const client = await this.client;
     const { tx, securityFee } = await this.createInitializeLockTx(args);
     const submitter = new TxSubmitter(client, tx, argonKeyring);
-    const txResult = await submitter.submit({ waitForBlock: true, logResults: true, tip });
+    const txResult = await submitter.submit({
+      waitForBlock: true,
+      logResults: true,
+      tip,
+      txProgressCallback
+    });
     const blockHash = await txResult.inBlockPromise;
     const blockHeight = await client.at(blockHash).then((x) => x.query.system.number()).then((x) => x.toNumber());
     const utxoId = await this.getUtxoIdFromEvents(txResult.events) ?? 0;
@@ -2533,7 +2537,8 @@ var BitcoinLocks = class _BitcoinLocks {
       lock,
       releaseRequest: { bitcoinNetworkFee, toScriptPubkey },
       argonKeyring,
-      tip
+      tip,
+      txProgressCallback
     } = args;
     if (!toScriptPubkey.startsWith("0x")) {
       throw new Error("toScriptPubkey must be a hex string starting with 0x");
@@ -2556,7 +2561,12 @@ var BitcoinLocks = class _BitcoinLocks {
         `Insufficient funds to release lock. Available: ${formatArgons(canAfford.availableBalance)}, Required: ${formatArgons(redemptionPrice)}`
       );
     }
-    const txResult = await submitter.submit({ waitForBlock: true, logResults: true, tip });
+    const txResult = await submitter.submit({
+      waitForBlock: true,
+      logResults: true,
+      tip,
+      txProgressCallback
+    });
     const blockHash = await txResult.inBlockPromise;
     const blockHeight = await client.at(blockHash).then((x) => x.query.system.number()).then((x) => x.toNumber());
     return {
@@ -2595,7 +2605,7 @@ var BitcoinLocks = class _BitcoinLocks {
     };
   }
   async ratchet(args) {
-    const { lock, argonKeyring, tip = 0n, vault } = args;
+    const { lock, argonKeyring, tip = 0n, vault, txProgressCallback } = args;
     const client = await this.client;
     const ratchetPrice = await this.getRatchetPrice(lock, vault);
     const txSubmitter = new TxSubmitter(
@@ -2616,7 +2626,8 @@ var BitcoinLocks = class _BitcoinLocks {
     }
     const submission = await txSubmitter.submit({
       waitForBlock: true,
-      tip
+      tip,
+      txProgressCallback
     });
     const ratchetEvent = submission.events.find(
       (x) => client.events.bitcoinLocks.BitcoinLockRatcheted.is(x)
@@ -2716,6 +2727,6 @@ async function getClient(host) {
   return await ApiPromise.create({ provider, noInitWarn: true });
 }
 
-export { AccountMiners, AccountRegistry, Accountset, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError2 as ExtrinsicError, FrameCalculator, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };
+export { AccountMiners, AccountRegistry, Accountset, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError2 as ExtrinsicError, FrameCalculator, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map