@helium/helium-admin-cli 0.11.4 → 0.11.6

package/lib/cjs/add-squads-proposer.js

@@ -0,0 +1,107 @@
+"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 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',
+            },
+            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 = 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 wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
+        let authority = provider.wallet.publicKey;
+        const multisigPda = new web3_js_1.PublicKey(argv.multisig);
+        const multisigInfo = yield multisig.accounts.Multisig.fromAccountAddress(provider.connection, multisigPda);
+        // Get the updated transaction index
+        const currentTransactionIndex = Number(multisigInfo.transactionIndex);
+        const newTransactionIndex = BigInt(currentTransactionIndex + 1);
+        const ix = yield 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 web3_js_1.PublicKey(argv.proposer),
+                        permissions: {
+                            mask: multisig.types.Permission.Initiate
+                        }
+                    },
+                }],
+        });
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
+            provider,
+            payer: wallet.publicKey,
+            instructions: [ix],
+            multisig: multisigPda,
+        });
+    });
+}
+exports.run = run;
+//# sourceMappingURL=add-squads-proposer.js.map

package/lib/cjs/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,0DAA4C;AAC5C,6CAA4C;AAC5C,yDAA2C;AAC3C,4CAAoB;AACpB,wDAAgC;AAChC,mCAGiB;AAEjB,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;gBACtG,QAAQ,EAAE,IAAI;aACf;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACf;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QAC1C,MAAM,WAAW,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CACtE,QAAQ,CAAC,UAAU,EACnB,WAAW,CACZ,CAAC;QAEF,oCAAoC;QACpC,MAAM,uBAAuB,GAAG,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACtE,MAAM,mBAAmB,GAAG,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;QAEhE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,uBAAuB,CAAC;YAC7D,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW;YACX,uCAAuC;YACvC,gBAAgB,EAAE,mBAAmB;YACrC,mDAAmD;YACnD,OAAO,EAAE,MAAM,CAAC,SAAS;YACzB,OAAO,EAAE,CAAC;oBACR,iBAAiB;oBACjB,MAAM,EAAE,WAAW;oBACnB,SAAS,EAAE;wBACT,GAAG,EAAE,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;wBACjC,WAAW,EAAE;4BACX,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ;yBACzC;qBACF;iBACF,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,IAAA,kCAA0B,EAAC;YAC/B,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,SAAS;YACvB,YAAY,EAAE,CAAC,EAAE,CAAC;YAClB,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAA;IACJ,CAAC;CAAA;AAjED,kBAiEC"}

package/lib/cjs/approve-carrier.js

@@ -40,7 +40,6 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const mobile_entity_manager_sdk_1 = require("@helium/mobile-entity-manager-sdk");
 const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
 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");
@@ -69,18 +68,10 @@ 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 = yield yarg.argv;
         process.env.ANCHOR_WALLET = argv.wallet;
@@ -102,16 +93,10 @@ function run(args = process.argv) {
             authority,
         })
             .instruction());
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: argv.executeTransaction,
-            squads,
             multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
             signers: [],
         });
     });

package/lib/cjs/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,iFAAgF;AAChF,qEAAyE;AACzE,6CAA6E;AAC7E,4CAAoB;AACpB,wDAAgC;AAChC,mCAAkE;AAClE,iDAAgD;AAEhD,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,sCAAsC;gBAChD,OAAO,EAAE,uBAAW,CAAC,QAAQ,EAAE;aAChC;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,gDAAgD;aAC3D;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAO,EAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAO,EAAC,QAAQ,CAAC,CAAC;QAE3C,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAA,+BAAS,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,MAAM,OAAO,GAAG,IAAA,sCAAU,EAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjD,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,gBAAgB,EAAE;aAClB,eAAe,CAAC;YACf,OAAO;YACP,SAAS;SACV,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QAEF,MAAM,IAAA,kCAA0B,EAAC;YAC/B,QAAQ;YACR,YAAY;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AA7DD,kBA6DC"}

package/lib/cjs/approve-maker.js

@@ -40,7 +40,6 @@ 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 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");
@@ -75,18 +74,10 @@ 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 = yield yarg.argv;
         process.env.ANCHOR_WALLET = argv.wallet;
@@ -111,16 +102,10 @@ function run(args = process.argv) {
             payer: authority
         })
             .instruction());
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: "finalized",
-        });
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: argv.executeTransaction,
-            squads,
             multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
             signers: [],
         });
     });

package/lib/cjs/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/cjs/approve-program.js

