@helium/helium-admin-cli 0.2.21 → 0.2.22-next.34

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

@@ -1,48 +1,49 @@
-import * as anchor from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
-import Squads from "@sqds/sdk";
-import os from "os";
-import yargs from "yargs/yargs";
-import { createCloseBufferInstruction, sendInstructionsOrSquads } from "./utils";
-import { BPF_UPGRADE_LOADER_ID } from "@solana/spl-governance";
-import bs58 from "bs58";
+import * as anchor from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import Squads from '@sqds/sdk';
+import os from 'os';
+import yargs from 'yargs/yargs';
+import { createCloseBufferInstruction, loadKeypair, sendInstructionsOrSquads, } from './utils';
+import { BPF_UPGRADE_LOADER_ID } from '@solana/spl-governance';
+import bs58 from 'bs58';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
         wallet: {
-            alias: "k",
-            describe: "Anchor wallet keypair",
+            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",
+            alias: 'u',
+            default: 'http://127.0.0.1:8899',
+            describe: 'The solana url',
         },
         executeTransaction: {
-            type: "boolean",
+            type: 'boolean',
         },
         multisig: {
-            type: "string",
-            describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
+            type: 'string',
+            describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
         },
         authorityIndex: {
-            type: "number",
-            describe: "Authority index for squads. Defaults to 1",
+            type: 'number',
+            describe: 'Authority index for squads. Defaults to 1',
             default: 1,
         },
         programId: {
-            type: "string",
+            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));
     const connection = provider.connection;
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, provider.wallet, {
-        commitmentOrConfig: "finalized",
+    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
+        commitmentOrConfig: 'finalized',
     });
     let authority = provider.wallet.publicKey;
     let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;

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

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

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

@@ -1,37 +1,37 @@
-import * as anchor from "@coral-xyz/anchor";
-import { PublicKey } from "@solana/web3.js";
-import Squads from "@sqds/sdk";
-import os from "os";
-import yargs from "yargs/yargs";
-import { sendInstructionsOrSquads } from "./utils";
-import { init, lazyTransactionsKey } from "@helium/lazy-transactions-sdk";
+import * as anchor from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import Squads from '@sqds/sdk';
+import os from 'os';
+import yargs from 'yargs/yargs';
+import { loadKeypair, sendInstructionsOrSquads, } from './utils';
+import { init, lazyTransactionsKey } from '@helium/lazy-transactions-sdk';
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
         wallet: {
-            alias: "k",
-            describe: "Anchor wallet keypair",
+            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",
+            alias: 'u',
+            default: 'http://127.0.0.1:8899',
+            describe: 'The solana url',
         },
         name: {
             required: true,
-            type: "string",
-            describe: "Lazy dist name",
+            type: 'string',
+            describe: 'Lazy dist name',
         },
         executeTransaction: {
-            type: "boolean",
+            type: 'boolean',
         },
         multisig: {
-            type: "string",
-            describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
+            type: 'string',
+            describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
         },
         authorityIndex: {
-            type: "number",
-            describe: "Authority index for squads. Defaults to 1",
+            type: 'number',
+            describe: 'Authority index for squads. Defaults to 1',
             default: 1,
         },
     });
@@ -40,15 +40,19 @@ export async function run(args = process.argv) {
     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));
     const program = await init(provider);
     const instructions = [];
     const lazyTransactions = lazyTransactionsKey(argv.name)[0];
