Merge branch 'main' into ignore_bad_tokens

velodrome-finance · Jan 27, 2025 · 9289437 · 9289437
2 parents e08ddc6 + d054e9f
commit 9289437
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,6 +22,12 @@ jobs:
             experimental: true
           - chain: metall2
             experimental: true
+          - chain: ink
+            experimental: true
+          - chain: superseed
+            experimental: true
+          - chain: soneium
+            experimental: true
 
     steps:
     - uses: actions/checkout@master

diff --git a/ape-config.yaml b/ape-config.yaml
@@ -26,6 +26,9 @@ networks:
     - name: mainnet
       ecosystem: soneium
       chain_id: 1868
+    - name: mainnet
+      ecosystem: superseed
+      chain_id: 5330
 
 node:
   mode:
@@ -46,3 +49,6 @@ node:
   soneium:
     mainnet:
       uri: https://rpc.soneium.org
+  superseed:
+    mainnet:
+      uri: https://mainnet.superseed.xyz
diff --git a/contracts/LpSugar.vy b/contracts/LpSugar.vy
@@ -984,8 +984,8 @@ def _cl_lp(_data: address[4], _token0: address, _token1: address) -> Lp:
   token1_fees: uint256 = 0
 
   slot: Slot = staticcall pool.slot0()
-  tick_low: int24 = slot.tick - tick_spacing
-  tick_high: int24 = slot.tick
+  tick_low: int24 = (slot.tick // tick_spacing) * tick_spacing
+  tick_high: int24 = tick_low + tick_spacing
 
   if gauge_liquidity > 0 and gauge.address != empty(address):
     fee_voting_reward = staticcall gauge.feesVotingReward()

diff --git a/deployments/optimism.env b/deployments/optimism.env
@@ -17,4 +17,4 @@ TEST_ALM_ADDRESS_10=0x892ff98a46e5bd141e2d12618f4b2fe6284debac
 LP_SUGAR_ADDRESS_10=0x3B919747B46B13CFfd9f16629cFf951C0b7ea1e2
 REWARDS_SUGAR_ADDRESS_10=0x62CCFB2496f49A80B0184AD720379B529E9152fB
 VE_SUGAR_ADDRESS_10=0xFE0a44d356a9F52c9F1bE0ba0f0877d986438c9C
-RELAY_SUGAR_ADDRESS_10=0xb8307e5842B9aeE75C704183F0355076aa74b4e2
+RELAY_SUGAR_ADDRESS_10=0xb8307e5842B9aeE75C704183F0355076aa74b4e2
diff --git a/deployments/superseed.env b/deployments/superseed.env
@@ -0,0 +1,20 @@
+CHAIN_ID=5330
+CONTRACT='lp'
+
+FACTORIES_5330=0x31832f2a97Fd20664D76Cc421207669b55CE4BC0,0x04625B046C69577EfC40e6c0Bb83CDBAfab5a55F
+REWARDS_FACTORIES_5330=0x7dc9fd82f91B36F416A89f5478375e4a79f4Fb2F,0x7dc9fd82f91B36F416A89f5478375e4a79f4Fb2F
+GAUGE_FACTORIES_5330=0x42e403b73898320f23109708b0ba1Ae85838C445,0xeAD23f606643E387a073D0EE8718602291ffaAeB
+INIT_HASHES_5330=0x558be7ee0c63546b31d0773eee1d90451bd76a0167bb89653722a2bd677c002d,0x7b216153c50849f664871825fa6f22b3356cdce2436e4f48734ae2a926a4c7e5
+
+VOTER_5330=0x97cDBCe21B6fd0585d29E539B1B99dAd328a1123
+REGISTRY_5330=0x42b9279236F590bd93736F806224825CBF5f7AE5
+CONVERTOR_5330=0x1111111111111111111111111111111111111111
+SLIPSTREAM_HELPER_5330=0x222ed297aF0560030136AE652d39fa40E1B72818
+ALM_FACTORY_5330=0x0000000000000000000000000000000000000000
+
+TEST_ADDRESS_5330=0x892ff98a46e5bd141e2d12618f4b2fe6284debac
+TEST_ALM_ADDRESS_5330=0x892ff98a46e5bd141e2d12618f4b2fe6284debac
+
+# Deployed Contracts
+LP_SUGAR_ADDRESS_5330=0xB1d0DFFe6260982164B53EdAcD3ccd58B081889d
+REWARDS_SUGAR_ADDRESS_5330=0xbDD1d5A9d9566F575bC59cE33C8F77ACa5cF924b