@helium/helium-admin-cli 0.11.6 → 0.11.8

package/lib/cjs/close-auto-topoff.js

@@ -0,0 +1,122 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const anchor = __importStar(require("@coral-xyz/anchor"));
+const data_credits_sdk_1 = require("@helium/data-credits-sdk");
+const dc_auto_top_sdk_1 = require("@helium/dc-auto-top-sdk");
+const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
+const spl_utils_1 = require("@helium/spl-utils");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const multisig = __importStar(require("@sqds/multisig"));
+const os_1 = __importDefault(require("os"));
+const yargs_1 = __importDefault(require("yargs/yargs"));
+const utils_1 = require("./utils");
+function run(args = process.argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const yarg = (0, yargs_1.default)(args).options({
+            wallet: {
+                alias: "k",
+                describe: "Anchor wallet keypair",
+                default: `${os_1.default.homedir()}/.config/solana/id.json`,
+            },
+            url: {
+                alias: "u",
+                default: "http://127.0.0.1:8899",
+                describe: "The solana url",
+            },
+            hntMint: {
+                type: "string",
+                describe: "Pubkey of the HNT token",
+                default: spl_utils_1.HNT_MINT.toBase58(),
+            },
+            dcMint: {
+                type: "string",
+                describe: "Pubkey of the Data Credit token",
+                default: spl_utils_1.DC_MINT.toBase58(),
+            },
+            routerKey: {
+                type: "string",
+                describe: "The router key for the delegated data credits",
+                required: true,
+            },
+            subDaoMint: {
+                type: "string",
+                describe: "The sub dao mint for the delegated data credits",
+                default: spl_utils_1.MOBILE_MINT.toBase58(),
+            },
+            multisig: {
+                type: "string",
+                describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
+            },
+        });
+        const argv = yield yarg.argv;
+        process.env.ANCHOR_WALLET = argv.wallet;
+        process.env.ANCHOR_PROVIDER_URL = argv.url;
+        anchor.setProvider(anchor.AnchorProvider.local(argv.url));
+        const subDaoMint = new web3_js_1.PublicKey(argv.subDaoMint);
+        const subDao = (0, helium_sub_daos_sdk_1.subDaoKey)(subDaoMint)[0];
+        const dcMint = new web3_js_1.PublicKey(argv.dcMint);
+        const provider = anchor.getProvider();
+        const dcAutoTopoffProgram = yield (0, dc_auto_top_sdk_1.init)(provider);
+        let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
+        let authority = multisigPda
+            ? multisig.getVaultPda({ multisigPda, index: 0 })[0]
+            : provider.wallet.publicKey;
+        const routerKey = argv.routerKey;
+        const delegatedDc = (0, data_credits_sdk_1.delegatedDataCreditsKey)(subDao, routerKey)[0];
+        const autoTopOff = (0, dc_auto_top_sdk_1.autoTopOffKey)(delegatedDc, authority)[0];
+        const createDcAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(authority, (0, spl_token_1.getAssociatedTokenAddressSync)(dcMint, authority, true), authority, dcMint);
+        const closeIx = yield dcAutoTopoffProgram.methods
+            .closeAutoTopOffV0()
+            .accountsPartial({
+            autoTopOff,
+            rentRefund: authority,
+            authority,
+        })
+            .instruction();
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
+            provider,
+            instructions: [createDcAtaIx, closeIx],
+            multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
+            signers: [],
+        });
+    });
+}
+exports.run = run;
+//# sourceMappingURL=close-auto-topoff.js.map

package/lib/cjs/close-auto-topoff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"close-auto-topoff.js","sourceRoot":"","sources":["../../src/close-auto-topoff.ts"],"names":[],"mappings":"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"}

package/lib/cjs/close-legacy-auto-topoff.js

