@helium/helium-admin-cli 0.11.5 → 0.11.7

package/lib/esm/src/close-all-subscriber-recipients.js

@@ -0,0 +1,287 @@
+import * as anchor from "@coral-xyz/anchor";
+import { keyToAssetForAsset } from "@helium/helium-entity-manager-sdk";
+import { daoKey } from "@helium/helium-sub-daos-sdk";
+import { init as initLazy, lazyDistributorKey, } from "@helium/lazy-distributor-sdk";
+import { init as initRewards } from "@helium/rewards-oracle-sdk";
+import { init as initMem } from "@helium/mobile-entity-manager-sdk";
+import { HNT_MINT, MOBILE_MINT, getAssetBatch, batchInstructionsToTxsWithPriorityFee, bulkSendTransactions, chunks, } from "@helium/spl-utils";
+import { PublicKey } from "@solana/web3.js";
+import bs58 from "bs58";
+import os from "os";
+import pLimit from "p-limit";
+import yargs from "yargs/yargs";
+import { loadKeypair } from "./utils";
+export async function run(args = process.argv) {
+    const yarg = yargs(args).options({
+        wallet: {
+            alias: "k",
+            describe: "Anchor wallet keypair",
+            default: `${os.homedir()}/.config/solana/id.json`,
+        },
+        url: {
+            alias: "u",
+            default: "http://127.0.0.1:8899",
+            describe: "The solana url",
+        },
+        authority: {
+            type: "string",
+            describe: "Path to the authority keypair. Defaults to wallet.",
+        },
+        approver: {
+            type: "string",
+            describe: "Path to the approver keypair (if lazy distributor has approver set)",
+        },
+        commit: {
+            type: "boolean",
+            describe: "Actually close accounts. Otherwise dry-run",
+            default: false,
+        },
+    });
+    const argv = await 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 lazyProgram = await initLazy(provider);
+    const rewardsOracleProgram = await initRewards(provider);
+    const memProgram = await initMem(provider);
+    const authority = argv.authority
+        ? loadKeypair(argv.authority)
+        : loadKeypair(argv.wallet);
+    const approver = argv.approver ? loadKeypair(argv.approver) : null;
+    const dao = daoKey(HNT_MINT)[0];
+    const lazyDistributor = lazyDistributorKey(MOBILE_MINT)[0];
+    // Fetch all subscriber collections
+    console.log("Fetching CarrierV0 accounts to identify subscriber collections...");
+    const carriers = await memProgram.account.carrierV0.all();
+    const subscriberCollections = new Set();
+    for (const carrier of carriers) {
+        subscriberCollections.add(carrier.account.collection.toBase58());
+    }
+    console.log(`  Found ${subscriberCollections.size} subscriber collection(s) from ${carriers.length} carriers\n`);
+    console.log("Fetching RecipientV0 accounts for MOBILE lazy distributor using pagination...");
+    const PAGE_SIZE = 5000; // Helius supports up to 5k per page for getProgramAccountsV2
+    const BATCH_SIZE = 50000; // Process in 50k chunks to avoid memory issues
+    let paginationKey = null;
+    let page = 0;
+    let totalRecipientsFetched = 0;
+    let totalSkippedNonSubscriber = 0;
+    let currentBatch = [];
+    const subscriberRecipients = [];
+    async function fetchAssetBatchWithRetry(chunk, maxRetries = 5) {
+        for (let attempt = 0; attempt < maxRetries; attempt++) {
+            try {
+                const result = await getAssetBatch(provider.connection.rpcEndpoint, chunk);
+                return result || [];
+            }
+            catch (err) {
+                const is429 = err.message?.includes("429") || err.status === 429;
+                if (attempt === maxRetries - 1 || !is429) {
+                    console.error(`Failed to fetch asset batch after ${maxRetries} attempts: ${err.message}`);
+                    return [];
+                }
+                // Exponential backoff for rate limits
+                const delay = Math.min(2000 * Math.pow(2, attempt), 30000);
+                console.log(`  Rate limited, retrying in ${delay / 1000}s...`);
+                await new Promise((resolve) => setTimeout(resolve, delay));
+            }
+        }
+        return [];
+    }
+    async function processBatch(batch, batchLabel) {
+        console.log(`\n--- Processing ${batchLabel} ---`);
+        const assetIds = batch.map((r) => r.account.asset);
+        console.log(`Fetching ${assetIds.length.toLocaleString()} assets...`);
+        // Fetch assets with concurrency control
+        const assetChunks = chunks(assetIds, 1000);
+        const assetLimiter = pLimit(10);
+        let fetchedCount = 0;
+        let assetBatchIndex = 0;
+        const assetResults = await Promise.all(assetChunks.map((chunk) => assetLimiter(async () => {
+            const result = await fetchAssetBatchWithRetry(chunk);
+            fetchedCount += chunk.length;
+            assetBatchIndex++;
+            if (assetBatchIndex % 10 === 0 || fetchedCount >= assetIds.length) {
+                console.log(`  ${assetBatchIndex} batches: ${fetchedCount.toLocaleString()} assets`);
+            }
+            return result;
+        })));
+        const assets = assetResults.flat();
+        // Filter for subscriber assets
+        console.log("Filtering for subscriber assets...");
+        let batchNonSubscribers = 0;
+        let batchSubscribers = 0;
+        batch.forEach((recipient, index) => {
+            const asset = assets[index];
+            if (!asset) {
+                batchNonSubscribers++;
+                return;
+            }
+            const assetCollection = asset.grouping?.find((g) => g.group_key === "collection")?.group_value;
+            if (assetCollection &&
+                subscriberCollections.has(assetCollection.toBase58())) {
+                subscriberRecipients.push({
+                    address: recipient.publicKey,
+                    asset,
+                    recipientData: recipient.account,
+                });
+                batchSubscribers++;
+            }
+            else {
+                batchNonSubscribers++;
+            }
+        });
+        return {
+            subscribers: batchSubscribers,
+            nonSubscribers: batchNonSubscribers,
+        };
+    }
+    // Pagination and batch processing loop
+    console.log("Fetching recipients with pagination and processing in batches...\n");
+    do {
+        page++;
+        // Fetch next page
+        const response = await fetch(provider.connection.rpcEndpoint, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                jsonrpc: "2.0",
+                id: `page-${page}`,
+                method: "getProgramAccountsV2",
+                params: [
+                    lazyProgram.programId.toBase58(),
+                    {
+                        encoding: "base64",
+                        filters: [
+                            {
+                                memcmp: {
+                                    offset: 8,
+                                    bytes: lazyDistributor.toBase58(),
+                                },
+                            },
+                        ],
+                        limit: PAGE_SIZE,
+                        ...(paginationKey && { paginationKey }),
+                    },
+                ],
+            }),
+        });
+        const data = await response.json();
+        if (data.error) {
+            throw new Error(`RPC error: ${data.error.message}`);
+        }
+        const { result } = data;
+        // If no more results, set paginationKey to null to end pagination
+        if (!result || !result.accounts || result.accounts.length === 0) {
+            paginationKey = null;
+        }
+        else {
+            // Decode and add to current batch
+            const pageRecipients = result.accounts.map((item) => ({
+                publicKey: new PublicKey(item.pubkey),
+                account: lazyProgram.coder.accounts.decode("recipientV0", Buffer.from(item.account.data[0], "base64")),
+            }));
+            currentBatch.push(...pageRecipients);
+            totalRecipientsFetched += pageRecipients.length;
+            if (page % 10 === 0) {
+                console.log(`  Fetched ${totalRecipientsFetched.toLocaleString()} recipients (batch size: ${currentBatch.length.toLocaleString()})...`);
+            }
+            paginationKey = result.paginationKey || null;
+        }
+        // Process batch when we hit BATCH_SIZE or finished pagination
+        const shouldProcessBatch = currentBatch.length >= BATCH_SIZE || !paginationKey;
+        if (shouldProcessBatch && currentBatch.length > 0) {
+            const { subscribers, nonSubscribers } = await processBatch(currentBatch, `batch of ${currentBatch.length.toLocaleString()} recipients`);
+            totalSkippedNonSubscriber += nonSubscribers;
+            console.log(`Found ${subscriberRecipients.length.toLocaleString()} subscriber recipients so far (${subscribers} subscribers, ${nonSubscribers} non-subscribers in this batch)\n`);
+            // Clear current batch to free memory
+            currentBatch = [];
+        }
+    } while (paginationKey);
+    console.log(`\n=== Summary ===`);
+    console.log(`Processed ${totalRecipientsFetched.toLocaleString()} total RecipientV0 accounts`);
+    console.log(`${subscriberRecipients.length.toLocaleString()} are for subscriber assets`);
+    console.log(`${totalSkippedNonSubscriber.toLocaleString()} skipped (non-subscriber assets)`);
+    if (!argv.commit) {
+        console.log(`\nDry run: would close ${subscriberRecipients.length} subscriber recipient accounts. Re-run with --commit to close recipients.`);
+        return;
+    }
+    if (subscriberRecipients.length === 0) {
+        console.log("\nNo subscriber recipient accounts to close.");
+        return;
+    }
+    console.log(`\nClosing ${subscriberRecipients.length.toLocaleString()} recipient accounts...`);
+    // Build close instructions
+    let failedCount = 0;
+    let processed = 0;
+    const recipientChunks = chunks(subscriberRecipients, 100);
+    const instructionLimiter = pLimit(50);
+    const allBatchResults = await Promise.all(recipientChunks.map((chunk) => instructionLimiter(async () => {
+        const batchResults = await Promise.all(chunk.map(async (recipient) => {
+            try {
+                const { address: recipientAddr, asset } = recipient;
+                // Compute the KeyToAssetV0 address
+                const keyToAsset = keyToAssetForAsset(asset, dao);
+                // Extract entity key from asset URI
+                const entityKeyStr = asset.content.json_uri.split("/").pop() || "";
+                const cleanEntityKeyStr = entityKeyStr.split(/[.?#]/)[0];
+                const entityKeyBytes = Buffer.from(bs58.decode(cleanEntityKeyStr));
+                // Get oracle_signer PDA
+                const [oracleSigner] = PublicKey.findProgramAddressSync([Buffer.from("oracle_signer", "utf-8")], rewardsOracleProgram.programId);
+                return await rewardsOracleProgram.methods
+                    .tempCloseRecipientWrapperV0({
+                    entityKey: entityKeyBytes,
+                    asset: new PublicKey(asset.id),
+                })
+                    .accountsPartial({
+                    lazyDistributor,
+                    recipient: recipientAddr,
+                    keyToAsset,
+                    dao,
+                    authority: authority.publicKey,
+                    approver: approver?.publicKey || null,
+                    oracleSigner,
+                    lazyDistributorProgram: lazyProgram.programId,
+                })
+                    .instruction();
+            }
+            catch (err) {
+                console.error(`Error building instruction for recipient ${recipient.address.toBase58()}: ${err.message}`);
+                return null;
+            }
+        }));
+        processed += chunk.length;
+        const validResults = batchResults.filter((i) => i !== null);
+        failedCount += chunk.length - validResults.length;
+        // Show progress every 1000 recipients or at end
+        if (processed % 1000 === 0 ||
+            processed === subscriberRecipients.length) {
+            console.log(`  Prepared ${processed - failedCount} / ${subscriberRecipients.length.toLocaleString()} instructions (${failedCount} failed)...`);
+        }
+        return batchResults;
+    })));
+    const instructions = allBatchResults
+        .flat()
+        .filter((i) => i !== null);
+    const instructionCount = instructions.length;
+    // Free memory
+    subscriberRecipients.length = 0;
+    console.log(`\nBatching ${instructionCount.toLocaleString()} instructions into transactions...`);
+    const txns = await batchInstructionsToTxsWithPriorityFee(provider, instructions, {
+        useFirstEstimateForAll: true,
+        computeUnitLimit: 600000,
+    });
+    // Free memory - instructions now in transactions
+    instructions.length = 0;
+    console.log(`\nSending ${txns.length} transactions...`);
+    // Sign with authority and approver (if present)
+    const extraSigners = [authority];
+    if (approver) {
+        extraSigners.push(approver);
+    }
+    await bulkSendTransactions(provider, txns, (status) => {
+        console.log(`Sending ${status.currentBatchProgress} / ${status.currentBatchSize} in batch. ${status.totalProgress} / ${txns.length}`);
+    }, 10, extraSigners);
+    console.log(`\n✓ Complete: Closed ${instructionCount} recipient accounts${failedCount > 0 ? ` (${failedCount} failed to build instructions)` : ""}`);
+}
+//# sourceMappingURL=close-all-subscriber-recipients.js.map

package/lib/esm/src/close-all-subscriber-recipients.js.map

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

package/lib/esm/src/close-buffers.js

@@ -1,9 +1,9 @@
 import * as anchor from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import Squads from '@sqds/sdk';
+import * as multisig from '@sqds/multisig';
 import os from 'os';
 import yargs from 'yargs/yargs';
-import { createCloseBufferInstruction, loadKeypair, sendInstructionsOrSquads, } from './utils';
+import { createCloseBufferInstruction, loadKeypair, sendInstructionsOrSquadsV4, } from './utils';
 import { BPF_UPGRADE_LOADER_ID } from '@solana/spl-governance';
 import bs58 from 'bs58';
 export async function run(args = process.argv) {
@@ -18,18 +18,10 @@ export async function run(args = process.argv) {
             default: 'http://127.0.0.1:8899',
             describe: 'The solana url',
         },
-        executeTransaction: {
-            type: 'boolean',
-        },
         multisig: {
             type: 'string',
             describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
         },
-        authorityIndex: {
-            type: 'number',
-            describe: 'Authority index for squads. Defaults to 1',
-            default: 1,
-        },
         programId: {
             type: 'string',
             required: true,
@@ -42,13 +34,14 @@ export async function run(args = process.argv) {
     const provider = anchor.getProvider();
     const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
     const connection = provider.connection;
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-        commitmentOrConfig: 'finalized',
-    });
     let authority = provider.wallet.publicKey;
-    let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
-    if (multisig) {
-        authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
+    let multisigPda = argv.multisig ? new PublicKey(argv.multisig) : null;
+    if (multisigPda) {
+        const [vaultPda] = multisig.getVaultPda({
+            multisigPda,
+            index: 0,
+        });
+        authority = vaultPda;
     }
     console.log(authority.toBase58());
     const buffers = (await connection.getProgramAccounts(BPF_UPGRADE_LOADER_ID, {
@@ -78,13 +71,10 @@ export async function run(args = process.argv) {
         ],
     })).map((b) => b.pubkey);
     const instructions = await Promise.all(buffers.map((b) => createCloseBufferInstruction(new PublicKey(argv.programId), b, authority, provider.wallet.publicKey)));
-    await sendInstructionsOrSquads({
+    await sendInstructionsOrSquadsV4({
         provider,
         instructions,
-        executeTransaction: argv.executeTransaction,
-        squads,
-        multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
-        authorityIndex: argv.authorityIndex,
+        multisig: multisigPda,
         signers: [],
     });
 }

package/lib/esm/src/close-buffers.js.map

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

package/lib/esm/src/close-canopy.js

@@ -1,9 +1,8 @@
 import * as anchor from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import Squads from '@sqds/sdk';
 import os from 'os';
 import yargs from 'yargs/yargs';
-import { loadKeypair, sendInstructionsOrSquads, } from './utils';
+import { loadKeypair, sendInstructionsOrSquadsV4, } from './utils';
 import { init, lazyTransactionsKey } from '@helium/lazy-transactions-sdk';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
@@ -22,18 +21,10 @@ export async function run(args = process.argv) {
             type: 'string',
             describe: 'Lazy dist name',
         },
-        executeTransaction: {
-            type: 'boolean',
-        },
         multisig: {
             type: 'string',
             describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
         },
-        authorityIndex: {
-            type: 'number',
-            describe: 'Authority index for squads. Defaults to 1',
-            default: 1,
-        },
     });
     const argv = await yarg.argv;
     process.env.ANCHOR_WALLET = argv.wallet;
@@ -51,16 +42,10 @@ export async function run(args = process.argv) {
         refund: provider.wallet.publicKey,
     })
         .instruction());
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-        commitmentOrConfig: 'finalized',
-    });
-    await sendInstructionsOrSquads({
+    await sendInstructionsOrSquadsV4({
         provider,
         instructions,
-        executeTransaction: argv.executeTransaction,
-        squads,
         multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
-        authorityIndex: argv.authorityIndex,
         signers: [],
     });
 }

package/lib/esm/src/close-canopy.js.map

@@ -1 +1 @@
-{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../../src/close-canopy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EACL,WAAW,EAEX,wBAAwB,GACzB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,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,IAAI,EAAE;YACJ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gBAAgB;SAC3B;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,SAAS;SAChB;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;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,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;SAClB,aAAa,EAAE;SACf,eAAe,CAAC;QACf,gBAAgB;QAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;KAClC,CAAC;SACD,WAAW,EAAE,CACjB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;QACtE,kBAAkB,EAAE,WAAW;KAChC,CAAC,CAAC;IACH,MAAM,wBAAwB,CAAC;QAC7B,QAAQ;QACR,YAAY;QACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,MAAM;QACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../../src/close-canopy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EACL,WAAW,EAEX,0BAA0B,GAC3B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,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,IAAI,EAAE;YACJ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gBAAgB;SAC3B;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;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,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;SAClB,aAAa,EAAE;SACf,eAAe,CAAC;QACf,gBAAgB;QAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;KAClC,CAAC;SACD,WAAW,EAAE,CACjB,CAAC;IAEF,MAAM,0BAA0B,CAAC;QAC/B,QAAQ;QACR,YAAY;QACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;AACL,CAAC"}

package/lib/esm/src/close-legacy-auto-topoff.js

@@ -0,0 +1,88 @@
+import * as anchor from "@coral-xyz/anchor";
+import { delegatedDataCreditsKey } from "@helium/data-credits-sdk";
+import { autoTopOffKey, init as initDcAutoTopoff, } from "@helium/dc-auto-top-sdk";
+import { subDaoKey } from "@helium/helium-sub-daos-sdk";
+import { DC_MINT, HNT_MINT, MOBILE_MINT } from "@helium/spl-utils";
+import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, } from "@solana/spl-token";
+import { PublicKey } from "@solana/web3.js";
+import os from "os";
+import yargs from "yargs/yargs";
+import { sendInstructionsOrSquads, } from "./utils";
+import Squads from "@sqds/sdk";
+export async function run(args = process.argv) {
+    const yarg = yargs(args).options({
+        wallet: {
+            alias: "k",
+            describe: "Anchor wallet keypair",
+            default: `${os.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: HNT_MINT.toBase58(),
+        },
+        dcMint: {
+            type: "string",
+            describe: "Pubkey of the Data Credit token",
+            default: 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: 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 = await 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 PublicKey(argv.subDaoMint);
+    const subDao = subDaoKey(subDaoMint)[0];
+    const dcMint = new PublicKey(argv.dcMint);
+    const provider = anchor.getProvider();
+    const dcAutoTopoffProgram = await initDcAutoTopoff(provider);
+    let authority = provider.wallet.publicKey;
+    const squads = new Squads({
+        connection: provider.connection,
+        wallet: provider.wallet,
+    });
+    let multisigPda = argv.multisig ? new PublicKey(argv.multisig) : null;
+    if (multisigPda) {
+        authority = squads.getAuthorityPDA(multisigPda, 1);
+    }
+    const routerKey = argv.routerKey;
+    const delegatedDc = delegatedDataCreditsKey(subDao, routerKey)[0];
+    const autoTopOff = autoTopOffKey(delegatedDc, authority)[0];
+    const createDcAtaIx = createAssociatedTokenAccountIdempotentInstruction(authority, getAssociatedTokenAddressSync(dcMint, authority, true), authority, dcMint);
+    const closeLegacyIx = await dcAutoTopoffProgram.methods
+        .closeLegacyAutoTopOff()
+        .accounts({
+        delegatedDataCredits: delegatedDc,
+        dcAccount: getAssociatedTokenAddressSync(dcMint, autoTopOff, true),
+    })
+        .instruction();
+    await sendInstructionsOrSquads({
+        provider,
+        instructions: [createDcAtaIx, closeLegacyIx],
+        multisig: multisigPda,
+        signers: [],
+        authorityIndex: 1,
+        executeTransaction: false,
+        squads,
+    });
+}
+//# sourceMappingURL=close-legacy-auto-topoff.js.map

package/lib/esm/src/close-legacy-auto-topoff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"close-legacy-auto-topoff.js","sourceRoot":"","sources":["../../../src/close-legacy-auto-topoff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EACL,aAAa,EACb,IAAI,IAAI,gBAAgB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EACL,iDAAiD,EACjD,6BAA6B,GAC9B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAEL,wBAAwB,GAEzB,MAAM,SAAS,CAAC;AACjB,OAAO,MAAM,MAAM,WAAW,CAAC;AAE/B,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,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,yBAAyB;YACnC,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC7B;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,iCAAiC;YAC3C,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;SAC5B;QACD,SAAS,EAAE;YACT,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,+CAA+C;YACzD,QAAQ,EAAE,IAAI;SACf;QACD,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,iDAAiD;YAC3D,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE;SAChC;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;KACF,CAAC,CAAC;IAEH,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,UAAU,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;IAC/D,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAE7D,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,MAAM,EAAE,QAAQ,CAAC,MAAa;KAC/B,CAAC,CAAC;IACH,IAAI,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,IAAI,WAAW,EAAE;QACf,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;KACpD;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACjC,MAAM,WAAW,GAAG,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,iDAAiD,CACrE,SAAS,EACT,6BAA6B,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EACtD,SAAS,EACT,MAAM,CACP,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,OAAO;SACpD,qBAAqB,EAAE;SACvB,QAAQ,CAAC;QACR,oBAAoB,EAAE,WAAW;QACjC,SAAS,EAAE,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC;KACnE,CAAC;SACD,WAAW,EAAE,CAAC;IAEjB,MAAM,wBAAwB,CAAC;QAC7B,QAAQ;QACR,YAAY,EAAE,CAAC,aAAa,EAAE,aAAa,CAAC;QAC5C,QAAQ,EAAE,WAAY;QACtB,OAAO,EAAE,EAAE;QACX,cAAc,EAAE,CAAC;QACjB,kBAAkB,EAAE,KAAK;QACzB,MAAM;KACP,CAAC,CAAC;AACL,CAAC"}

package/lib/esm/src/create-and-approve-makers.js

@@ -10,8 +10,8 @@ import { Keypair, PublicKey, SystemProgram, } from '@solana/web3.js';
 import fs from 'fs';
 import os from 'os';
 import yargs from 'yargs/yargs';
-import { exists, loadKeypair, sendInstructionsOrSquads, merkleSizes, } from './utils';
-import Squads from '@sqds/sdk';
+import { exists, loadKeypair, sendInstructionsOrSquadsV4, merkleSizes, } from './utils';
+import * as multisig from '@sqds/multisig';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
         wallet: {
@@ -19,9 +19,6 @@ export async function run(args = process.argv) {
             describe: 'Anchor wallet keypair',
             default: `${os.homedir()}/.config/solana/id.json`,
         },
-        executeTransaction: {
-            type: 'boolean',
-        },
         url: {
             alias: 'u',
             default: 'http://127.0.0.1:8899',
@@ -75,11 +72,6 @@ export async function run(args = process.argv) {
             type: 'string',
             describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
         },
-        authorityIndex: {
-            type: 'number',
-            describe: 'Authority index for squads. Defaults to 1',
-            default: 1,
-        },
     });
     const argv = await yarg.argv;
     process.env.ANCHOR_WALLET = argv.wallet;
@@ -120,13 +112,14 @@ export async function run(args = process.argv) {
     const dao = await hsdProgram.account.daoV0.fetch(subdaoAcc.dao);
     let subdaoPayer = provider.wallet.publicKey;
     let daoPayer = provider.wallet.publicKey;
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-        commitmentOrConfig: 'finalized',
-    });
     let authority = provider.wallet.publicKey;
-    let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
-    if (multisig) {
-        authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
+    let multisigPda = argv.multisig ? new PublicKey(argv.multisig) : null;
+    if (multisigPda) {
+        const [vaultPda] = multisig.getVaultPda({
+            multisigPda,
+            index: 0,
+        });
+        authority = vaultPda;
         subdaoPayer = authority;
         daoPayer = authority;
         console.log('SQUAD AUTH', authority.toBase58());
@@ -257,19 +250,16 @@ export async function run(args = process.argv) {
         approveInstructions.push(innerApproveInstrs);
     }
     console.log('Total sol needed: ', humanReadable(new anchor.BN(totalSol), 9));
-    if (multisig) {
+    if (multisigPda) {
         // Approve instructions must execute after ALL create instructions
         const instrs = createInstructions.flat().filter(truthy);
         const approveInstrs = approveInstructions.flat().filter(truthy);
         for (const chunk of chunks([...instrs, ...approveInstrs], 3)) {
-            await sendInstructionsOrSquads({
+            await sendInstructionsOrSquadsV4({
                 provider,
                 instructions: chunk,
                 signers: [],
-                executeTransaction: argv.executeTransaction,
-                squads,
-                multisig,
-                authorityIndex: argv.authorityIndex,
+                multisig: multisigPda,
             });
         }
     }