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

package/lib/cli.js

@@ -55,8 +55,6 @@ __export(index_exports, {
   getClient: () => getClient,
   getTickFromHeader: () => getTickFromHeader,
   gettersToObject: () => gettersToObject,
-  keyringFromCli: () => keyringFromCli,
-  keyringFromFile: () => keyringFromFile,
   keyringFromSuri: () => keyringFromSuri,
   mnemonicGenerate: () => mnemonicGenerate,
   waitForLoad: () => waitForLoad
@@ -437,11 +435,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) {
@@ -471,7 +466,7 @@ var BlockWatch = class {
     this.options.shouldLog ??= true;
     this.options.finalizedBlocks ??= false;
   }
-  events = new EventEmitter();
+  events = createNanoEvents();
   obligationsById = {};
   obligationIdByUtxoId = {};
   unsubscribe;
@@ -648,10 +643,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;
@@ -662,6 +657,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;
@@ -674,7 +670,7 @@ var AccountMiners = class _AccountMiners {
       };
     }
   }
-  events = new EventEmitter2();
+  events = createNanoEvents2();
   miningRotations;
   trackedAccountsByAddress = {};
   async watch() {
@@ -789,7 +785,7 @@ var AccountMiners = class _AccountMiners {
 };
 
 // src/Accountset.ts
-var Accountset = class _Accountset {
+var Accountset = class {
   txSubmitterPair;
   isProxy = false;
   seedAddress;
@@ -1172,24 +1168,6 @@ var Accountset = class _Accountset {
     await accountMiners.watch();
     return accountMiners;
   }
-  static async fromCli(program2, proxyForAddress) {
-    const parentOptions = program2.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 {
@@ -1401,8 +1379,8 @@ var Vault = class {
 };
 
 // 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;
@@ -1432,7 +1410,7 @@ var VaultMonitor = class {
       this.printBids(header.hash);
     });
   }
-  events = new EventEmitter3();
+  events = createNanoEvents3();
   vaultsById = {};
   blockWatch;
   mainchain;
@@ -2310,47 +2288,13 @@ 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/index.ts
@@ -2381,7 +2325,7 @@ function accountCli() {
     "Manage subaccounts from a single keypair"
   );
   program2.command("watch").description("Watch for blocks closed by subaccounts").action(async () => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const accountMiners = await accountset.watchBlocks();
     accountMiners.events.on("mined", (_block, mined) => {
       console.log("Your accounts authored a block", mined);
@@ -2392,7 +2336,7 @@ function accountCli() {
   });
   program2.command("list", { isDefault: true }).description("Show subaccounts").option("--addresses", "Just show a list of ids").action(async ({ addresses }) => {
     const { subaccounts } = globalOptions(program2);
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     if (addresses) {
       const addresses2 = accountset.addresses;
       console.log(addresses2.join(","));
@@ -2423,7 +2367,7 @@ function accountCli() {
     "Register the keys to a url (normally this is localhost)"
   ).action(async ({ registerKeysTo, path }) => {
     const { accountPassphrase, accountSuri, accountFilePath } = globalOptions(program2);
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     process3.env.KEYS_MNEMONIC ||= mnemonicGenerate();
     if (registerKeysTo) {
       await accountset.registerKeys(registerKeysTo);
@@ -2464,7 +2408,7 @@ function accountCli() {
     "--print-only",
     "Output as curl commands instead of direct registration"
   ).action(async (nodeRpcUrl, { printOnly }) => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     if (printOnly) {
       const { gran, seal } = accountset.keys();
       const commands = [];
@@ -2498,7 +2442,7 @@ function accountCli() {
     "Restrict this operation to a subset of the subaccounts (eg, 0-10)",
     parseSubaccountRange
   ).action(async ({ subaccounts }) => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const result = await accountset.consolidate(subaccounts);
     printTable3(result);
     process3.exit(0);
@@ -2517,7 +2461,7 @@ function vaultCli() {
     "Monitor vaults and manage securitization"
   );
   program2.command("list", { isDefault: true }).description("Show current state of vaults").action(async () => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const vaults = new VaultMonitor(accountset, void 0, {
       vaultOnlyWatchMode: true
     });
@@ -2533,7 +2477,7 @@ function vaultCli() {
     "The tip to include with the transaction",
     parseFloat
   ).action(async ({ tip, argons, vaultId, ratio }) => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const client = await accountset.client;
     const resolvedTip = tip ? BigInt(tip * 1e6) : 0n;
     const microgons = BigInt(argons * 1e6);
@@ -2594,7 +2538,7 @@ function vaultCli() {
         "Bitcoin pubkey must be 66 characters (add 0x in front optionally)"
       );
     }
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const client = await accountset.client;
     const resolvedTip = tip ? BigInt(tip * 1e6) : 0n;
     const microgons = BigInt(argons * 1e6);
@@ -2677,7 +2621,7 @@ function miningCli() {
     "Watch mining seats or setup bidding"
   );
   program2.command("list", { isDefault: true }).description("Monitor all miners").action(async () => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const bids = new MiningBids(accountset.client);
     const api = await accountset.client;
     let lastMiners = {};
@@ -2773,7 +2717,7 @@ function miningCli() {
       bidIncrement,
       proxyForAddress
     }) => {
-      const accountset = await Accountset.fromCli(program2, proxyForAddress);
+      const accountset = await accountsetFromCli(program2, proxyForAddress);
       let cohortBidder;
       const miningBids = new MiningBids(accountset.client, false);
       const maxCohortSize = await miningBids.maxCohortSize();
@@ -2860,7 +2804,7 @@ function miningCli() {
   ).action(async ({ outfile, proxyPassphrase, feeArgons }) => {
     const { mainchainUrl } = globalOptions(program2);
     const client = await getClient(mainchainUrl);
-    const keyringPair = await createKeyringPair({
+    const keyringPair = await saveKeyringPair({
       filePath: outfile,
       passphrase: proxyPassphrase
     });
@@ -2874,7 +2818,7 @@ function miningCli() {
     ]);
     let keypair;
     try {
-      const accountset = await Accountset.fromCli(program2);
+      const accountset = await accountsetFromCli(program2);
       keypair = accountset.txSubmitterPair;
     } catch (e) {
       const polkadotLink = `https://polkadot.js.org/apps/?rpc=${mainchainUrl}#/extrinsics/decode/${tx.toHex()}`;
@@ -2902,7 +2846,7 @@ function liquidityCli() {
     "Monitor or bond to liquidity pools"
   );
   program2.command("list", { isDefault: true }).description("Show or watch the vault bid pool rewards").action(async () => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const bidPool = new BidPool(
       accountset.client,
       accountset.txSubmitterPair
@@ -2918,7 +2862,7 @@ function liquidityCli() {
     "The tip to include with the transaction",
     parseFloat
   ).action(async ({ tip, argons, vaultId }) => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const resolvedTip = tip ? BigInt(tip * 1e6) : 0n;
     const microgons = BigInt(argons * 1e6);
     const bidPool = new BidPool(
@@ -2946,7 +2890,7 @@ function liquidityCli() {
     parseFloat
   ).action(async ({ maxArgons, minPctSharing, tip }) => {
     const maxAmountPerSlot = BigInt(maxArgons * 1e6);
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const vaults = new VaultMonitor(
       accountset,
       {
@@ -2995,7 +2939,7 @@ function bitcoinCli() {
     "Alert when bitcoin space exceeds this amount",
     parseFloat
   ).description("Watch for bitcoin space available").action(async ({ argons }) => {
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     const bot = new VaultMonitor(accountset, {
       bitcoinSpaceAvailable: argons ? BigInt(argons * 1e6) : 1n
     });
@@ -3027,7 +2971,7 @@ function bitcoinCli() {
     0
   ).action(async ({ argons, bitcoinXpub, maxLockFee, tip }) => {
     const amountToLock = BigInt(argons * 1e6);
-    const accountset = await Accountset.fromCli(program2);
+    const accountset = await accountsetFromCli(program2);
     await BitcoinLocks.waitForSpace(accountset, {
       argonAmount: amountToLock,
       bitcoinXpub,
@@ -3045,6 +2989,32 @@ function bitcoinCli() {
   return program2;
 }
 
+// src/clis/keyringStore.ts
+import { promises } from "node:fs";
+import * as os from "node:os";
+var { readFile, writeFile } = promises;
+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 saveKeyringPair(opts) {
+  const { filePath, passphrase, cryptoType } = opts;
+  const keyring = createKeyringPair({ cryptoType });
+  if (filePath) {
+    const json = keyring.toJson(passphrase);
+    await writeFile(filePath, JSON.stringify(json, null, 2));
+  }
+  return keyring;
+}
+
 // src/clis/index.ts
 function globalOptions(program2) {
   return program2.optsWithGlobals();
@@ -3074,6 +3044,38 @@ function buildCli() {
     ).env("SUBACCOUNT_RANGE").argParser(parseSubaccountRange)
   ).addCommand(accountCli()).addCommand(vaultCli()).addCommand(miningCli()).addCommand(liquidityCli()).addCommand(bitcoinCli());
 }
+async function accountsetFromCli(program2, proxyForAddress) {
+  const opts = program2.parent?.optsWithGlobals();
+  let keypair;
+  if (opts.accountSuri) {
+    keypair = keyringFromSuri(opts.accountSuri);
+  }
+  if (opts.accountFilePath) {
+    keypair = await keyringFromFile({
+      filePath: opts.accountFilePath,
+      passphrase: opts.accountPassphrase
+    });
+  }
+  if (!keypair) {
+    throw new Error(
+      "No ACCOUNT account loaded (either ACCOUNT_SURI or ACCOUNT_JSON_PATH required)"
+    );
+  }
+  const client = getClient(opts.mainchainUrl);
+  if (proxyForAddress) {
+    return new Accountset({
+      client,
+      isProxy: true,
+      seedAddress: proxyForAddress,
+      txSubmitter: keypair
+    });
+  } else {
+    return new Accountset({
+      seedAccount: keypair,
+      client
+    });
+  }
+}
 function addGlobalArgs(program2) {
   for (const command of program2.commands) {
     command.configureHelp({