@helium/helium-admin-cli 0.11.5 → 0.11.6

package/lib/cjs/reset-vsr-voting-mint.js

@@ -40,7 +40,6 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
 const voter_stake_registry_sdk_1 = require("@helium/voter-stake-registry-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");
@@ -78,18 +77,10 @@ function run(args = process.argv) {
                 describe: 'Reset the subdao voting mint',
                 default: false,
             },
-            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;
@@ -106,9 +97,6 @@ function run(args = process.argv) {
         const now = Number(yield (0, utils_1.getUnixTimestamp)(provider));
         const in7Days = now + (0, utils_1.getTimestampFromDays)(7);
         const instructions = [];
-        const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
-            commitmentOrConfig: 'finalized',
-        });
         if (argv.resetDaoVotingMint) {
             console.log('resetting dao votingMint');
             const hntMint = new web3_js_1.PublicKey(argv.hntMint);
@@ -165,13 +153,10 @@ function run(args = process.argv) {
             ])
                 .instruction());
         }
-        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/reset-vsr-voting-mint.js.map

@@ -1 +1 @@
-{"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAIqC;AACrC,+EAAmE;AACnE,6CAAoE;AACpE,4CAAoB;AACpB,wDAAgC;AAChC,mCAKiB;AAEjB,MAAM,YAAY,GAAG,KAAK,CAAC;AAC3B,MAAM,aAAa,GAAG,GAAG,GAAG,YAAY,CAAC;AACzC,MAAM,UAAU,GAAG,CAAC,GAAG,aAAa,CAAC;AAErC,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,EACN,sEAAsE;aACzE;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,4EAA4E;aAC/E;YACD,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,2BAA2B;gBACrC,OAAO,EAAE,KAAK;aACf;YACD,qBAAqB,EAAE;gBACrB,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,8BAA8B;gBACxC,OAAO,EAAE,KAAK;aACf;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;SACF,CAAC,CAAC;QAEH,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;QAE1D,IAAI,IAAI,CAAC,qBAAqB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/C,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACrC,OAAO;SACR;QAED,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,UAAU,GAAG,MAAM,IAAA,0BAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAO,EAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,GAAG,GAAG,IAAA,4BAAoB,EAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,YAAY,GAA6B,EAAE,CAAC;QAGlD,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,OAAQ,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,IAAA,4BAAM,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEzD,YAAY,CAAC,IAAI,CACf,MAAM,WAAW,CAAC,OAAO;iBACtB,qBAAqB,CAAC;gBACrB,GAAG,EAAE,CAAC;gBACN,8BAA8B,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;gBACtD,oCAAoC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;gBAC9D,oBAAoB,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC;gBAC/C,0BAA0B,EAAE,CAAC;gBAC7B,sCAAsC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC;aAC/D,CAAC;iBACD,eAAe,CAAC;gBACf,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,cAAc,EAAE,MAAM,CAAC,SAAS;gBAChC,IAAI,EAAE,OAAO;aACd,CAAC;iBACD,iBAAiB,CAAC;gBACjB;oBACE,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,KAAK;iBAClB;aACF,CAAC;iBACD,WAAW,EAAE,CACjB,CAAC;SACH;QAED,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,OAAQ,CAAC,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAA,+BAAS,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAElE,YAAY,CAAC,IAAI,CACf,MAAM,WAAW,CAAC,OAAO;iBACtB,qBAAqB,CAAC;gBACrB,GAAG,EAAE,CAAC;gBACN,8BAA8B,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC;gBACtD,oCAAoC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC;gBAC9D,oBAAoB,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC;gBAC/C,0BAA0B,EAAE,CAAC;gBAC7B,sCAAsC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC;aAC3D,CAAC;iBACD,eAAe,CAAC;gBACf,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,SAAS,CAAC,SAAS;aACpC,CAAC;iBACD,iBAAiB,CAAC;gBACjB;oBACE,MAAM,EAAE,OAAO;oBACf,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,KAAK;iBAClB;aACF,CAAC;iBACD,WAAW,EAAE,CACjB,CAAC;SACH;QAED,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;AAhID,kBAgIC"}

