make v2 and v3 fee inputs dinstict

Author: jalbrekt85

.github/workflows/trigger_fee_collection.yaml

@@ -42,7 +42,7 @@ jobs:
           echo "JSON Path: $JSON_PATH"
           
           # Extract the end date from filename using cut
-          END_DATE=$(basename "$JSON_PATH" | cut -d'_' -f3 | cut -d'.' -f1)
+          END_DATE=$(basename "$JSON_PATH" | cut -d'_' -f4 | cut -d'.' -f1)
           
           echo "end-date=$END_DATE" >> $GITHUB_OUTPUT
 

combine_payloads.py

@@ -5,8 +5,7 @@
 
 
 def combine_payloads(fees_file_name: str) -> None:
-    # Extract the end date from the fees file name (fees_START-DATE_END-DATE.json)
-    date_str = fees_file_name.split('_')[2].split('.')[0]
+    date_str = fees_file_name.split('_')[3].split('.')[0]
 
     payload_dir = Path("fee_allocator/payloads")
 

fee_allocator/fees_collected/get_report.py

@@ -45,7 +45,7 @@ def get_report(start_date, end_date):
 
         report = get_report(yesterday.strftime("%Y-%m-%d"), today.strftime("%Y-%m-%d"))
         with open(
-            f"fee_allocator/fees_collected/fees_{epoch_start.strftime('%Y-%m-%d')}_{today.strftime('%Y-%m-%d')}.json",
+            f"fee_allocator/fees_collected/v2_fees_{epoch_start.strftime('%Y-%m-%d')}_{today.strftime('%Y-%m-%d')}.json",
             "w",
         ) as f:
             json.dump(report, f, indent=2)

fee_allocator/utils.py

@@ -98,12 +98,12 @@ def get_block_by_ts(timestamp, chain: "CorePoolChain", before=False):
     else:
         return chain.subgraph.get_first_block_after_utc_timestamp(timestamp)
 
-def fetch_collected_fees(start_date: str, end_date: str, fees_file_name: str = None) -> dict:
+def fetch_collected_fees(start_date: str, end_date: str, fees_file_name: str = None, protocol_version: str = "v2") -> dict:
     # If fees_file_name is provided, use that directly
     if fees_file_name:
         filename = fees_file_name
     else:
-        filename = f"fees_{start_date}_{end_date}.json"
+        filename = f"{protocol_version}_fees_{start_date}_{end_date}.json"
 
     local_path = f"fee_allocator/fees_collected/{filename}"
     if os.path.exists(local_path):

main.py

@@ -40,7 +40,7 @@ def main() -> None:
     start_date = datetime.fromtimestamp(ts_in_the_past, tz=pytz.UTC).strftime("%Y-%m-%d")
     end_date = datetime.fromtimestamp(ts_now, tz=pytz.UTC).strftime("%Y-%m-%d")
 
-    input_fees = fetch_collected_fees(start_date, end_date, args.fees_file_name)
+    input_fees = fetch_collected_fees(start_date, end_date, args.fees_file_name, args.protocol_version)
     date_range = (ts_in_the_past, ts_now)
 
     fee_allocator = FeeAllocator(input_fees, date_range, protocol_version=args.protocol_version)