-    instructions.push(await program.methods.closeCanopyV0().accounts({
+    instructions.push(await program.methods
+        .closeCanopyV0()
+        .accounts({
         lazyTransactions,
-        refund: provider.wallet.publicKey
-    }).instruction());
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, provider.wallet, {
-        commitmentOrConfig: "finalized",
+        refund: provider.wallet.publicKey,
+    })
+        .instruction());
+    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
+        commitmentOrConfig: 'finalized',
     });
     await sendInstructionsOrSquads({
         provider,

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

@@ -1 +1 @@
-{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../../src/close-canopy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAA0B,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE;YACN,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,yBAAyB;SAClD;QACD,GAAG,EAAE;YACH,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,gBAAgB;SAC3B;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gBAAgB;SAC3B;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,SAAS;SAChB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,2CAA2C;YACrD,OAAO,EAAE,CAAC;SACX;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;IAC/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC;QAC7C,gBAAgB;QAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;KAClC,CAAC,CAAC,WAAW,EAAE,CACjB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAC5B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAC/B,QAAQ,CAAC,MAAM,EACf;QACE,kBAAkB,EAAE,WAAW;KAChC,CACF,CAAC;IACF,MAAM,wBAAwB,CAAC;QAC7B,QAAQ;QACR,YAAY;QACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,MAAM;QACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"close-canopy.js","sourceRoot":"","sources":["../../../src/close-canopy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EACL,WAAW,EAEX,wBAAwB,GACzB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE;YACN,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,yBAAyB;SAClD;QACD,GAAG,EAAE;YACH,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,gBAAgB;SAC3B;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,gBAAgB;SAC3B;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,SAAS;SAChB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,2CAA2C;YACrD,OAAO,EAAE,CAAC;SACX;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;IAC/D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;SAClB,aAAa,EAAE;SACf,QAAQ,CAAC;QACR,gBAAgB;QAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;KAClC,CAAC;SACD,WAAW,EAAE,CACjB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;QACtE,kBAAkB,EAAE,WAAW;KAChC,CAAC,CAAC;IACH,MAAM,wBAAwB,CAAC;QAC7B,QAAQ;QACR,YAAY;QACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,MAAM;QACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;AACL,CAAC"}

package/lib/esm/src/close-lazy-transaction-markers.js

@@ -0,0 +1,67 @@
+import * as anchor from "@coral-xyz/anchor";
+import { blockKey, init as initLazy, lazyTransactionsKey } from "@helium/lazy-transactions-sdk";
+import os from "os";
+import yargs from "yargs/yargs";
+import { bulkSendTransactions, chunks } from "@helium/spl-utils";
+import { Transaction } from "@solana/web3.js";
+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",
+        },
+        name: {
+            default: "nJWGUMOK",
+            describe: "The lazy transactions instance name"
+        }
+    });
+    const argv = await yarg.argv;
+    process.env.ANCHOR_WALLET = argv.wallet;
+    process.env.ANCHOR_PROVIDER_URL = argv.url;
+    anchor.setProvider(anchor.AnchorProvider.local(argv.url));
+    const provider = anchor.getProvider();
+    const lazyProgram = await initLazy(provider);
+    const ltKey = lazyTransactionsKey(argv.name)[0];
+    const lt = await lazyProgram.account.lazyTransactionsV0.fetch(ltKey);
+    const blocks = await lazyProgram.account.block.all();
+    const blocksByKey = new Set(blocks.map((b) => b.publicKey.toString()));
+    const allIndices = new Array(1 << lt.maxDepth).fill(0).map((_, i) => i);
+    const blockIndices = allIndices.filter((bi) => blocksByKey.has(blockKey(ltKey, bi)[0].toBase58()));
+    if (lt.executed.length !== 1 << lt.maxDepth) {
+        await lazyProgram.methods
+            .reinitializeExecutedTransactionsV0()
+            .accounts({
+            lazyTransactions: ltKey,
+        })
+            .rpc({ skipPreflight: true });
+    }
+    const instructions = await Promise.all(blockIndices.map((bi) => lazyProgram.methods
+        .closeMarkerV0({
+        index: bi,
+    })
+        .accounts({
+        refund: provider.wallet.publicKey,
+        lazyTransactions: ltKey,
+        authority: provider.wallet.publicKey,
+    })
+        .instruction()));
+    console.log(`${blocks.length} blocks to close`);
+    const txns = chunks(instructions, 10).map(chunk => {
+        const tx = new Transaction({
+            feePayer: provider.wallet.publicKey,
+        });
+        tx.add(...chunk);
+        return tx;
+    });
+    await bulkSendTransactions(provider, txns, (status) => {
+        console.log(`Sending ${status.currentBatchProgress} / ${status.currentBatchSize} batch. ${status.totalProgress} / ${txns.length}`);
+    });
+    console.log("Done");
+}
+//# sourceMappingURL=close-lazy-transaction-markers.js.map

