From f616345535bd0934cb9f83f384c18248f89fd4c1 Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Wed, 15 Jan 2025 23:42:57 -0600 Subject: [PATCH 1/4] set no core pool chain fees to 0 --- fee_allocator/accounting/fee_pipeline.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fee_allocator/accounting/fee_pipeline.py b/fee_allocator/accounting/fee_pipeline.py index 87841713..167c88cc 100644 --- a/fee_allocator/accounting/fee_pipeline.py +++ b/fee_allocator/accounting/fee_pipeline.py @@ -79,6 +79,12 @@ def run_fees( print( f"Warning pool {pool_id}({description}) on chain {chain} is in the core pools list but does not have a gauge. Skipping." ) + if not pools: + logger.warning( + f"{chain.value} has {fees_to_distribute[chain.value]} in fees but no core pools defined. setting fees to 0." + ) + fees_to_distribute[chain.value] = 0 + continue target_blocks[chain.value] = ( get_block_by_ts(timestamp_now, chain.value), # Block now From 0b0ed7cc05eb908b68a60036797e9a0606de17cd Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Thu, 16 Jan 2025 00:09:21 -0600 Subject: [PATCH 2/4] test fees --- .../fees_collected/fees_2025-01-02_2025-01-16.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json diff --git a/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json b/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json new file mode 100644 index 00000000..ec4eb3ef --- /dev/null +++ b/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json @@ -0,0 +1,8 @@ +{ + "arbitrum": 33159141927, + "avalanche": 2650158183, + "polygon": 17452623442, + "base": 37815110612, + "gnosis": 32581881730, + "mainnet": 277674315913 +} \ No newline at end of file From 03a6d8c6bcee83a59ca3a494ff7a6cf21792741e Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Thu, 16 Jan 2025 00:31:35 -0600 Subject: [PATCH 3/4] check for chain fees first --- fee_allocator/accounting/fee_pipeline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fee_allocator/accounting/fee_pipeline.py b/fee_allocator/accounting/fee_pipeline.py index 167c88cc..035110d8 100644 --- a/fee_allocator/accounting/fee_pipeline.py +++ b/fee_allocator/accounting/fee_pipeline.py @@ -69,7 +69,7 @@ def run_fees( poolutil = BalPoolsGauges(chain.value) listed_core_pools = core_pools.get(chain.value, None) pools = {} - if listed_core_pools is None: + if listed_core_pools is None or not fees_to_distribute.get(chain.value): continue ### Remove any invalid core pools for pool_id, description in listed_core_pools.items(): From a5de06006836dd1f8906814b6c65a83c47d323d0 Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Thu, 16 Jan 2025 01:08:09 -0600 Subject: [PATCH 4/4] remove test fee data --- .../fees_collected/fees_2025-01-02_2025-01-16.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json diff --git a/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json b/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json deleted file mode 100644 index ec4eb3ef..00000000 --- a/fee_allocator/fees_collected/fees_2025-01-02_2025-01-16.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "arbitrum": 33159141927, - "avalanche": 2650158183, - "polygon": 17452623442, - "base": 37815110612, - "gnosis": 32581881730, - "mainnet": 277674315913 -} \ No newline at end of file