@argonprotocol/mainchain 1.3.3 → 1.3.5

package/lib/{chunk-OFYVHBKG.cjs → chunk-P5WWWRSU.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10; var _class11;// src/interfaces/augment-api-consts.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; } var _class; var _class2; var _class3; var _class4; var _class5; var _class6; var _class7; var _class8; var _class9; var _class10;// src/interfaces/augment-api-consts.ts
 require('@polkadot/api-base/types/consts');
 
 // src/interfaces/augment-api-errors.ts
@@ -123,20 +123,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 + (_nullishCoalesce(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);
@@ -240,7 +241,15 @@ var TxResult = (_class = class {
     if (isFinalized) {
       this.finalizedResolve(status.asFinalized);
     }
-    _optionalChain([this, 'access', _2 => _2.onResultCallback, 'optionalCall', _3 => _3(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);
@@ -250,13 +259,12 @@ var TxResult = (_class = class {
 
 // src/utils.ts
 var _bignumberjs = require('bignumber.js'); var BN = _interopRequireWildcard(_bignumberjs); var BN2 = _interopRequireWildcard(_bignumberjs);
-var _util = require('@polkadot/util');
 var { ROUND_FLOOR } = BN;
 var MICROGONS_PER_ARGON = 1e6;
-function formatArgons(x) {
-  if (x === void 0 || x === null) return "na";
-  const isNegative = x < 0;
-  let format = BN.default.call(void 0, 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 = BN.default.call(void 0, microgons.toString()).abs().div(MICROGONS_PER_ARGON).toFormat(2, ROUND_FLOOR);
   if (format.endsWith(".00")) {
     format = format.slice(0, -3);
   }
@@ -321,7 +329,7 @@ function convertNumberToPermill(value) {
 function eventDataToJson(event) {
   const obj = {};
   event.data.forEach((data, index) => {
-    const name = _optionalChain([event, 'access', _4 => _4.data, 'access', _5 => _5.names, 'optionalAccess', _6 => _6[index]]);
+    const name = _optionalChain([event, 'access', _2 => _2.data, 'access', _3 => _3.names, 'optionalAccess', _4 => _4[index]]);
     obj[_nullishCoalesce(name, () => ( `${index}`))] = data.toJSON();
   });
   return obj;
@@ -400,7 +408,7 @@ var JsonExt = class {
         return BigInt(v.slice(0, -1));
       }
       if (typeof v === "object" && v !== null && v.type === "Buffer" && Array.isArray(v.data)) {
-        return _util.hexToU8a.call(void 0, v.data);
+        return Uint8Array.from(v.data);
       }
       return v;
     });
@@ -419,7 +427,7 @@ var TypedEmitter = (_class2 = class {constructor() { _class2.prototype.__init2.c
   on(event, cb) {
     (this.events[event] ||= []).push(cb);
     return () => {
-      this.events[event] = _optionalChain([this, 'access', _7 => _7.events, 'access', _8 => _8[event], 'optionalAccess', _9 => _9.filter, 'call', _10 => _10((i) => cb !== i)]);
+      this.events[event] = _optionalChain([this, 'access', _5 => _5.events, 'access', _6 => _6[event], 'optionalAccess', _7 => _7.filter, 'call', _8 => _8((i) => cb !== i)]);
     };
   }
 }, _class2);
@@ -589,7 +597,7 @@ BLOCK #${header.number}, ${header.hash.toHuman()}`);
             if (this.options.shouldLog) {
               console.log(
                 `> [Failed Tx] ${section}.${name} -> ${ext.method.section}.${ext.method.method} (nonce=${ext.nonce})`,
-                _optionalChain([ext, 'access', _11 => _11.toHuman, 'call', _12 => _12(), 'optionalAccess', _13 => _13.method, 'optionalAccess', _14 => _14.args])
+                _optionalChain([ext, 'access', _9 => _9.toHuman, 'call', _10 => _10(), 'optionalAccess', _11 => _11.method, 'optionalAccess', _12 => _12.args])
               );
             }
           } else {
@@ -787,7 +795,7 @@ var AccountMiners = (_class5 = class _AccountMiners {
 }, _class5);
 
 // src/Accountset.ts
-
+var _util = require('@polkadot/util');
 var Accountset = (_class6 = class {
   
   __init9() {this.isProxy = false}
@@ -845,7 +853,7 @@ var Accountset = (_class6 = class {
       return {
         address,
         amount: account.data.free.toBigInt(),
-        index: _nullishCoalesce(_optionalChain([this, 'access', _15 => _15.subAccountsByAddress, 'access', _16 => _16[address], 'optionalAccess', _17 => _17.index]), () => ( Number.NaN))
+        index: _nullishCoalesce(_optionalChain([this, 'access', _13 => _13.subAccountsByAddress, 'access', _14 => _14[address], 'optionalAccess', _15 => _15.index]), () => ( Number.NaN))
       };
     });
   }
@@ -859,7 +867,7 @@ var Accountset = (_class6 = class {
       return {
         address,
         amount: account.free.toBigInt(),
-        index: _nullishCoalesce(_optionalChain([this, 'access', _18 => _18.subAccountsByAddress, 'access', _19 => _19[address], 'optionalAccess', _20 => _20.index]), () => ( Number.NaN))
+        index: _nullishCoalesce(_optionalChain([this, 'access', _16 => _16.subAccountsByAddress, 'access', _17 => _17[address], 'optionalAccess', _18 => _18.index]), () => ( Number.NaN))
       };
     });
   }
@@ -908,7 +916,7 @@ var Accountset = (_class6 = class {
       const [frameIdRaw, indexRaw] = rawIndices[i].value;
       const frameId = frameIdRaw.toNumber();
       const index = indexRaw.toNumber();
-      const bidAmount = _optionalChain([bidAmountsByFrame, 'access', _21 => _21[frameId], 'optionalAccess', _22 => _22[index]]);
+      const bidAmount = _optionalChain([bidAmountsByFrame, 'access', _19 => _19[frameId], 'optionalAccess', _20 => _20[index]]);
       addressToMiningIndex[address] = {
         startingFrameId: frameId,
         index,
@@ -926,7 +934,7 @@ var Accountset = (_class6 = class {
         address,
         seat: cohort,
         isLastDay,
-        subaccountIndex: _nullishCoalesce(_optionalChain([this, 'access', _23 => _23.subAccountsByAddress, 'access', _24 => _24[address], 'optionalAccess', _25 => _25.index]), () => ( Number.NaN))
+        subaccountIndex: _nullishCoalesce(_optionalChain([this, 'access', _21 => _21.subAccountsByAddress, 'access', _22 => _22[address], 'optionalAccess', _23 => _23.index]), () => ( Number.NaN))
       };
     });
   }
@@ -940,7 +948,7 @@ var Accountset = (_class6 = class {
       return {
         ...miner,
         hasWinningBid: !!bid,
-        bidAmount: _nullishCoalesce(_nullishCoalesce(_optionalChain([bid, 'optionalAccess', _26 => _26.bid, 'access', _27 => _27.toBigInt, 'call', _28 => _28()]), () => ( _optionalChain([miner, 'access', _29 => _29.seat, 'optionalAccess', _30 => _30.bidAmount]))), () => ( 0n))
+        bidAmount: _nullishCoalesce(_nullishCoalesce(_optionalChain([bid, 'optionalAccess', _24 => _24.bid, 'access', _25 => _25.toBigInt, 'call', _26 => _26()]), () => ( _optionalChain([miner, 'access', _27 => _27.seat, 'optionalAccess', _28 => _28.bidAmount]))), () => ( 0n))
       };
     });
   }
@@ -956,9 +964,9 @@ var Accountset = (_class6 = class {
       const entry = registrationsByAddress[address];
       return {
         address,
-        bidPlace: _optionalChain([entry, 'optionalAccess', _31 => _31.index]),
-        bidAmount: _optionalChain([entry, 'optionalAccess', _32 => _32.bid, 'optionalAccess', _33 => _33.toBigInt, 'call', _34 => _34()]),
-        index: _nullishCoalesce(_optionalChain([this, 'access', _35 => _35.subAccountsByAddress, 'access', _36 => _36[address], 'optionalAccess', _37 => _37.index]), () => ( Number.NaN))
+        bidPlace: _optionalChain([entry, 'optionalAccess', _29 => _29.index]),
+        bidAmount: _optionalChain([entry, 'optionalAccess', _30 => _30.bid, 'optionalAccess', _31 => _31.toBigInt, 'call', _32 => _32()]),
+        index: _nullishCoalesce(_optionalChain([this, 'access', _33 => _33.subAccountsByAddress, 'access', _34 => _34[address], 'optionalAccess', _35 => _35.index]), () => ( Number.NaN))
       };
     });
   }
@@ -1008,23 +1016,23 @@ var Accountset = (_class6 = class {
       {
         index: "main",
         address: this.seedAddress,
-        argons: formatArgons(_nullishCoalesce(_optionalChain([argons, 'access', _38 => _38.find, 'call', _39 => _39((x) => x.address === this.seedAddress), 'optionalAccess', _40 => _40.amount]), () => ( 0n))),
-        argonots: formatArgons(_nullishCoalesce(_optionalChain([argonots, 'access', _41 => _41.find, 'call', _42 => _42((x) => x.address === this.seedAddress), 'optionalAccess', _43 => _43.amount]), () => ( 0n)))
+        argons: formatArgons(_nullishCoalesce(_optionalChain([argons, 'access', _36 => _36.find, 'call', _37 => _37((x) => x.address === this.seedAddress), 'optionalAccess', _38 => _38.amount]), () => ( 0n))),
+        argonots: formatArgons(_nullishCoalesce(_optionalChain([argonots, 'access', _39 => _39.find, 'call', _40 => _40((x) => x.address === this.seedAddress), 'optionalAccess', _41 => _41.amount]), () => ( 0n)))
       }
     ];
     for (const [address, { index }] of Object.entries(this.subAccountsByAddress)) {
-      const argonAmount = _nullishCoalesce(_optionalChain([argons, 'access', _44 => _44.find, 'call', _45 => _45((x) => x.address === address), 'optionalAccess', _46 => _46.amount]), () => ( 0n));
-      const argonotAmount = _nullishCoalesce(_optionalChain([argonots, 'access', _47 => _47.find, 'call', _48 => _48((x) => x.address === address), 'optionalAccess', _49 => _49.amount]), () => ( 0n));
+      const argonAmount = _nullishCoalesce(_optionalChain([argons, 'access', _42 => _42.find, 'call', _43 => _43((x) => x.address === address), 'optionalAccess', _44 => _44.amount]), () => ( 0n));
+      const argonotAmount = _nullishCoalesce(_optionalChain([argonots, 'access', _45 => _45.find, 'call', _46 => _46((x) => x.address === address), 'optionalAccess', _47 => _47.amount]), () => ( 0n));
       const bid = bids.find((x) => x.address === address);
-      const seat = _optionalChain([seats, 'access', _50 => _50.find, 'call', _51 => _51((x) => x.address === address), 'optionalAccess', _52 => _52.seat]);
+      const seat = _optionalChain([seats, 'access', _48 => _48.find, 'call', _49 => _49((x) => x.address === address), 'optionalAccess', _50 => _50.seat]);
       const entry = {
         index: ` //${index}`,
         address,
         argons: formatArgons(argonAmount),
         argonots: formatArgons(argonotAmount),
         seat,
-        bidPlace: _optionalChain([bid, 'optionalAccess', _53 => _53.bidPlace]),
-        bidAmount: _nullishCoalesce(_optionalChain([bid, 'optionalAccess', _54 => _54.bidAmount]), () => ( 0n))
+        bidPlace: _optionalChain([bid, 'optionalAccess', _51 => _51.bidPlace]),
+        bidAmount: _nullishCoalesce(_optionalChain([bid, 'optionalAccess', _52 => _52.bidAmount]), () => ( 0n))
       };
       if (accountSubset) {
         entry.isWorkingOn = accountSubset.some((x) => x.address === address);
@@ -1232,12 +1240,12 @@ var MiningBids = (_class7 = class {
         const nextFrameId = rawNextCohortStartingFrameId.toNumber();
         if (isBiddingOpen.isTrue) {
           if (openCohortStartingFrameId !== 0) {
-            await _optionalChain([onBiddingEnd, 'optionalCall', _55 => _55(openCohortStartingFrameId)]);
+            await _optionalChain([onBiddingEnd, 'optionalCall', _53 => _53(openCohortStartingFrameId)]);
           }
           openCohortStartingFrameId = nextFrameId;
-          await _optionalChain([onBiddingStart, 'optionalCall', _56 => _56(nextFrameId)]);
+          await _optionalChain([onBiddingStart, 'optionalCall', _54 => _54(nextFrameId)]);
         } else {
-          await _optionalChain([onBiddingEnd, 'optionalCall', _57 => _57(nextFrameId)]);
+          await _optionalChain([onBiddingEnd, 'optionalCall', _55 => _55(nextFrameId)]);
           openCohortStartingFrameId = 0;
         }
       }
@@ -1294,19 +1302,20 @@ var MiningBids = (_class7 = class {
 var _bs58check = require('bs58check'); var _bs58check2 = _interopRequireDefault(_bs58check);
 
 var { ROUND_FLOOR: ROUND_FLOOR2 } = BN2;
-var Vault = (_class8 = class _Vault {
-  constructor(id, vault, tickDuration) {;_class8.prototype.__init12.call(this);
+var Vault = class _Vault {
+  constructor(id, vault, tickDuration) {
     this.tickDuration = tickDuration;
     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);
   }
   
   
   
   
-  __init12() {this.argonsScheduledForRelease = /* @__PURE__ */ new Map()}
+  
   
   
   
@@ -1317,7 +1326,9 @@ var Vault = (_class8 = class _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) {
@@ -1359,21 +1370,21 @@ var Vault = (_class8 = class _Vault {
   getRelockCapacity() {
     return [...this.argonsScheduledForRelease.values()].reduce((acc, val) => acc + val, 0n);
   }
+  securitizationRatioBN() {
+    return new (0, BN.default)(this.securitizationRatio);
+  }
   recoverySecuritization() {
-    const reserved = new (0, BN.default)(1).div(this.securitizationRatio);
+    const reserved = new (0, BN.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, BN.default.ROUND_CEIL).toString()
+      this.securitizationRatioBN().multipliedBy(this.argonsLocked.toString()).decimalPlaces(0, BN.default.ROUND_CEIL).toString()
     );
   }
   activatedSecuritization() {
     const activated = this.argonsLocked - this.argonsPendingActivation;
-    let maxRatio = this.securitizationRatio;
-    if (this.securitizationRatio.toNumber() > 2) {
-      maxRatio = BN.default.call(void 0, 2);
-    }
+    const maxRatio = BN.default.call(void 0, Math.min(this.securitizationRatio, 2));
     return BigInt(maxRatio.multipliedBy(activated.toString()).toFixed(0, ROUND_FLOOR2));
   }
   /**
@@ -1404,7 +1415,7 @@ var Vault = (_class8 = class _Vault {
       bitcoinXpub,
       tip,
       doNotExceedBalance,
-      progressCallback
+      txProgressCallback
     } = args;
     let xpubBytes = _util.hexToU8a.call(void 0, bitcoinXpub);
     if (xpubBytes.length !== 78) {
@@ -1447,21 +1458,7 @@ var Vault = (_class8 = 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;
-        }
-        _optionalChain([progressCallback, 'optionalCall', _58 => _58(percent, result2.status)]);
-      }
+      txProgressCallback
     });
     await result.inBlockPromise;
     let vaultId;
@@ -1482,12 +1479,12 @@ var Vault = (_class8 = class _Vault {
     const vault = new _Vault(vaultId, rawVault.unwrap(), tickDuration);
     return { vault, txResult: result };
   }
-}, _class8);
+};
 
 // src/VaultMonitor.ts
 
-var VaultMonitor = (_class9 = class {
-  constructor(accountset, alerts = {}, options = {}) {;_class9.prototype.__init13.call(this);_class9.prototype.__init14.call(this);_class9.prototype.__init15.call(this);_class9.prototype.__init16.call(this);_class9.prototype.__init17.call(this);_class9.prototype.__init18.call(this);
+var VaultMonitor = (_class8 = class {
+  constructor(accountset, alerts = {}, options = {}) {;_class8.prototype.__init12.call(this);_class8.prototype.__init13.call(this);_class8.prototype.__init14.call(this);_class8.prototype.__init15.call(this);_class8.prototype.__init16.call(this);_class8.prototype.__init17.call(this);
     this.accountset = accountset;
     this.alerts = alerts;
     this.options = options;
@@ -1515,16 +1512,16 @@ var VaultMonitor = (_class9 = class {
       this.printBids(header.hash);
     });
   }
-  __init13() {this.events = createNanoEvents()}
-  __init14() {this.vaultsById = {}}
+  __init12() {this.events = createNanoEvents()}
+  __init13() {this.vaultsById = {}}
   
   
-  __init15() {this.activatedCapitalByVault = {}}
+  __init14() {this.activatedCapitalByVault = {}}
   
   
-  __init16() {this.tickDuration = 0}
-  __init17() {this.vaultOnlyWatchMode = false}
-  __init18() {this.shouldLog = true}
+  __init15() {this.tickDuration = 0}
+  __init16() {this.vaultOnlyWatchMode = false}
+  __init17() {this.shouldLog = true}
   stop() {
     this.blockWatch.stop();
   }
@@ -1568,7 +1565,7 @@ var VaultMonitor = (_class9 = 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}`,
@@ -1655,11 +1652,11 @@ var VaultMonitor = (_class9 = class {
     this.miningBids.print();
     this.lastPrintedBids = blockHash;
   }
-}, _class9);
+}, _class8);
 
 // src/CohortBidder.ts
-var CohortBidder = (_class10 = class {
-  constructor(accountset, cohortStartingFrameId, subaccounts, options) {;_class10.prototype.__init19.call(this);_class10.prototype.__init20.call(this);_class10.prototype.__init21.call(this);_class10.prototype.__init22.call(this);_class10.prototype.__init23.call(this);_class10.prototype.__init24.call(this);_class10.prototype.__init25.call(this);_class10.prototype.__init26.call(this);
+var CohortBidder = (_class9 = class {
+  constructor(accountset, cohortStartingFrameId, subaccounts, options) {;_class9.prototype.__init18.call(this);_class9.prototype.__init19.call(this);_class9.prototype.__init20.call(this);_class9.prototype.__init21.call(this);_class9.prototype.__init22.call(this);_class9.prototype.__init23.call(this);_class9.prototype.__init24.call(this);_class9.prototype.__init25.call(this);
     this.accountset = accountset;
     this.cohortStartingFrameId = cohortStartingFrameId;
     this.subaccounts = subaccounts;
@@ -1671,19 +1668,19 @@ var CohortBidder = (_class10 = class {
   get client() {
     return this.accountset.client;
   }
-  __init19() {this.txFees = 0n}
-  __init20() {this.winningBids = []}
+  __init18() {this.txFees = 0n}
+  __init19() {this.winningBids = []}
   
   
   
-  __init21() {this.isStopped = false}
-  __init22() {this.needsRebid = false}
-  __init23() {this.lastBidTime = 0}
+  __init20() {this.isStopped = false}
+  __init21() {this.needsRebid = false}
+  __init22() {this.lastBidTime = 0}
   
-  __init24() {this.minIncrement = 10000n}
+  __init23() {this.minIncrement = 10000n}
   
-  __init25() {this.lastBidBlockNumber = 0}
-  __init26() {this.myAddresses = /* @__PURE__ */ new Set()}
+  __init24() {this.lastBidBlockNumber = 0}
+  __init25() {this.myAddresses = /* @__PURE__ */ new Set()}
   async start() {
     console.log(`Starting cohort ${this.cohortStartingFrameId} bidder`, {
       maxBid: formatArgons(this.options.maxBid),
@@ -1911,7 +1908,7 @@ var CohortBidder = (_class10 = class {
     const bids = await client.query.miningSlot.bidsForNextSlotCohort();
     await this.checkWinningBids(bids);
   }
-}, _class10);
+}, _class9);
 
 // src/BidPool.ts
 
@@ -1922,23 +1919,23 @@ var EMPTY_TABLE = {
   tableBottom: { left: " ", mid: " ", other: " ", right: " " },
   vertical: " "
 };
-var BidPool = (_class11 = class {
-  constructor(client, keypair, accountRegistry = AccountRegistry.factory()) {;_class11.prototype.__init27.call(this);_class11.prototype.__init28.call(this);_class11.prototype.__init29.call(this);_class11.prototype.__init30.call(this);_class11.prototype.__init31.call(this);_class11.prototype.__init32.call(this);
+var BidPool = (_class10 = class {
+  constructor(client, keypair, accountRegistry = AccountRegistry.factory()) {;_class10.prototype.__init26.call(this);_class10.prototype.__init27.call(this);_class10.prototype.__init28.call(this);_class10.prototype.__init29.call(this);_class10.prototype.__init30.call(this);_class10.prototype.__init31.call(this);
     this.client = client;
     this.keypair = keypair;
     this.accountRegistry = accountRegistry;
     this.blockWatch = new BlockWatch(client, { shouldLog: false });
   }
-  __init27() {this.bidPoolAmount = 0n}
-  __init28() {this.nextFrameId = 1}
-  __init29() {this.poolVaultCapitalByFrame = {}}
-  __init30() {this.vaultSecuritization = []}
+  __init26() {this.bidPoolAmount = 0n}
+  __init27() {this.nextFrameId = 1}
+  __init28() {this.poolVaultCapitalByFrame = {}}
+  __init29() {this.vaultSecuritization = []}
   
   
-  __init31() {this.vaultsById = {}}
+  __init30() {this.vaultsById = {}}
   
   
-  __init32() {this.FrameSubscriptions = {}}
+  __init31() {this.FrameSubscriptions = {}}
   async onVaultsUpdated(blockHash, vaultIdSet) {
     const client = await this.client;
     this.tickDuration ??= (await client.query.ticks.genesisTicker()).tickDurationMillis.toNumber();
@@ -2012,7 +2009,7 @@ var BidPool = (_class11 = class {
         const { frameId: rawFrameId } = event.data;
         this.lastDistributedFrameId = rawFrameId.toNumber();
         this.bidPoolAmount = await this.getBidPool();
-        _optionalChain([this, 'access', _59 => _59.FrameSubscriptions, 'access', _60 => _60[rawFrameId.toNumber()], 'optionalCall', _61 => _61()]);
+        _optionalChain([this, 'access', _56 => _56.FrameSubscriptions, 'access', _57 => _57[rawFrameId.toNumber()], 'optionalCall', _58 => _58()]);
         const entrant = await api.query.liquidityPools.vaultPoolsByFrame(rawFrameId);
         this.loadFrameData(rawFrameId.toNumber(), entrant);
         this.printDebounce();
@@ -2058,7 +2055,7 @@ var BidPool = (_class11 = class {
     const tx = client.tx.liquidityPools.bondArgons(vaultId, amount);
     const txSubmitter = new TxSubmitter(client, tx, this.keypair);
     const affordability = await txSubmitter.canAfford({
-      tip: _optionalChain([options, 'optionalAccess', _62 => _62.tip]),
+      tip: _optionalChain([options, 'optionalAccess', _59 => _59.tip]),
       unavailableBalance: amount
     });
     if (!affordability.canAfford) {
@@ -2069,7 +2066,7 @@ var BidPool = (_class11 = class {
       throw new Error("Insufficient balance to bond argons to liquidity pool");
     }
     const result = await txSubmitter.submit({
-      tip: _optionalChain([options, 'optionalAccess', _63 => _63.tip]),
+      tip: _optionalChain([options, 'optionalAccess', _60 => _60.tip]),
       useLatestNonce: true
     });
     await result.inBlockPromise;
@@ -2198,7 +2195,7 @@ Raising Funds (Frame ${this.nextFrameId + 1}):`);
     this.poolVaultCapitalByFrame ??= {};
     this.poolVaultCapitalByFrame[frameId] ??= {};
     this.poolVaultCapitalByFrame[frameId][vaultId] ??= {
-      activatedCapital: _nullishCoalesce(_nullishCoalesce(data.activatedCapital, () => ( _optionalChain([data, 'access', _64 => _64.contributors, 'optionalAccess', _65 => _65.reduce, 'call', _66 => _66((a, b) => a + b.amount, 0n)]))), () => ( 0n))
+      activatedCapital: _nullishCoalesce(_nullishCoalesce(data.activatedCapital, () => ( _optionalChain([data, 'access', _61 => _61.contributors, 'optionalAccess', _62 => _62.reduce, 'call', _63 => _63((a, b) => a + b.amount, 0n)]))), () => ( 0n))
     };
     Object.assign(this.poolVaultCapitalByFrame[frameId][vaultId], filterUndefined(data));
   }
@@ -2244,7 +2241,7 @@ Raising Funds (Frame ${this.nextFrameId + 1}):`);
       });
     }
   }
-}, _class11);
+}, _class10);
 
 // src/BitcoinLocks.ts
 
@@ -2287,13 +2284,14 @@ 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
     };
   }
   async getBitcoinConfirmedBlockHeight() {
     const client = await this.client;
-    return await client.query.bitcoinUtxos.confirmedBitcoinBlockTip().then((x) => _nullishCoalesce(_optionalChain([x, 'access', _67 => _67.value, 'optionalAccess', _68 => _68.blockHeight, 'access', _69 => _69.toNumber, 'call', _70 => _70()]), () => ( 0)));
+    return await client.query.bitcoinUtxos.confirmedBitcoinBlockTip().then((x) => _nullishCoalesce(_optionalChain([x, 'access', _64 => _64.value, 'optionalAccess', _65 => _65.blockHeight, 'access', _66 => _66.toNumber, 'call', _67 => _67()]), () => ( 0)));
   }
   /**
    * Gets the UTXO reference by ID.
@@ -2341,7 +2339,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(
@@ -2351,7 +2349,7 @@ var BitcoinLocks = class _BitcoinLocks {
     const signature = _util.u8aToHex.call(void 0, 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;
@@ -2427,7 +2425,7 @@ var BitcoinLocks = class _BitcoinLocks {
         const atHeight = header.number.toNumber();
         this.getVaultCosignSignature(utxoId, atHeight).then((signature) => {
           if (signature) {
-            _optionalChain([unsub, 'optionalCall', _71 => _71()]);
+            _optionalChain([unsub, 'optionalCall', _68 => _68()]);
             clearTimeout(timeout);
             resolve({ signature, blockHeight: atHeight });
           }
@@ -2437,7 +2435,7 @@ var BitcoinLocks = class _BitcoinLocks {
       });
       if (waitForSignatureMillis !== -1) {
         timeout = setTimeout(() => {
-          _optionalChain([unsub, 'optionalCall', _72 => _72()]);
+          _optionalChain([unsub, 'optionalCall', _69 => _69()]);
           reject(new Error(`Timeout waiting for cosign signature for UTXO ID ${utxoId}`));
         }, waitForSignatureMillis);
       }
@@ -2522,11 +2520,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 _asyncNullishCoalesce(await this.getUtxoIdFromEvents(txResult.events), async () => ( 0));
@@ -2549,7 +2552,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");
@@ -2572,7 +2576,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 {
@@ -2611,7 +2620,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(
@@ -2632,7 +2641,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)
@@ -2833,5 +2843,6 @@ async function getClient(host) {
 
 
 
-exports.WageProtector = WageProtector; exports.setConfig = setConfig; exports.getConfig = getConfig; exports.TxSubmitter = TxSubmitter; exports.MICROGONS_PER_ARGON = MICROGONS_PER_ARGON; exports.formatArgons = formatArgons; exports.formatPercent = formatPercent; exports.filterUndefined = filterUndefined; exports.gettersToObject = gettersToObject; exports.toFixedNumber = toFixedNumber; exports.convertNumberToFixedU128 = convertNumberToFixedU128; exports.convertFixedU128ToBigNumber = convertFixedU128ToBigNumber; exports.convertPermillToBigNumber = convertPermillToBigNumber; exports.convertNumberToPermill = convertNumberToPermill; exports.eventDataToJson = eventDataToJson; exports.dispatchErrorToString = dispatchErrorToString; exports.ExtrinsicError = ExtrinsicError2; exports.dispatchErrorToExtrinsicError = dispatchErrorToExtrinsicError; exports.checkForExtrinsicSuccess = checkForExtrinsicSuccess; exports.JsonExt = JsonExt; exports.createNanoEvents = createNanoEvents; exports.TypedEmitter = TypedEmitter; exports.AccountRegistry = AccountRegistry; exports.getTickFromHeader = getTickFromHeader; exports.getAuthorFromHeader = getAuthorFromHeader; exports.BlockWatch = BlockWatch; exports.FrameCalculator = FrameCalculator; exports.AccountMiners = AccountMiners; exports.Accountset = Accountset; exports.parseSubaccountRange = parseSubaccountRange; exports.MiningBids = MiningBids; exports.Vault = Vault; exports.VaultMonitor = VaultMonitor; exports.CohortBidder = CohortBidder; exports.BidPool = BidPool; exports.SATS_PER_BTC = SATS_PER_BTC; exports.BitcoinLocks = BitcoinLocks; exports.keyringFromSuri = keyringFromSuri; exports.createKeyringPair = createKeyringPair; exports.Keyring = _api.Keyring; exports.decodeAddress = _utilcrypto.decodeAddress; exports.mnemonicGenerate = _utilcrypto.mnemonicGenerate; exports.waitForLoad = waitForLoad; exports.getClient = getClient; exports.u8aToHex = _util.u8aToHex; exports.hexToU8a = _util.hexToU8a; exports.u8aEq = _util.u8aEq; exports.GenericEvent = _generic.GenericEvent; exports.GenericBlock = _generic.GenericBlock; exports.GenericAddress = _generic.GenericAddress; exports.BTreeMap = _typescodec.BTreeMap; exports.Bytes = _typescodec.Bytes; exports.Compact = _typescodec.Compact; exports.Enum = _typescodec.Enum; exports.Null = _typescodec.Null; exports.Option = _typescodec.Option; exports.Result = _typescodec.Result; exports.Bool = _typescodec.Bool; exports.Tuple = _typescodec.Tuple; exports.Range = _typescodec.Range; exports.Struct = _typescodec.Struct; exports.Text = _typescodec.Text; exports.U256 = _typescodec.U256; exports.U8aFixed = _typescodec.U8aFixed; exports.Vec = _typescodec.Vec; exports.bool = _typescodec.bool; exports.i128 = _typescodec.i128; exports.u128 = _typescodec.u128; exports.u16 = _typescodec.u16; exports.u32 = _typescodec.u32; exports.u64 = _typescodec.u64; exports.u8 = _typescodec.u8;
-//# sourceMappingURL=chunk-OFYVHBKG.cjs.map
+
+exports.WageProtector = WageProtector; exports.setConfig = setConfig; exports.getConfig = getConfig; exports.TxSubmitter = TxSubmitter; exports.TxResult = TxResult; exports.MICROGONS_PER_ARGON = MICROGONS_PER_ARGON; exports.formatArgons = formatArgons; exports.formatPercent = formatPercent; exports.filterUndefined = filterUndefined; exports.gettersToObject = gettersToObject; exports.toFixedNumber = toFixedNumber; exports.convertNumberToFixedU128 = convertNumberToFixedU128; exports.convertFixedU128ToBigNumber = convertFixedU128ToBigNumber; exports.convertPermillToBigNumber = convertPermillToBigNumber; exports.convertNumberToPermill = convertNumberToPermill; exports.eventDataToJson = eventDataToJson; exports.dispatchErrorToString = dispatchErrorToString; exports.ExtrinsicError = ExtrinsicError2; exports.dispatchErrorToExtrinsicError = dispatchErrorToExtrinsicError; exports.checkForExtrinsicSuccess = checkForExtrinsicSuccess; exports.JsonExt = JsonExt; exports.createNanoEvents = createNanoEvents; exports.TypedEmitter = TypedEmitter; exports.AccountRegistry = AccountRegistry; exports.getTickFromHeader = getTickFromHeader; exports.getAuthorFromHeader = getAuthorFromHeader; exports.BlockWatch = BlockWatch; exports.FrameCalculator = FrameCalculator; exports.AccountMiners = AccountMiners; exports.Accountset = Accountset; exports.parseSubaccountRange = parseSubaccountRange; exports.MiningBids = MiningBids; exports.Vault = Vault; exports.VaultMonitor = VaultMonitor; exports.CohortBidder = CohortBidder; exports.BidPool = BidPool; exports.SATS_PER_BTC = SATS_PER_BTC; exports.BitcoinLocks = BitcoinLocks; exports.keyringFromSuri = keyringFromSuri; exports.createKeyringPair = createKeyringPair; exports.Keyring = _api.Keyring; exports.decodeAddress = _utilcrypto.decodeAddress; exports.mnemonicGenerate = _utilcrypto.mnemonicGenerate; exports.waitForLoad = waitForLoad; exports.getClient = getClient; exports.u8aToHex = _util.u8aToHex; exports.hexToU8a = _util.hexToU8a; exports.u8aEq = _util.u8aEq; exports.GenericEvent = _generic.GenericEvent; exports.GenericBlock = _generic.GenericBlock; exports.GenericAddress = _generic.GenericAddress; exports.BTreeMap = _typescodec.BTreeMap; exports.Bytes = _typescodec.Bytes; exports.Compact = _typescodec.Compact; exports.Enum = _typescodec.Enum; exports.Null = _typescodec.Null; exports.Option = _typescodec.Option; exports.Result = _typescodec.Result; exports.Bool = _typescodec.Bool; exports.Tuple = _typescodec.Tuple; exports.Range = _typescodec.Range; exports.Struct = _typescodec.Struct; exports.Text = _typescodec.Text; exports.U256 = _typescodec.U256; exports.U8aFixed = _typescodec.U8aFixed; exports.Vec = _typescodec.Vec; exports.bool = _typescodec.bool; exports.i128 = _typescodec.i128; exports.u128 = _typescodec.u128; exports.u16 = _typescodec.u16; exports.u32 = _typescodec.u32; exports.u64 = _typescodec.u64; exports.u8 = _typescodec.u8;
+//# sourceMappingURL=chunk-P5WWWRSU.cjs.map