package/lib/esm/src/close-lazy-transaction-markers.js.map

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

package/lib/esm/src/create-dao.js

@@ -1,22 +1,22 @@
-import * as anchor from "@coral-xyz/anchor";
-import { ThresholdType } from "@helium/circuit-breaker-sdk";
-import { dataCreditsKey, init as initDc, PROGRAM_ID, accountPayerKey, } from "@helium/data-credits-sdk";
-import { init as initHem, dataOnlyConfigKey, } from "@helium/helium-entity-manager-sdk";
-import { fanoutKey } from "@helium/fanout-sdk";
-import { daoKey, init as initDao, threadKey, } from "@helium/helium-sub-daos-sdk";
-import { sendInstructions, toBN } from "@helium/spl-utils";
-import { init as initVsr, registrarKey, } from "@helium/voter-stake-registry-sdk";
-import { getGovernanceProgramVersion, GoverningTokenConfigAccountArgs, GoverningTokenType, MintMaxVoteWeightSource, SetRealmAuthorityAction, withCreateRealm, withSetRealmAuthority, } from "@solana/spl-governance";
-import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, } from "@solana/spl-token";
-import { ComputeBudgetProgram, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, } from "@solana/web3.js";
-import Squads from "@sqds/sdk";
-import os from "os";
-import yargs from "yargs/yargs";
-import { createAndMint, isLocalhost, loadKeypair, parseEmissionsSchedule, sendInstructionsOrSquads, } from "./utils";
-import fs from "fs";
-import { BN } from "bn.js";
-import { getConcurrentMerkleTreeAccountSize, SPL_ACCOUNT_COMPRESSION_PROGRAM_ID } from "@solana/spl-account-compression";
-const { hideBin } = require("yargs/helpers");
+import * as anchor from '@coral-xyz/anchor';
+import { ThresholdType } from '@helium/circuit-breaker-sdk';
+import { dataCreditsKey, init as initDc, PROGRAM_ID, accountPayerKey, } from '@helium/data-credits-sdk';
+import { init as initHem, dataOnlyConfigKey, } from '@helium/helium-entity-manager-sdk';
+import { fanoutKey } from '@helium/fanout-sdk';
+import { daoKey, init as initDao, threadKey, } from '@helium/helium-sub-daos-sdk';
+import { sendInstructions, toBN } from '@helium/spl-utils';
+import { init as initVsr, registrarKey, } from '@helium/voter-stake-registry-sdk';
+import { getGovernanceProgramVersion, GoverningTokenConfigAccountArgs, GoverningTokenType, MintMaxVoteWeightSource, SetRealmAuthorityAction, withCreateRealm, withSetRealmAuthority, } from '@solana/spl-governance';
+import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, } from '@solana/spl-token';
+import { ComputeBudgetProgram, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, } from '@solana/web3.js';
+import Squads from '@sqds/sdk';
+import os from 'os';
+import yargs from 'yargs/yargs';
+import { createAndMint, isLocalhost, loadKeypair, parseEmissionsSchedule, sendInstructionsOrSquads, } from './utils';
+import fs from 'fs';
+import { BN } from 'bn.js';
+import { getConcurrentMerkleTreeAccountSize, SPL_ACCOUNT_COMPRESSION_PROGRAM_ID, } from '@solana/spl-account-compression';
+const { hideBin } = require('yargs/helpers');
 const HNT_EPOCH_REWARDS = 10000000000;
 const SECS_PER_DAY = 86400;
 const SECS_PER_YEAR = 365 * SECS_PER_DAY;
