From 379c7353368f204bf4035ab9ac5e5a688612d277 Mon Sep 17 00:00:00 2001
From: Noah Prince <83885631+ChewingGlass@users.noreply.github.com>
Date: Wed, 5 Mar 2025 19:02:47 -0800
Subject: [PATCH] Fix helium vote svc sql for mainnet (#859)

---
 packages/helium-vote-service/src/index.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/helium-vote-service/src/index.ts b/packages/helium-vote-service/src/index.ts
index af4630866..65166355f 100644
--- a/packages/helium-vote-service/src/index.ts
+++ b/packages/helium-vote-service/src/index.ts
@@ -471,16 +471,19 @@ server.post<{
               pa.address as proxy_assignment,
               dp.address as delegated_position
             FROM proxy_assignments pa
+            JOIN positions p ON p.mint = pa.asset AND p.registrar = '${HNT_REGISTRAR.toBase58()}'
             LEFT OUTER JOIN vote_markers vm ON vm.mint = pa.asset AND (
               vm.registrar = '${HNT_REGISTRAR.toBase58()}' AND vm.proposal = '${proposal.toBase58()}'
             )
             LEFT OUTER JOIN delegated_positions dp ON dp.mint = pa.asset
             WHERE pa.proxy_config = '${HELIUM_PROXY_CONFIG.toBase58()}' AND pa.voter = '${wallet.toBase58()}' AND pa.index > 0 AND (
               vm is NULL
-              OR vm.proxy_index >= pa.index
-              OR vm.choices IS DISTINCT FROM ARRAY[${choices.join(
-                ","
-              )}]::integer[]
+              OR (
+                vm.proxy_index >= pa.index AND
+                vm.choices IS DISTINCT FROM ARRAY[${choices.join(
+                  ","
+                )}]::integer[]
+              )
             )
             LIMIT ${MARKERS_TO_CHECK}
           `)
@@ -565,7 +568,10 @@ server.post<{
                     position: positionKey(new PublicKey(vote.asset))[0],
                     proposal,
                     mint: new PublicKey(vote.asset),
-                    marker: voteMarkerKey(new PublicKey(vote.asset), proposal)[0],
+                    marker: voteMarkerKey(
+                      new PublicKey(vote.asset),
+                      proposal
+                    )[0],
                   })
                   .instruction();
                 instructions.push(delegatedCountIx);