diff --git a/.github/workflows/run_payment_round.yaml b/.github/workflows/run_payment_round.yaml index 54af7e2..3521a31 100644 --- a/.github/workflows/run_payment_round.yaml +++ b/.github/workflows/run_payment_round.yaml @@ -21,7 +21,7 @@ jobs: - name: Setup Python 3.9 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: "3.10" - name: Generate Payload and report env: diff --git a/automation/arbitrum_stip_bridge_start_q2_2024.py b/automation/arbitrum_stip_bridge_start_q2_2024.py index b1be22e..73d4df2 100644 --- a/automation/arbitrum_stip_bridge_start_q2_2024.py +++ b/automation/arbitrum_stip_bridge_start_q2_2024.py @@ -35,10 +35,12 @@ { "pool_id": "0x125bc5a031b2db6733bfa35d914ffa428095978b000200000000000000000514", "meta": {"symbol": "ECLP-AUSDC-AUSDT"}, + "fixedBoost": 1.75, }, { "pool_id": "0x260dbd54d87a10a0fc9d08622ebc969a3bf4e6bb000200000000000000000536", "meta": {"symbol": "jitoSOL/wstETH"}, + "fixedBoost": 1.5, }, { "pool_id": "0x2ce4457acac29da4736ae6f5cd9f583a6b335c270000000000000000000004dc", @@ -84,11 +86,20 @@ "pool_id": "0x9f8ed1acfe0c863381b9081aff2144fc867aa7730002000000000000000004d4", "meta": {"symbol": "ANKR:ankrETH"}, }, + { + "pool_id": "0x90e6cb5249f5e1572afbf8a96d8a1ca6acffd73900000000000000000000055c", + "meta": {"symbol": "rsETH-wETH"}, + "fixedEmissions": 2000, + }, + { + "pool_id": "0xcdcef9765d369954a4a936064535710f7235110a000200000000000000000558", + "meta": {"symbol": "weETH-wstETH ECLP"}, + "fixedBoost": 1.5, + "fixedEmissions": 2000, + }, ] - - # assert that the total sum of all fixedEmissions is equal to FIXED_INCENTIVE_TOKENS_PER_EPOCH total_fixed_emissions = sum( [x.get("fixedEmissions", 0) for x in ACTIVE_POOLS_AND_OVERRIDES] diff --git a/automation/constants.py b/automation/constants.py index 53c959b..2d42db5 100644 --- a/automation/constants.py +++ b/automation/constants.py @@ -7,9 +7,9 @@ CHAIN_NAME = "arbitrum" CURRENT_YEAR = 2024 # How many incentives should be taken away from vote following to be distributed as fixed incentives? Per 2 week epoch -FIXED_INCENTIVE_TOKENS_PER_EPOCH = 0 +FIXED_INCENTIVE_TOKENS_PER_EPOCH = 4000 # Max 10k according ot grant # Total number of tokens available per 2 week epoch -TOTAL_TOKENS_PER_EPOCH = 600_000 / (12/2) # 100k per epoch, 50k per week +TOTAL_TOKENS_PER_EPOCH = 600_000 / (12 / 2) # 100k per epoch, 50k per week DYNAMIC_BOOST_CAP = 3 MIN_BAL_IN_USD_FOR_BOOST = 200 TOKENS_TO_FOLLOW_VOTING = TOTAL_TOKENS_PER_EPOCH - FIXED_INCENTIVE_TOKENS_PER_EPOCH diff --git a/automation/lstGrant.py b/automation/lstGrant.py index c8ee7e8..5662b33 100644 --- a/automation/lstGrant.py +++ b/automation/lstGrant.py @@ -326,8 +326,13 @@ def run_stip_pipeline(end_date: int) -> None: pool_protocol_fees.get(gauge_addr, 0) / dollar_value_of_bal_emitted, DYNAMIC_BOOST_CAP, ) + print( + f"Gauge {gauge_addr} has a fees of {pool_protocol_fees.get(gauge_addr, 0)} and earned {dollar_value_of_bal_emitted} in USD BAL rendering a raw dynamic boost of {dynamic_boost}" + ) else: - dynamic_boost = 0 + dynamic_boost = 1.0 + if dynamic_boost < 1: + dynamic_boost = 1.0 dynamic_boosts[gauge_addr] = dynamic_boost # Now calculate the final boost value, which uses formula - (dynamic boost + fixed boost) - 1 diff --git a/main.py b/main.py index fcd4731..774e601 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ # TS_NOW = 1702512000 # TS_NOW = 1703721600 # 28-12-2023 -TS_NOW = 1717106400 # 2024-05-31 +TS_NOW = 1718143200 # 2024-06-13 parser = argparse.ArgumentParser() parser.add_argument( diff --git a/requirements.txt b/requirements.txt index 7bfe3a0..e77fbed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ -pandas==2.0.3 -python-dotenv -web3==6.9.0 +pandas>2.0,<2.3 gql[requests] pycoingecko==3.1.0 -git+https://github.com/BalancerMaxis/bal_addresses@0.9.4 -#git+https://github.com/BalancerMaxis/bal_tools \ No newline at end of file +git+https://github.com/BalancerMaxis/bal_addresses@0.9.5 +#git+https://github.com/BalancerMaxis/bal_tools +python-dotenv \ No newline at end of file