@@ -43,10 +43,10 @@ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
 const spl_utils_1 = require("@helium/spl-utils");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const multisig = __importStar(require("@sqds/multisig"));
 const os_1 = __importDefault(require("os"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const utils_1 = require("./utils");
+const sdk_1 = __importDefault(require("@sqds/sdk"));
 function run(args = process.argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const yarg = (0, yargs_1.default)(args).options({
@@ -81,8 +81,8 @@ function run(args = process.argv) {
                 default: spl_utils_1.MOBILE_MINT.toBase58(),
             },
             multisig: {
-                type: 'string',
-                describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
+                type: "string",
+                describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
             },
         });
         const argv = yield yarg.argv;
@@ -95,28 +95,33 @@ function run(args = process.argv) {
         const provider = anchor.getProvider();
         const dcAutoTopoffProgram = yield (0, dc_auto_top_sdk_1.init)(provider);
         let authority = provider.wallet.publicKey;
+        const squads = new sdk_1.default({
+            connection: provider.connection,
+            wallet: provider.wallet,
+        });
         let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
         if (multisigPda) {
-            const [vaultPda] = multisig.getVaultPda({
-                multisigPda,
-                index: 0,
-            });
-            authority = vaultPda;
+            authority = squads.getAuthorityPDA(multisigPda, 1);
         }
         const routerKey = argv.routerKey;
         const delegatedDc = (0, data_credits_sdk_1.delegatedDataCreditsKey)(subDao, routerKey)[0];
         const autoTopOff = (0, dc_auto_top_sdk_1.autoTopOffKey)(delegatedDc, authority)[0];
-        const closeLegacyIx = yield dcAutoTopoffProgram.methods.closeLegacyAutoTopOff()
+        const createDcAtaIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(authority, (0, spl_token_1.getAssociatedTokenAddressSync)(dcMint, authority, true), authority, dcMint);
+        const closeLegacyIx = yield dcAutoTopoffProgram.methods
+            .closeLegacyAutoTopOff()
             .accounts({
             delegatedDataCredits: delegatedDc,
             dcAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(dcMint, autoTopOff, true),
         })
             .instruction();
-        yield (0, utils_1.sendInstructionsOrSquadsV4)({
+        yield (0, utils_1.sendInstructionsOrSquads)({
             provider,
-            instructions: [closeLegacyIx],
+            instructions: [createDcAtaIx, closeLegacyIx],
             multisig: multisigPda,
             signers: [],
+            authorityIndex: 1,
+            executeTransaction: false,
+            squads,
         });
     });
 }

package/lib/cjs/close-legacy-auto-topoff.js.map

@@ -1 +1 @@
-{"version":3,"file":"close-legacy-auto-topoff.js","sourceRoot":"","sources":["../../src/close-legacy-auto-topoff.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"close-legacy-auto-topoff.js","sourceRoot":"","sources":["../../src/close-legacy-auto-topoff.ts"],"names":[],"mappings":"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"}

package/lib/cjs/extend-common-lut.js

@@ -39,10 +39,10 @@ exports.run = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_utils_1 = require("@helium/spl-utils");
 const web3_js_1 = require("@solana/web3.js");
-const multisig = __importStar(require("@sqds/multisig"));
 const os_1 = __importDefault(require("os"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const utils_1 = require("./utils");
+const sdk_1 = __importDefault(require("@sqds/sdk"));
 function run(args = process.argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const yarg = (0, yargs_1.default)(args).options({
@@ -73,34 +73,37 @@ function run(args = process.argv) {
         const provider = anchor.getProvider();
         const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
         let authority = provider.wallet.publicKey;
+        const squads = new sdk_1.default({
+            connection: provider.connection,
+            wallet: wallet,
+        });
         let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
         if (multisigPda) {
-            const [vaultPda] = multisig.getVaultPda({
-                multisigPda,
-                index: 0,
-            });
-            authority = vaultPda;
+            authority = squads.getAuthorityPDA(multisigPda, 1);
         }
         const accounts = [
-            // HNT lazy distributor
-            // "6gcZXjHgKUBMedc2V1aZLFPwh8M1rPVRw7kpo2KqNrFq",
-            // HNT Circuit Breaker
-            // "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
-            // HNT Rewards pool
-            // "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
-            // TaskQueueAuthorityV0 for welcome-pack
-            "9hLWFGiit1ZpFHmopyacWqiVx8sQX9U86dnKqtDjkjnL",
-            // Queue authority for welcome-pack
-            "3HTSCuJGL8e5zPpf7rMhq42YgA7f3WdF5bm78YQ3HEBK"
+        // HNT lazy distributor
+        // "6gcZXjHgKUBMedc2V1aZLFPwh8M1rPVRw7kpo2KqNrFq",
+        // HNT Circuit Breaker
+        // "73zsmmqCXjvHHhNSib26Y8p3jYiH3UUuyKv71RJDnctW",
+        // HNT Rewards pool
+        // "BDs6RPnpJNzmuMNv1z8cDh9cxKFgCxEVDaCfoHZWyvqJ",
+        // TaskQueueAuthorityV0 for welcome-pack
+        // "9hLWFGiit1ZpFHmopyacWqiVx8sQX9U86dnKqtDjkjnL",
+        // Queue authority for welcome-pack
+        // "3HTSCuJGL8e5zPpf7rMhq42YgA7f3WdF5bm78YQ3HEBK"
         ].map((a) => {
             return new web3_js_1.PublicKey(a);
         });
         const lookupTableAddress = new web3_js_1.PublicKey(argv.lookupTable);
         for (const addresses of (0, spl_utils_1.chunks)(accounts, 20)) {
-            yield (0, utils_1.sendInstructionsOrSquadsV4)({
+            yield (0, utils_1.sendInstructionsOrSquads)({
                 provider,
                 signers: [],
                 multisig: multisigPda,
+                authorityIndex: 1,
+                executeTransaction: false,
+                squads,
                 instructions: yield (0, spl_utils_1.withPriorityFees)({
                     connection: provider.connection,
                     computeUnits: 200000,

package/lib/cjs/extend-common-lut.js.map

@@ -1 +1 @@
-{"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}

package/lib/cjs/issue-service-rewards-nft.js

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const anchor = __importStar(require("@coral-xyz/anchor"));
+const helium_entity_manager_sdk_1 = require("@helium/helium-entity-manager-sdk");
+const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
+const mobile_entity_manager_sdk_1 = require("@helium/mobile-entity-manager-sdk");
+const spl_utils_1 = require("@helium/spl-utils");
+const web3_js_1 = require("@solana/web3.js");
+const os_1 = __importDefault(require("os"));
+const yargs_1 = __importDefault(require("yargs/yargs"));
+function run(args = process.argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const yarg = (0, yargs_1.default)(args).options({
+            wallet: {
+                alias: "k",
+                describe: "Anchor wallet keypair",
+                default: `${os_1.default.homedir()}/.config/solana/id.json`,
+            },
+            url: {
+                alias: "u",
+                default: "http://127.0.0.1:8899",
+                describe: "The solana url",
+            },
+            hntMint: {
+                default: spl_utils_1.HNT_MINT.toBase58(),
+            },
+            dntMint: {
+                default: spl_utils_1.MOBILE_MINT.toBase58(),
+                describe: "Public Key of the subdao mint",
+                type: "string",
+            },
+            name: {
+                alias: "n",
+                type: "string",
+                required: true,
+                describe: "The name of the carrier",
+            },
+            recipient: {
+                describe: "Recipient of the rewardable mapping rewards nft, default to this wallet",
+                type: "string",
+                required: false,
+            },
+        });
+        const argv = yield yarg.argv;
+        process.env.ANCHOR_WALLET = argv.wallet;
+        process.env.ANCHOR_PROVIDER_URL = argv.url;
+        anchor.setProvider(anchor.AnchorProvider.local(argv.url));
+        const provider = anchor.getProvider();
+        const name = "Helium Mobile Service Rewards";
+        const hemProgram = yield (0, helium_entity_manager_sdk_1.init)(provider);
+        const memProgram = yield (0, mobile_entity_manager_sdk_1.init)(provider);
+        const dntMint = new web3_js_1.PublicKey(argv.dntMint);
+        const subDao = (yield (0, helium_sub_daos_sdk_1.subDaoKey)(dntMint))[0];
+        const carrier = yield (0, mobile_entity_manager_sdk_1.carrierKey)(subDao, argv.name)[0];
+        const hntMint = new web3_js_1.PublicKey(argv.hntMint);
+        const recipient = argv.recipient
+            ? new web3_js_1.PublicKey(argv.recipient)
+            : provider.wallet.publicKey;
+        const [keyToAssetK] = (0, helium_entity_manager_sdk_1.keyToAssetKey)((0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0], Buffer.from(name, "utf-8"));
+        const keyToAsset = yield hemProgram.account.keyToAssetV0.fetchNullable(keyToAssetK);
+        if (!keyToAsset) {
+            console.log("Minting service rewards NFT");
+            console.log(yield memProgram.methods
+                .issueServiceRewardsNftV0({
+                metadataUrl: `https://entities.nft.helium.io/Helium%20Mobile%20Service%20Rewards`,
+            })
+                .preInstructions([
+                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }),
+            ])
+                .accountsPartial({ carrier, recipient, keyToAsset: keyToAssetK })
+                .rpc({ skipPreflight: false }));
+        }
+    });
+}
+exports.run = run;
+//# sourceMappingURL=issue-service-rewards-nft.js.map

package/lib/cjs/issue-service-rewards-nft.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"issue-service-rewards-nft.js","sourceRoot":"","sources":["../../src/issue-service-rewards-nft.ts"],"names":[],"mappings":"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"}

package/lib/cjs/reschedule-all-mini-fanouts.js

@@ -41,7 +41,6 @@ const hpl_crons_sdk_1 = require("@helium/hpl-crons-sdk");
 const mini_fanout_sdk_1 = require("@helium/mini-fanout-sdk");
 const spl_utils_1 = require("@helium/spl-utils");
 const tuktuk_sdk_1 = require("@helium/tuktuk-sdk");
-const web3_js_1 = require("@solana/web3.js");
 const os_1 = __importDefault(require("os"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const utils_1 = require("./utils");
@@ -78,12 +77,11 @@ function run(args = process.argv) {
                 console.log(`Processed ${i} mini fanouts`);
             }
             const batch = miniFanouts.slice(i, i + batchSize);
-            yield Promise.all(batch.map((delegation, j) => __awaiter(this, void 0, void 0, function* () {
-                const miniFanout = batch[j];
+            yield Promise.all(batch.map((miniFanout) => __awaiter(this, void 0, void 0, function* () {
                 const nextTask = freeTasks.pop();
                 const nextPreTask = freeTasks.pop();
-                const nextTaskAcc = miniFanout.account.nextTask.equals(web3_js_1.PublicKey.default) ? undefined : yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextTask);
-                const nextPreTaskAcc = miniFanout.account.nextPreTask.equals(web3_js_1.PublicKey.default) ? undefined : yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextPreTask);
+                const nextTaskAcc = miniFanout.account.nextTask.equals(program.programId) || miniFanout.account.nextTask.equals(miniFanout.publicKey) ? undefined : yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextTask);
+                const nextPreTaskAcc = miniFanout.account.nextPreTask.equals(program.programId) || miniFanout.account.nextPreTask.equals(miniFanout.publicKey) ? undefined : yield tuktukProgram.account.taskV0.fetchNullable(miniFanout.account.nextPreTask);
                 instructions.push([
                     nextTaskAcc ? yield tuktukProgram.methods.dequeueTaskV0().accounts({
                         task: miniFanout.account.nextTask,

package/lib/cjs/reschedule-all-mini-fanouts.js.map

@@ -1 +1 @@
-{"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reschedule-all-mini-fanouts.js","sourceRoot":"","sources":["../../src/reschedule-all-mini-fanouts.ts"],"names":[],"mappings":"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"}