@helium/helium-admin-cli 0.10.29 → 0.10.31

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.
@@ -89,9 +89,13 @@ function run(args = process.argv) {
89
89
  // HNT lazy distributor
90
90
  // "6gcZXjHgKUBMedc2V1aZLFPwh8M1rPVRw7kpo2KqNrFq",
91
91
  // HNT Circuit Breaker
92
- "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
92
+ // "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
93
93
  // HNT Rewards pool
94
- "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
94
+ // "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
95
+ // TaskQueueAuthorityV0 for welcome-pack
96
+ "9hLWFGiit1ZpFHmopyacWqiVx8sQX9U86dnKqtDjkjnL",
97
+ // Queue authority for welcome-pack
98
+ "3HTSCuJGL8e5zPpf7rMhq42YgA7f3WdF5bm78YQ3HEBK"
95
99
  ].map((a) => {
96
100
  return new web3_js_1.PublicKey(a);
97
101
  });
@@ -1 +1 @@
1
- {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,116 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
+ return new (P || (P = Promise))(function (resolve, reject) {
28
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
32
+ });
33
+ };
34
+ var __importDefault = (this && this.__importDefault) || function (mod) {
35
+ return (mod && mod.__esModule) ? mod : { "default": mod };
36
+ };
37
+ Object.defineProperty(exports, "__esModule", { value: true });
38
+ exports.run = void 0;
39
+ const anchor = __importStar(require("@coral-xyz/anchor"));
40
+ const hpl_crons_sdk_1 = require("@helium/hpl-crons-sdk");
41
+ const mini_fanout_sdk_1 = require("@helium/mini-fanout-sdk");
42
+ const spl_utils_1 = require("@helium/spl-utils");
43
+ const tuktuk_sdk_1 = require("@helium/tuktuk-sdk");
44
+ const os_1 = __importDefault(require("os"));
45
+ const yargs_1 = __importDefault(require("yargs/yargs"));
46
+ const utils_1 = require("./utils");
47
+ function run(args = process.argv) {
48
+ return __awaiter(this, void 0, void 0, function* () {
49
+ const yarg = (0, yargs_1.default)(args).options({
50
+ wallet: {
51
+ alias: "k",
52
+ describe: "Anchor wallet keypair",
53
+ default: `${os_1.default.homedir()}/.config/solana/id.json`,
54
+ },
55
+ url: {
56
+ alias: "u",
57
+ default: "http://127.0.0.1:8899",
58
+ describe: "The solana url",
59
+ },
60
+ });
61
+ const argv = yield yarg.argv;
62
+ process.env.ANCHOR_WALLET = argv.wallet;
63
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
64
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
65
+ const provider = anchor.getProvider();
66
+ const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
67
+ const program = yield (0, mini_fanout_sdk_1.init)(provider);
68
+ const tuktukProgram = yield (0, tuktuk_sdk_1.init)(provider);
69
+ const instructions = [];
70
+ const miniFanouts = yield program.account.miniFanoutV0.all();
71
+ const batchSize = 10;
72
+ const taskQueue = yield tuktukProgram.account.taskQueueV0.fetch(hpl_crons_sdk_1.TASK_QUEUE_ID);
73
+ const freeTasks = (0, tuktuk_sdk_1.nextAvailableTaskIds)(taskQueue.taskBitmap, miniFanouts.length * 2);
74
+ for (let i = 0; i < miniFanouts.length; i += batchSize) {
75
+ // Log progress every 100 positions
76
+ if (i > 0 && i % 100 === 0) {
77
+ console.log(`Processed ${i} mini fanouts`);
78
+ }
79
+ const batch = miniFanouts.slice(i, i + batchSize);
80
+ yield Promise.all(batch.map((delegation, j) => __awaiter(this, void 0, void 0, function* () {
81
+ const miniFanout = batch[j];
82
+ const nextTask = freeTasks.pop();
83
+ const nextPreTask = freeTasks.pop();
84
+ const nextTaskAcc = yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextTask);
85
+ const nextPreTaskAcc = yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextPreTask);
86
+ instructions.push([
87
+ nextTaskAcc ? yield tuktukProgram.methods.dequeueTaskV0().accounts({
88
+ task: miniFanout.account.nextTask,
89
+ }).instruction() : undefined,
90
+ nextPreTaskAcc ? yield tuktukProgram.methods.dequeueTaskV0().accounts({
91
+ task: miniFanout.account.nextPreTask,
92
+ }).instruction() : undefined,
93
+ yield program.methods.scheduleTaskV0({
94
+ taskId: nextTask,
95
+ preTaskId: nextPreTask,
96
+ })
97
+ .accounts({
98
+ payer: wallet.publicKey,
99
+ miniFanout: miniFanout.publicKey,
100
+ task: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextTask)[0],
101
+ preTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextPreTask)[0],
102
+ })
103
+ .instruction()
104
+ ].filter(spl_utils_1.truthy));
105
+ })));
106
+ }
107
+ console.log(`Finished processing ${miniFanouts.length} mini fanouts`);
108
+ const transactions = yield (0, spl_utils_1.batchInstructionsToTxsWithPriorityFee)(provider, instructions, {
109
+ useFirstEstimateForAll: true,
110
+ computeUnitLimit: 1200000,
111
+ });
112
+ yield (0, spl_utils_1.bulkSendTransactions)(provider, transactions, console.log, 10, [], 100);
113
+ });
114
+ }
115
+ exports.run = run;
116
+ //# sourceMappingURL=reschedule-all-mini-fanouts.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"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"}
@@ -251,11 +251,11 @@ function run(args = process.argv) {
251
251
  WHERE
252
252
  (
253
253
  lockup_kind = 'constant'
254
- or end_ts > (
254
+ or end_ts >= (
255
255
  floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)
256
256
  ) + 60 * 60 * 24
257
257
  )
258
- AND d.expiration_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
258
+ AND d.expiration_ts >= (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
259
259
  GROUP BY s.dnt_mint, s.vehnt_fall_rate, s.vehnt_delegated, s.vehnt_last_calculated_ts, s.vehnt_last_calculated_ts
260
260
  )
261
261
  SELECT
@@ -50,9 +50,13 @@ export async function run(args = process.argv) {
50
50
  // HNT lazy distributor
51
51
  // "6gcZXjHgKUBMedc2V1aZLFPwh8M1rPVRw7kpo2KqNrFq",
52
52
  // HNT Circuit Breaker
53
- "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
53
+ // "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
54
54
  // HNT Rewards pool
55
- "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
55
+ // "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
56
+ // TaskQueueAuthorityV0 for welcome-pack
57
+ "9hLWFGiit1ZpFHmopyacWqiVx8sQX9U86dnKqtDjkjnL",
58
+ // Queue authority for welcome-pack
59
+ "3HTSCuJGL8e5zPpf7rMhq42YgA7f3WdF5bm78YQ3HEBK"
56
60
  ].map((a) => {
57
61
  return new PublicKey(a);
58
62
  });
@@ -1 +1 @@
1
- {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../../src/extend-common-lut.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,iBAAiB,EACjB,MAAM,EACN,MAAM,EACN,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,yBAAyB,EACzB,SAAS,GACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE;YACN,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,yBAAyB;SAClD;QACD,GAAG,EAAE;YACH,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,gBAAgB;SAC3B;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,2CAA2C;YACrD,OAAO,EAAE,CAAC;SACX;QACD,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,iBAAiB,CAAC,QAAQ,EAAE;SACtC;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;IAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;QACtE,kBAAkB,EAAE,WAAW;KAChC,CAAC,CAAC;IACH,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IAC1C,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,IAAI,QAAQ,EAAE;QACZ,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;KACnE;IAED,MAAM,QAAQ,GAAG;QACf,uBAAuB;QACvB,kDAAkD;QAClD,sBAAsB;QACtB,8CAA8C;QAC9C,mBAAmB;QACnB,8CAA8C;KAE/C,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACV,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3D,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;QAC5C,MAAM,wBAAwB,CAAC;YAC7B,QAAQ;YACR,OAAO,EAAE,EAAE;YACX,MAAM;YACN,QAAQ,EAAE,QAAS;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,YAAY,EAAE,MAAM,gBAAgB,CAAC;gBACnC,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,YAAY,EAAE,MAAM;gBACpB,YAAY,EAAE;oBACZ,yBAAyB,CAAC,iBAAiB,CAAC;wBAC1C,KAAK,EAAE,SAAS;wBAChB,SAAS;wBACT,WAAW,EAAE,kBAAkB;wBAC/B,SAAS,EAAE,SAAS;qBACrB,CAAC;iBACH,CAAC,MAAM,CAAC,MAAM,CAAC;aACjB,CAAC;SACH,CAAC,CAAC;KACJ;IACD,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,75 @@
1
+ import * as anchor from "@coral-xyz/anchor";
2
+ import { TASK_QUEUE_ID } from "@helium/hpl-crons-sdk";
3
+ import { init as initMfan } from "@helium/mini-fanout-sdk";
4
+ import { batchInstructionsToTxsWithPriorityFee, bulkSendTransactions, truthy } from "@helium/spl-utils";
5
+ import { init as initTuktuk, nextAvailableTaskIds, taskKey } from "@helium/tuktuk-sdk";
6
+ import os from "os";
7
+ import yargs from "yargs/yargs";
8
+ import { loadKeypair } from "./utils";
9
+ export async function run(args = process.argv) {
10
+ const yarg = yargs(args).options({
11
+ wallet: {
12
+ alias: "k",
13
+ describe: "Anchor wallet keypair",
14
+ default: `${os.homedir()}/.config/solana/id.json`,
15
+ },
16
+ url: {
17
+ alias: "u",
18
+ default: "http://127.0.0.1:8899",
19
+ describe: "The solana url",
20
+ },
21
+ });
22
+ const argv = await yarg.argv;
23
+ process.env.ANCHOR_WALLET = argv.wallet;
24
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
25
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
26
+ const provider = anchor.getProvider();
27
+ const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
28
+ const program = await initMfan(provider);
29
+ const tuktukProgram = await initTuktuk(provider);
30
+ const instructions = [];
31
+ const miniFanouts = await program.account.miniFanoutV0.all();
32
+ const batchSize = 10;
33
+ const taskQueue = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
34
+ const freeTasks = nextAvailableTaskIds(taskQueue.taskBitmap, miniFanouts.length * 2);
35
+ for (let i = 0; i < miniFanouts.length; i += batchSize) {
36
+ // Log progress every 100 positions
37
+ if (i > 0 && i % 100 === 0) {
38
+ console.log(`Processed ${i} mini fanouts`);
39
+ }
40
+ const batch = miniFanouts.slice(i, i + batchSize);
41
+ await Promise.all(batch.map(async (delegation, j) => {
42
+ const miniFanout = batch[j];
43
+ const nextTask = freeTasks.pop();
44
+ const nextPreTask = freeTasks.pop();
45
+ const nextTaskAcc = await tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextTask);
46
+ const nextPreTaskAcc = await tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextPreTask);
47
+ instructions.push([
48
+ nextTaskAcc ? await tuktukProgram.methods.dequeueTaskV0().accounts({
49
+ task: miniFanout.account.nextTask,
50
+ }).instruction() : undefined,
51
+ nextPreTaskAcc ? await tuktukProgram.methods.dequeueTaskV0().accounts({
52
+ task: miniFanout.account.nextPreTask,
53
+ }).instruction() : undefined,
54
+ await program.methods.scheduleTaskV0({
55
+ taskId: nextTask,
56
+ preTaskId: nextPreTask,
57
+ })
58
+ .accounts({
59
+ payer: wallet.publicKey,
60
+ miniFanout: miniFanout.publicKey,
61
+ task: taskKey(TASK_QUEUE_ID, nextTask)[0],
62
+ preTask: taskKey(TASK_QUEUE_ID, nextPreTask)[0],
63
+ })
64
+ .instruction()
65
+ ].filter(truthy));
66
+ }));
67
+ }
68
+ console.log(`Finished processing ${miniFanouts.length} mini fanouts`);
69
+ const transactions = await batchInstructionsToTxsWithPriorityFee(provider, instructions, {
70
+ useFirstEstimateForAll: true,
71
+ computeUnitLimit: 1200000,
72
+ });
73
+ await bulkSendTransactions(provider, transactions, console.log, 10, [], 100);
74
+ }
75
+ //# sourceMappingURL=reschedule-all-mini-fanouts.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"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"}
@@ -212,11 +212,11 @@ export async function run(args = process.argv) {
212
212
  WHERE
213
213
  (
214
214
  lockup_kind = 'constant'
215
- or end_ts > (
215
+ or end_ts >= (
216
216
  floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)
217
217
  ) + 60 * 60 * 24
218
218
  )
219
- AND d.expiration_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
219
+ AND d.expiration_ts >= (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
220
220
  GROUP BY s.dnt_mint, s.vehnt_fall_rate, s.vehnt_delegated, s.vehnt_last_calculated_ts, s.vehnt_last_calculated_ts
221
221
  )
222
222
  SELECT