@@ -40,7 +40,6 @@ 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 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");
@@ -68,18 +67,10 @@ 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 = yield yarg.argv;
         process.env.ANCHOR_WALLET = argv.wallet;
@@ -104,16 +95,10 @@ function run(args = process.argv) {
             payer: authority,
         })
             .instruction());
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: argv.executeTransaction,
-            squads,
             multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
             signers: [],
         });
     });

package/lib/cjs/approve-program.js.map

@@ -1 +1 @@
-{"version":3,"file":"approve-program.js","sourceRoot":"","sources":["../../src/approve-program.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,iFAAoE;AACpE,qEAAsE;AACtE,6CAAoE;AACpE,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,mCAAgE;AAChE,iDAA6C;AAE7C,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,mCAAmC;gBAC7C,OAAO,EAAE,oBAAQ,CAAC,QAAQ,EAAE;aAC7B;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,qBAAqB;gBAC/B,QAAQ,EAAE,IAAI;aACf;YACD,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAChB;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,2CAA2C;gBACrD,OAAO,EAAE,CAAC;aACX;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAO,EAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhD,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAA,4BAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,gBAAgB,CAAC;YAChB,SAAS;SACV,CAAC;aACD,eAAe,CAAC;YACf,GAAG;YACH,SAAS;YACT,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QAEF,MAAM,MAAM,GAAG,aAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;YACtE,kBAAkB,EAAE,WAAW;SAChC,CAAC,CAAC;QAEH,MAAM,IAAA,gCAAwB,EAAC;YAC7B,QAAQ;YACR,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AA9ED,kBA8EC"}
+{"version":3,"file":"approve-program.js","sourceRoot":"","sources":["../../src/approve-program.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,iFAAoE;AACpE,qEAAsE;AACtE,6CAAoE;AACpE,4CAAoB;AACpB,wDAAgC;AAChC,mCAAkE;AAClE,iDAA6C;AAE7C,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,mCAAmC;gBAC7C,OAAO,EAAE,oBAAQ,CAAC,QAAQ,EAAE;aAC7B;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,qBAAqB;gBAC/B,QAAQ,EAAE,IAAI;aACf;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAO,EAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhD,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAA,4BAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,gBAAgB,CAAC;YAChB,SAAS;SACV,CAAC;aACD,eAAe,CAAC;YACf,GAAG;YACH,SAAS;YACT,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QAEF,MAAM,IAAA,kCAA0B,EAAC;YAC/B,QAAQ;YACR,YAAY;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AA/DD,kBA+DC"}

package/lib/cjs/close-buffers.js

@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const web3_js_1 = require("@solana/web3.js");
-const sdk_1 = __importDefault(require("@sqds/sdk"));
+const multisig = __importStar(require("@sqds/multisig"));
 const os_1 = __importDefault(require("os"));
 const yargs_1 = __importDefault(require("yargs/yargs"));
 const utils_1 = require("./utils");
@@ -57,18 +57,10 @@ 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,
@@ -81,13 +73,14 @@ function run(args = process.argv) {
         const provider = anchor.getProvider();
         const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
         const connection = provider.connection;
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
         let authority = provider.wallet.publicKey;
-        let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
-        if (multisig) {
-            authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
+        let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
+        if (multisigPda) {
+            const [vaultPda] = multisig.getVaultPda({
+                multisigPda,
+                index: 0,
+            });
+            authority = vaultPda;
         }
         console.log(authority.toBase58());
         const buffers = (yield connection.getProgramAccounts(spl_governance_1.BPF_UPGRADE_LOADER_ID, {
@@ -117,13 +110,10 @@ function run(args = process.argv) {
             ],
         })).map((b) => b.pubkey);
         const instructions = yield Promise.all(buffers.map((b) => (0, utils_1.createCloseBufferInstruction)(new web3_js_1.PublicKey(argv.programId), b, authority, provider.wallet.publicKey)));
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: argv.executeTransaction,
-            squads,
-            multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
+            multisig: multisigPda,
             signers: [],
         });
     });

package/lib/cjs/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/cjs/close-canopy.js

@@ -38,7 +38,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 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");
@@ -61,18 +60,10 @@ 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 = yield yarg.argv;
         process.env.ANCHOR_WALLET = argv.wallet;
@@ -90,16 +81,10 @@ function run(args = process.argv) {
             refund: provider.wallet.publicKey,
         })
             .instruction());
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: argv.executeTransaction,
-            squads,
             multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
             signers: [],
         });
     });

package/lib/cjs/close-canopy.js.map

