@argonprotocol/mainchain 1.3.6 → 1.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser/index.d.ts +5 -4
- package/browser/index.js +21 -12
- package/browser/index.js.map +1 -1
- package/lib/{chunk-KYRBSY6G.cjs → chunk-4ZBJ5W3P.cjs} +51 -51
- package/lib/{chunk-KYRBSY6G.cjs.map → chunk-4ZBJ5W3P.cjs.map} +1 -1
- package/lib/{chunk-KMBXJV55.js → chunk-PE7HFDHD.js} +7 -7
- package/lib/{chunk-FGSUNAT4.js → chunk-PXZPYJ4P.js} +32 -20
- package/lib/{chunk-FGSUNAT4.js.map → chunk-PXZPYJ4P.js.map} +1 -1
- package/lib/{chunk-U6J3AWYW.cjs → chunk-VXYWJG66.cjs} +24 -12
- package/lib/chunk-VXYWJG66.cjs.map +1 -0
- package/lib/cli.cjs +6 -6
- package/lib/cli.js +2 -2
- package/lib/clis/index.cjs +3 -3
- package/lib/clis/index.js +2 -2
- package/lib/index.cjs +4 -2
- package/lib/index.cjs.map +1 -1
- package/lib/index.d.cts +5 -4
- package/lib/index.d.ts +5 -4
- package/lib/index.js +3 -1
- package/package.json +19 -19
- package/lib/chunk-U6J3AWYW.cjs.map +0 -1
- /package/lib/{chunk-KMBXJV55.js.map → chunk-PE7HFDHD.js.map} +0 -0
|
@@ -96,7 +96,7 @@ function getConfig() {
|
|
|
96
96
|
return {
|
|
97
97
|
debug: _nullishCoalesce(config.debug, () => ( getEnvVar("DEBUG") === "true")),
|
|
98
98
|
keysVersion: _nullishCoalesce(config.keysVersion, () => ( (getEnvVar("KEYS_VERSION") ? parseInt(getEnvVar("KEYS_VERSION")) : void 0))),
|
|
99
|
-
|
|
99
|
+
keySeedOrMnemonic: _nullishCoalesce(config.keySeedOrMnemonic, () => ( getEnvVar("KEYS_MNEMONIC"))),
|
|
100
100
|
subaccountRange: _nullishCoalesce(_nullishCoalesce(config.subaccountRange, () => ( getEnvVar("SUBACCOUNT_RANGE"))), () => ( "0-9"))
|
|
101
101
|
};
|
|
102
102
|
}
|
|
@@ -259,8 +259,19 @@ var TxResult = (_class = class {
|
|
|
259
259
|
|
|
260
260
|
// src/utils.ts
|
|
261
261
|
var _bignumberjs = require('bignumber.js'); var BN = _interopRequireWildcard(_bignumberjs); var BN2 = _interopRequireWildcard(_bignumberjs);
|
|
262
|
+
|
|
263
|
+
var _util = require('@polkadot/util');
|
|
262
264
|
var { ROUND_FLOOR } = BN;
|
|
263
265
|
var MICROGONS_PER_ARGON = 1e6;
|
|
266
|
+
function miniSecretFromUri(uri, password) {
|
|
267
|
+
const { phrase, path } = _utilcrypto.keyExtractSuri.call(void 0, uri);
|
|
268
|
+
let mini = _utilcrypto.mnemonicToMiniSecret.call(void 0, phrase, password);
|
|
269
|
+
for (const j of path) {
|
|
270
|
+
if (!j.isHard) throw new Error("ed25519 soft derivation not supported");
|
|
271
|
+
mini = _utilcrypto.ed25519DeriveHard.call(void 0, mini, j.chainCode);
|
|
272
|
+
}
|
|
273
|
+
return _util.u8aToHex.call(void 0, mini);
|
|
274
|
+
}
|
|
264
275
|
function formatArgons(microgons) {
|
|
265
276
|
if (microgons === void 0 || microgons === null) return "na";
|
|
266
277
|
const isNegative = microgons < 0;
|
|
@@ -404,7 +415,7 @@ var JsonExt = class {
|
|
|
404
415
|
}
|
|
405
416
|
static parse(str) {
|
|
406
417
|
return JSON.parse(str, (_, v) => {
|
|
407
|
-
if (typeof v === "string" && v.match(
|
|
418
|
+
if (typeof v === "string" && v.match(/^-?\d+n$/)) {
|
|
408
419
|
return BigInt(v.slice(0, -1));
|
|
409
420
|
}
|
|
410
421
|
if (typeof v === "object" && v !== null && v.type === "Buffer" && Array.isArray(v.data)) {
|
|
@@ -812,7 +823,7 @@ var AccountMiners = (_class5 = class _AccountMiners {
|
|
|
812
823
|
}, _class5);
|
|
813
824
|
|
|
814
825
|
// src/Accountset.ts
|
|
815
|
-
|
|
826
|
+
|
|
816
827
|
var Accountset = (_class6 = class {
|
|
817
828
|
|
|
818
829
|
__init9() {this.isProxy = false}
|
|
@@ -837,7 +848,7 @@ var Accountset = (_class6 = class {
|
|
|
837
848
|
this.txSubmitterPair = options.txSubmitter;
|
|
838
849
|
this.seedAddress = options.seedAddress;
|
|
839
850
|
}
|
|
840
|
-
this.
|
|
851
|
+
this.sessionKeySeed = options.sessionKeySeedOrMnemonic;
|
|
841
852
|
this.accountRegistry = _nullishCoalesce(options.accountRegistry, () => ( AccountRegistry.factory(options.name)));
|
|
842
853
|
this.client = options.client;
|
|
843
854
|
const defaultRange = _nullishCoalesce(options.subaccountRange, () => ( getDefaultSubaccountRange()));
|
|
@@ -918,7 +929,6 @@ var Accountset = (_class6 = class {
|
|
|
918
929
|
];
|
|
919
930
|
const bidAmountsByFrame = {};
|
|
920
931
|
if (frameIds.length) {
|
|
921
|
-
console.log("Looking up cohorts for frames", frameIds);
|
|
922
932
|
const cohorts = await api.query.miningSlot.minersByCohort.multi(frameIds);
|
|
923
933
|
for (let i = 0; i < frameIds.length; i++) {
|
|
924
934
|
const cohort = cohorts[i];
|
|
@@ -1076,12 +1086,12 @@ var Accountset = (_class6 = class {
|
|
|
1076
1086
|
keys(keysVersion) {
|
|
1077
1087
|
const config2 = getConfig();
|
|
1078
1088
|
let version = _nullishCoalesce(_nullishCoalesce(keysVersion, () => ( config2.keysVersion)), () => ( 0));
|
|
1079
|
-
const
|
|
1080
|
-
if (!
|
|
1089
|
+
const seed = _nullishCoalesce(this.sessionKeySeed, () => ( config2.keySeedOrMnemonic));
|
|
1090
|
+
if (!seed) {
|
|
1081
1091
|
throw new Error("KEYS_MNEMONIC environment variable not set. Cannot derive keys.");
|
|
1082
1092
|
}
|
|
1083
|
-
const blockSealKey = `${
|
|
1084
|
-
const granKey = `${
|
|
1093
|
+
const blockSealKey = `${seed}//block-seal//${version}`;
|
|
1094
|
+
const granKey = `${seed}//grandpa//${version}`;
|
|
1085
1095
|
const blockSealAccount = new (0, _api.Keyring)().createFromUri(blockSealKey, {
|
|
1086
1096
|
type: "ed25519"
|
|
1087
1097
|
});
|
|
@@ -1775,7 +1785,7 @@ var CohortBidder = (_class9 = class {
|
|
|
1775
1785
|
} else {
|
|
1776
1786
|
blockNumber = await client.query.system.number().then((x) => x.toNumber());
|
|
1777
1787
|
}
|
|
1778
|
-
const blockHash = await client.
|
|
1788
|
+
const blockHash = await client.rpc.chain.getBlockHash(blockNumber);
|
|
1779
1789
|
const api = await client.at(blockHash);
|
|
1780
1790
|
const rawBids = await api.query.miningSlot.bidsForNextSlotCohort();
|
|
1781
1791
|
const currentTick = await api.query.ticks.currentTick().then((x) => x.toNumber());
|
|
@@ -1964,6 +1974,7 @@ var CohortBidder = (_class9 = class {
|
|
|
1964
1974
|
}
|
|
1965
1975
|
}
|
|
1966
1976
|
scheduleEvaluation() {
|
|
1977
|
+
if (this.isStopped) return;
|
|
1967
1978
|
const millisPerTick = this.millisPerTick;
|
|
1968
1979
|
const delayTicks = Math.max(this.options.bidDelay, 1);
|
|
1969
1980
|
const delay = delayTicks * millisPerTick;
|
|
@@ -2966,5 +2977,6 @@ async function getClient(host) {
|
|
|
2966
2977
|
|
|
2967
2978
|
|
|
2968
2979
|
|
|
2969
|
-
|
|
2970
|
-
|
|
2980
|
+
|
|
2981
|
+
exports.WageProtector = WageProtector; exports.setConfig = setConfig; exports.getConfig = getConfig; exports.TxSubmitter = TxSubmitter; exports.TxResult = TxResult; exports.MICROGONS_PER_ARGON = MICROGONS_PER_ARGON; exports.miniSecretFromUri = miniSecretFromUri; exports.formatArgons = formatArgons; exports.formatPercent = formatPercent; exports.filterUndefined = filterUndefined; exports.gettersToObject = gettersToObject; exports.toFixedNumber = toFixedNumber; exports.convertNumberToFixedU128 = convertNumberToFixedU128; exports.convertFixedU128ToBigNumber = convertFixedU128ToBigNumber; exports.convertPermillToBigNumber = convertPermillToBigNumber; exports.convertNumberToPermill = convertNumberToPermill; exports.eventDataToJson = eventDataToJson; exports.dispatchErrorToString = dispatchErrorToString; exports.ExtrinsicError = ExtrinsicError2; exports.dispatchErrorToExtrinsicError = dispatchErrorToExtrinsicError; exports.checkForExtrinsicSuccess = checkForExtrinsicSuccess; exports.JsonExt = JsonExt; exports.createNanoEvents = createNanoEvents; exports.TypedEmitter = TypedEmitter; exports.AccountRegistry = AccountRegistry; exports.getTickFromHeader = getTickFromHeader; exports.getAuthorFromHeader = getAuthorFromHeader; exports.BlockWatch = BlockWatch; exports.FrameCalculator = FrameCalculator; exports.AccountMiners = AccountMiners; exports.Accountset = Accountset; exports.parseSubaccountRange = parseSubaccountRange; exports.MiningBids = MiningBids; exports.Vault = Vault; exports.VaultMonitor = VaultMonitor; exports.CohortBidder = CohortBidder; exports.BidPool = BidPool; exports.SATS_PER_BTC = SATS_PER_BTC; exports.BitcoinLocks = BitcoinLocks; exports.keyringFromSuri = keyringFromSuri; exports.createKeyringPair = createKeyringPair; exports.Keyring = _api.Keyring; exports.decodeAddress = _utilcrypto.decodeAddress; exports.mnemonicGenerate = _utilcrypto.mnemonicGenerate; exports.waitForLoad = waitForLoad; exports.getClient = getClient; exports.u8aToHex = _util.u8aToHex; exports.hexToU8a = _util.hexToU8a; exports.u8aEq = _util.u8aEq; exports.GenericEvent = _generic.GenericEvent; exports.GenericBlock = _generic.GenericBlock; exports.GenericAddress = _generic.GenericAddress; exports.BTreeMap = _typescodec.BTreeMap; exports.Bytes = _typescodec.Bytes; exports.Compact = _typescodec.Compact; exports.Enum = _typescodec.Enum; exports.Null = _typescodec.Null; exports.Option = _typescodec.Option; exports.Result = _typescodec.Result; exports.Bool = _typescodec.Bool; exports.Tuple = _typescodec.Tuple; exports.Range = _typescodec.Range; exports.Struct = _typescodec.Struct; exports.Text = _typescodec.Text; exports.U256 = _typescodec.U256; exports.U8aFixed = _typescodec.U8aFixed; exports.Vec = _typescodec.Vec; exports.bool = _typescodec.bool; exports.i128 = _typescodec.i128; exports.u128 = _typescodec.u128; exports.u16 = _typescodec.u16; exports.u32 = _typescodec.u32; exports.u64 = _typescodec.u64; exports.u8 = _typescodec.u8;
|
|
2982
|
+
//# sourceMappingURL=chunk-VXYWJG66.cjs.map
|