Create tuktuk tasks to resolve proposals and close expired vote markers

package.json

@@ -9,17 +9,17 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@coral-xyz/anchor": "^0.29.0",
-    "@helium/account-fetch-cache": "^0.9.23",
-    "@helium/account-fetch-cache-hooks": "^0.9.23",
-    "@helium/helium-react-hooks": "^0.9.23",
-    "@helium/modular-governance-hooks": "^0.0.13",
-    "@helium/modular-governance-idls": "^0.0.13",
-    "@helium/organization-sdk": "^0.0.13",
-    "@helium/spl-utils": "^0.9.23",
-    "@helium/state-controller-sdk": "^0.0.13",
-    "@helium/voter-stake-registry-hooks": "^0.9.23",
-    "@helium/voter-stake-registry-sdk": "^0.9.23",
+    "@coral-xyz/anchor": "^0.30.1",
+    "@helium/account-fetch-cache": "^0.10.0-alpha.13",
+    "@helium/account-fetch-cache-hooks": "^0.10.0-alpha.13",
+    "@helium/helium-react-hooks": "^0.10.0-alpha.13",
+    "@helium/modular-governance-hooks": "^0.1.4",
+    "@helium/modular-governance-idls": "^0.1.4",
+    "@helium/organization-sdk": "^0.1.4",
+    "@helium/spl-utils": "^0.10.0-alpha.13",
+    "@helium/state-controller-sdk": "^0.1.4",
+    "@helium/voter-stake-registry-hooks": "^0.10.0-alpha.13",
+    "@helium/voter-stake-registry-sdk": "^0.10.0-alpha.13",
     "@hookform/resolvers": "^3.3.4",
     "@metaplex-foundation/mpl-token-metadata": "2.10.0",
     "@project-serum/anchor": "^0.26.0",
@@ -41,6 +41,9 @@
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-react-ui": "^0.9.35",
     "@solana/wallet-adapter-wallets": "^0.19.32",
+    "@helium/hpl-crons-sdk": "^0.10.0-alpha.13",
+    "@helium/no-emit-sdk": "^0.10.0-alpha.13",
+    "@helium/tuktuk-sdk": "^0.0.2",
     "@solana/web3.js": "^1.95.4",
     "@sqds/sdk": "^2.0.4",
     "@tanstack/react-query": "5.45.1",
@@ -73,15 +76,15 @@
   "resolutions": {
     "@tanstack/react-query": "5.45.1",
     "@solana/web3.js": "^1.90.0",
-    "@helium/account-fetch-cache": "^0.9.23",
-    "@helium/account-fetch-cache-hooks": "^0.9.23",
-    "@helium/helium-react-hooks": "^0.9.23",
-    "@helium/voter-stake-registry-hooks": "^0.9.23",
-    "@helium/modular-governance-idls": "^0.0.13",
-    "@helium/spl-utils": "^0.9.23",
-    "@helium/modular-governance-hooks": "^0.0.13",
+    "@helium/account-fetch-cache": "^0.10.0-alpha.13",
+    "@helium/account-fetch-cache-hooks": "^0.10.0-alpha.13",
+    "@helium/helium-react-hooks": "^0.10.0-alpha.13",
+    "@helium/voter-stake-registry-hooks": "^0.10.0-alpha.13",
+    "@helium/modular-governance-idls": "^0.1.4",
+    "@helium/spl-utils": "^0.10.0-alpha.13",
+    "@helium/modular-governance-hooks": "^0.1.4",
     "@solana/wallet-adapter-react": "^0.15.35",
-    "@helium/voter-stake-registry-sdk": "^0.9.23"
+    "@helium/voter-stake-registry-sdk": "^0.10.0-alpha.13"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",

scripts/bootstrap.ts

@@ -180,7 +180,7 @@ export async function run(args: any = process.argv) {
           uri: null,
           authority,
         })
