@helium/helium-admin-cli 0.11.5 → 0.11.7

package/lib/cjs/upsert-incentive-program.js

@@ -41,7 +41,6 @@ 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 sdk_1 = __importDefault(require("@sqds/sdk"));
 const os_1 = __importDefault(require("os"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const utils_1 = require("./utils");
@@ -147,19 +146,13 @@ function run(args = process.argv) {
             })
                 .instruction());
         }
-        // @ts-ignore
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, provider.wallet, {
-            commitmentOrConfig: "finalized",
-        });
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
             signers: [],
             payer: provider.wallet.publicKey,
             commitment: "confirmed",
-            executeTransaction: false,
             multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            squads,
         });
     });
 }

package/lib/cjs/upsert-incentive-program.js.map

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

package/lib/cjs/utils.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseEmissionsSchedule = exports.sendInstructionsOrSquads = exports.createCloseBufferInstruction = exports.sendInstructionsOrCreateProposal = exports.isLocalhost = exports.loadKeypair = exports.createAndMint = exports.exists = exports.getUnixTimestamp = exports.getTimestampFromDays = exports.createIdlUpgradeInstruction = exports.merkleSizes = void 0;
+exports.parseEmissionsSchedule = exports.sendInstructionsOrSquads = exports.sendInstructionsOrSquadsV4 = exports.createCloseBufferInstruction = exports.sendInstructionsOrCreateProposal = exports.isLocalhost = exports.loadKeypair = exports.createAndMint = exports.exists = exports.getUnixTimestamp = exports.getTimestampFromDays = exports.createIdlUpgradeInstruction = exports.createSetIdlAuthorityInstruction = exports.createProgramSetAuthorityInstruction = exports.merkleSizes = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const idl_1 = require("@coral-xyz/anchor/dist/cjs/idl");
 const spl_utils_1 = require("@helium/spl-utils");
@@ -44,9 +44,11 @@ const spl_governance_1 = require("@solana/spl-governance");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const sdk_1 = require("@sqds/sdk");
+const multisig = __importStar(require("@sqds/multisig"));
 const bn_js_1 = require("bn.js");
 const fs_1 = __importDefault(require("fs"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
+const squads_batch_optimizer_1 = require("./squads-batch-optimizer");
 const SECONDS_PER_DAY = 86400;
 // Goal = 3 proof nodes needed
 exports.merkleSizes = [
@@ -61,6 +63,61 @@ exports.merkleSizes = [
     [20, 64, 17],
     [24, 64, 17],
 ];
+function createProgramSetAuthorityInstruction(programId, upgradeAuthority, newAuthority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const bpfUpgradableLoaderId = spl_governance_1.BPF_UPGRADE_LOADER_ID;
+        const [programDataAddress] = yield web3_js_1.PublicKey.findProgramAddress([programId.toBuffer()], bpfUpgradableLoaderId);
+        const keys = [
+            {
+                pubkey: programDataAddress,
+                isWritable: true,
+                isSigner: false,
+            },
+            {
+                pubkey: upgradeAuthority,
+                isWritable: false,
+                isSigner: true,
+            },
+            {
+                pubkey: newAuthority,
+                isWritable: false,
+                isSigner: false,
+            },
+        ];
+        return new web3_js_1.TransactionInstruction({
+            keys,
+            programId: bpfUpgradableLoaderId,
+            data: Buffer.from([4, 0, 0, 0]), // SetAuthority instruction bincode
+        });
+    });
+}
+exports.createProgramSetAuthorityInstruction = createProgramSetAuthorityInstruction;
+function createSetIdlAuthorityInstruction(programId, upgradeAuthority, newAuthority) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prefix = Buffer.from("0a69e9a778bcf440", "hex");
+        const ixn = Buffer.from("04", "hex");
+        const data = Buffer.concat([prefix.reverse(), ixn, newAuthority.toBuffer()]);
+        const idlAddr = yield (0, idl_1.idlAddress)(programId);
+        const keys = [
+            {
+                pubkey: idlAddr,
+                isWritable: true,
+                isSigner: false,
+            },
+            {
+                pubkey: upgradeAuthority,
+                isWritable: false,
+                isSigner: true,
+            },
+        ];
+        return new web3_js_1.TransactionInstruction({
+            keys,
+            programId,
+            data,
+        });
+    });
+}
+exports.createSetIdlAuthorityInstruction = createSetIdlAuthorityInstruction;
 function createIdlUpgradeInstruction(programId, bufferAddress, upgradeAuthority) {
     return __awaiter(this, void 0, void 0, function* () {
         const prefix = Buffer.from("0a69e9a778bcf440", "hex");
@@ -356,13 +413,15 @@ function createCloseBufferInstruction(programId, bufferAddress, upgradeAuthority
     });
 }
 exports.createCloseBufferInstruction = createCloseBufferInstruction;
-function sendInstructionsOrSquads({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), executeTransaction = false, squads, multisig, authorityIndex, }) {
+function sendInstructionsOrSquadsV4({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), multisig: multisigPda, addressLookupTableAddresses = [], }) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!multisig) {
             return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
                 connection: provider.connection,
                 computeUnits: 1000000,
                 instructions,
+                feePayer: payer,
+                addressLookupTableAddresses,
             }), signers, payer, commitment, idlErrors);
         }
         const signerSet = new Set(instructions
@@ -377,11 +436,106 @@ function sendInstructionsOrSquads({ provider, instructions, signers = [], payer
                 connection: provider.connection,
                 computeUnits: 1000000,
                 instructions: nonMissingSignerIxs,
+                feePayer: payer,
+                addressLookupTableAddresses,
             }), signers, payer, commitment, idlErrors);
         }
         if (squadsSignatures.length >= 2) {
             throw new Error("Too many missing signatures");
         }
