@argonprotocol/mainchain 1.3.3 → 1.3.4

package/lib/{chunk-FCT7GMFN.js → chunk-P3OMJABP.js}

@@ -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 + (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);
@@ -202,7 +203,7 @@ var TxResult = class {
    * The fee tip paid for the transaction.
    */
   finalFeeTip;
-  onResultCallback;
+  txProgressCallback;
   inBlockResolve;
   inBlockReject;
   finalizedResolve;
@@ -240,7 +241,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);
@@ -250,7 +259,6 @@ var TxResult = class {
 
 // src/utils.ts
 import BigNumber, * as BN from "bignumber.js";
-import { hexToU8a } from "@polkadot/util";
 var { ROUND_FLOOR } = BN;
 var MICROGONS_PER_ARGON = 1e6;
 function formatArgons(x) {
@@ -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 hexToU8a(v.data);
+        return Uint8Array.from(v.data);
       }
       return v;
     });
@@ -1292,21 +1300,21 @@ var MiningBids = class {
 // src/Vault.ts
 import BigNumber2, * as BN2 from "bignumber.js";
 import bs58check from "bs58check";
-import { hexToU8a as hexToU8a2 } from "@polkadot/util";
+import { hexToU8a } from "@polkadot/util";
 var { ROUND_FLOOR: ROUND_FLOOR2 } = BN2;
 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);
   }
   securitization;
-  securitizationRatio;
   argonsLocked;
   argonsPendingActivation;
-  argonsScheduledForRelease = /* @__PURE__ */ new Map();
+  argonsScheduledForRelease;
   terms;
   operatorAccountId;
   isClosed;
@@ -1315,9 +1323,12 @@ var Vault = class _Vault {
   pendingTermsChangeTick;
   openedDate;
   openedTick;
+  securitizationRatio;
   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 = class _Vault {
   getRelockCapacity() {
     return [...this.argonsScheduledForRelease.values()].reduce((acc, val) => acc + val, 0n);
   }
+  securitizationRatioBN() {
+    return new BigNumber2(this.securitizationRatio);
+  }
   recoverySecuritization() {
-    const reserved = new BigNumber2(1).div(this.securitizationRatio);
+    const reserved = new BigNumber2(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, BigNumber2.ROUND_CEIL).toString()
+      this.securitizationRatioBN().multipliedBy(this.argonsLocked.toString()).decimalPlaces(0, BigNumber2.ROUND_CEIL).toString()
     );
   }
   activatedSecuritization() {
     const activated = this.argonsLocked - this.argonsPendingActivation;
-    let maxRatio = this.securitizationRatio;
-    if (this.securitizationRatio.toNumber() > 2) {
-      maxRatio = BigNumber2(2);
-    }
+    const maxRatio = BigNumber2(Math.min(this.securitizationRatio, 2));
     return BigInt(maxRatio.multipliedBy(activated.toString()).toFixed(0, ROUND_FLOOR2));
   }
   /**
@@ -1404,9 +1415,9 @@ var Vault = class _Vault {
       bitcoinXpub,
       tip,
       doNotExceedBalance,
-      progressCallback
+      txProgressCallback
     } = args;
-    let xpubBytes = hexToU8a2(bitcoinXpub);
+    let xpubBytes = hexToU8a(bitcoinXpub);
     if (xpubBytes.length !== 78) {
       if (bitcoinXpub.startsWith("xpub") || bitcoinXpub.startsWith("tpub") || bitcoinXpub.startsWith("zpub")) {
         const bytes = bs58check.decode(bitcoinXpub);
@@ -1447,21 +1458,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;
@@ -1568,7 +1565,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}`,
@@ -2247,7 +2244,7 @@ Raising Funds (Frame ${this.nextFrameId + 1}):`);
 };
 
 // src/BitcoinLocks.ts
-import { hexToU8a as hexToU8a3, u8aToHex as u8aToHex2 } from "@polkadot/util";
+import { hexToU8a as hexToU8a2, u8aToHex as u8aToHex2 } from "@polkadot/util";
 var SATS_PER_BTC = 100000000n;
 var BitcoinLocks = class _BitcoinLocks {
   constructor(client) {
@@ -2287,6 +2284,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
     };
@@ -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 = u8aToHex2(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;
@@ -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 this.getUtxoIdFromEvents(txResult.events) ?? 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)
@@ -2664,7 +2674,7 @@ var BitcoinLocks = class _BitcoinLocks {
     const vaults = new VaultMonitor(accountset, {
       bitcoinSpaceAvailable: argonAmount
     });
-    const bitcoinXpubBuffer = hexToU8a3(bitcoinXpub);
+    const bitcoinXpubBuffer = hexToU8a2(bitcoinXpub);
     return new Promise(async (resolve, reject) => {
       vaults.events.on("bitcoin-space-above", async (vaultId, amount) => {
         const vault = vaults.vaultsById[vaultId];
@@ -2721,7 +2731,7 @@ function createKeyringPair(opts) {
 }
 
 // src/index.ts
-import { u8aToHex as u8aToHex3, hexToU8a as hexToU8a4, u8aEq } from "@polkadot/util";
+import { u8aToHex as u8aToHex3, hexToU8a as hexToU8a3, u8aEq } from "@polkadot/util";
 import { GenericEvent as GenericEvent2, GenericBlock, GenericAddress } from "@polkadot/types/generic";
 import {
   BTreeMap,
@@ -2765,6 +2775,7 @@ export {
   setConfig,
   getConfig,
   TxSubmitter,
+  TxResult,
   MICROGONS_PER_ARGON,
   formatArgons,
   formatPercent,
@@ -2806,7 +2817,7 @@ export {
   waitForLoad,
   getClient,
   u8aToHex3 as u8aToHex,
-  hexToU8a4 as hexToU8a,
+  hexToU8a3 as hexToU8a,
   u8aEq,
   GenericEvent2 as GenericEvent,
   GenericBlock,
@@ -2834,4 +2845,4 @@ export {
   u64,
   u8
 };
-//# sourceMappingURL=chunk-FCT7GMFN.js.map
+//# sourceMappingURL=chunk-P3OMJABP.js.map