-        .accounts({ organization, authority: organizationAcc.authority })
+        .accountsPartial({ organization, authority: organizationAcc.authority })
         .instruction();
 
       await sendInstructionsOrSquads({

scripts/bulk-create-proposal.ts

@@ -1,12 +1,23 @@
 import * as anchor from "@coral-xyz/anchor";
-import { init as initOrg, organizationKey, proposalKey } from "@helium/organization-sdk";
+import {
+  init as initOrg,
+  organizationKey,
+  proposalKey,
+} from "@helium/organization-sdk";
 import os from "os";
 import yargs from "yargs/yargs";
 import { init as initState } from "@helium/state-controller-sdk";
 import Squads from "@sqds/sdk";
-import { PublicKey, TransactionInstruction } from "@solana/web3.js";
+import { PublicKey, SystemProgram, TransactionInstruction } from "@solana/web3.js";
 import { loadKeypair, sendInstructionsOrSquads } from "./utils";
 import fs from "fs";
+import { init as initTuktuk, taskKey } from "@helium/tuktuk-sdk";
+import {
+  nextAvailableTaskIds,
+  TASK_QUEUE_ID,
+  init as initHplCrons,
+  queueAuthorityKey,
+} from "@helium/hpl-crons-sdk";
 
 interface Choice {
   uri: string;
@@ -79,11 +90,31 @@ export async function run(args: any = process.argv) {
   const fileData = fs.readFileSync(argv.file, "utf8");
   const proposals: Proposal[] = JSON.parse(fileData);
 
+  const queueAuthority = queueAuthorityKey()[0];
+  console.log(
+    `Queue authority: ${queueAuthority.toBase58()} (Fund with Sol to pay task rent)`
+  );
+
   const instructions: TransactionInstruction[] = [];
   const organizationK = organizationKey(argv.orgName)[0];
   const organization = await orgProgram.account.organizationV0.fetch(
     organizationK
   );
+  const tuktukProgram = await initTuktuk(provider);
+  const hplCronsProgram = await initHplCrons(provider);
+
+  const queue = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
+  const freeTasks = nextAvailableTaskIds(
+    queue.taskBitmap,
+    proposals.length - organization.numProposals
+  )[0];
+  let freeTaskIdx = 0;
+  const proposalConfig = argv.proposalConfig
+    ? new PublicKey(argv.proposalConfig)
+    : organization.defaultProposalConfig;
+  const proposalConfigAcc = await stateProgram.account.proposalConfigV0.fetch(
+    proposalConfig
+  );
 
   let i = 0;
   for (const proposalData of proposals) {
@@ -93,7 +124,7 @@ export async function run(args: any = process.argv) {
         pubkeys: { proposal },
       } = await orgProgram.methods
         .initializeProposalV0(proposalData)
-        .accounts({
+        .accountsPartial({
           organization: organizationK,
           owner: authority,
           authority,
@@ -103,10 +134,11 @@ export async function run(args: any = process.argv) {
         .prepare();
 
       const { instruction: setState } = await stateProgram.methods
+        // @ts-ignore
         .updateStateV0({
           newState: { voting: {} },
         })
-        .accounts({
+        .accountsPartial({
           proposal,
           owner: authority,
           proposalConfig: proposalData.proposalConfig
@@ -116,6 +148,25 @@ export async function run(args: any = process.argv) {
         })
         .prepare();
 
+      const resolveIx = await hplCronsProgram.methods
+        .queueResolveProposalV0({
+          freeTaskId: freeTasks[freeTaskIdx],
+        })
+        .accountsPartial({
+          proposal: proposal!,
+          taskQueue: TASK_QUEUE_ID,
+          namespace: organizationK,
+          task: taskKey(TASK_QUEUE_ID, freeTasks[freeTaskIdx])[0],
+          proposalConfig,
+          stateController: proposalConfigAcc.stateController,
+          payer: authority,
+          systemProgram: SystemProgram.programId,
+          queueAuthority,
+          tuktukProgram: tuktukProgram.programId,
+        })
+        .instruction();
+
+      freeTaskIdx++;
       instructions.push(instruction, setState);
     }
     i++;

scripts/cancel-proposal.ts

@@ -61,7 +61,7 @@ export async function run(args: any = process.argv) {
     .updateStateV0({
       newState: { cancelled: {} },
     })
-    .accounts({
+    .accountsPartial({
       proposal,
       owner,
     })

scripts/create-proposal.ts

@@ -4,8 +4,15 @@ import os from "os";
 import yargs from "yargs/yargs";
 import { init as initState } from "@helium/state-controller-sdk";
 import Squads from "@sqds/sdk";
-import { PublicKey } from "@solana/web3.js";
+import { PublicKey, SystemProgram } from "@solana/web3.js";
 import { loadKeypair, sendInstructionsOrSquads } from "./utils";
+import { init as initTuktuk, taskKey } from "@helium/tuktuk-sdk";
+import {
+  nextAvailableTaskIds,
+  queueAuthorityKey,
+  TASK_QUEUE_ID,
+} from "@helium/hpl-crons-sdk";
+import { init as initHplCrons } from "@helium/hpl-crons-sdk";
 
 export async function run(args: any = process.argv) {
   const yarg = yargs(args).options({
@@ -69,6 +76,8 @@ export async function run(args: any = process.argv) {
   const wallet = new anchor.Wallet(walletKP);
   const orgProgram = await initOrg(provider);
   const stateProgram = await initState(provider);
+  const tuktukProgram = await initTuktuk(provider);
+  const hplCronsProgram = await initHplCrons(provider);
   const organizationK = organizationKey(argv.orgName)[0];
   const organization = await orgProgram.account.organizationV0.fetch(
     organizationK
@@ -97,31 +106,61 @@ export async function run(args: any = process.argv) {
       })),
       tags: ["test", "tags"],
     })
-    .accounts({
+    .accountsPartial({
       payer: authority,
       authority,
       organization: organizationK,
       owner: authority,
     })
     .prepare();
 
+  const proposalConfig = argv.proposalConfig
+    ? new PublicKey(argv.proposalConfig)
+    : organization.defaultProposalConfig;
+  const proposalConfigAcc = await stateProgram.account.proposalConfigV0.fetch(
+    proposalConfig
+  );
+  const queueAuthority = queueAuthorityKey()[0];
+  console.log(
+    `Queue authority: ${queueAuthority.toBase58()} (Fund with Sol to pay task rent)`
+  );
   const { instruction: setState } = await stateProgram.methods
+    // @ts-ignore
     .updateStateV0({
       newState: { voting: {} },
     })
-    .accounts({
-      proposal,
+    .accountsStrict({
+      proposal: proposal!,
       owner: authority,
-      proposalConfig: argv.proposalConfig
-        ? new PublicKey(argv.proposalConfig)
-        : organization.defaultProposalConfig,
+      proposalConfig,
       proposalProgram: organization.proposalProgram,
+      stateController: proposalConfigAcc.stateController,
     })
     .prepare();
 
+  const queue = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
+  const freeTask = nextAvailableTaskIds(queue.taskBitmap, 1)[0];
+  const resolveIx = await hplCronsProgram.methods
+    .queueResolveProposalV0({
+      freeTaskId: freeTask,
+    })
+    .accountsPartial({
+      proposal: proposal!,
+      taskQueue: TASK_QUEUE_ID,
+      namespace: organizationK,
+      task: taskKey(TASK_QUEUE_ID, freeTask)[0],
+      proposalConfig,
+      stateController: proposalConfigAcc.stateController,
+      payer: authority,
+      systemProgram: SystemProgram.programId,
+      queueAuthority,
+      tuktukProgram: tuktukProgram.programId,
+    })
+    .instruction();
+
   await sendInstructionsOrSquads({
     provider,
-    instructions: [instruction, setState],
+    instructions: [instruction, setState, resolveIx],
     executeTransaction: false,
     squads,
     multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,

scripts/resolve-proposals.ts

@@ -57,7 +57,7 @@ export async function run(args: any = process.argv) {
 
   const resolveIxs = await Promise.all(openProposals.map(async p => {
     return await stateProgram.methods.resolveV0()
-    .accounts({
+    .accountsPartial({
       proposal: p.pubkey,
     })
     .instruction()

src/components/Positions.tsx

@@ -104,6 +104,7 @@ export const Positions: FC = () => {
         toast("Rewards claimed!");
         refetchState();
       } catch (e: any) {
+        console.error(e);
         if (!(e instanceof WalletSignTransactionError)) {
           toast(e.message || "Claiming rewards failed, please try again");
         }

src/components/VoteOptions.tsx

@@ -61,6 +61,7 @@ export const VoteOptions: FC<{
         });
         toast("Vote submitted");
       } catch (e: any) {
+        console.error(e);
         if (!(e instanceof WalletSignTransactionError)) {
           setCurrVote(0);
           toast(e.message || "Vote failed, please try again");
@@ -81,6 +82,7 @@ export const VoteOptions: FC<{
         });
         toast("Vote relinquished");
       } catch (e: any) {
+        console.error(e);
         if (!(e instanceof WalletSignTransactionError)) {
           setCurrVote(0);
           toast(e.message || "Relinquish vote failed, please try again");

src/lib/utils.ts

@@ -300,7 +300,26 @@ export const onInstructions =
       useFirstEstimateForAll = false,
     }: { useFirstEstimateForAll?: boolean } = {}
   ) =>
-  async (instructions: TransactionInstruction[], sigs?: Keypair[]) => {
+  async (
+    instructions: TransactionInstruction[] | TransactionInstruction[][],
+    sigs?: Keypair[]
+  ) => {
+    if (useFirstEstimateForAll) {
+      // Sort instructions array so longest groups are first
+      instructions.sort((a, b) => {
+        const lengthA = Array.isArray(a) ? a.length : 1;
+        const lengthB = Array.isArray(b) ? b.length : 1;
+        return lengthB - lengthA;
+      });
+    }
+
+    // Sort instructions array so longest groups are first
+    instructions.sort((a, b) => {
+      const lengthA = Array.isArray(a) ? a.length : 1;
+      const lengthB = Array.isArray(b) ? b.length : 1;
+      return lengthB - lengthA;
+    });
+
     if (provider) {
       if (sigs) {
         const transactions = await batchInstructionsToTxsWithPriorityFee(