+        const multisigInfo = yield multisig.accounts.Multisig.fromAccountAddress(provider.connection, multisigPda);
+        const transactionIndex = Number(multisigInfo.transactionIndex) + 1;
+        const createBatchIx = yield multisig.instructions.batchCreate({
+            batchIndex: BigInt(transactionIndex),
+            creator: provider.wallet.publicKey,
+            multisigPda: multisigPda,
+            vaultIndex: 0,
+            memo: "Helium-admin-cli batch",
+        });
+        const [vault] = yield multisig.getVaultPda({
+            multisigPda: multisigPda,
+            index: 0,
+            programId: multisig.PROGRAM_ID,
+        });
+        const addressLookupTableAccounts = yield (0, spl_utils_1.getAddressLookupTableAccounts)(provider.connection, addressLookupTableAddresses);
+        const { transactionMessages, failedBuckets } = yield (0, squads_batch_optimizer_1.packageInstructions)(instructions.map((ix) => [ix]), addressLookupTableAccounts, vault);
+        yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
+            connection: provider.connection,
+            addressLookupTableAddresses,
+            instructions: [
+                createBatchIx,
+                yield multisig.instructions.proposalCreate({
+                    multisigPda: multisigPda,
+                    transactionIndex: BigInt(transactionIndex),
+                    creator: provider.wallet.publicKey,
+                    isDraft: true,
+                }),
+            ],
+            feePayer: payer,
+        }));
+        const addInstructions = yield Promise.all(transactionMessages.map((tm, index) => multisig.instructions.batchAddTransaction({
+            batchIndex: BigInt(transactionIndex),
+            multisigPda: multisigPda,
+            transactionIndex: index + 1,
+            transactionMessage: tm,
+            vaultIndex: 0,
+            member: provider.wallet.publicKey,
+            ephemeralSigners: 0,
+            addressLookupTableAccounts,
+        })));
+        if (failedBuckets.length > 0) {
+            throw new Error(`Failed to package instructions: ${failedBuckets.join(", ")}`);
+        }
+        for (const ix of addInstructions) {
+            yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
+                feePayer: payer,
+                connection: provider.connection,
+                instructions: [ix],
+                addressLookupTableAddresses,
+            }));
+        }
+        yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
+            connection: provider.connection,
+            instructions: [
+                yield multisig.instructions.proposalActivate({
+                    multisigPda: multisigPda,
+                    transactionIndex: BigInt(transactionIndex),
+                    member: provider.wallet.publicKey,
+                }),
+            ],
+            feePayer: payer,
+            addressLookupTableAddresses,
+        }));
+    });
+}
+exports.sendInstructionsOrSquadsV4 = sendInstructionsOrSquadsV4;
+function sendInstructionsOrSquads({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), executeTransaction = false, squads, multisig, authorityIndex, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!multisig) {
+            return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
+                connection: provider.connection,
+                computeUnits: 1000000,
+                instructions,
+            }), signers, payer, commitment, idlErrors);
+        }
+        const signerSet = new Set(instructions
+            .map((ix) => ix.keys.filter((k) => k.isSigner).map((k) => k.pubkey.toBase58()))
+            .flat());
+        const signerKeys = Array.from(signerSet).map((k) => new web3_js_1.PublicKey(k));
+        const nonMissingSignerIxs = instructions.filter((ix) => !ix.keys.some((k) => k.isSigner && !k.pubkey.equals(provider.wallet.publicKey)));
+        const squadsSignatures = signerKeys.filter((k) => !k.equals(provider.wallet.publicKey) &&
+            !signers.some((s) => s.publicKey.equals(k)));
+        if (squadsSignatures.length == 0) {
+            return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
+                connection: provider.connection,
+                computeUnits: 1000000,
+                instructions: nonMissingSignerIxs,
+            }), signers, payer, commitment, idlErrors);
+        }
+        if (squadsSignatures.length >= 2) {
+            throw new Error("Too many missing signatures " +
+                squadsSignatures.map((s) => s.toBase58()).join(", "));
+        }
         const txIndex = yield squads.getNextTransactionIndex(multisig);
         const ix = yield squads.buildCreateTransaction(multisig, authorityIndex, txIndex);
         yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
@@ -410,7 +564,7 @@ function sendInstructionsOrSquads({ provider, instructions, signers = [], payer
         yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
             connection: provider.connection,
             computeUnits: 1000000,
-            instructions: ixs
+            instructions: ixs,
         }), signers);
     });
 }

