Merge branch 'biweekly-runs' into test-workflow

Author: jalbrekt85

.github/workflows/collect_fees.yaml

@@ -33,8 +33,12 @@ jobs:
           start_timestamp=$(date -d "$start_day 00:00:00" +"%s")
           end_timestamp=$((start_timestamp + 60*60*24*14)) # 2 weeks later
           pip3 install -r requirements.txt
-          python3 main.py --ts_now $end_timestamp --ts_in_the_past $start_timestamp --fees_file_name fees_${date_range_string}.json --output_file_name incentives_${date_range_string}.csv
-          # python3 generate_merged_allocation_csv.py ## don't think this is needed anymore
+          
+          # v2 run
+          python3 main.py --ts_now $end_timestamp --ts_in_the_past $start_timestamp --fees_file_name fees_${date_range_string}.json --output_file_name incentives_${date_range_string}.csv --protocol_version v2
+          # v3 run
+          python3 main.py --ts_now $end_timestamp --ts_in_the_past $start_timestamp --fees_file_name fees_${date_range_string}.json --output_file_name incentives_${date_range_string}.csv --protocol_version v3
+          python3 combine_payloads.py --payload_file_name fees_${date_range_string}.json
       - name: Create PR
         id: cpr
         uses: peter-evans/create-pull-request@v7

.github/workflows/trigger_fee_collection.yaml

@@ -9,7 +9,7 @@ on:
         type: string
   push:
     branches:
-      - main
+      - test-workflow
     paths:
       - 'fee_allocator/fees_collected/*.json'