fix: fee was waaaayyyy too high

curvefi · Aug 6, 2023 · 8d1b609 · 8d1b609
1 parent 7eebe94
commit 8d1b609
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/contracts/main/CurveTricryptoOptimizedWETH.vy b/contracts/main/CurveTricryptoOptimizedWETH.vy
@@ -1204,7 +1204,7 @@ def _fee(xp: uint256[N_COINS]) -> uint256:
 
     fee_params: uint256[3] = self._unpack(self.packed_fee_params)
 
-    if self.future_A_gamma_time < block.timestamp:
+    if self.future_A_gamma_time > block.timestamp:  # TODO: do not charge max fee else pool rekt!
         fee_params[0] = MAX_FEE  # mid_fee is MAX_FEE during ramping
         fee_params[1] = MAX_FEE  # out_fee is MAX_FEE during ramping
 

diff --git a/tests/boa/unitary/pool/stateful/stateful_base.py b/tests/boa/unitary/pool/stateful/stateful_base.py
@@ -63,8 +63,6 @@ def setup(self, user_id=0):
         self.total_supply = self.token.balanceOf(user)
 
     def get_coin_balance(self, user, coin):
-        if coin.symbol() == "WETH":
-            return boa.env.get_balance(user)
         return coin.balanceOf(user)
 
     def convert_amounts(self, amounts):
@@ -163,7 +161,7 @@ def _exchange(
             with boa.env.prank(user):
                 self.coins[exchange_i].approve(self.swap, 2**256 - 1)
                 out = self.swap.exchange(
-                    exchange_i, exchange_j, exchange_amount_in, 0
+                    exchange_i, exchange_j, exchange_amount_in, calc_amount
                 )
         except Exception:
 
@@ -179,7 +177,6 @@ def _exchange(
                 and self.check_limits(_amounts)
             ):
                 raise
-
             return None
 
         # This is to check that we didn't end up in a borked state after

diff --git a/tests/boa/unitary/pool/stateful/test_simulate.py b/tests/boa/unitary/pool/stateful/test_simulate.py
@@ -97,7 +97,6 @@ def exchange(self, exchange_amount_in, exchange_i, exchange_j, user):
         if self.swap_out:
 
             dy_trader = self.trader.buy(dx, exchange_i, exchange_j)
-
             self.trader.tweak_price(boa.env.vm.state.timestamp)
 
             # check if output value from exchange is similar:

diff --git a/tests/boa/unitary/pool/test_deposit_withdraw.py b/tests/boa/unitary/pool/test_deposit_withdraw.py
@@ -34,8 +34,8 @@ def test_1st_deposit_and_last_withdraw(swap, coins, user, fee_receiver):
     with boa.env.prank(user):
         swap.add_liquidity(quantities, 0)
 
-    # test if eth was deposited:
-    assert boa.env.get_balance(swap.address) == bal_before + quantities[2]
+    # test if eth wasnt deposited:
+    assert boa.env.get_balance(swap.address) == bal_before
 
     token_balance = swap.balanceOf(user)
     assert (
@@ -79,8 +79,8 @@ def test_first_deposit_full_withdraw_second_deposit(
     assert swap.xcp_profit() >= 10**18
     assert swap.virtual_price() >= 10**18
 
-    # test if eth was deposited:
-    assert boa.env.get_balance(swap.address) == quantities[2] + eth_bal_before
+    # test if eth was not deposited:
+    assert boa.env.get_balance(swap.address) == eth_bal_before
 
     for i in range(len(coins)):
         assert swap.balances(i) == quantities[i] + swap_balances_before[i]