helium · ChewingGlass · Oct 29, 2024 · Oct 25, 2024 · Oct 28, 2024 · Oct 28, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-library/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package helium-program-library
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-library/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "packages/*"
   ],
   "useWorkspaces": true,
-  "version": "0.9.9"
+  "version": "0.9.10"
 }
diff --git a/packages/account-fetch-cache-hooks/CHANGELOG.md b/packages/account-fetch-cache-hooks/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-libary/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/account-fetch-cache-hooks
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-libary/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/account-fetch-cache-hooks

diff --git a/packages/account-fetch-cache-hooks/package.json b/packages/account-fetch-cache-hooks/package.json
@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "Apache-2.0",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "React hooks and context for account-fetch-cache",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
     "prebuild": "npm run clean && npm run package"
   },
   "dependencies": {
-    "@helium/account-fetch-cache": "^0.9.9",
+    "@helium/account-fetch-cache": "^0.9.10",
     "@solana/web3.js": "^1.78.8",
     "react-async-hook": "^4.0.0"
   },

diff --git a/packages/account-fetch-cache-hooks/yarn.deploy.lock b/packages/account-fetch-cache-hooks/yarn.deploy.lock
@@ -27,7 +27,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@helium/account-fetch-cache-hooks@workspace:."
   dependencies:
-    "@helium/account-fetch-cache": ^0.9.9
+    "@helium/account-fetch-cache": ^0.9.10
     "@solana/web3.js": ^1.78.8
     git-format-staged: ^2.1.3
     react-async-hook: ^4.0.0
@@ -39,7 +39,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@helium/account-fetch-cache@^0.9.9":
+"@helium/account-fetch-cache@^0.9.10":
   version: 0.0.0-use.local
   resolution: "@helium/account-fetch-cache@workspace:packages/account-fetch-cache"
   dependencies:

diff --git a/packages/account-fetch-cache/CHANGELOG.md b/packages/account-fetch-cache/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-library/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/account-fetch-cache
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-library/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/account-fetch-cache

