@argonprotocol/mainchain 1.3.6 → 1.3.7

package/lib/{chunk-FGSUNAT4.js → chunk-PXZPYJ4P.js}

@@ -96,7 +96,7 @@ function getConfig() {
   return {
     debug: config.debug ?? getEnvVar("DEBUG") === "true",
     keysVersion: config.keysVersion ?? (getEnvVar("KEYS_VERSION") ? parseInt(getEnvVar("KEYS_VERSION")) : void 0),
-    keysMnemonic: config.keysMnemonic ?? getEnvVar("KEYS_MNEMONIC"),
+    keySeedOrMnemonic: config.keySeedOrMnemonic ?? getEnvVar("KEYS_MNEMONIC"),
     subaccountRange: config.subaccountRange ?? getEnvVar("SUBACCOUNT_RANGE") ?? "0-9"
   };
 }
@@ -259,8 +259,19 @@ var TxResult = class {
 
 // src/utils.ts
 import BigNumber, * as BN from "bignumber.js";
+import { ed25519DeriveHard, keyExtractSuri, mnemonicToMiniSecret } from "@polkadot/util-crypto";
+import { u8aToHex } from "@polkadot/util";
 var { ROUND_FLOOR } = BN;
 var MICROGONS_PER_ARGON = 1e6;
+function miniSecretFromUri(uri, password) {
+  const { phrase, path } = keyExtractSuri(uri);
+  let mini = mnemonicToMiniSecret(phrase, password);
+  for (const j of path) {
+    if (!j.isHard) throw new Error("ed25519 soft derivation not supported");
+    mini = ed25519DeriveHard(mini, j.chainCode);
+  }
+  return u8aToHex(mini);
+}
 function formatArgons(microgons) {
   if (microgons === void 0 || microgons === null) return "na";
   const isNegative = microgons < 0;
@@ -404,7 +415,7 @@ var JsonExt = class {
   }
   static parse(str) {
     return JSON.parse(str, (_, v) => {
-      if (typeof v === "string" && v.match(/^\d+n$/)) {
+      if (typeof v === "string" && v.match(/^-?\d+n$/)) {
         return BigInt(v.slice(0, -1));
       }
       if (typeof v === "object" && v !== null && v.type === "Buffer" && Array.isArray(v.data)) {
@@ -812,7 +823,7 @@ var AccountMiners = class _AccountMiners {
 };
 
 // src/Accountset.ts
-import { u8aToHex } from "@polkadot/util";
+import { u8aToHex as u8aToHex2 } from "@polkadot/util";
 var Accountset = class {
   txSubmitterPair;
   isProxy = false;
@@ -826,7 +837,7 @@ var Accountset = class {
   get namedAccounts() {
     return this.accountRegistry.namedAccounts;
   }
-  sessionKeyMnemonic;
+  sessionKeySeed;
   constructor(options) {
     if ("seedAccount" in options) {
       this.txSubmitterPair = options.seedAccount;
@@ -837,7 +848,7 @@ var Accountset = class {
       this.txSubmitterPair = options.txSubmitter;
       this.seedAddress = options.seedAddress;
     }
-    this.sessionKeyMnemonic = options.sessionKeyMnemonic;
+    this.sessionKeySeed = options.sessionKeySeedOrMnemonic;
     this.accountRegistry = options.accountRegistry ?? AccountRegistry.factory(options.name);
     this.client = options.client;
     const defaultRange = options.subaccountRange ?? getDefaultSubaccountRange();
@@ -918,7 +929,6 @@ var Accountset = class {
     ];
     const bidAmountsByFrame = {};
     if (frameIds.length) {
-      console.log("Looking up cohorts for frames", frameIds);
       const cohorts = await api.query.miningSlot.minersByCohort.multi(frameIds);
       for (let i = 0; i < frameIds.length; i++) {
         const cohort = cohorts[i];
@@ -1076,12 +1086,12 @@ var Accountset = class {
   keys(keysVersion) {
     const config2 = getConfig();
     let version = keysVersion ?? config2.keysVersion ?? 0;
-    const seedMnemonic = this.sessionKeyMnemonic ?? config2.keysMnemonic;
-    if (!seedMnemonic) {
+    const seed = this.sessionKeySeed ?? config2.keySeedOrMnemonic;
+    if (!seed) {
       throw new Error("KEYS_MNEMONIC environment variable not set. Cannot derive keys.");
     }
-    const blockSealKey = `${seedMnemonic}//block-seal//${version}`;
-    const granKey = `${seedMnemonic}//grandpa//${version}`;
+    const blockSealKey = `${seed}//block-seal//${version}`;
+    const granKey = `${seed}//grandpa//${version}`;
     const blockSealAccount = new Keyring().createFromUri(blockSealKey, {
       type: "ed25519"
     });
@@ -1091,12 +1101,12 @@ var Accountset = class {
     return {
       seal: {
         privateKey: blockSealKey,
-        publicKey: u8aToHex(blockSealAccount.publicKey),
+        publicKey: u8aToHex2(blockSealAccount.publicKey),
         rawPublicKey: blockSealAccount.publicKey
       },
       gran: {
         privateKey: granKey,
-        publicKey: u8aToHex(grandpaAccount.publicKey),
+        publicKey: u8aToHex2(grandpaAccount.publicKey),
         rawPublicKey: grandpaAccount.publicKey
       }
     };
@@ -1775,7 +1785,7 @@ var CohortBidder = class {
     } else {
       blockNumber = await client.query.system.number().then((x) => x.toNumber());
     }
-    const blockHash = await client.query.system.blockHash(blockNumber);
+    const blockHash = await client.rpc.chain.getBlockHash(blockNumber);
     const api = await client.at(blockHash);
     const rawBids = await api.query.miningSlot.bidsForNextSlotCohort();
     const currentTick = await api.query.ticks.currentTick().then((x) => x.toNumber());
@@ -1964,6 +1974,7 @@ var CohortBidder = class {
     }
   }
   scheduleEvaluation() {
+    if (this.isStopped) return;
     const millisPerTick = this.millisPerTick;
     const delayTicks = Math.max(this.options.bidDelay, 1);
     const delay = delayTicks * millisPerTick;
@@ -2356,7 +2367,7 @@ Raising Funds (Frame ${this.nextFrameId + 1}):`);
 };
 
 // src/BitcoinLocks.ts
-import { hexToU8a as hexToU8a2, u8aToHex as u8aToHex2 } from "@polkadot/util";
+import { hexToU8a as hexToU8a2, u8aToHex as u8aToHex3 } from "@polkadot/util";
 var SATS_PER_BTC = 100000000n;
 var BitcoinLocks = class _BitcoinLocks {
   constructor(client) {
@@ -2425,8 +2436,8 @@ var BitcoinLocks = class _BitcoinLocks {
       return;
     }
     const ref = refRaw.unwrap();
-    const txid = u8aToHex2(ref.txid);
-    const bitcoinTxid = u8aToHex2(ref.txid.reverse());
+    const txid = u8aToHex3(ref.txid);
+    const bitcoinTxid = u8aToHex3(ref.txid.reverse());
     const vout = ref.outputIndex.toNumber();
     return { txid, vout, bitcoinTxid };
   }
@@ -2457,7 +2468,7 @@ var BitcoinLocks = class _BitcoinLocks {
         `Invalid vault signature length: ${vaultSignature.byteLength}. Must be 70-73 bytes.`
       );
     }
-    const signature = u8aToHex2(vaultSignature);
+    const signature = u8aToHex3(vaultSignature);
     const tx = client.tx.bitcoinLocks.cosignRelease(utxoId, signature);
     const submitter = new TxSubmitter(client, tx, argonKeyring);
     return await submitter.submit({ txProgressCallback });
@@ -2853,7 +2864,7 @@ function createKeyringPair(opts) {
 }
 
 // src/index.ts
-import { u8aToHex as u8aToHex3, hexToU8a as hexToU8a3, u8aEq } from "@polkadot/util";
+import { u8aToHex as u8aToHex4, hexToU8a as hexToU8a3, u8aEq } from "@polkadot/util";
 import { GenericEvent as GenericEvent2, GenericBlock, GenericAddress } from "@polkadot/types/generic";
 import {
   BTreeMap,
@@ -2899,6 +2910,7 @@ export {
   TxSubmitter,
   TxResult,
   MICROGONS_PER_ARGON,
+  miniSecretFromUri,
   formatArgons,
   formatPercent,
   filterUndefined,
@@ -2938,7 +2950,7 @@ export {
   mnemonicGenerate,
   waitForLoad,
   getClient,
-  u8aToHex3 as u8aToHex,
+  u8aToHex4 as u8aToHex,
   hexToU8a3 as hexToU8a,
   u8aEq,
   GenericEvent2 as GenericEvent,
@@ -2967,4 +2979,4 @@ export {
   u64,
   u8
 };
-//# sourceMappingURL=chunk-FGSUNAT4.js.map
+//# sourceMappingURL=chunk-PXZPYJ4P.js.map