@@ -1 +1 @@
-{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../src/close-canopy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAE5C,6CAAoE;AACpE,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,mCAIiB;AACjB,yEAA0E;AAE1E,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,gBAAgB;aAC3B;YACD,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAChB;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,2CAA2C;gBACrD,OAAO,EAAE,CAAC;aACX;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAI,EAAC,QAAQ,CAAC,CAAC;QAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,gBAAgB,GAAG,IAAA,2CAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,aAAa,EAAE;aACf,eAAe,CAAC;YACf,gBAAgB;YAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;SAClC,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QAEF,MAAM,MAAM,GAAG,aAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;YACtE,kBAAkB,EAAE,WAAW;SAChC,CAAC,CAAC;QACH,MAAM,IAAA,gCAAwB,EAAC;YAC7B,QAAQ;YACR,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AAhED,kBAgEC"}
+{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../src/close-canopy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAE5C,6CAAoE;AACpE,4CAAoB;AACpB,wDAAgC;AAChC,mCAIiB;AACjB,yEAA0E;AAE1E,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,gBAAgB;aAC3B;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAI,EAAC,QAAQ,CAAC,CAAC;QAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;QAElD,MAAM,gBAAgB,GAAG,IAAA,2CAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,aAAa,EAAE;aACf,eAAe,CAAC;YACf,gBAAgB;YAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;SAClC,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;QAEF,MAAM,IAAA,kCAA0B,EAAC;YAC/B,QAAQ;YACR,YAAY;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YAClE,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AAlDD,kBAkDC"}

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

@@ -0,0 +1,124 @@
+"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 authority = provider.wallet.publicKey;
+        let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
+        if (multisigPda) {
+            const [vaultPda] = multisig.getVaultPda({
+                multisigPda,
+                index: 0,
+            });
+            authority = vaultPda;
+        }
+        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()
+            .accounts({
+            delegatedDataCredits: delegatedDc,
+            dcAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(dcMint, autoTopOff, true),
+        })
+            .instruction();
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
+            provider,
+            instructions: [closeLegacyIx],
+            multisig: multisigPda,
+            signers: [],
+        });
+    });
+}
+exports.run = run;
+//# sourceMappingURL=close-legacy-auto-topoff.js.map

package/lib/cjs/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":"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"}

package/lib/cjs/create-and-approve-makers.js

@@ -49,7 +49,7 @@ const fs_1 = __importDefault(require("fs"));
 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"));
+const multisig = __importStar(require("@sqds/multisig"));
 function run(args = process.argv) {
     return __awaiter(this, void 0, void 0, function* () {
         const yarg = (0, yargs_1.default)(args).options({
@@ -58,9 +58,6 @@ function run(args = process.argv) {
                 describe: 'Anchor wallet keypair',
                 default: `${os_1.default.homedir()}/.config/solana/id.json`,
             },
-            executeTransaction: {
-                type: 'boolean',
-            },
             url: {
                 alias: 'u',
                 default: 'http://127.0.0.1:8899',
@@ -114,11 +111,6 @@ 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 = yield yarg.argv;
         process.env.ANCHOR_WALLET = argv.wallet;
@@ -159,13 +151,14 @@ function run(args = process.argv) {
         const dao = yield hsdProgram.account.daoV0.fetch(subdaoAcc.dao);
         let subdaoPayer = provider.wallet.publicKey;
         let daoPayer = provider.wallet.publicKey;
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
         let authority = provider.wallet.publicKey;
-        let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
-        if (multisig) {
-            authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
+        let multisigPda = argv.multisig ? new web3_js_1.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());
@@ -296,19 +289,16 @@ function run(args = process.argv) {
             approveInstructions.push(innerApproveInstrs);
         }
         console.log('Total sol needed: ', (0, spl_utils_1.humanReadable)(new anchor.BN(totalSol), 9));
-        if (multisig) {
+        if (multisigPda) {
             // Approve instructions must execute after ALL create instructions
             const instrs = createInstructions.flat().filter(spl_utils_1.truthy);
             const approveInstrs = approveInstructions.flat().filter(spl_utils_1.truthy);
             for (const chunk of (0, spl_utils_1.chunks)([...instrs, ...approveInstrs], 3)) {
-                yield (0, utils_1.sendInstructionsOrSquads)({
+                yield (0, utils_1.sendInstructionsOrSquadsV4)({
                     provider,
                     instructions: chunk,
                     signers: [],
-                    executeTransaction: argv.executeTransaction,
-                    squads,
-                    multisig,
-                    authorityIndex: argv.authorityIndex,
+                    multisig: multisigPda,
                 });
             }
         }