@@ -30,106 +30,107 @@ async function exists(connection, account) {
 export async function run(args = process.argv) {
     const yarg = yargs(args).options({
         wallet: {
-            alias: "k",
-            describe: "Anchor wallet keypair",
+            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",
+            alias: 'u',
+            default: 'http://127.0.0.1:8899',
+            describe: 'The solana url',
         },
         hntKeypair: {
-            type: "string",
-            describe: "Keypair of the HNT token",
+            type: 'string',
+            describe: 'Keypair of the HNT token',
             default: `${__dirname}/../../keypairs/hnt.json`,
         },
         dcKeypair: {
-            type: "string",
-            describe: "Keypair of the Data Credit token",
+            type: 'string',
+            describe: 'Keypair of the Data Credit token',
             default: `${__dirname}/../../keypairs/dc.json`,
         },
         numHnt: {
-            type: "number",
-            describe: "Number of HNT tokens to pre mint before assigning authority to lazy distributor",
+            type: 'number',
+            describe: 'Number of HNT tokens to pre mint before assigning authority to lazy distributor',
             default: 0,
         },
         numDc: {
-            type: "number",
-            describe: "Number of DC tokens to pre mint before assigning authority to lazy distributor",
+            type: 'number',
+            describe: 'Number of DC tokens to pre mint before assigning authority to lazy distributor',
             default: 1000,
         },
         bucket: {
-            type: "string",
-            describe: "Bucket URL prefix holding all of the metadata jsons",
-            default: "https://shdw-drive.genesysgo.net/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP",
+            type: 'string',
+            describe: 'Bucket URL prefix holding all of the metadata jsons',
+            default: 'https://shdw-drive.genesysgo.net/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP',
         },
         emissionSchedulePath: {
             required: true,
-            describe: "Path to file that contains the hnt emissions schedule",
-            type: "string",
+            describe: 'Path to file that contains the hnt emissions schedule',
+            type: 'string',
             default: `${__dirname}/../../emissions/hnt.json`,
         },
         hstEmissionSchedulePath: {
             required: true,
-            describe: "Path to file that contains the hst emissions schedule",
-            type: "string",
+            describe: 'Path to file that contains the hst emissions schedule',
+            type: 'string',
             default: `${__dirname}/../../emissions/hst.json`,
         },
         govProgramId: {
-            type: "string",
-            describe: "Pubkey of the GOV program",
-            default: "hgovkRU6Ghe1Qoyb54HdSLdqN7VtxaifBzRmh9jtd3S",
+            type: 'string',
+            describe: 'Pubkey of the GOV program',
+            default: 'hgovkRU6Ghe1Qoyb54HdSLdqN7VtxaifBzRmh9jtd3S',
         },
         realmName: {
-            type: "string",
-            describe: "Name of the realm to be generated",
-            default: "Helium",
+            type: 'string',
+            describe: 'Name of the realm to be generated',
+            default: 'Helium',
         },
         councilKeypair: {
-            type: "string",
-            describe: "Keypair of gov council token",
+            type: 'string',
+            describe: 'Keypair of gov council token',
             default: `${__dirname}/../../keypairs/council.json`,
         },
         councilWallet: {
-            type: "string",
-            describe: "Pubkey for holding/distributing council tokens",
+            type: 'string',
+            describe: 'Pubkey for holding/distributing council tokens',
             default: await loadKeypair(`${os.homedir()}/.config/solana/id.json`).publicKey.toBase58(),
         },
         numCouncil: {
-            type: "number",
-            describe: "Number of Gov Council tokens to pre mint before assigning authority to dao",
+            type: 'number',
+            describe: 'Number of Gov Council tokens to pre mint before assigning authority to dao',
             default: 10,
         },
         multisig: {
-            type: "string",
-            describe: "Address of the squads multisig to control the dao. If not provided, your wallet will be the authority",
+            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",
+            type: 'number',
+            describe: 'Authority index for squads. Defaults to 1',
             default: 1,
         },
         hntPriceOracle: {
-            type: "string",
-            required: true
+            type: 'string',
+            required: true,
         },
         numHst: {
-            type: "number",
-            describe: "Number of HST tokens to pre mint before assigning authority to lazy distributor",
+            type: 'number',
+            describe: 'Number of HST tokens to pre mint before assigning authority to lazy distributor',
             default: 0,
         },
         merklePath: {
-            type: "string",
-            describe: "Path to the merkle keypair",
+            type: 'string',
+            describe: 'Path to the merkle keypair',
             default: `${__dirname}/../../keypairs/data-only-merkle.json`,
-        }
+        },
     });
     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));
     const dataCreditsProgram = await initDc(provider);
     const heliumSubDaosProgram = await initDao(provider);
     const heliumVsrProgram = await initVsr(provider);
