More bugfixes

helium · Jan 9, 2025 · 6238fa1 · 6238fa1
1 parent af1df36
commit 6238fa1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/programs/helium-sub-daos/src/state.rs b/programs/helium-sub-daos/src/state.rs
@@ -283,7 +283,7 @@ pub struct SubDaoEpochInfoV0 {
 }
 
 impl SubDaoEpochInfoV0 {
-  pub const SIZE: usize = 60 + 8 + std::mem::size_of::<SubDaoEpochInfoV0>() - 8 - 8 - 8 - 4; // subtract 8 the extra u64 we added to vehnt, dc onboarding fees paid, hnt rewards issued, and prev percentage
+  pub const SIZE: usize = 60 + 8 + std::mem::size_of::<SubDaoEpochInfoV0>() - 8 - 8 - 8; // subtract 8 the extra u64 we added to vehnt, dc onboarding fees paid, hnt rewards issued, and prev percentage
 }
 impl SubDaoEpochInfoV0 {
   pub fn start_ts(&self) -> i64 {

diff --git a/programs/helium-sub-daos/src/utils.rs b/programs/helium-sub-daos/src/utils.rs
@@ -310,6 +310,8 @@ pub fn caclulate_vhnt_info(
         .unwrap(),
     )
     .unwrap()
+  } else if expiration_ts == 0 {
+    position.lockup.seconds_left(curr_ts)
   } else {
     min(
       u64::try_from(expiration_ts.checked_sub(curr_ts).unwrap()).unwrap(),
@@ -328,7 +330,11 @@ pub fn caclulate_vhnt_info(
   } else {
     position.voting_power_precise(voting_mint_config, curr_ts)?
   };
-  let delegation_end_ts = min(expiration_ts, position.lockup.end_ts);
+  let delegation_end_ts = if expiration_ts == 0 {
+    position.lockup.end_ts
+  } else {
+    min(expiration_ts, position.lockup.end_ts)
+  };
   let vehnt_at_delegation_end =
     position.voting_power_precise(voting_mint_config, delegation_end_ts)?;
 

diff --git a/utils/vehnt/Cargo.lock b/utils/vehnt/Cargo.lock
diff --git a/utils/vehnt/src/cli/delegated.rs b/utils/vehnt/src/cli/delegated.rs
@@ -165,10 +165,12 @@ impl Delegated {
     epoch_infos_by_subdao_and_epoch
       .insert(Pubkey::from_str(MOBILE_SUBDAO).unwrap(), HashMap::new());
     for info in infos {
+        if info.1.sub_dao == Pubkey::from_str(IOT_SUBDAO).unwrap() || info.1.sub_dao == Pubkey::from_str(MOBILE_SUBDAO).unwrap() {
       epoch_infos_by_subdao_and_epoch
-        .get_mut(&info.1.sub_dao)
-        .unwrap()
-        .insert(info.1.epoch, info);
+          .get_mut(&info.1.sub_dao)
+          .unwrap()
+          .insert(info.1.epoch, info);
+      }
     }
     let mut new_epoch_infos_by_subdao_and_epoch: HashMap<
       Pubkey,