@helium/helium-admin-cli 0.11.17 → 0.11.19
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/lib/cjs/close-council-fanout.js +142 -0
- package/lib/cjs/close-council-fanout.js.map +1 -0
- package/lib/cjs/create-council-fanout.js +69 -14
- package/lib/cjs/create-council-fanout.js.map +1 -1
- package/lib/cjs/end-epoch.js +34 -2
- package/lib/cjs/end-epoch.js.map +1 -1
- package/lib/cjs/hip149.js +13 -0
- package/lib/cjs/hip149.js.map +1 -0
- package/lib/cjs/mini-fanout-utils.js +57 -0
- package/lib/cjs/mini-fanout-utils.js.map +1 -0
- package/lib/cjs/queue-hotspot-claims.js +2 -6
- package/lib/cjs/queue-hotspot-claims.js.map +1 -1
- package/lib/cjs/queue-position-claims.js +1 -3
- package/lib/cjs/queue-position-claims.js.map +1 -1
- package/lib/cjs/requeue-hotspot-claims.js +1 -3
- package/lib/cjs/requeue-hotspot-claims.js.map +1 -1
- package/lib/cjs/reschedule-all-mini-fanouts.js +38 -14
- package/lib/cjs/reschedule-all-mini-fanouts.js.map +1 -1
- package/lib/cjs/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/cjs/update-council-fanout.js +177 -0
- package/lib/cjs/update-council-fanout.js.map +1 -0
- package/lib/cjs/update-data-credits.js +12 -12
- package/lib/esm/src/close-council-fanout.js +92 -0
- package/lib/esm/src/close-council-fanout.js.map +1 -0
- package/lib/esm/src/create-council-fanout.js +69 -14
- package/lib/esm/src/create-council-fanout.js.map +1 -1
- package/lib/esm/src/end-epoch.js +35 -3
- package/lib/esm/src/end-epoch.js.map +1 -1
- package/lib/esm/src/hip149.js +10 -0
- package/lib/esm/src/hip149.js.map +1 -0
- package/lib/esm/src/mini-fanout-utils.js +40 -0
- package/lib/esm/src/mini-fanout-utils.js.map +1 -0
- package/lib/esm/src/queue-hotspot-claims.js +2 -6
- package/lib/esm/src/queue-hotspot-claims.js.map +1 -1
- package/lib/esm/src/queue-position-claims.js +1 -3
- package/lib/esm/src/queue-position-claims.js.map +1 -1
- package/lib/esm/src/requeue-hotspot-claims.js +1 -3
- package/lib/esm/src/requeue-hotspot-claims.js.map +1 -1
- package/lib/esm/src/reschedule-all-mini-fanouts.js +39 -15
- package/lib/esm/src/reschedule-all-mini-fanouts.js.map +1 -1
- package/lib/esm/src/update-council-fanout.js +126 -0
- package/lib/esm/src/update-council-fanout.js.map +1 -0
- package/lib/esm/src/update-data-credits.js +18 -18
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/close-council-fanout.d.ts +2 -0
- package/lib/types/src/close-council-fanout.d.ts.map +1 -0
- package/lib/types/src/create-council-fanout.d.ts.map +1 -1
- package/lib/types/src/end-epoch.d.ts.map +1 -1
- package/lib/types/src/hip149.d.ts +4 -0
- package/lib/types/src/hip149.d.ts.map +1 -0
- package/lib/types/src/mini-fanout-utils.d.ts +25 -0
- package/lib/types/src/mini-fanout-utils.d.ts.map +1 -0
- package/lib/types/src/queue-hotspot-claims.d.ts.map +1 -1
- package/lib/types/src/queue-position-claims.d.ts.map +1 -1
- package/lib/types/src/requeue-hotspot-claims.d.ts.map +1 -1
- package/lib/types/src/reschedule-all-mini-fanouts.d.ts.map +1 -1
- package/lib/types/src/update-council-fanout.d.ts +2 -0
- package/lib/types/src/update-council-fanout.d.ts.map +1 -0
- package/package.json +22 -22
|
@@ -5,8 +5,10 @@ import { HNT_MINT, sendInstructionsWithPriorityFee } from "@helium/spl-utils";
|
|
|
5
5
|
import { init as initTuktuk, nextAvailableTaskIds, taskKey, } from "@helium/tuktuk-sdk";
|
|
6
6
|
import { getAssociatedTokenAddressSync } from "@solana/spl-token";
|
|
7
7
|
import { PublicKey, SystemProgram, } from "@solana/web3.js";
|
|
8
|
+
import * as multisig from "@sqds/multisig";
|
|
8
9
|
import os from "os";
|
|
9
10
|
import yargs from "yargs/yargs";
|
|
11
|
+
import { COUNCIL_FANOUT_TOKEN_ACCOUNT } from "./hip149";
|
|
10
12
|
import { loadKeypair } from "./utils";
|
|
11
13
|
// HIP 149 Decision 4: create the Advisory Council compensation fanout. The supplement mint in
|
|
12
14
|
// helium-sub-daos splits off 1.25% to this fanout's HNT token account; the fanout's tuktuk
|
|
@@ -17,14 +19,19 @@ import { loadKeypair } from "./utils";
|
|
|
17
19
|
// patch-time edit that sets INFLATION_START), then set the cron's council_vault to it.
|
|
18
20
|
//
|
|
19
21
|
// Operational rules (see HIP 149 Decision 4):
|
|
20
|
-
// - `owner` MUST be the governance multisig, never the Receiving Entity. It is the
|
|
21
|
-
// authority that can edit the seated-member set; the community seats/removes members
|
|
22
|
-
// vote and the multisig executes the corresponding update.
|
|
22
|
+
// - `owner` MUST be the governance multisig's vault, never the Receiving Entity. It is the
|
|
23
|
+
// only authority that can edit the seated-member set; the community seats/removes members
|
|
24
|
+
// by vote and the multisig executes the corresponding update. Prefer --multisig over
|
|
25
|
+
// --owner: it derives the vault the same way update-council-fanout.ts and
|
|
26
|
+
// close-council-fanout.ts do, instead of relying on a manually-typed vault address.
|
|
23
27
|
// - On a seat change, CRANK before updating the member vec, so accrual maps to the set that
|
|
24
28
|
// was seated when it accrued (a vacant seat's share then redistributes to the seated
|
|
25
29
|
// members from that point forward, per the HIP).
|
|
26
30
|
// - Keep the fanout funded with lamports; it pays its own crank reward and silently
|
|
27
31
|
// unschedules itself if it runs dry.
|
|
32
|
+
// - Closing the fanout refunds its rent to whoever paid to create it, not to the owner:
|
|
33
|
+
// initialize_mini_fanout_v0 stores `ctx.accounts.payer.key()` as `rent_refund` and never
|
|
34
|
+
// reads the account passed under that name. Pick the payer accordingly.
|
|
28
35
|
export async function run(args = process.argv) {
|
|
29
36
|
const yarg = yargs(args).options({
|
|
30
37
|
wallet: {
|
|
@@ -39,8 +46,11 @@ export async function run(args = process.argv) {
|
|
|
39
46
|
},
|
|
40
47
|
owner: {
|
|
41
48
|
type: "string",
|
|
42
|
-
|
|
43
|
-
|
|
49
|
+
describe: "Fanout owner = governance multisig (Squads vault) address directly. Edits the seated-member set. NEVER the Receiving Entity. Prefer --multisig, which derives this the same way update-council-fanout.ts and close-council-fanout.ts do; use --owner only to bypass that derivation.",
|
|
50
|
+
},
|
|
51
|
+
multisig: {
|
|
52
|
+
type: "string",
|
|
53
|
+
describe: "Address of the squads multisig whose vault (index 0) should own the fanout. Derives --owner for you, the same way update-council-fanout.ts and close-council-fanout.ts derive it from --multisig. Exactly one of --owner / --multisig is required.",
|
|
44
54
|
},
|
|
45
55
|
members: {
|
|
46
56
|
type: "string",
|
|
@@ -71,7 +81,16 @@ export async function run(args = process.argv) {
|
|
|
71
81
|
const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
|
|
72
82
|
const program = await initMfan(provider);
|
|
73
83
|
const tuktukProgram = await initTuktuk(provider);
|
|
74
|
-
|
|
84
|
+
if (Boolean(argv.owner) === Boolean(argv.multisig)) {
|
|
85
|
+
throw new Error("exactly one of --owner / --multisig is required");
|
|
86
|
+
}
|
|
87
|
+
const owner = argv.multisig
|
|
88
|
+
? (await multisig.getVaultPda({
|
|
89
|
+
multisigPda: new PublicKey(argv.multisig),
|
|
90
|
+
index: 0,
|
|
91
|
+
programId: multisig.PROGRAM_ID,
|
|
92
|
+
}))[0]
|
|
93
|
+
: new PublicKey(argv.owner); // validated above: exactly one of owner/multisig is set
|
|
75
94
|
const members = argv.members
|
|
76
95
|
.split(",")
|
|
77
96
|
.map((m) => m.trim())
|
|
@@ -98,11 +117,28 @@ export async function run(args = process.argv) {
|
|
|
98
117
|
payer: wallet.publicKey,
|
|
99
118
|
owner,
|
|
100
119
|
taskQueue: TASK_QUEUE_ID,
|
|
101
|
-
|
|
120
|
+
// The account required here does not decide where rent goes:
|
|
121
|
+
// initialize_mini_fanout_v0 stores `ctx.accounts.payer.key()` and never reads this one.
|
|
122
|
+
// Passing the payer keeps the argument honest about the refund destination, and keeps a
|
|
123
|
+
// vault that has no other role in this instruction out of the writable set. Change the
|
|
124
|
+
// payer to change where closing the fanout refunds its rent.
|
|
125
|
+
rentRefund: wallet.publicKey,
|
|
102
126
|
mint: HNT_MINT,
|
|
103
127
|
})
|
|
104
128
|
.prepare();
|
|
105
129
|
instructions.push(initIx);
|
|
130
|
+
// The fanout PDA is seeded by the `namespace` signer and `--seed`. Anchor resolves that
|
|
131
|
+
// signer to the provider wallet, so a different wallet, or a different seed, silently
|
|
132
|
+
// produces a different PDA, a different HNT associated token account, and a fanout that
|
|
133
|
+
// `issue_rewards_v0` rejects on its account pin. That would fail every epoch close inside a
|
|
134
|
+
// supplement window. Members, owner and schedule do not enter the derivation, so this only
|
|
135
|
+
// constrains the two inputs that have to stay fixed. Checked before anything is sent.
|
|
136
|
+
const tokenAccount = getAssociatedTokenAddressSync(HNT_MINT, miniFanout, true);
|
|
137
|
+
if (!tokenAccount.equals(COUNCIL_FANOUT_TOKEN_ACCOUNT)) {
|
|
138
|
+
throw new Error(`Derived fanout token account ${tokenAccount.toBase58()} does not match the ` +
|
|
139
|
+
`COUNCIL_FANOUT_TOKEN_ACCOUNT pinned in issue_rewards_v0 ` +
|
|
140
|
+
`(${COUNCIL_FANOUT_TOKEN_ACCOUNT.toBase58()}). Wrong signing wallet or wrong --seed.`);
|
|
141
|
+
}
|
|
106
142
|
// Fund the fanout so it can pay its own crank reward and stay scheduled.
|
|
107
143
|
instructions.push(SystemProgram.transfer({
|
|
108
144
|
fromPubkey: wallet.publicKey,
|
|
@@ -110,29 +146,48 @@ export async function run(args = process.argv) {
|
|
|
110
146
|
lamports: argv.fundingLamports,
|
|
111
147
|
}));
|
|
112
148
|
// Schedule the first distribution task; the fanout self-reschedules thereafter.
|
|
149
|
+
//
|
|
150
|
+
// `schedule_task_v0` declares `has_one = task_queue / next_task / next_pre_task` on the
|
|
151
|
+
// fanout, and Anchor's client resolver satisfies those by fetching it. The instruction
|
|
152
|
+
// above creates the fanout in this same transaction, so there is nothing on chain to fetch
|
|
153
|
+
// and resolution fails before anything is sent. Each of those accounts is known ahead of
|
|
154
|
+
// time instead: `initialize_mini_fanout_v0` stores the task queue it was handed, and sets
|
|
155
|
+
// `next_task` and `next_pre_task` to the fanout's own key, the "no next task" sentinel that
|
|
156
|
+
// the scheduling constraint accepts.
|
|
157
|
+
const [queueAuthority] = PublicKey.findProgramAddressSync([Buffer.from("queue_authority", "utf-8")], program.programId);
|
|
158
|
+
const [taskQueueAuthority] = PublicKey.findProgramAddressSync([
|
|
159
|
+
Buffer.from("task_queue_authority", "utf-8"),
|
|
160
|
+
TASK_QUEUE_ID.toBuffer(),
|
|
161
|
+
queueAuthority.toBuffer(),
|
|
162
|
+
], tuktukProgram.programId);
|
|
113
163
|
const taskQueueAcc = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
|
|
114
164
|
const [taskId, preTaskId] = nextAvailableTaskIds(taskQueueAcc.taskBitmap, 2);
|
|
115
165
|
instructions.push(await program.methods
|
|
116
166
|
.scheduleTaskV0({ taskId, preTaskId })
|
|
117
|
-
.
|
|
167
|
+
.accountsPartial({
|
|
118
168
|
payer: wallet.publicKey,
|
|
119
169
|
miniFanout: miniFanout,
|
|
170
|
+
taskQueue: TASK_QUEUE_ID,
|
|
171
|
+
queueAuthority,
|
|
172
|
+
taskQueueAuthority,
|
|
173
|
+
nextTask: miniFanout,
|
|
174
|
+
nextPreTask: miniFanout,
|
|
120
175
|
task: taskKey(TASK_QUEUE_ID, taskId)[0],
|
|
121
176
|
preTask: taskKey(TASK_QUEUE_ID, preTaskId)[0],
|
|
122
177
|
})
|
|
123
178
|
.instruction());
|
|
124
|
-
await sendInstructionsWithPriorityFee(provider, instructions
|
|
125
|
-
computeUnitLimit: 500000,
|
|
126
|
-
});
|
|
127
|
-
const tokenAccount = getAssociatedTokenAddressSync(HNT_MINT, miniFanout, true);
|
|
179
|
+
await sendInstructionsWithPriorityFee(provider, instructions);
|
|
128
180
|
console.log("Council fanout created.");
|
|
129
|
-
|
|
181
|
+
if (argv.multisig) {
|
|
182
|
+
console.log(` multisig: ${argv.multisig}`);
|
|
183
|
+
}
|
|
184
|
+
console.log(` owner (governance multisig vault): ${owner.toBase58()}`);
|
|
130
185
|
console.log(` mini fanout: ${miniFanout.toBase58()}`);
|
|
131
186
|
console.log(` schedule: ${argv.schedule}`);
|
|
132
187
|
console.log(` members (${members.length}):`);
|
|
133
188
|
members.forEach((m) => console.log(` - ${m.toBase58()}`));
|
|
134
189
|
console.log("");
|
|
135
|
-
console.log(" >>> Council fanout token account (
|
|
190
|
+
console.log(" >>> Council fanout token account (matches COUNCIL_FANOUT_TOKEN_ACCOUNT):");
|
|
136
191
|
console.log(` ${tokenAccount.toBase58()}`);
|
|
137
192
|
}
|
|
138
193
|
//# sourceMappingURL=create-council-fanout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-council-fanout.js","sourceRoot":"","sources":["../../../src/create-council-fanout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EACL,IAAI,IAAI,UAAU,EAClB,oBAAoB,EACpB,OAAO,GACR,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EACL,SAAS,EACT,aAAa,GAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,8FAA8F;AAC9F,2FAA2F;AAC3F,yEAAyE;AACzE,EAAE;AACF,2EAA2E;AAC3E,uFAAuF;AACvF,uFAAuF;AACvF,EAAE;AACF,8CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"create-council-fanout.js","sourceRoot":"","sources":["../../../src/create-council-fanout.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/src/end-epoch.js
CHANGED
|
@@ -6,8 +6,9 @@ import { init as initLazy, lazyDistributorKey, recipientKey, } from "@helium/laz
|
|
|
6
6
|
import { init as initBurn } from "@helium/no-emit-sdk";
|
|
7
7
|
import { init as initRewards } from "@helium/rewards-oracle-sdk";
|
|
8
8
|
import { HNT_MINT, HNT_PYTH_PRICE_FEED, IOT_MINT, MOBILE_MINT, createMintInstructions, sendAndConfirmWithRetry, sendInstructions, sendInstructionsWithPriorityFee, } from "@helium/spl-utils";
|
|
9
|
-
import { Keypair, PublicKey, SYSVAR_CLOCK_PUBKEY, } from "@solana/web3.js";
|
|
9
|
+
import { Keypair, PublicKey, SYSVAR_CLOCK_PUBKEY, SystemProgram, } from "@solana/web3.js";
|
|
10
10
|
import { BN } from "bn.js";
|
|
11
|
+
import { COUNCIL_FANOUT_TOKEN_ACCOUNT, SUPPLEMENT_VAULT_TOKEN_ACCOUNT, } from "./hip149";
|
|
11
12
|
import b58 from "bs58";
|
|
12
13
|
import os from "os";
|
|
13
14
|
import yargs from "yargs/yargs";
|
|
@@ -43,6 +44,16 @@ export async function run(args = process.argv) {
|
|
|
43
44
|
type: "number",
|
|
44
45
|
describe: "The timestamp to start ending epochs from",
|
|
45
46
|
},
|
|
47
|
+
supplementVault: {
|
|
48
|
+
type: "string",
|
|
49
|
+
default: SUPPLEMENT_VAULT_TOKEN_ACCOUNT.toBase58(),
|
|
50
|
+
describe: "HIP 149 Decision 2 Receiving Entity vault HNT token account. Required to close an epoch inside a supplement window. Defaults to the address issue_rewards_v0 pins, which is the only value that can succeed while a window is open; a wrong value fails the instruction rather than misrouting the mint. Passing the system program id withholds it, which is what a dormant-supplement build expects.",
|
|
51
|
+
},
|
|
52
|
+
councilVault: {
|
|
53
|
+
type: "string",
|
|
54
|
+
default: COUNCIL_FANOUT_TOKEN_ACCOUNT.toBase58(),
|
|
55
|
+
describe: "HIP 149 Decision 4 Council fanout HNT token account. Same defaulting and same on-chain pinning as --supplementVault.",
|
|
56
|
+
},
|
|
46
57
|
});
|
|
47
58
|
const argv = await yarg.argv;
|
|
48
59
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
@@ -55,6 +66,27 @@ export async function run(args = process.argv) {
|
|
|
55
66
|
const unixNow = new Date().valueOf() / 1000;
|
|
56
67
|
const [dao] = daoKey(hntMint);
|
|
57
68
|
const basePriorityFee = Number(argv.basePriorityFee || 1);
|
|
69
|
+
// The supplement follows crank time, not epoch time: issue_rewards_v0 sizes it from
|
|
70
|
+
// Clock::get() at execution, not from the epoch it is settling. So backfilling this loop
|
|
71
|
+
// through several stale epochs while a window is open mints a full per-epoch supplement for
|
|
72
|
+
// each one, on the day the backfill runs, and cranks that cross a window boundary late are
|
|
73
|
+
// paid at the later rate. The HNT mint circuit breaker is the backstop that bounds this: at
|
|
74
|
+
// a 350,000 HNT/day absolute threshold it admits roughly one supplement per day on top of
|
|
75
|
+
// normal emissions, so a multi-epoch backfill fails on the breaker rather than overminting
|
|
76
|
+
// without limit. Settle stale epochs one crank interval at a time while a window is open.
|
|
77
|
+
//
|
|
78
|
+
// Both destinations default to the pinned constants, so the permissionless fallback cannot
|
|
79
|
+
// silently omit them: a null vault during an open window makes issue_rewards_v0 fail, and
|
|
80
|
+
// this loop collects that into `errors` and advances rather than stopping. Pass the system
|
|
81
|
+
// program id to withhold one deliberately.
|
|
82
|
+
const asVault = (raw) => {
|
|
83
|
+
if (!raw)
|
|
84
|
+
return null;
|
|
85
|
+
const key = new PublicKey(raw);
|
|
86
|
+
return key.equals(SystemProgram.programId) ? null : key;
|
|
87
|
+
};
|
|
88
|
+
const supplementVault = asVault(argv.supplementVault);
|
|
89
|
+
const councilVault = asVault(argv.councilVault);
|
|
58
90
|
const subDaos = await heliumSubDaosProgram.account.subDaoV0.all([
|
|
59
91
|
{
|
|
60
92
|
memcmp: {
|
|
@@ -142,8 +174,8 @@ export async function run(args = process.argv) {
|
|
|
142
174
|
.issueRewardsV0({ epoch })
|
|
143
175
|
.accountsPartial({
|
|
144
176
|
subDao: subDao.publicKey,
|
|
145
|
-
supplementVault
|
|
146
|
-
councilVault
|
|
177
|
+
supplementVault,
|
|
178
|
+
councilVault,
|
|
147
179
|
})
|
|
148
180
|
.instruction(),
|
|
149
181
|
], {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-epoch.js","sourceRoot":"","sources":["../../../src/end-epoch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"end-epoch.js","sourceRoot":"","sources":["../../../src/end-epoch.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { PublicKey } from "@solana/web3.js";
|
|
2
|
+
// The HIP 149 supplement destinations, as pinned in `helium-sub-daos::supplement`.
|
|
3
|
+
//
|
|
4
|
+
// `issue_rewards_v0` requires whatever it is handed to equal these exact keys while a supplement
|
|
5
|
+
// window is open, so a value that disagrees with the program fails the instruction and can never
|
|
6
|
+
// misroute a mint. That pin is what makes it safe to default the `end-epoch` flags to them, and
|
|
7
|
+
// what `create-council-fanout` checks its derived fanout account against before sending.
|
|
8
|
+
export const SUPPLEMENT_VAULT_TOKEN_ACCOUNT = new PublicKey("AGPDcgpXan5RB2Y9usHvdJmmJHpyyYqcQm8KouRkK6f4");
|
|
9
|
+
export const COUNCIL_FANOUT_TOKEN_ACCOUNT = new PublicKey("EYbAXgLq1aRr9a9y55DbjfMdXNrZuMa69WXN9c1UR6eK");
|
|
10
|
+
//# sourceMappingURL=hip149.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hip149.js","sourceRoot":"","sources":["../../../src/hip149.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,mFAAmF;AACnF,EAAE;AACF,iGAAiG;AACjG,iGAAiG;AACjG,gGAAgG;AAChG,yFAAyF;AACzF,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,SAAS,CACzD,8CAA8C,CAC/C,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,SAAS,CACvD,8CAA8C,CAC/C,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { taskKey, nextAvailableTaskIds } from "@helium/tuktuk-sdk";
|
|
2
|
+
// Shared helpers for admin scripts that create, update, reschedule, or close a
|
|
3
|
+
// mini-fanout (see create-council-fanout.ts, update-council-fanout.ts,
|
|
4
|
+
// close-council-fanout.ts). Kept separate from utils.ts because these only
|
|
5
|
+
// make sense in the context of the mini-fanout program's task-queue plumbing.
|
|
6
|
+
/**
|
|
7
|
+
* Allocate a fresh (task, preTask) id/pubkey pair from the given tuktuk task
|
|
8
|
+
* queue, for scheduling a mini-fanout's next distribution.
|
|
9
|
+
*/
|
|
10
|
+
export async function allocateNextTasks(tuktukProgram, taskQueue) {
|
|
11
|
+
const taskQueueAcc = await tuktukProgram.account.taskQueueV0.fetch(taskQueue);
|
|
12
|
+
const [taskId, preTaskId] = nextAvailableTaskIds(taskQueueAcc.taskBitmap, 2);
|
|
13
|
+
return {
|
|
14
|
+
taskId,
|
|
15
|
+
preTaskId,
|
|
16
|
+
task: taskKey(taskQueue, taskId)[0],
|
|
17
|
+
preTask: taskKey(taskQueue, preTaskId)[0],
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* The tuktuk program's dequeue_task_v0 requires the passed-in rent_refund
|
|
22
|
+
* account to match the task's own `rent_refund` field exactly (it's a
|
|
23
|
+
* `has_one` constraint), which is set at queue time to whoever paid to queue
|
|
24
|
+
* it — not necessarily the wallet running this script. Resolve it from the
|
|
25
|
+
* on-chain task rather than assuming it's the current payer.
|
|
26
|
+
*
|
|
27
|
+
* A mini-fanout with nothing currently scheduled points `next_task` /
|
|
28
|
+
* `next_pre_task` back at itself (or at the program id, legacy); in that case
|
|
29
|
+
* there's nothing to dequeue, so the returned value is unused by the caller
|
|
30
|
+
* and any pubkey is safe to pass through.
|
|
31
|
+
*/
|
|
32
|
+
export async function resolveTaskRentRefund(tuktukProgram, taskPubkey, miniFanoutPubkey, miniFanoutProgramId, fallback) {
|
|
33
|
+
if (taskPubkey.equals(miniFanoutPubkey) ||
|
|
34
|
+
taskPubkey.equals(miniFanoutProgramId)) {
|
|
35
|
+
return fallback;
|
|
36
|
+
}
|
|
37
|
+
const task = await tuktukProgram.account.taskV0.fetchNullable(taskPubkey);
|
|
38
|
+
return task ? task.rentRefund : fallback;
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=mini-fanout-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mini-fanout-utils.js","sourceRoot":"","sources":["../../../src/mini-fanout-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAGnE,+EAA+E;AAC/E,uEAAuE;AACvE,2EAA2E;AAC3E,8EAA8E;AAE9E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,aAAkB,EAClB,SAAoB;IAOpB,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAChE,SAAS,CACV,CAAC;IACF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO;QACL,MAAM;QACN,SAAS;QACT,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,aAAkB,EAClB,UAAqB,EACrB,gBAA2B,EAC3B,mBAA8B,EAC9B,QAAmB;IAEnB,IACE,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACnC,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,EACtC,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1E,OAAO,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,UAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC1D,CAAC"}
|
|
@@ -69,9 +69,7 @@ export async function run(args = process.argv) {
|
|
|
69
69
|
toPubkey: cronJob,
|
|
70
70
|
lamports: BigInt(argv.fundingAmount),
|
|
71
71
|
}),
|
|
72
|
-
]
|
|
73
|
-
computeUnitLimit: 500000
|
|
74
|
-
});
|
|
72
|
+
]);
|
|
75
73
|
}
|
|
76
74
|
console.log("Cron job account", cronJob.toBase58());
|
|
77
75
|
const cronJobAcc = await cronProgram.account.cronJobV0.fetch(cronJob);
|
|
@@ -87,8 +85,6 @@ export async function run(args = process.argv) {
|
|
|
87
85
|
})
|
|
88
86
|
.prepare();
|
|
89
87
|
instructions.push(instruction);
|
|
90
|
-
await sendInstructionsWithPriorityFee(provider, instructions
|
|
91
|
-
computeUnitLimit: 500000,
|
|
92
|
-
});
|
|
88
|
+
await sendInstructionsWithPriorityFee(provider, instructions);
|
|
93
89
|
}
|
|
94
90
|
//# sourceMappingURL=queue-hotspot-claims.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-hotspot-claims.js","sourceRoot":"","sources":["../../../src/queue-hotspot-claims.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queue-hotspot-claims.js","sourceRoot":"","sources":["../../../src/queue-hotspot-claims.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,8 +112,6 @@ export async function run(args = process.argv) {
|
|
|
112
112
|
.prepare();
|
|
113
113
|
console.log("Queue authority is", pubkeys.queueAuthority.toBase58());
|
|
114
114
|
instructions.push(instruction);
|
|
115
|
-
await sendInstructionsWithPriorityFee(provider, instructions
|
|
116
|
-
computeUnitLimit: 500000,
|
|
117
|
-
});
|
|
115
|
+
await sendInstructionsWithPriorityFee(provider, instructions);
|
|
118
116
|
}
|
|
119
117
|
//# sourceMappingURL=queue-position-claims.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-position-claims.js","sourceRoot":"","sources":["../../../src/queue-position-claims.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queue-position-claims.js","sourceRoot":"","sources":["../../../src/queue-position-claims.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requeue-hotspot-claims.js","sourceRoot":"","sources":["../../../src/requeue-hotspot-claims.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"requeue-hotspot-claims.js","sourceRoot":"","sources":["../../../src/requeue-hotspot-claims.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as anchor from "@coral-xyz/anchor";
|
|
2
2
|
import { TASK_QUEUE_ID } from "@helium/hpl-crons-sdk";
|
|
3
3
|
import { init as initMfan } from "@helium/mini-fanout-sdk";
|
|
4
|
-
import { batchInstructionsToTxsWithPriorityFee, bulkSendTransactions
|
|
4
|
+
import { batchInstructionsToTxsWithPriorityFee, bulkSendTransactions } from "@helium/spl-utils";
|
|
5
5
|
import { init as initTuktuk, nextAvailableTaskIds, taskKey } from "@helium/tuktuk-sdk";
|
|
6
|
+
import { PublicKey } from "@solana/web3.js";
|
|
6
7
|
import os from "os";
|
|
7
8
|
import yargs from "yargs/yargs";
|
|
8
9
|
import { loadKeypair } from "./utils";
|
|
@@ -18,6 +19,10 @@ export async function run(args = process.argv) {
|
|
|
18
19
|
default: "http://127.0.0.1:8899",
|
|
19
20
|
describe: "The solana url",
|
|
20
21
|
},
|
|
22
|
+
miniFanout: {
|
|
23
|
+
type: "string",
|
|
24
|
+
describe: "Reschedule only this mini fanout instead of every mini fanout on the network. Use this to recover a single fanout (e.g. the council fanout) that went idle after running out of lamports, without touching anyone else's.",
|
|
25
|
+
},
|
|
21
26
|
});
|
|
22
27
|
const argv = await yarg.argv;
|
|
23
28
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
@@ -28,28 +33,47 @@ export async function run(args = process.argv) {
|
|
|
28
33
|
const program = await initMfan(provider);
|
|
29
34
|
const tuktukProgram = await initTuktuk(provider);
|
|
30
35
|
const instructions = [];
|
|
31
|
-
const
|
|
36
|
+
const allMiniFanouts = await program.account.miniFanoutV0.all();
|
|
37
|
+
const miniFanouts = argv.miniFanout
|
|
38
|
+
? allMiniFanouts.filter((mf) => mf.publicKey.equals(new PublicKey(argv.miniFanout)))
|
|
39
|
+
: allMiniFanouts;
|
|
40
|
+
if (argv.miniFanout && miniFanouts.length === 0) {
|
|
41
|
+
throw new Error(`No mini fanout found at ${argv.miniFanout}`);
|
|
42
|
+
}
|
|
43
|
+
// scheduleTaskV0 only accepts a fanout whose next_task/next_pre_task are
|
|
44
|
+
// already the "nothing scheduled" sentinel (pointing at the fanout itself,
|
|
45
|
+
// or legacy: at the program id) -- see its on-chain constraint. Anything
|
|
46
|
+
// else means a task is genuinely still live, and dequeuing a live task
|
|
47
|
+
// requires a CPI signature from the mini-fanout program's own
|
|
48
|
+
// queue_authority PDA (see queue_authority_seeds! in state.rs), which only
|
|
49
|
+
// update_mini_fanout_v0 / close_mini_fanout_v0 can produce -- both of which
|
|
50
|
+
// require the owner (governance multisig) to sign. There is no way to
|
|
51
|
+
// dequeue a live task from a bare client instruction, so don't try; skip
|
|
52
|
+
// and say so instead of submitting a transaction guaranteed to fail on a
|
|
53
|
+
// missing signature.
|
|
54
|
+
const isIdleSentinel = (miniFanout, task) => task.equals(program.programId) || task.equals(miniFanout.publicKey);
|
|
55
|
+
const idle = miniFanouts.filter((mf) => {
|
|
56
|
+
const ok = isIdleSentinel(mf, mf.account.nextTask) &&
|
|
57
|
+
isIdleSentinel(mf, mf.account.nextPreTask);
|
|
58
|
+
if (!ok) {
|
|
59
|
+
console.log(`Skipping ${mf.publicKey.toBase58()}: still has a live scheduled task; ` +
|
|
60
|
+
`use update-council-fanout.ts (owner-signed) to reschedule it instead.`);
|
|
61
|
+
}
|
|
62
|
+
return ok;
|
|
63
|
+
});
|
|
32
64
|
const batchSize = 10;
|
|
33
65
|
const taskQueue = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
|
|
34
|
-
const freeTasks = nextAvailableTaskIds(taskQueue.taskBitmap,
|
|
35
|
-
for (let i = 0; i <
|
|
66
|
+
const freeTasks = nextAvailableTaskIds(taskQueue.taskBitmap, idle.length * 2);
|
|
67
|
+
for (let i = 0; i < idle.length; i += batchSize) {
|
|
36
68
|
// Log progress every 100 positions
|
|
37
69
|
if (i > 0 && i % 100 === 0) {
|
|
38
70
|
console.log(`Processed ${i} mini fanouts`);
|
|
39
71
|
}
|
|
40
|
-
const batch =
|
|
72
|
+
const batch = idle.slice(i, i + batchSize);
|
|
41
73
|
await Promise.all(batch.map(async (miniFanout) => {
|
|
42
74
|
const nextTask = freeTasks.pop();
|
|
43
75
|
const nextPreTask = freeTasks.pop();
|
|
44
|
-
const nextTaskAcc = miniFanout.account.nextTask.equals(program.programId) || miniFanout.account.nextTask.equals(miniFanout.publicKey) ? undefined : await tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextTask);
|
|
45
|
-
const nextPreTaskAcc = miniFanout.account.nextPreTask.equals(program.programId) || miniFanout.account.nextPreTask.equals(miniFanout.publicKey) ? undefined : await tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextPreTask);
|
|
46
76
|
instructions.push([
|
|
47
|
-
nextTaskAcc ? await tuktukProgram.methods.dequeueTaskV0().accounts({
|
|
48
|
-
task: miniFanout.account.nextTask,
|
|
49
|
-
}).instruction() : undefined,
|
|
50
|
-
nextPreTaskAcc ? await tuktukProgram.methods.dequeueTaskV0().accounts({
|
|
51
|
-
task: miniFanout.account.nextPreTask,
|
|
52
|
-
}).instruction() : undefined,
|
|
53
77
|
await program.methods.scheduleTaskV0({
|
|
54
78
|
taskId: nextTask,
|
|
55
79
|
preTaskId: nextPreTask,
|
|
@@ -61,10 +85,10 @@ export async function run(args = process.argv) {
|
|
|
61
85
|
preTask: taskKey(TASK_QUEUE_ID, nextPreTask)[0],
|
|
62
86
|
})
|
|
63
87
|
.instruction()
|
|
64
|
-
]
|
|
88
|
+
]);
|
|
65
89
|
}));
|
|
66
90
|
}
|
|
67
|
-
console.log(`Finished processing ${
|
|
91
|
+
console.log(`Finished processing ${idle.length} mini fanouts (${miniFanouts.length - idle.length} skipped as not idle)`);
|
|
68
92
|
const transactions = await batchInstructionsToTxsWithPriorityFee(provider, instructions, {
|
|
69
93
|
useFirstEstimateForAll: true,
|
|
70
94
|
computeUnitLimit: 1200000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,qCAAqC,EAAE,oBAAoB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"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"}
|