@@ -141,17 +142,17 @@ export async function run(args = process.argv) {
     const dcKeypair = loadKeypair(argv.dcKeypair);
     const me = provider.wallet.publicKey;
     const dao = daoKey(hntKeypair.publicKey)[0];
-    console.log("HNT", hntKeypair.publicKey.toBase58());
-    console.log("DC", dcKeypair.publicKey.toBase58());
-    console.log("GOV PID", govProgramId.toBase58());
-    console.log("COUNCIL", councilKeypair.publicKey.toBase58());
-    console.log("COUNCIL WALLET", councilWallet.toBase58());
-    const thread = threadKey(dao, "issue_hst")[0];
-    console.log("DAO", dao.toString());
-    console.log("THREAD", thread.toString());
+    console.log('HNT', hntKeypair.publicKey.toBase58());
+    console.log('DC', dcKeypair.publicKey.toBase58());
+    console.log('GOV PID', govProgramId.toBase58());
+    console.log('COUNCIL', councilKeypair.publicKey.toBase58());
+    console.log('COUNCIL WALLET', councilWallet.toBase58());
+    const thread = threadKey(dao, 'issue_hst')[0];
+    console.log('DAO', dao.toString());
+    console.log('THREAD', thread.toString());
     const conn = provider.connection;
-    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, provider.wallet, {
-        commitmentOrConfig: "finalized"
+    const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
+        commitmentOrConfig: 'finalized',
     });
     let authority = provider.wallet.publicKey;
     let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
