Bugfixes for 138

packages/helium-admin-cli/src/create-dao.ts

@@ -542,6 +542,7 @@ export async function run(args: any = process.argv) {
             netEmissionsCap: null,
             proposalNamespace: organizationKey("Helium")[0],
             delegatorRewardsPercent: delegatorRewardsPercent(argv.delegatorRewardsPercent),
+            rewardsEscrow,
           })
           .accounts({
             dao,

packages/helium-admin-cli/src/migrate-to-hip-138.ts

@@ -3,9 +3,12 @@ import { ThresholdType } from "@helium/circuit-breaker-sdk";
 import {
   daoKey,
   delegatorRewardsPercent,
-  init as initHsd
+  init as initHsd,
 } from "@helium/helium-sub-daos-sdk";
-import { init as initLazy, lazyDistributorKey } from "@helium/lazy-distributor-sdk";
+import {
+  init as initLazy,
+  lazyDistributorKey,
+} from "@helium/lazy-distributor-sdk";
 import { organizationKey } from "@helium/organization-sdk";
 import { oracleSignerKey } from "@helium/rewards-oracle-sdk";
 import {
@@ -124,7 +127,7 @@ export async function run(args: any = process.argv) {
     );
   }
   console.log("Resizing accounts");
-  await batchParallelInstructionsWithPriorityFee(provider, resizes);``
+  await batchParallelInstructionsWithPriorityFee(provider, resizes);
 
   const daoAcc = await hsdProgram.account.daoV0.fetch(dao);
   const authority = daoAcc.authority;
@@ -180,6 +183,7 @@ export async function run(args: any = process.argv) {
         hstPool: null,
         proposalNamespace: organizationKey("Helium")[0],
         delegatorRewardsPercent: delegatorRewardsPercent(6),
+        rewardsEscrow: getAssociatedTokenAddressSync(hntMint, ld, true),
       })
       .accounts({
         dao,
@@ -189,14 +193,16 @@ export async function run(args: any = process.argv) {
       .instruction()
   );
 
-  if (!daoAcc.rewardsEscrow) {
+  if (!daoAcc.rewardsEscrow || daoAcc.rewardsEscrow.equals(PublicKey.default)) {
     instructions.push(
       await hsdProgram.methods
         .initializeHntDelegatorPool()
         .accounts({
           dao,
           payer: daoAcc.authority,
           delegatorPool: getAssociatedTokenAddressSync(hntMint, dao, true),
+          rewardsEscrow: getAssociatedTokenAddressSync(hntMint, ld, true),
+          authority: daoAcc.authority,
         })
         .instruction()
     );

packages/helium-admin-cli/src/update-dao.ts

@@ -132,6 +132,7 @@ export async function run(args: any = process.argv) {
         delegatorRewardsPercent: argv.delegatorRewardsPercent
           ? delegatorRewardsPercent(argv.delegatorRewardsPercent)
           : null,
+        rewardsEscrow: null,  
       })
       .accounts({
         dao,

programs/helium-sub-daos/src/instructions/initialize_hnt_delegator_pool.rs

@@ -39,11 +39,6 @@ pub struct InitializeHntDelegatorPool<'info> {
     associated_token::authority = dao,
   )]
   pub delegator_pool: Box<Account<'info, TokenAccount>>,
-  #[account(
-    token::mint = hnt_mint,
-  )]
-  pub rewards_escrow: Box<Account<'info, TokenAccount>>,
-
   pub system_program: Program<'info, System>,
   pub token_program: Program<'info, Token>,
   pub circuit_breaker_program: Program<'info, CircuitBreaker>,

programs/helium-sub-daos/src/instructions/update_dao_v0.rs

@@ -12,6 +12,7 @@ pub struct UpdateDaoArgsV0 {
   pub net_emissions_cap: Option<u64>,
   pub proposal_namespace: Option<Pubkey>,
   pub delegator_rewards_percent: Option<u64>,
+  pub rewards_escrow: Option<Pubkey>,
 }
 
 #[derive(Accounts)]
@@ -36,6 +37,10 @@ pub fn handler(ctx: Context<UpdateDaoV0>, args: UpdateDaoArgsV0) -> Result<()> {
     ctx.accounts.dao.authority = new_authority;
   }
 
+  if let Some(rewards_escrow) = args.rewards_escrow {
+    ctx.accounts.dao.rewards_escrow = rewards_escrow;
+  }
+
   if let Some(hst_emission_schedule) = args.hst_emission_schedule {
     ctx.accounts.dao.hst_emission_schedule = hst_emission_schedule;
     should_resize = true;

tests/helium-sub-daos.ts

@@ -278,6 +278,7 @@ describe("helium-sub-daos", () => {
           netEmissionsCap: null,
           proposalNamespace: null,
           delegatorRewardsPercent: null,
+          rewardsEscrow: null,
         })
         .accounts({
           dao,