@argonprotocol/mainchain 1.3.6 → 1.3.7

package/browser/index.d.ts

@@ -11399,6 +11399,7 @@ declare class AccountRegistry {
 }
 
 declare const MICROGONS_PER_ARGON = 1000000;
+declare function miniSecretFromUri(uri: string, password?: string): string;
 declare function formatArgons(microgons: bigint | number): string;
 declare function formatPercent(x: BigNumber | undefined): string;
 type NonNullableProps<T> = {
@@ -11600,12 +11601,12 @@ declare class Accountset {
     readonly client: Promise<ArgonClient>;
     get addresses(): string[];
     get namedAccounts(): IAddressNames;
-    private readonly sessionKeyMnemonic;
+    private readonly sessionKeySeed;
     constructor(options: {
         client: Promise<ArgonClient>;
         accountRegistry?: AccountRegistry;
         subaccountRange?: SubaccountRange;
-        sessionKeyMnemonic?: string;
+        sessionKeySeedOrMnemonic?: string;
         name?: string;
     } & ({
         seedAccount: KeyringPair;
@@ -12169,7 +12170,7 @@ declare function createKeyringPair(opts: {
 interface ArgonClientConfig {
     debug?: boolean;
     keysVersion?: number;
-    keysMnemonic?: string;
+    keySeedOrMnemonic?: string;
     subaccountRange?: string;
 }
 declare function setConfig(newConfig: ArgonClientConfig): void;
@@ -12187,4 +12188,4 @@ declare function waitForLoad(): Promise<void>;
  */
 declare function getClient(host: string): Promise<ArgonClient>;
 
-export { AccountMiners, AccountRegistry, Accountset, type ArgonClient, type ArgonClientConfig, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError, FrameCalculator, type IBitcoinLock, type IBitcoinLockConfig, type IMiningIndex, type IReleaseRequest, type IReleaseRequestDetails, type ISubaccountMiner, type ITxProgressCallback, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };
+export { AccountMiners, AccountRegistry, Accountset, type ArgonClient, type ArgonClientConfig, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError, FrameCalculator, type IBitcoinLock, type IBitcoinLockConfig, type IMiningIndex, type IReleaseRequest, type IReleaseRequestDetails, type ISubaccountMiner, type ITxProgressCallback, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, miniSecretFromUri, setConfig, toFixedNumber, waitForLoad };

package/browser/index.js

@@ -9,7 +9,7 @@ import '@polkadot/types/types/registry';
 export * from '@polkadot/types/lookup';
 import { Keyring, HttpProvider, WsProvider, ApiPromise } from '@polkadot/api';
 export { Keyring } from '@polkadot/api';
-import { mnemonicGenerate, cryptoWaitReady } from '@polkadot/util-crypto';
+import { keyExtractSuri, mnemonicToMiniSecret, ed25519DeriveHard, mnemonicGenerate, cryptoWaitReady } from '@polkadot/util-crypto';
 export { decodeAddress, mnemonicGenerate } from '@polkadot/util-crypto';
 import * as BigNumber from 'bignumber.js';
 import BigNumber__default from 'bignumber.js';
@@ -94,7 +94,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"
   };
 }
@@ -256,6 +256,15 @@ var TxResult = class {
 };
 var { ROUND_FLOOR } = BigNumber;
 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;
@@ -399,7 +408,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)) {
@@ -821,7 +830,7 @@ var Accountset = class {
     __publicField(this, "subAccountsByAddress", {});
     __publicField(this, "accountRegistry");
     __publicField(this, "client");
-    __publicField(this, "sessionKeyMnemonic");
+    __publicField(this, "sessionKeySeed");
     if ("seedAccount" in options) {
       this.txSubmitterPair = options.seedAccount;
       this.seedAddress = options.seedAccount.address;
@@ -831,7 +840,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 +927,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 +1084,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"
     });
@@ -1765,7 +1773,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());
@@ -1954,6 +1962,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;
@@ -2849,6 +2858,6 @@ async function getClient(host) {
   return await ApiPromise.create({ provider, noInitWarn: true });
 }
 
-export { AccountMiners, AccountRegistry, Accountset, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError2 as ExtrinsicError, FrameCalculator, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, setConfig, toFixedNumber, waitForLoad };
+export { AccountMiners, AccountRegistry, Accountset, BidPool, BitcoinLocks, BlockWatch, CohortBidder, ExtrinsicError2 as ExtrinsicError, FrameCalculator, JsonExt, MICROGONS_PER_ARGON, MiningBids, SATS_PER_BTC, TxResult, TxSubmitter, TypedEmitter, Vault, VaultMonitor, WageProtector, checkForExtrinsicSuccess, convertFixedU128ToBigNumber, convertNumberToFixedU128, convertNumberToPermill, convertPermillToBigNumber, createKeyringPair, createNanoEvents, dispatchErrorToExtrinsicError, dispatchErrorToString, eventDataToJson, filterUndefined, formatArgons, formatPercent, getAuthorFromHeader, getClient, getConfig, getTickFromHeader, gettersToObject, keyringFromSuri, miniSecretFromUri, setConfig, toFixedNumber, waitForLoad };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map