@@ -160,7 +161,7 @@ export async function run(args = process.argv) {
         // Fund authority
         const authAcc = await provider.connection.getAccountInfo(authority);
         if (!authAcc || authAcc.lamports < LAMPORTS_PER_SOL) {
-            console.log("Funding multisig...");
+            console.log('Funding multisig...');
             await sendInstructions(provider, [
                 await SystemProgram.transfer({
                     fromPubkey: me,
@@ -175,7 +176,7 @@ export async function run(args = process.argv) {
         mintKeypair: hntKeypair,
         amount: argv.numHnt,
         metadataUrl: `${argv.bucket}/hnt.json`,
-        updateAuthority: authority
+        updateAuthority: authority,
     });
     await createAndMint({
         provider,
@@ -195,13 +196,13 @@ export async function run(args = process.argv) {
         updateAuthority: authority,
     });
     let instructions = [];
-    const govProgramVersion = await getGovernanceProgramVersion(conn, govProgramId, isLocalhost(provider) ? "localnet" : undefined);
+    const govProgramVersion = await getGovernanceProgramVersion(conn, govProgramId, isLocalhost(provider) ? 'localnet' : undefined);
     const realmName = argv.realmName;
-    const realm = await PublicKey.findProgramAddressSync([Buffer.from("governance", "utf-8"), Buffer.from(realmName, "utf-8")], govProgramId)[0];
-    console.log("Realm, ", realm.toBase58());
+    const realm = await PublicKey.findProgramAddressSync([Buffer.from('governance', 'utf-8'), Buffer.from(realmName, 'utf-8')], govProgramId)[0];
+    console.log('Realm, ', realm.toBase58());
     const needRealmCreate = !(await exists(conn, realm));
     if (needRealmCreate) {
-        console.log("Initializing Realm");
+        console.log('Initializing Realm');
         await withCreateRealm(instructions, govProgramId, govProgramVersion, realmName, provider.wallet.publicKey, // realmAuthorityPk
         hntKeypair.publicKey, // communityMintPk
         provider.wallet.publicKey, // payer
@@ -223,7 +224,7 @@ export async function run(args = process.argv) {
     }
     const registrar = (await registrarKey(realm, hntKeypair.publicKey))[0];
     if (!(await exists(conn, registrar))) {
-        console.log("Initializing VSR Registrar");
+        console.log('Initializing VSR Registrar');
         instructions.push(ComputeBudgetProgram.setComputeUnitLimit({ units: 800000 }));
         instructions.push(await heliumVsrProgram.methods
             .initializeRegistrarV0({
@@ -237,7 +238,7 @@ export async function run(args = process.argv) {
         await sendInstructions(provider, instructions, []);
         instructions = [];
     }
-    console.log("Configuring VSR voting mint at [0]");
+    console.log('Configuring VSR voting mint at [0]');
     instructions.push(await heliumVsrProgram.methods
         .configureVotingMintV0({
         idx: 0,
@@ -246,7 +247,7 @@ export async function run(args = process.argv) {
         maxExtraLockupVoteWeightScaledFactor: new anchor.BN(SCALE * 1e9),
         genesisVotePowerMultiplier: GENESIS_MULTIPLIER,
         // April 28th, 23:59:59 UTC
-        genesisVotePowerMultiplierExpirationTs: new anchor.BN("1682726399"),
+        genesisVotePowerMultiplierExpirationTs: new anchor.BN('1682726399'),
         lockupSaturationSecs: new anchor.BN(MAX_LOCKUP),
     })
         .accounts({
@@ -263,7 +264,7 @@ export async function run(args = process.argv) {
         .instruction());
     await sendInstructions(provider, instructions, []);
     instructions = [];
-    console.log("Creating max voter record");
+    console.log('Creating max voter record');
     instructions.push(await heliumVsrProgram.methods
         .updateMaxVoterWeightV0()
         .accounts({
@@ -280,7 +281,7 @@ export async function run(args = process.argv) {
     await sendInstructions(provider, instructions, []);
     instructions = [];
     const dcKey = (await dataCreditsKey(dcKeypair.publicKey))[0];
-    console.log("dcpid", PROGRAM_ID.toBase58());
+    console.log('dcpid', PROGRAM_ID.toBase58());
     if (!(await exists(conn, dcKey))) {
         await dataCreditsProgram.methods
             .initializeDataCreditsV0({
@@ -288,7 +289,7 @@ export async function run(args = process.argv) {
             config: {
                 windowSizeSeconds: new anchor.BN(60 * 60),
                 thresholdType: ThresholdType.Absolute,
-                threshold: new anchor.BN("1000000000000"),
+                threshold: new anchor.BN('1000000000000'),
             },
         })
             .accounts({
@@ -308,12 +309,12 @@ export async function run(args = process.argv) {
         await provider.sendAndConfirm(tx);
     }
     if (!(await exists(conn, dao))) {
-        console.log("Initializing DAO");
+        console.log('Initializing DAO');
         const hstEmission = await parseEmissionsSchedule(argv.hstEmissionSchedulePath);
         const hntEmission = await parseEmissionsSchedule(argv.emissionSchedulePath);
         const currentHstEmission = hstEmission[0];
         const currentHntEmission = hntEmission[0];
-        const fanout = fanoutKey("HST")[0];
+        const fanout = fanoutKey('HST')[0];
         const hstPool = getAssociatedTokenAddressSync(hntKeypair.publicKey, fanout, true);
         await heliumSubDaosProgram.methods
             .initializeDaoV0({
@@ -393,15 +394,15 @@ export async function run(args = process.argv) {
                     newTreeBufferSize: buffer,
                     newTreeSpace: new BN(getConcurrentMerkleTreeAccountSize(size, buffer, canopy)),
                     newTreeFeeLamports: new BN(cost / 2 ** size),
-                    name: "DATAONLY",
-                    metadataUrl: "https://shdw-drive.genesysgo.net/H8b1gZmA2aBqDYxicxawGpznCaNbFSEJ3YnJuawGQ2EQ/data-only.json",
+                    name: 'DATAONLY',
+                    metadataUrl: 'https://shdw-drive.genesysgo.net/H8b1gZmA2aBqDYxicxawGpznCaNbFSEJ3YnJuawGQ2EQ/data-only.json',
                 })
                     .accounts({
                     dao,
                     authority,
                     merkleTree: merkle.publicKey,
                 })
-                    .instruction()
+                    .instruction(),
             ],
             executeTransaction: false,
             squads,