package/lib/cjs/revoke-maker.js

@@ -41,7 +41,6 @@ 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 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");
@@ -64,18 +63,10 @@ function run(args = process.argv) {
                 required: true,
                 describe: "Name of the maker, 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,
-            },
             dntMint: {
                 type: "string",
                 describe: "The dnt mint to revoke",
@@ -109,16 +100,10 @@ function run(args = process.argv) {
             rewardableEntityConfig: rewardableEntityConfigK,
         })
             .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/revoke-maker.js.map

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

package/lib/cjs/set-dc-onboarding-fees-paid-epoch-info.js

@@ -40,7 +40,6 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-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");
@@ -57,18 +56,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,
-            },
             minimumPeriods: {
                 type: "number",
                 describe: "The new minimum number of periods",
@@ -109,16 +100,10 @@ function run(args = process.argv) {
             authority: subDaoAcc.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/set-dc-onboarding-fees-paid-epoch-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-dc-onboarding-fees-paid-epoch-info.js","sourceRoot":"","sources":["../../src/set-dc-onboarding-fees-paid-epoch-info.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set-dc-onboarding-fees-paid-epoch-info.js","sourceRoot":"","sources":["../../src/set-dc-onboarding-fees-paid-epoch-info.ts"],"names":[],"mappings":"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"}

package/lib/cjs/set-dc-onboarding-fees-paid.js

@@ -40,7 +40,6 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-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");
@@ -57,18 +56,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,
-            },
             minimumPeriods: {
                 type: "number",
                 describe: "The new minimum number of periods",
@@ -104,16 +95,10 @@ function run(args = process.argv) {
             authority: subDaoAcc.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/set-dc-onboarding-fees-paid.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-dc-onboarding-fees-paid.js","sourceRoot":"","sources":["../../src/set-dc-onboarding-fees-paid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set-dc-onboarding-fees-paid.js","sourceRoot":"","sources":["../../src/set-dc-onboarding-fees-paid.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAAyE;AACzE,iDAAgD;AAChD,6CAAoE;AACpE,4CAAoB;AACpB,wDAAgC;AAChC,mCAAkE;AAElE,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;aACvG;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,mCAAmC;aAC9C;YACD,oBAAoB,EAAE;gBACpB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,iCAAiC;aAC5C;YACD,OAAO,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,8BAA8B;gBACxC,OAAO,EAAE,uBAAW,CAAC,QAAQ,EAAE;aAChC;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,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,OAAO,GAAG,IAAA,+BAAS,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEnE,YAAY,CAAC,IAAI,CACf,MAAM,UAAU,CAAC,OAAO;aACrB,4BAA4B,CAAC;YAC5B,oBAAoB,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC;SAC/D,CAAC;aACD,eAAe,CAAC;YACf,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B,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;AAhED,kBAgEC"}

package/lib/cjs/set-proxy-config.js

@@ -45,7 +45,7 @@ const voter_stake_registry_sdk_1 = require("@helium/voter-stake-registry-sdk");
 const fs_1 = __importDefault(require("fs"));
 const spl_utils_1 = require("@helium/spl-utils");
 const web3_js_1 = require("@solana/web3.js");
-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({
@@ -67,11 +67,6 @@ function run(args = process.argv) {
                 type: "string",
                 describe: "Address of the squads multisig to control the dao. If not provided, your wallet will be the authority",
             },
-            authorityIndex: {
-                type: "number",
-                describe: "Authority index for squads. Defaults to 1",
-                default: 1,
-            },
             proxySeasonsFile: {
                 type: "string",
                 default: `${__dirname}/../../proxy-seasons.json`,
@@ -83,13 +78,14 @@ function run(args = process.argv) {
         anchor.setProvider(anchor.AnchorProvider.local(argv.url));
         const provider = anchor.getProvider();
         const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
-        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;
         }
         const delProgram = yield (0, nft_proxy_sdk_1.init)(provider);
         const vsrProgram = yield (0, voter_stake_registry_sdk_1.init)(provider);
@@ -115,7 +111,7 @@ function run(args = process.argv) {
             yield (0, spl_utils_1.sendInstructions)(provider, [instruction]);
         }
         console.log("Updating registrar to delegation config");
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions: [
                 yield vsrProgram.methods
@@ -127,10 +123,7 @@ function run(args = process.argv) {
                 })
                     .instruction(),
             ],
-            executeTransaction: false,
-            squads,
-            multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
+            multisig: multisigPda,
             signers: [],
         });
     });

package/lib/cjs/set-proxy-config.js.map

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

package/lib/cjs/setup-dc-auto-topoff.js

@@ -42,14 +42,15 @@ 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 hpl_crons_sdk_1 = require("@helium/hpl-crons-sdk");
 const spl_utils_1 = require("@helium/spl-utils");
+const multisig = __importStar(require("@sqds/multisig"));
 const spl_token_1 = require("@solana/spl-token");
 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");
 const tuktuk_sdk_1 = require("@helium/tuktuk-sdk");
 function run(args = process.argv) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const yarg = (0, yargs_1.default)(args).options({
             wallet: {
@@ -75,13 +76,16 @@ function run(args = process.argv) {
             threshold: {
                 type: "number",
                 describe: "Threshold for auto topoff in DC, raw with no decimals",
-                default: 1,
             },
             initialLamports: {
                 type: "number",
                 describe: "Initial lamports to send to the auto topoff, pays for crank turns.",
                 default: 10000000,
             },
+            newAuthority: {
+                type: "string",
+                describe: "New authority for the auto topoff",
+            },
             routerKey: {
                 type: "string",
                 describe: "The router key for the delegated data credits",
@@ -96,15 +100,45 @@ 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,
-            },
             schedule: {
                 type: 'string',
                 describe: 'Cron schedule for the auto topoff',
-                required: true,
+            },
+            hntPriceOracle: {
+                type: 'string',
+                describe: 'Pubkey of the HNT price oracle',
+            },
+            hntThreshold: {
+                type: 'number',
+                describe: 'HNT threshold for the auto topoff',
+            },
+            dcaMint: {
+                type: 'string',
+                describe: 'Pubkey of the DCA mint',
+            },
+            dcaSwapAmount: {
+                type: 'number',
+                describe: 'DCA swap amount for the auto topoff',
+            },
+            dcaIntervalSeconds: {
+                type: 'number',
+                describe: 'DCA interval seconds for the auto topoff',
+            },
+            dcaInputPriceOracle: {
+                type: 'string',
+                describe: 'Pubkey of the DCA input price oracle',
+            },
+            dcaOutputPriceOracle: {
+                type: 'string',
+                describe: 'Pubkey of the DCA output price oracle',
+            },
+            dcaSigner: {
+                type: 'string',
+                describe: 'Pubkey of the DCA signer',
+            },
+            dcaUrl: {
+                type: 'string',
+                describe: 'URL of the DCA server',
             },
         });
         const argv = yield yarg.argv;
@@ -120,13 +154,14 @@ function run(args = process.argv) {
         const dcAutoTopoffProgram = yield (0, dc_auto_top_sdk_1.init)(provider);
         const tuktukProgram = yield (0, tuktuk_sdk_1.init)(provider);
         const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
-        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;
         }
         const routerKey = argv.routerKey;
         const delegatedDc = (0, data_credits_sdk_1.delegatedDataCreditsKey)(subDao, routerKey)[0];
@@ -150,38 +185,150 @@ function run(args = process.argv) {
         }
         const autoTopOff = (0, dc_auto_top_sdk_1.autoTopOffKey)(delegatedDc, authority)[0];
         const taskQueue = yield tuktukProgram.account.taskQueueV0.fetch(hpl_crons_sdk_1.TASK_QUEUE_ID);
-        const [nextPythTask, nextTask] = (0, tuktuk_sdk_1.nextAvailableTaskIds)(taskQueue.taskBitmap, 2);
+        const [nextTask, nextHntTask] = (0, tuktuk_sdk_1.nextAvailableTaskIds)(taskQueue.taskBitmap, 2);
         const autoTopOffAcc = yield dcAutoTopoffProgram.account.autoTopOffV0.fetchNullable(autoTopOff);
-        if (autoTopOffAcc) {
+        // Check if auto topoff exists with different authority
+        if (autoTopOffAcc && !autoTopOffAcc.authority.equals(authority)) {
+            console.log(`Authority mismatch detected. Old authority: ${autoTopOffAcc.authority.toBase58()}, New authority: ${authority.toBase58()}`);
+            // Get HNT balance from old auto topoff
+            const oldAutoTopOffHntAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(hntMint, autoTopOff, true);
+            const oldHntAccountInfo = yield provider.connection.getAccountInfo(oldAutoTopOffHntAccount);
+            let oldHntBalance = new anchor.BN(0);
+            if (oldHntAccountInfo) {
+                const oldHntAccount = yield provider.connection.getTokenAccountBalance(oldAutoTopOffHntAccount);
+                oldHntBalance = new anchor.BN(oldHntAccount.value.amount);
+                console.log(`Old auto topoff HNT balance: ${oldHntBalance.toString()}`);
+            }
+            // Close the old auto topoff
+            const closeIx = yield dcAutoTopoffProgram.methods.closeAutoTopOffV0()
+                .accounts({
+                autoTopOff: autoTopOff,
+                rentRefund: authority,
+            })
+                .instruction();
+            instructions.push(closeIx);
+            const schedule = argv.schedule ? argv.schedule : Buffer.from(autoTopOffAcc.schedule).toString('utf-8').replace(/\0/g, '');
+            const threshold = argv.threshold ? new anchor.BN(argv.threshold) : autoTopOffAcc.threshold;
+            const newAutoTopOff = (0, dc_auto_top_sdk_1.autoTopOffKey)(delegatedDc, authority)[0];
+            const initIx = yield dcAutoTopoffProgram.methods.initializeAutoTopOffV0({
+                schedule,
+                threshold,
+                routerKey,
+                hntThreshold: argv.hntThreshold ? new anchor.BN(argv.hntThreshold) : autoTopOffAcc.hntThreshold,
+                dcaMint: argv.dcaMint ? new web3_js_1.PublicKey(argv.dcaMint) : autoTopOffAcc.dcaMint,
+                dcaSwapAmount: argv.dcaSwapAmount ? new anchor.BN(argv.dcaSwapAmount) : autoTopOffAcc.dcaSwapAmount,
+                dcaIntervalSeconds: argv.dcaIntervalSeconds ? new anchor.BN(argv.dcaIntervalSeconds) : autoTopOffAcc.dcaIntervalSeconds,
+                dcaInputPriceOracle: argv.dcaInputPriceOracle ? new web3_js_1.PublicKey(argv.dcaInputPriceOracle) : autoTopOffAcc.dcaInputPriceOracle,
+                dcaSigner: argv.dcaSigner ? new web3_js_1.PublicKey(argv.dcaSigner) : autoTopOffAcc.dcaSigner,
+                dcaUrl: argv.dcaUrl ? argv.dcaUrl : Buffer.from(autoTopOffAcc.dcaUrl).toString('utf-8').replace(/\0/g, ''),
+            })
+                .accountsPartial({
+                payer: authority,
+                authority,
+                taskQueue: hpl_crons_sdk_1.TASK_QUEUE_ID,
+                delegatedDataCredits: delegatedDc,
+                dao: (0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0],
+                dataCredits: (0, data_credits_sdk_1.dataCreditsKey)(dcMint)[0],
+                dcMint,
+                hntMint,
+                subDao,
+                hntPriceOracle: argv.hntPriceOracle ? new web3_js_1.PublicKey(argv.hntPriceOracle) : autoTopOffAcc.hntPriceOracle,
+            })
+                .instruction();
+            instructions.push(initIx);
+            const { instruction: scheduleTaskInstruction } = yield dcAutoTopoffProgram.methods.scheduleTaskV0({
+                taskId: nextTask,
+                hntTaskId: nextHntTask,
+            })
+                .accountsPartial({
+                payer: authority,
+                autoTopOff: autoTopOff,
+                nextTask: autoTopOff,
+                task: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextTask)[0],
+                hntTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextHntTask)[0],
+                taskQueue: hpl_crons_sdk_1.TASK_QUEUE_ID,
+            })
+                .prepare();
+            instructions.push(scheduleTaskInstruction);
+            instructions.push(web3_js_1.SystemProgram.transfer({
+                fromPubkey: authority,
+                toPubkey: newAutoTopOff,
+                lamports: argv.initialLamports,
+            }));
+            // Transfer HNT from old wallet (if any) to new auto topoff
+            if (oldHntBalance.gt(new anchor.BN(0))) {
+                const walletHntAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(hntMint, authority, true);
+                const newAutoTopOffHntAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(hntMint, newAutoTopOff, true);
+                instructions.push((0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(authority, newAutoTopOffHntAccount, newAutoTopOff, hntMint));
+                instructions.push((0, spl_token_1.createTransferInstruction)(walletHntAccount, newAutoTopOffHntAccount, authority, BigInt(oldHntBalance.toString())));
+                console.log(`Will transfer ${oldHntBalance.toString()} HNT from wallet to new auto topoff`);
+            }
+        }
+        else if (autoTopOffAcc) {
             const queueAuthority = (0, dc_auto_top_sdk_1.queueAuthorityKey)()[0];
+            const taskRentRefund = ((_a = (yield tuktukProgram.account.taskV0.fetchNullable(autoTopOffAcc.nextTask))) === null || _a === void 0 ? void 0 : _a.rentRefund) || authority;
+            const hntTaskRentRefund = ((_b = (yield tuktukProgram.account.taskV0.fetchNullable(autoTopOffAcc.nextHntTask))) === null || _b === void 0 ? void 0 : _b.rentRefund) || authority;
+            // Update the auto topoff configuration
             const updateIx = yield dcAutoTopoffProgram.methods.updateAutoTopOffV0({
-                newTaskId: nextTask,
-                newPythTaskId: nextPythTask,
-                schedule: argv.schedule,
-                threshold: new anchor.BN(argv.threshold),
+                schedule: argv.schedule ? argv.schedule : null,
+                threshold: argv.threshold ? new anchor.BN(argv.threshold) : null,
+                hntPriceOracle: argv.hntPriceOracle ? new web3_js_1.PublicKey(argv.hntPriceOracle) : null,
+                hntThreshold: argv.hntThreshold ? new anchor.BN(argv.hntThreshold) : null,
+                dcaMint: argv.dcaMint ? new web3_js_1.PublicKey(argv.dcaMint) : null,
+                dcaSwapAmount: argv.dcaSwapAmount ? new anchor.BN(argv.dcaSwapAmount) : null,
+                dcaIntervalSeconds: argv.dcaIntervalSeconds ? new anchor.BN(argv.dcaIntervalSeconds) : null,
+                dcaInputPriceOracle: argv.dcaInputPriceOracle ? new web3_js_1.PublicKey(argv.dcaInputPriceOracle) : null,
             })
-                .accountsStrict({
+                .accountsPartial({
                 payer: authority,
                 autoTopOff: autoTopOff,
                 nextTask: autoTopOffAcc.nextTask,
-                newTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextTask)[0],
-                newPythTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextPythTask)[0],
-                taskQueue: hpl_crons_sdk_1.TASK_QUEUE_ID,
-                authority: authority,
-                systemProgram: web3_js_1.SystemProgram.programId,
-                queueAuthority,
-                nextPythTask: autoTopOffAcc.nextPythTask,
-                taskQueueAuthority: (0, tuktuk_sdk_1.taskQueueAuthorityKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, queueAuthority)[0],
-                tuktukProgram: tuktukProgram.programId,
+                nextHntTask: autoTopOffAcc.nextHntTask,
+                taskRentRefund,
+                hntTaskRentRefund,
             })
                 .instruction();
             instructions.push(updateIx);
+            // Schedule new tasks separately
+            const scheduleTaskIx = yield dcAutoTopoffProgram.methods.scheduleTaskV0({
+                taskId: nextTask,
+                hntTaskId: nextHntTask,
+            })
+                .accountsPartial({
+                payer: authority,
+                autoTopOff: autoTopOff,
+                nextTask: autoTopOffAcc.nextTask,
+                task: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextTask)[0],
+                hntTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextHntTask)[0],
+                taskQueue: hpl_crons_sdk_1.TASK_QUEUE_ID,
+            })
+                .instruction();
+            instructions.push(scheduleTaskIx);
         }
         else {
+            if (!argv.schedule || !argv.threshold) {
+                throw new Error("Schedule and threshold are required to initialize auto topoff");
+            }
+            if (!argv.hntPriceOracle) {
+                throw new Error("HNT price oracle is required to initialize auto topoff");
+            }
+            if (!argv.dcaSigner) {
+                throw new Error("DCA signer is required to initialize auto topoff");
+            }
+            if (!argv.dcaUrl) {
+                throw new Error("DCA URL is required to initialize auto topoff");
+            }
             const instruction = yield dcAutoTopoffProgram.methods.initializeAutoTopOffV0({
                 schedule: argv.schedule,
                 threshold: new anchor.BN(argv.threshold),
                 routerKey,
+                hntThreshold: new anchor.BN(argv.hntThreshold),
+                dcaMint: new web3_js_1.PublicKey(argv.dcaMint),
+                dcaSwapAmount: new anchor.BN(argv.dcaSwapAmount),
+                dcaIntervalSeconds: new anchor.BN(argv.dcaIntervalSeconds),
+                dcaInputPriceOracle: new web3_js_1.PublicKey(argv.dcaInputPriceOracle),
+                dcaSigner: new web3_js_1.PublicKey(argv.dcaSigner),
+                dcaUrl: argv.dcaUrl,
             })
                 .accountsPartial({
                 payer: authority,
@@ -193,19 +340,20 @@ function run(args = process.argv) {
                 dcMint,
                 hntMint,
                 subDao,
+                hntPriceOracle: new web3_js_1.PublicKey(argv.hntPriceOracle),
             })
                 .instruction();
             instructions.push(instruction);
             const { instruction: scheduleTaskInstruction, pubkeys: { queueAuthority } } = yield dcAutoTopoffProgram.methods.scheduleTaskV0({
                 taskId: nextTask,
-                pythTaskId: nextPythTask,
+                hntTaskId: nextHntTask,
             })
                 .accountsPartial({
                 payer: authority,
                 autoTopOff: autoTopOff,
-                nextTask: web3_js_1.PublicKey.default,
+                nextTask: autoTopOff,
                 task: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextTask)[0],
-                pythTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextPythTask)[0],
+                hntTask: (0, tuktuk_sdk_1.taskKey)(hpl_crons_sdk_1.TASK_QUEUE_ID, nextHntTask)[0],
                 taskQueue: hpl_crons_sdk_1.TASK_QUEUE_ID,
             })
                 .prepare();
@@ -217,13 +365,10 @@ function run(args = process.argv) {
                 lamports: argv.initialLamports,
             }));
         }
-        yield (0, utils_1.sendInstructionsOrSquads)({
+        yield (0, utils_1.sendInstructionsOrSquadsV4)({
             provider,
             instructions,
-            executeTransaction: false,
-            squads,
-            multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
-            authorityIndex: argv.authorityIndex,
+            multisig: multisigPda,
             signers: [],
         });
         console.log(`Initialized auto topoff for ${routerKey} with schedule ${argv.schedule} and threshold ${argv.threshold}. Send HNT to ${autoTopOff.toBase58()}`);