From fc383359e7a5606826e3a3a8e59bc205a8b21098 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 15 Jan 2026 20:33:37 +0700 Subject: [PATCH 1/2] Revert "fix: bring back aura vebal share calc" This reverts commit 792ee5b9f81127eed3cde041ca5d86e0625795de. --- fee_allocator/accounting/chains.py | 10 ---------- fee_allocator/fee_allocator.py | 15 +++++---------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/fee_allocator/accounting/chains.py b/fee_allocator/accounting/chains.py index adb97c8..5637f99 100644 --- a/fee_allocator/accounting/chains.py +++ b/fee_allocator/accounting/chains.py @@ -83,7 +83,6 @@ def __init__( self.cache_dir.mkdir(exist_ok=True) self._chains: Union[dict[str, CorePoolChain], None] = None - self.aura_vebal_share: Union[Decimal, None] = None self.protocol_version = protocol_version @@ -117,15 +116,6 @@ def set_core_pool_chains_data(self): self._chains = _chains - def set_aura_vebal_share(self): - if not self.mainnet: - raise ValueError( - "mainnet must be initialized to calculate aura vebal share" - ) - self.aura_vebal_share = self.mainnet.subgraph.calculate_aura_vebal_share( - self.mainnet.web3, self.mainnet.block_range[1] - ) - def set_initial_pool_allocation(self) -> None: """ sets the intial fee allocation for all pools for all chains diff --git a/fee_allocator/fee_allocator.py b/fee_allocator/fee_allocator.py index 77da265..b0247fc 100644 --- a/fee_allocator/fee_allocator.py +++ b/fee_allocator/fee_allocator.py @@ -70,7 +70,6 @@ def allocate(self, redistribute=True): Non-core pools: 82.5% veBAL, 17.5% DAO """ self.run_config.set_core_pool_chains_data() - self.run_config.set_aura_vebal_share() self.run_config.set_initial_pool_allocation() if redistribute: self.redistribute_fees() @@ -80,13 +79,11 @@ def redistribute_fees(self): Redistributes fees among pools based on minimum incentive amounts. Pools with total incentives below the minimum threshold get their incentives - redistributed to eligible pools above the threshold. The threshold is scaled - by Aura's veBAL share to ensure the effective Aura incentive meets the minimum. + redistributed to eligible pools above the threshold. + """ - min_aura = Decimal(self.run_config.fee_config.min_aura_incentive) - aura_share = self.run_config.aura_vebal_share - min_amount = min_aura / aura_share - logger.info(f"Redistribution threshold: ${min_amount:.0f} (${min_aura:.0f} min Aura / {aura_share:.2%} veBAL share)") + min_amount = self.run_config.fee_config.min_aura_incentive + logger.info(f"Redistribution threshold: ${min_amount}") for chain in self.run_config.all_chains: pools_to_redistribute = [p for p in chain.core_pools if p.total_to_incentives_usd < min_amount] @@ -517,9 +514,7 @@ def recon(self) -> None: "createdAt": int(datetime.datetime.now().timestamp()), "periodStart": self.date_range[0], "periodEnd": self.date_range[1], - "minAuraIncentive": self.run_config.fee_config.min_aura_incentive, - "auraVebalShare": float(round(self.run_config.aura_vebal_share, 4)), - "bribeThreshold": int(self.run_config.fee_config.min_aura_incentive / self.run_config.aura_vebal_share) + "bribeThreshold": self.run_config.fee_config.min_aura_incentive } recon_file = Path(PROJECT_ROOT) / "fee_allocator/summaries" / f"{self.run_config.protocol_version}_recon.json" From a4c5bb4b8dd94c80ceb189d79b3d3d58b4c59a14 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 15 Jan 2026 20:39:38 +0700 Subject: [PATCH 2/2] refactor: rename min_aura_incentive to min_total_bribe_threshold --- fee_allocator/accounting/models.py | 6 +++--- fee_allocator/fee_allocator.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fee_allocator/accounting/models.py b/fee_allocator/accounting/models.py index ecdf4c1..ba6c39d 100644 --- a/fee_allocator/accounting/models.py +++ b/fee_allocator/accounting/models.py @@ -15,7 +15,7 @@ class PoolOverride(BaseModel): class GlobalFeeConfig(BaseModel): - min_aura_incentive: int = 0 + min_total_bribe_threshold: int = 0 vebal_share_pct: Decimal dao_share_pct: Decimal @@ -27,8 +27,8 @@ class GlobalFeeConfig(BaseModel): beets_share_pct: Decimal @model_validator(mode="after") - def set_dynamic_min_aura_incentive(self): - self.min_aura_incentive = StakeDAO().calculate_dynamic_min_incentive() + def set_dynamic_min_total_bribe_threshold(self): + self.min_total_bribe_threshold = StakeDAO().calculate_dynamic_min_incentive() return self diff --git a/fee_allocator/fee_allocator.py b/fee_allocator/fee_allocator.py index b0247fc..8385c0f 100644 --- a/fee_allocator/fee_allocator.py +++ b/fee_allocator/fee_allocator.py @@ -82,7 +82,7 @@ def redistribute_fees(self): redistributed to eligible pools above the threshold. """ - min_amount = self.run_config.fee_config.min_aura_incentive + min_amount = self.run_config.fee_config.min_total_bribe_threshold logger.info(f"Redistribution threshold: ${min_amount}") for chain in self.run_config.all_chains: @@ -514,7 +514,7 @@ def recon(self) -> None: "createdAt": int(datetime.datetime.now().timestamp()), "periodStart": self.date_range[0], "periodEnd": self.date_range[1], - "bribeThreshold": self.run_config.fee_config.min_aura_incentive + "bribeThreshold": self.run_config.fee_config.min_total_bribe_threshold } recon_file = Path(PROJECT_ROOT) / "fee_allocator/summaries" / f"{self.run_config.protocol_version}_recon.json"