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

package/lib/index.cjs

@@ -50,7 +50,7 @@ __export(index_exports, {
   convertFixedU128ToBigNumber: () => convertFixedU128ToBigNumber,
   convertPermillToBigNumber: () => convertPermillToBigNumber,
   createKeyringPair: () => createKeyringPair,
-  decodeAddress: () => import_util_crypto2.decodeAddress,
+  decodeAddress: () => import_util_crypto.decodeAddress,
   dispatchErrorToString: () => dispatchErrorToString,
   eventDataToJson: () => eventDataToJson,
   filterUndefined: () => filterUndefined,
@@ -60,10 +60,8 @@ __export(index_exports, {
   getClient: () => getClient,
   getTickFromHeader: () => getTickFromHeader,
   gettersToObject: () => gettersToObject,
-  keyringFromCli: () => keyringFromCli,
-  keyringFromFile: () => keyringFromFile,
   keyringFromSuri: () => keyringFromSuri,
-  mnemonicGenerate: () => import_util_crypto2.mnemonicGenerate,
+  mnemonicGenerate: () => import_util_crypto.mnemonicGenerate,
   waitForLoad: () => waitForLoad
 });
 module.exports = __toCommonJS(index_exports);
@@ -94,7 +92,7 @@ var import_registry = require("@polkadot/types/types/registry");
 
 // src/index.ts
 var import_api = require("@polkadot/api");
-var import_util_crypto2 = require("@polkadot/util-crypto");
+var import_util_crypto = require("@polkadot/util-crypto");
 __reExport(index_exports, require("@polkadot/types-codec/types"), module.exports);
 
 // src/WageProtector.ts
@@ -438,11 +436,8 @@ var AccountRegistry = class _AccountRegistry {
 // src/Accountset.ts
 var process2 = __toESM(require("process"), 1);
 
-// src/AccountMiners.ts
-var import_node_events2 = __toESM(require("events"), 1);
-
 // src/BlockWatch.ts
-var import_node_events = __toESM(require("events"), 1);
+var import_nanoevents = require("nanoevents");
 function getTickFromHeader(client, header) {
   for (const x of header.digest.logs) {
     if (x.isPreRuntime) {
@@ -472,7 +467,7 @@ var BlockWatch = class {
     this.options.shouldLog ??= true;
     this.options.finalizedBlocks ??= false;
   }
-  events = new import_node_events.default();
+  events = (0, import_nanoevents.createNanoEvents)();
   obligationsById = {};
   obligationIdByUtxoId = {};
   unsubscribe;
@@ -649,10 +644,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;
@@ -663,6 +658,7 @@ var MiningRotations = class {
 };
 
 // src/AccountMiners.ts
+var import_nanoevents2 = require("nanoevents");
 var AccountMiners = class _AccountMiners {
   constructor(accountset, registeredMiners, options = { shouldLog: false }) {
     this.accountset = accountset;
@@ -675,7 +671,7 @@ var AccountMiners = class _AccountMiners {
       };
     }
   }
-  events = new import_node_events2.default();
+  events = (0, import_nanoevents2.createNanoEvents)();
   miningRotations;
   trackedAccountsByAddress = {};
   async watch() {
@@ -790,7 +786,7 @@ var AccountMiners = class _AccountMiners {
 };
 
 // src/Accountset.ts
-var Accountset = class _Accountset {
+var Accountset = class {
   txSubmitterPair;
   isProxy = false;
   seedAddress;
@@ -1173,24 +1169,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 {
@@ -1402,8 +1380,8 @@ var Vault = class {
 };
 
 // src/VaultMonitor.ts
-var import_node_events3 = require("events");
 var import_console_table_printer2 = require("console-table-printer");
+var import_nanoevents3 = require("nanoevents");
 var VaultMonitor = class {
   constructor(accountset, alerts = {}, options = {}) {
     this.accountset = accountset;
@@ -1433,7 +1411,7 @@ var VaultMonitor = class {
       this.printBids(header.hash);
     });
   }
-  events = new import_node_events3.EventEmitter();
+  events = (0, import_nanoevents3.createNanoEvents)();
   vaultsById = {};
   blockWatch;
   mainchain;
@@ -2311,81 +2289,20 @@ var BitcoinLocks = class _BitcoinLocks {
 };
 
 // src/keyringUtils.ts
-var import_node_fs = require("fs");
-var os = __toESM(require("os"), 1);
-var { readFile, writeFile } = import_node_fs.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 import_api.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 import_api.Keyring().createFromJson(json);
-  mainAccount.decodePkcs8(opts.passphrase);
-  return mainAccount;
-}
-async function createKeyringPair(opts) {
-  const { filePath, passphrase, cryptoType } = opts;
-  const seed = (0, import_util_crypto2.mnemonicGenerate)();
-  const keyring = keyringFromSuri(seed, cryptoType);
-  if (filePath) {
-    const json = keyring.toJson(passphrase);
-    await writeFile(filePath, JSON.stringify(json, null, 2));
-  }
-  return keyring;
+function createKeyringPair(opts) {
+  const { cryptoType } = opts;
+  const seed = (0, import_util_crypto.mnemonicGenerate)();
+  return keyringFromSuri(seed, cryptoType);
 }
 
-// src/clis/index.ts
-var import_extra_typings6 = require("@commander-js/extra-typings");
-
-// src/clis/accountCli.ts
-var import_extra_typings = require("@commander-js/extra-typings");
-var import_console_table_printer4 = require("console-table-printer");
-var import_util_crypto = require("@polkadot/util-crypto");
-var import_node_fs2 = require("fs");
-var process3 = __toESM(require("process"), 1);
-
-// src/clis/index.ts
-var import_dotenv = require("dotenv");
-var import_node_path = __toESM(require("path"), 1);
-
-// src/clis/vaultCli.ts
-var import_extra_typings2 = require("@commander-js/extra-typings");
-
-// src/clis/miningCli.ts
-var import_extra_typings3 = require("@commander-js/extra-typings");
-var import_console_table_printer5 = require("console-table-printer");
-
-// src/clis/liquidityCli.ts
-var import_extra_typings4 = require("@commander-js/extra-typings");
-
-// src/clis/bitcoinCli.ts
-var import_extra_typings5 = require("@commander-js/extra-typings");
-
 // src/index.ts
 __reExport(index_exports, require("@polkadot/types"), module.exports);
 __reExport(index_exports, require("@polkadot/types/interfaces"), module.exports);
 async function waitForLoad() {
-  await (0, import_util_crypto2.cryptoWaitReady)();
+  await (0, import_util_crypto.cryptoWaitReady)();
 }
 async function getClient(host) {
   let provider;
@@ -2427,8 +2344,6 @@ async function getClient(host) {
   getClient,
   getTickFromHeader,
   gettersToObject,
-  keyringFromCli,
-  keyringFromFile,
   keyringFromSuri,
   mnemonicGenerate,
   waitForLoad,