use nonBlacklistedVotes, update recon data, change cron schedule to run on thursday weekly

Author: jalbrekt85

.github/workflows/backfill_aura_split.yaml

@@ -2,7 +2,7 @@ name: Backfill Aura/BAL Split
 
 on:
   schedule:
-    - cron: "0 12 * * 2"  # Weekly Tuesday 12:00 UTC
+    - cron: "0 8 * * 4" # Weekly Thursday 08:00 UTC
   workflow_dispatch:
 
 jobs:

fee_allocator/summaries/v3_recon.json

@@ -456,11 +456,11 @@
     "periodStart": 1768435200,
     "periodEnd": 1769644800,
     "bribeThreshold": 490,
-    "auraIncentives": 4111.32,
-    "balIncentives": 9761.36,
-    "auravebalShare": 0.3,
-    "auraIncentivesPct": 0.1577,
-    "balIncentivesPct": 0.3745
+    "auraIncentives": 9207.38,
+    "balIncentives": 4665.29,
+    "auravebalShare": 0.66,
+    "auraIncentivesPct": 0.3532,
+    "balIncentivesPct": 0.179
   },
   {
     "feesCollected": 42204.24,
@@ -482,11 +482,11 @@
     "periodStart": 1769644800,
     "periodEnd": 1770854400,
     "bribeThreshold": 390,
-    "auraIncentives": 5957.27,
-    "balIncentives": 12529.01,
-    "auravebalShare": 0.32,
-    "auraIncentivesPct": 0.1412,
-    "balIncentivesPct": 0.2969
+    "auraIncentives": 9583.32,
+    "balIncentives": 8902.96,
+    "auravebalShare": 0.52,
+    "auraIncentivesPct": 0.2271,
+    "balIncentivesPct": 0.2109
   },
   {
     "feesCollected": 24064.52,
@@ -508,10 +508,10 @@
     "periodStart": 1770854400,
     "periodEnd": 1772064000,
     "bribeThreshold": 410,
-    "auraIncentives": 5496.92,
-    "balIncentives": 5487.9,
-    "auravebalShare": 0.5,
-    "auraIncentivesPct": 0.2284,
-    "balIncentivesPct": 0.228
+    "auraIncentives": 8383.21,
+    "balIncentives": 2601.61,
+    "auravebalShare": 0.76,
+    "auraIncentivesPct": 0.3484,
+    "balIncentivesPct": 0.1081
   }
 ]

fee_allocator/votemarket_analytics.py

@@ -20,14 +20,14 @@ def _find_matching_rounds(metadata: list, period_start: int, period_end: int) ->
     return [r["id"] for r in metadata if r["endVoting"] > period_start and r["endVoting"] <= period_end]
 
 
-def _aggregate_deposited_per_gauge(round_url_template: str, round_ids: List[int]) -> Dict[str, float]:
-    deposited = {}
+def _aggregate_votes_per_gauge(round_url_template: str, round_ids: List[int]) -> Dict[str, float]:
+    votes = {}
     for rid in round_ids:
         data = _fetch_json(round_url_template.format(round_id=rid))
         for gauge in data["analytics"]:
             addr = gauge["gauge"].lower()
-            deposited[addr] = deposited.get(addr, 0) + gauge["totalDeposited"]
-    return deposited
+            votes[addr] = votes.get(addr, 0) + gauge["nonBlacklistedVotes"]
+    return votes
 
 
 def get_aura_share_per_gauge(period_start: int, period_end: int) -> Dict[str, Decimal]:
@@ -37,16 +37,20 @@ def get_aura_share_per_gauge(period_start: int, period_end: int) -> Dict[str, De
     bal_round_ids = _find_matching_rounds(bal_metadata, period_start, period_end)
     aura_round_ids = _find_matching_rounds(aura_metadata, period_start, period_end)
 
+    if not bal_round_ids and not aura_round_ids:
+        logger.info(f"VoteMarket: no rounds found for period {period_start}-{period_end}")
+        return {}
+
     logger.info(f"VoteMarket rounds for period {period_start}-{period_end}: bal={bal_round_ids} aura={aura_round_ids}")
 
-    bal_deposited = _aggregate_deposited_per_gauge(BALANCER_ROUND_URL, bal_round_ids)
-    aura_deposited = _aggregate_deposited_per_gauge(VLAURA_ROUND_URL, aura_round_ids)
+    bal_votes = _aggregate_votes_per_gauge(BALANCER_ROUND_URL, bal_round_ids)
+    aura_votes = _aggregate_votes_per_gauge(VLAURA_ROUND_URL, aura_round_ids)
 
     shares = {}
-    all_gauges = set(bal_deposited) | set(aura_deposited)
+    all_gauges = set(bal_votes) | set(aura_votes)
     for gauge in all_gauges:
-        b = bal_deposited.get(gauge, 0)
-        a = aura_deposited.get(gauge, 0)
+        b = bal_votes.get(gauge, 0)
+        a = aura_votes.get(gauge, 0)
         total = b + a
         shares[gauge] = Decimal(str(a / total)) if total > 0 else Decimal(0)