package/lib/cjs/utils.js.map

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

package/lib/esm/src/add-squads-proposer.js

@@ -0,0 +1,66 @@
+import * as anchor from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import * as multisig from "@sqds/multisig";
+import os from 'os';
+import yargs from 'yargs/yargs';
+import { loadKeypair, sendInstructionsOrSquadsV4 } 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',
+        },
+        multisig: {
+            type: 'string',
+            describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
+            required: true,
+        },
+        proposer: {
+            type: 'string',
+            required: true,
+        },
+    });
+    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 wallet = new anchor.Wallet(loadKeypair(argv.wallet));
+    let authority = provider.wallet.publicKey;
+    const multisigPda = new PublicKey(argv.multisig);
+    const multisigInfo = await multisig.accounts.Multisig.fromAccountAddress(provider.connection, multisigPda);
+    // Get the updated transaction index
+    const currentTransactionIndex = Number(multisigInfo.transactionIndex);
+    const newTransactionIndex = BigInt(currentTransactionIndex + 1);
+    const ix = await multisig.instructions.configTransactionCreate({
+        rentPayer: wallet.publicKey,
+        multisigPda,
+        // Replace with current index if needed
+        transactionIndex: newTransactionIndex,
+        // Member must have at least "Proposer" permissions
+        creator: wallet.publicKey,
+        actions: [{
+                // Type of action
+                __kind: "AddMember",
+                newMember: {
+                    key: new PublicKey(argv.proposer),
+                    permissions: {
+                        mask: multisig.types.Permission.Initiate
+                    }
+                },
+            }],
+    });
+    await sendInstructionsOrSquadsV4({
+        provider,
+        payer: wallet.publicKey,
+        instructions: [ix],
+        multisig: multisigPda,
+    });
+}
+//# sourceMappingURL=add-squads-proposer.js.map

package/lib/esm/src/add-squads-proposer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-squads-proposer.js","sourceRoot":"","sources":["../../../src/add-squads-proposer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EACL,WAAW,EACX,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAEjB,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;YACtG,QAAQ,EAAE,IAAI;SACf;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SACf;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,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CACtE,QAAQ,CAAC,UAAU,EACnB,WAAW,CACZ,CAAC;IAEF,oCAAoC;IACpC,MAAM,uBAAuB,GAAG,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;IAEhE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,uBAAuB,CAAC;QAC7D,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW;QACX,uCAAuC;QACvC,gBAAgB,EAAE,mBAAmB;QACrC,mDAAmD;QACnD,OAAO,EAAE,MAAM,CAAC,SAAS;QACzB,OAAO,EAAE,CAAC;gBACR,iBAAiB;gBACjB,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE;oBACT,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACjC,WAAW,EAAE;wBACX,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ;qBACzC;iBACF;aACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,0BAA0B,CAAC;QAC/B,QAAQ;QACR,KAAK,EAAE,MAAM,CAAC,SAAS;QACvB,YAAY,EAAE,CAAC,EAAE,CAAC;QAClB,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAA;AACJ,CAAC"}

package/lib/esm/src/approve-carrier.js

@@ -2,10 +2,9 @@ import * as anchor from '@coral-xyz/anchor';
 import { carrierKey, init as initMem } from '@helium/mobile-entity-manager-sdk';
 import { subDaoKey, init as initHsd } from '@helium/helium-sub-daos-sdk';
 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 { MOBILE_MINT } from '@helium/spl-utils';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
@@ -30,18 +29,10 @@ export async function run(args = process.argv) {
             required: true,
             describe: 'Name of the carrier to approve, case sensitive',
         },
-        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;
@@ -63,16 +54,10 @@ export async function run(args = process.argv) {
         authority,
     })
         .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/approve-carrier.js.map

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

package/lib/esm/src/approve-maker.js

@@ -2,10 +2,9 @@ import * as anchor from "@coral-xyz/anchor";
 import { rewardableEntityConfigKey, makerKey, init as initHem, } from "@helium/helium-entity-manager-sdk";
 import { subDaoKey, daoKey, init as initHsd } from "@helium/helium-sub-daos-sdk";
 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 { HNT_MINT, MOBILE_MINT } from "@helium/spl-utils";
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
@@ -36,18 +35,10 @@ export async function run(args = process.argv) {
             required: true,
             describe: "The symbol of the entity config",
         },
-        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;
@@ -72,16 +63,10 @@ export async function run(args = process.argv) {
         payer: authority
     })
         .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/approve-maker.js.map

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

package/lib/esm/src/approve-program.js

@@ -2,10 +2,9 @@ import * as anchor from '@coral-xyz/anchor';
 import { init as initHem } from '@helium/helium-entity-manager-sdk';
 import { daoKey, init as initHsd } from '@helium/helium-sub-daos-sdk';
 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 { HNT_MINT } from '@helium/spl-utils';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
@@ -29,18 +28,10 @@ export async function run(args = process.argv) {
             describe: 'Program ID to allow',
             required: true,
         },
-        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;
@@ -65,16 +56,10 @@ export async function run(args = process.argv) {
         payer: authority,
     })
         .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/approve-program.js.map

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