@argonprotocol/mainchain 1.1.0-rc.4 → 1.1.0-rc.6

package/lib/index.js

@@ -25,7 +25,7 @@ import "@polkadot/types/types/registry";
 // src/index.ts
 import { ApiPromise, HttpProvider, Keyring, WsProvider } from "@polkadot/api";
 import {
-  cryptoWaitReady as cryptoWaitReady2,
+  cryptoWaitReady,
   decodeAddress,
   mnemonicGenerate
 } from "@polkadot/util-crypto";
@@ -87,11 +87,11 @@ var WageProtector = class _WageProtector {
 };
 
 // src/utils.ts
-import BigNumber2, * as BN from "bignumber.js";
+import BigNumber, * as BN from "bignumber.js";
 var { ROUND_FLOOR } = BN;
 function formatArgons(x) {
   const isNegative = x < 0;
-  let format = BigNumber2(x.toString()).abs().div(1e6).toFormat(2, ROUND_FLOOR);
+  let format = BigNumber(x.toString()).abs().div(1e6).toFormat(2, ROUND_FLOOR);
   if (format.endsWith(".00")) {
     format = format.slice(0, -3);
   }
@@ -134,13 +134,13 @@ async function gettersToObject(obj) {
   return result;
 }
 function convertFixedU128ToBigNumber(fixedU128) {
-  const decimalFactor = new BigNumber2(10).pow(new BigNumber2(18));
-  const rawValue = new BigNumber2(fixedU128.toString());
+  const decimalFactor = new BigNumber(10).pow(new BigNumber(18));
+  const rawValue = new BigNumber(fixedU128.toString());
   return rawValue.div(decimalFactor);
 }
 function convertPermillToBigNumber(permill) {
-  const decimalFactor = new BigNumber2(1e6);
-  const rawValue = new BigNumber2(permill.toString());
+  const decimalFactor = new BigNumber(1e6);
+  const rawValue = new BigNumber(permill.toString());
   return rawValue.div(decimalFactor);
 }
 function eventDataToJson(event) {
@@ -372,11 +372,8 @@ var AccountRegistry = class _AccountRegistry {
 // src/Accountset.ts
 import * as process2 from "node:process";
 
-// src/AccountMiners.ts
-import EventEmitter2 from "node:events";
-
 // src/BlockWatch.ts
-import EventEmitter from "node:events";
+import { createNanoEvents } from "nanoevents";
 function getTickFromHeader(client, header) {
   for (const x of header.digest.logs) {
     if (x.isPreRuntime) {
@@ -406,7 +403,7 @@ var BlockWatch = class {
     this.options.shouldLog ??= true;
     this.options.finalizedBlocks ??= false;
   }
-  events = new EventEmitter();
+  events = createNanoEvents();
   obligationsById = {};
   obligationIdByUtxoId = {};
   unsubscribe;
@@ -583,10 +580,10 @@ var MiningRotations = class {
     }));
     this.genesisTick ??= await client.query.ticks.genesisTick().then((x) => x.toNumber());
     const ticksBetweenSlots = this.miningConfig.ticksBetweenSlots;
-    const slot1BiddingStartTick = this.genesisTick + this.miningConfig.slotBiddingStartAfterTicks;
-    if (tick < slot1BiddingStartTick) return 0;
-    const ticksSinceBiddingStart = tick - slot1BiddingStartTick;
-    return Math.floor(ticksSinceBiddingStart / ticksBetweenSlots) + 1;
+    const slot1StartTick = this.genesisTick + this.miningConfig.slotBiddingStartAfterTicks + ticksBetweenSlots;
+    if (tick < slot1StartTick) return 0;
+    const ticksSinceSlot1 = tick - slot1StartTick;
+    return Math.floor(ticksSinceSlot1 / ticksBetweenSlots);
   }
   async getForHeader(client, header) {
     if (header.number.toNumber() === 0) return 0;
@@ -597,6 +594,7 @@ var MiningRotations = class {
 };
 
 // src/AccountMiners.ts
+import { createNanoEvents as createNanoEvents2 } from "nanoevents";
 var AccountMiners = class _AccountMiners {
   constructor(accountset, registeredMiners, options = { shouldLog: false }) {
     this.accountset = accountset;
@@ -609,7 +607,7 @@ var AccountMiners = class _AccountMiners {
       };
     }
   }
-  events = new EventEmitter2();
+  events = createNanoEvents2();
   miningRotations;
   trackedAccountsByAddress = {};
   async watch() {
@@ -724,7 +722,7 @@ var AccountMiners = class _AccountMiners {
 };
 
 // src/Accountset.ts
-var Accountset = class _Accountset {
+var Accountset = class {
   txSubmitterPair;
   isProxy = false;
   seedAddress;
@@ -1107,24 +1105,6 @@ var Accountset = class _Accountset {
     await accountMiners.watch();
     return accountMiners;
   }
-  static async fromCli(program, proxyForAddress) {
-    const parentOptions = program.parent?.optsWithGlobals();
-    const keypair = await keyringFromCli(parentOptions);
-    const client = getClient(parentOptions.mainchainUrl);
-    if (proxyForAddress) {
-      return new _Accountset({
-        client,
-        isProxy: true,
-        seedAddress: proxyForAddress,
-        txSubmitter: keypair
-      });
-    } else {
-      return new _Accountset({
-        seedAccount: keypair,
-        client
-      });
-    }
-  }
 };
 function getDefaultSubaccountRange() {
   try {
@@ -1249,7 +1229,7 @@ var MiningBids = class {
 };
 
 // src/Vault.ts
-import BigNumber3, * as BN2 from "bignumber.js";
+import BigNumber2, * as BN2 from "bignumber.js";
 var { ROUND_FLOOR: ROUND_FLOOR2 } = BN2;
 var Vault = class {
   securitization;
@@ -1302,21 +1282,21 @@ var Vault = class {
     return this.securitization - recoverySecuritization - this.bitcoinLocked;
   }
   recoverySecuritization() {
-    const reserved = new BigNumber3(1).div(this.securitizationRatio);
+    const reserved = new BigNumber2(1).div(this.securitizationRatio);
     return this.securitization - BigInt(
       reserved.multipliedBy(this.securitization.toString()).toFixed(0, ROUND_FLOOR2)
     );
   }
   minimumSecuritization() {
     return BigInt(
-      this.securitizationRatio.multipliedBy(this.bitcoinLocked.toString()).decimalPlaces(0, BigNumber3.ROUND_CEIL).toString()
+      this.securitizationRatio.multipliedBy(this.bitcoinLocked.toString()).decimalPlaces(0, BigNumber2.ROUND_CEIL).toString()
     );
   }
   activatedSecuritization() {
     const activated = this.bitcoinLocked - this.bitcoinPending;
     let maxRatio = this.securitizationRatio;
     if (this.securitizationRatio.toNumber() > 2) {
-      maxRatio = BigNumber3(2);
+      maxRatio = BigNumber2(2);
     }
     return BigInt(
       maxRatio.multipliedBy(activated.toString()).toFixed(0, ROUND_FLOOR2)
@@ -1330,14 +1310,14 @@ var Vault = class {
     return activated / 10n;
   }
   calculateBitcoinFee(amount) {
-    const fee = this.terms.bitcoinAnnualPercentRate.multipliedBy(Number(amount)).integerValue(BigNumber3.ROUND_CEIL);
+    const fee = this.terms.bitcoinAnnualPercentRate.multipliedBy(Number(amount)).integerValue(BigNumber2.ROUND_CEIL);
     return BigInt(fee.toString()) + this.terms.bitcoinBaseFee;
   }
 };
 
 // src/VaultMonitor.ts
-import { EventEmitter as EventEmitter3 } from "node:events";
 import { printTable as printTable2 } from "console-table-printer";
+import { createNanoEvents as createNanoEvents3 } from "nanoevents";
 var VaultMonitor = class {
   constructor(accountset, alerts = {}, options = {}) {
     this.accountset = accountset;
@@ -1367,7 +1347,7 @@ var VaultMonitor = class {
       this.printBids(header.hash);
     });
   }
-  events = new EventEmitter3();
+  events = createNanoEvents3();
   vaultsById = {};
   blockWatch;
   mainchain;
@@ -2245,81 +2225,20 @@ var BitcoinLocks = class _BitcoinLocks {
 };
 
 // src/keyringUtils.ts
-import { promises } from "node:fs";
-import * as os from "node:os";
-var { readFile, writeFile } = promises;
-async function keyringFromCli(opts) {
-  if (opts.accountSuri) {
-    return keyringFromSuri(opts.accountSuri);
-  }
-  if (opts.accountFilePath) {
-    return keyringFromFile({
-      filePath: opts.accountFilePath,
-      passphrase: opts.accountPassphrase
-    });
-  }
-  throw new Error(
-    "No ACCOUNT account loaded (either ACCOUNT_SURI or ACCOUNT_JSON_PATH required)"
-  );
-}
 function keyringFromSuri(suri, cryptoType = "sr25519") {
   return new Keyring({ type: cryptoType }).createFromUri(suri);
 }
-async function keyringFromFile(opts) {
-  if (!opts.filePath) {
-    throw new Error(
-      "No ACCOUNT account loaded (either ACCOUNT_SURI or ACCOUNT_JSON_PATH required)"
-    );
-  }
-  const path = opts.filePath.replace("~", os.homedir());
-  const json = JSON.parse(await readFile(path, "utf-8"));
-  const mainAccount = new Keyring().createFromJson(json);
-  mainAccount.decodePkcs8(opts.passphrase);
-  return mainAccount;
-}
-async function createKeyringPair(opts) {
-  const { filePath, passphrase, cryptoType } = opts;
+function createKeyringPair(opts) {
+  const { cryptoType } = opts;
   const seed = mnemonicGenerate();
-  const keyring = keyringFromSuri(seed, cryptoType);
-  if (filePath) {
-    const json = keyring.toJson(passphrase);
-    await writeFile(filePath, JSON.stringify(json, null, 2));
-  }
-  return keyring;
+  return keyringFromSuri(seed, cryptoType);
 }
 
-// src/clis/index.ts
-import { Command as Command6, Option as Option2 } from "@commander-js/extra-typings";
-
-// src/clis/accountCli.ts
-import { Command } from "@commander-js/extra-typings";
-import { printTable as printTable3 } from "console-table-printer";
-import { cryptoWaitReady } from "@polkadot/util-crypto";
-import { writeFileSync } from "node:fs";
-import * as process3 from "node:process";
-
-// src/clis/index.ts
-import { configDotenv } from "dotenv";
-import Path from "node:path";
-
-// src/clis/vaultCli.ts
-import { Command as Command2 } from "@commander-js/extra-typings";
-
-// src/clis/miningCli.ts
-import { Command as Command3 } from "@commander-js/extra-typings";
-import { printTable as printTable4 } from "console-table-printer";
-
-// src/clis/liquidityCli.ts
-import { Command as Command4 } from "@commander-js/extra-typings";
-
-// src/clis/bitcoinCli.ts
-import { Command as Command5 } from "@commander-js/extra-typings";
-
 // src/index.ts
 export * from "@polkadot/types";
 export * from "@polkadot/types/interfaces";
 async function waitForLoad() {
-  await cryptoWaitReady2();
+  await cryptoWaitReady();
 }
 async function getClient(host) {
   let provider;
@@ -2360,8 +2279,6 @@ export {
   getClient,
   getTickFromHeader,
   gettersToObject,
-  keyringFromCli,
-  keyringFromFile,
   keyringFromSuri,
   mnemonicGenerate,
   waitForLoad