diff --git a/packages/account-fetch-cache/package.json b/packages/account-fetch-cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helium/account-fetch-cache",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Solana account fetch cache to eliminate reduntant fetching, and batch fetches",
   "publishConfig": {
     "access": "public",

diff --git a/packages/account-postgres-sink-service/CHANGELOG.md b/packages/account-postgres-sink-service/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-libary/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/account-postgres-sink-service
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-libary/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/account-postgres-sink-service

diff --git a/packages/account-postgres-sink-service/package.json b/packages/account-postgres-sink-service/package.json
@@ -6,7 +6,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "Apache-2.0",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Sync account data to postgres",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "@connectrpc/connect-node": "^1.3.0",
     "@coral-xyz/anchor": "^0.28.0",
     "@fastify/cors": "^8.1.1",
-    "@helium/account-fetch-cache": "^0.9.9",
+    "@helium/account-fetch-cache": "^0.9.10",
     "@metaplex-foundation/mpl-token-metadata": "^2.10.0",
     "@solana/web3.js": "^1.78.8",
     "@substreams/core": "^0.15.1",

diff --git a/packages/account-postgres-sink-service/yarn.deploy.lock b/packages/account-postgres-sink-service/yarn.deploy.lock
@@ -179,7 +179,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@helium/account-fetch-cache@^0.9.9":
+"@helium/account-fetch-cache@^0.9.10":
   version: 0.0.0-use.local
   resolution: "@helium/account-fetch-cache@workspace:packages/account-fetch-cache"
   dependencies:
@@ -199,7 +199,7 @@ __metadata:
     "@connectrpc/connect-node": ^1.3.0
     "@coral-xyz/anchor": ^0.28.0
     "@fastify/cors": ^8.1.1
-    "@helium/account-fetch-cache": ^0.9.9
+    "@helium/account-fetch-cache": ^0.9.10
     "@metaplex-foundation/mpl-token-metadata": ^2.10.0
     "@solana/web3.js": ^1.78.8
     "@substreams/core": ^0.15.1

diff --git a/packages/active-device-oracle/CHANGELOG.md b/packages/active-device-oracle/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-libary/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/active-device-oracle
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-libary/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/active-device-oracle

diff --git a/packages/active-device-oracle/package.json b/packages/active-device-oracle/package.json
@@ -6,7 +6,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "Apache-2.0",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Oracle of helium active devices",
   "repository": {
     "type": "git",

diff --git a/packages/anchor-resolvers/CHANGELOG.md b/packages/anchor-resolvers/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-library/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/anchor-resolvers
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-library/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/anchor-resolvers

diff --git a/packages/anchor-resolvers/package.json b/packages/anchor-resolvers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helium/anchor-resolvers",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Wrappers around anchor custom resolvers to make composition easier",
   "publishConfig": {
     "access": "public",

diff --git a/packages/circuit-breaker-sdk/CHANGELOG.md b/packages/circuit-breaker-sdk/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-libary/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/circuit-breaker-sdk
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-libary/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/circuit-breaker-sdk

diff --git a/packages/circuit-breaker-sdk/package.json b/packages/circuit-breaker-sdk/package.json
@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "Apache-2.0",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "Interface to the circuit breaker smart contract",
   "repository": {
     "type": "git",
@@ -32,8 +32,8 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
-    "@helium/anchor-resolvers": "^0.9.9",
-    "@helium/idls": "^0.9.9",
+    "@helium/anchor-resolvers": "^0.9.10",
+    "@helium/idls": "^0.9.10",
     "bn.js": "^5.2.0",
     "bs58": "^4.0.1"
   },

diff --git a/packages/circuit-breaker-sdk/yarn.deploy.lock b/packages/circuit-breaker-sdk/yarn.deploy.lock
@@ -67,7 +67,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@helium/anchor-resolvers@^0.9.9":
+"@helium/anchor-resolvers@^0.9.10":
   version: 0.0.0-use.local
   resolution: "@helium/anchor-resolvers@workspace:packages/anchor-resolvers"
   dependencies:
@@ -86,8 +86,8 @@ __metadata:
   resolution: "@helium/circuit-breaker-sdk@workspace:."
   dependencies:
     "@coral-xyz/anchor": ^0.28.0
-    "@helium/anchor-resolvers": ^0.9.9
-    "@helium/idls": ^0.9.9
+    "@helium/anchor-resolvers": ^0.9.10
+    "@helium/idls": ^0.9.10
     bn.js: ^5.2.0
     bs58: ^4.0.1
     git-format-staged: ^2.1.3
@@ -97,7 +97,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@helium/idls@^0.9.9":
+"@helium/idls@^0.9.10":
   version: 0.0.0-use.local
   resolution: "@helium/idls@workspace:packages/idls"
   dependencies:

diff --git a/packages/crons/CHANGELOG.md b/packages/crons/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.10](https://github.com/helium/helium-program-library/compare/v0.9.8...v0.9.10) (2024-10-28)
+
+**Note:** Version bump only for package @helium/crons
+
+
+
+
+
 ## [0.9.9](https://github.com/helium/helium-program-library/compare/v0.9.2...v0.9.9) (2024-10-28)
 
 **Note:** Version bump only for package @helium/crons

diff --git a/packages/crons/package.json b/packages/crons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helium/crons",
-  "version": "0.9.9",
+  "version": "0.9.10",
   "description": "scripts to run on a schedule",
   "private": true,
   "publishConfig": {
@@ -32,25 +32,25 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
-    "@helium/account-fetch-cache": "^0.9.9",
-    "@helium/distributor-oracle": "^0.9.9",
-    "@helium/fanout-sdk": "^0.9.9",
-    "@helium/helium-entity-manager-sdk": "^0.9.9",
-    "@helium/helium-sub-daos-sdk": "^0.9.9",
-    "@helium/idls": "^0.9.9",
-    "@helium/lazy-distributor-sdk": "^0.9.9",
-    "@helium/mobile-entity-manager-sdk": "^0.9.9",
+    "@helium/account-fetch-cache": "^0.9.10",
+    "@helium/distributor-oracle": "^0.9.10",
+    "@helium/fanout-sdk": "^0.9.10",
+    "@helium/helium-entity-manager-sdk": "^0.9.10",
+    "@helium/helium-sub-daos-sdk": "^0.9.10",
+    "@helium/idls": "^0.9.10",
+    "@helium/lazy-distributor-sdk": "^0.9.10",
+    "@helium/mobile-entity-manager-sdk": "^0.9.10",
     "@helium/nft-proxy-sdk": "^0.0.12",
-    "@helium/no-emit-sdk": "^0.9.9",
+    "@helium/no-emit-sdk": "^0.9.10",
     "@helium/organization-sdk": "^0.0.12",
-    "@helium/position-voting-rewards-sdk": "^0.9.9",
-    "@helium/price-oracle-sdk": "^0.9.9",
+    "@helium/position-voting-rewards-sdk": "^0.9.10",
+    "@helium/price-oracle-sdk": "^0.9.10",
     "@helium/proposal-sdk": "^0.0.12",
-    "@helium/rewards-oracle-sdk": "^0.9.9",
-    "@helium/spl-utils": "^0.9.9",
+    "@helium/rewards-oracle-sdk": "^0.9.10",
+    "@helium/spl-utils": "^0.9.10",
     "@helium/state-controller-sdk": "^0.0.12",
-    "@helium/treasury-management-sdk": "^0.9.9",
-    "@helium/voter-stake-registry-sdk": "^0.9.9",
+    "@helium/treasury-management-sdk": "^0.9.10",
+    "@helium/voter-stake-registry-sdk": "^0.9.10",
     "@solana/spl-token": "^0.3.8",
     "@solana/web3.js": "^1.78.8",
     "axios": "^1.3.6",

diff --git a/packages/crons/src/end-epoch.ts b/packages/crons/src/end-epoch.ts
@@ -78,12 +78,20 @@ async function getSolanaUnixTimestamp(connection: Connection): Promise<bigint> {
         },
       },
     ]);
+    const vetokenTrackers = subDaos.map(subDao => subDao.account.vetokenTracker).filter(tracker => !tracker.equals(PublicKey.default));
+    const vetokenTrackerAccounts = await Promise.all(vetokenTrackers.map(tracker => pvrProgram.account.veTokenTrackerV0.fetch(tracker)));
+    const targetTsVetokenTrackers = vetokenTrackerAccounts.reduce(
+      (acc, tracker) => BN.min(acc, tracker.vetokenLastCalculatedTs),
+      // Start one day back to ensure we at least close the epoch that the job is running in.
+      new BN(unixNow - 24 * 60 * 60)
+    );
 
-    let targetTs = subDaos.reduce(
+    let targetTsSubdao = subDaos.reduce(
       (acc, subDao) => BN.min(acc, subDao.account.vehntLastCalculatedTs),
       // Start one day back to ensure we at least close the epoch that the job is running in.
       new BN(unixNow - 24 * 60 * 60)
     );
+    let targetTs = BN.min(targetTsSubdao, targetTsVetokenTrackers);
     const solanaTime = await getSolanaUnixTimestamp(provider.connection)
 
     mainLoop: while (targetTs.toNumber() < unixNow) {
@@ -147,8 +155,9 @@ async function getSolanaUnixTimestamp(connection: Connection): Promise<bigint> {
         }
       }
 
-      if (!daoEpochInfo?.doneIssuingRewards) {
-        for (const subDao of subDaos) {
+
+      for (const subDao of subDaos) {
+        if (!daoEpochInfo?.doneIssuingRewards) {
           const [subDaoEpoch] = subDaoEpochInfoKey(subDao.publicKey, targetTs);
           const subDaoEpochInfo =
             await heliumSubDaosProgram.account.subDaoEpochInfoV0.fetchNullable(
@@ -175,15 +184,20 @@ async function getSolanaUnixTimestamp(connection: Connection): Promise<bigint> {
               );
             }
           }
+        }
 
-          const hasVeTokenTracker = !subDao.account.vetokenTracker.equals(PublicKey.default);
-          if (hasVeTokenTracker) {
-            const [vsrEpoch] = vsrEpochInfoKey(subDao.account.vetokenTracker, targetTs);
-            const vsrEpochInfo =
-              await pvrProgram.account.vsrEpochInfoV0.fetchNullable(
-                vsrEpoch
-              );
-            if (!vsrEpochInfo || !vsrEpochInfo.rewardsIssuedAt) {
+        const hasVeTokenTracker = !subDao.account.vetokenTracker.equals(
+          PublicKey.default
+        );
+
+        if (hasVeTokenTracker) {
+          const [vsrEpoch] = vsrEpochInfoKey(
+            subDao.account.vetokenTracker,
+            targetTs
+          );
+          const vsrEpochInfo =
+            await pvrProgram.account.vsrEpochInfoV0.fetchNullable(vsrEpoch);
+          if (!vsrEpochInfo || !vsrEpochInfo.rewardsIssuedAt) {
             try {
               await sendInstructionsWithPriorityFee(
                 provider,
@@ -203,8 +217,7 @@ async function getSolanaUnixTimestamp(connection: Connection): Promise<bigint> {
             } catch (err: any) {
               errors.push(
                 `Failed to issue voting rewards for ${subDao.account.dntMint.toBase58()}: ${err}`
-                );
-              }
+              );
             }
           }
         }