update tricrypto-ng

scripts/deployment_utils.py

@@ -351,20 +351,6 @@ def test_deployment(pool, coins, fee_receiver, account):
         assert coin_contract.balanceOf(account) == coin_balance + dy_coin
         logger.info(f"Removed {dy_coin} of {coin_name}.")
 
-    logger.info("------------------------------ Claim admin fees")
-    logger.info("(should not claim since pool hasn't accrued enough profits)")
-
-    fees_claimed = pool.balanceOf(fee_receiver)
-    pool.claim_admin_fees(sender=account, gas_limit=400000, **_get_tx_params())
-    if pool.totalSupply() < 10**18:
-        assert pool.balanceOf(fee_receiver) == fees_claimed
-        logger.info("No fees claimed.")
-    else:
-        assert pool.balanceOf(fee_receiver) > fees_claimed
-        logger.info(
-            f"{pool.balanceOf(fee_receiver) - fees_claimed} LP tokens of admin fees claimed!"  # noqa: E501
-        )
-
     logger.info(
         "------------------------------ Remove liquidity proportionally"
     )

scripts/experiments/sim_dydx.py

@@ -72,7 +72,13 @@ def _get_dydx(swap, i, j):
     A = ANN / 10**4 / 3**3
     gamma = swap.gamma() / 10**18
 
-    xp = swap.internal.xp()
+    balances = []
+    for i in range(3):
+        balances.append(swap.balances(i))
+
+    xp = swap.internal.xp(
+        balances, swap._storage.price_scale_packed.get(), swap.precisions()
+    )
 
     for k in range(3):
         if k != i and k != j:

tests/boa/fixtures/pool.py

@@ -46,7 +46,6 @@ def _crypto_swap_with_deposit(
 @pytest.fixture(scope="module")
 def params():
 
-    ma_time = 866  # 600 seconds / ln(2)
     return {
         "A": 135 * 3**3 * 10000,
         "gamma": int(7e-5 * 1e18),
@@ -55,7 +54,8 @@ def params():
         "allowed_extra_profit": 2 * 10**12,
         "fee_gamma": int(0.01 * 1e18),
         "adjustment_step": int(0.0015 * 1e18),
-        "ma_time": ma_time,
+        "ma_time": 866,  # # 600 seconds//math.log(2)
+        "xcp_ma_time": 62324,  # 12 hours//math.log(2)
         "initial_prices": INITIAL_PRICES[1:],
     }
 

tests/boa/profiling/test_boa_profile.py

@@ -19,12 +19,7 @@ def _random_exchange(swap):
     i, j = _choose_indices()
     amount = int(swap.balances(i) * 0.01)
 
-    use_eth = i == 2
-    value = 0
-    if use_eth:
-        value = amount
-
-    swap.exchange(i, j, amount, 0, use_eth, value=value)
+    swap.exchange(i, j, amount, 0)
     boa.env.time_travel(random.randint(12, 600))
 
 
@@ -34,7 +29,7 @@ def _random_deposit(swap):
     c = random.uniform(0, 0.05)
     amounts = [int(c * i * random.uniform(0, 0.8)) for i in balances]
 
-    swap.add_liquidity(amounts, 0, True, value=amounts[2])
+    swap.add_liquidity(amounts, 0)
 
     boa.env.time_travel(random.randint(12, 600))
 
@@ -44,42 +39,20 @@ def _random_deposit_weth(swap):
     balances = [swap.balances(i) for i in range(3)]
     c = random.uniform(0, 0.05)
     amounts = [int(c * i * random.uniform(0, 0.8)) for i in balances]
-    swap.add_liquidity(amounts, 0, False)
+    swap.add_liquidity(amounts, 0)
     boa.env.time_travel(random.randint(12, 600))
 
 
 def _random_deposit_one(swap):
     balances = [swap.balances(i) for i in range(3)]
     c = random.uniform(0, 0.05)
     i = random.randint(0, 2)
-    use_eth = i == 2
-    amounts = [0, 0, 0]
-    value = 0
-    for j in range(3):
-        if i == j:
-            amounts[i] = int(balances[i] * c)
-            if use_eth:
-                value = amounts[i]
-
-    swap.add_liquidity(amounts, 0, use_eth, value=value)
-
-    boa.env.time_travel(random.randint(12, 600))
-
-
-def _random_deposit_eth(swap):
-    balances = [swap.balances(i) for i in range(3)]
-    c = random.uniform(0, 0.05)
-    i = 2
-    use_eth = True
     amounts = [0, 0, 0]
-    value = 0
     for j in range(3):
         if i == j:
             amounts[i] = int(balances[i] * c)
-            if use_eth:
-                value = amounts[i]
 
-    swap.add_liquidity(amounts, 0, use_eth, value=value)
+    swap.add_liquidity(amounts, 0)
 
     boa.env.time_travel(random.randint(12, 600))
 
@@ -88,7 +61,7 @@ def _random_proportional_withdraw(swap):
 
     amount = int(swap.totalSupply() * random.uniform(0, 0.01))
 
-    swap.remove_liquidity(amount, [0, 0, 0], True)
+    swap.remove_liquidity(amount, [0, 0, 0])
 
     boa.env.time_travel(random.randint(12, 600))
 
@@ -97,13 +70,11 @@ def _random_withdraw_one(swap):
 
     i = random.randint(0, 2)
     amount = int(swap.totalSupply() * 0.01)
-    use_eth = i == 2
-
-    swap.remove_liquidity_one_coin(amount, i, 0, use_eth)
+    swap.remove_liquidity_one_coin(amount, i, 0)
 
 
 @pytest.mark.profile
-def test_profile_amms(swap_with_deposit, coins, user, math_contract):
+def test_profile_amms(swap_with_deposit, coins, user):
 
     swap = swap_with_deposit
 
@@ -126,9 +97,6 @@ def test_profile_amms(swap_with_deposit, coins, user, math_contract):
             # deposit single token:
             _random_deposit_one(swap)
 
-            # deposit only eth:
-            _random_deposit_eth(swap)
-
             # swap:
             _random_exchange(swap)
 

tests/boa/unitary/factory/test_deploy_pool.py

@@ -18,9 +18,7 @@ def empty_factory(deployer, fee_receiver, owner, weth):
 def test_check_packed_params_on_deployment(swap, params, coins):
 
     # check packed precisions
-    unpacked_precisions = swap.internal._unpack(
-        swap._storage.packed_precisions.get()
-    )
+    unpacked_precisions = swap.precisions()
     for i in range(len(coins)):
         assert unpacked_precisions[i] == 10 ** (18 - coins[i].decimals())
 

tests/boa/unitary/math/test_get_p.py

@@ -52,12 +52,10 @@ def get_p(
 
 def _get_dydx_vyper(swap, i, j, price_calc):
 
-    # ANN = swap.A()
-    # A = ANN // 10**4 // 3**3
-    A = swap.A()
-    gamma = swap.gamma()
-
-    xp = swap.internal.xp()
+    xp = swap.internal.xp(
+        swap._storage.balances.get(),
+        swap._storage.price_scale_packed.get(),
+    )
 
     for k in range(3):
         if k != i and k != j:
@@ -67,10 +65,7 @@ def _get_dydx_vyper(swap, i, j, price_calc):
     x2 = xp[j]
     x3 = xp[k]
 
-    D = swap.D()
-
-    dxdy = price_calc.get_p(x1, x2, x3, D, A, gamma)
-    return dxdy
+    return price_calc.get_p(x1, x2, x3, swap.D(), swap.A(), swap.gamma())
 
 
 def _get_prices_vyper(swap, price_calc):

tests/boa/unitary/math/test_get_p_expt.py

@@ -155,7 +155,12 @@ def _get_prices_vyper(swap, price_calc):
 
     A = swap.A()
     gamma = swap.gamma()
-    xp = swap.internal.xp()
+    balances = []
+    for i in range(3):
+        balances.append(swap.balances(i))
+
+    xp = swap.internal.xp(balances, swap._storage.price_scale_packed.get())
+
     D = swap.D()
 
     p = price_calc.get_p(xp, D, [A, gamma])
@@ -224,11 +229,12 @@ def test_against_expt(dydx_optimised_math):
 def _imbalance_swap(swap, coins, imbalance_frac, user, dollar_amount, i, j):
 
     # make swap imbalanced:
-    mint_for_testing(coins[0], user, int(swap.balances(0) * imbalance_frac))
+    imbalance_amount = int(swap.balances(i) * imbalance_frac)
+    mint_for_testing(coins[i], user, imbalance_amount)
 
     try:
         with boa.env.prank(user):
-            swap.exchange(i, j, coins[0].balanceOf(user), 0)
+            swap.exchange(i, j, imbalance_amount, 0)
     except boa.BoaError as b_error:
         assert_string_contains(
             b_error.stack_trace.last_frame.pretty_vm_reason,

tests/boa/unitary/pool/admin/test_commit_params.py

@@ -3,25 +3,24 @@
 import boa
 
 
-def _commit_apply_new_params(swap, params):
-    swap.commit_new_parameters(
+def _apply_new_params(swap, params):
+    swap.apply_new_parameters(
         params["mid_fee"],
         params["out_fee"],
         params["fee_gamma"],
         params["allowed_extra_profit"],
         params["adjustment_step"],
         params["ma_time"],
+        params["xcp_ma_time"],
     )
-    boa.env.time_travel(7 * 24 * 60 * 60)
-    swap.apply_new_parameters()
 
 
 def test_commit_accept_mid_fee(swap, factory_admin, params):
 
     p = copy.deepcopy(params)
     p["mid_fee"] = p["mid_fee"] + 1
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     mid_fee = swap.internal._unpack(swap._storage.packed_fee_params.get())[0]
     assert mid_fee == p["mid_fee"]
@@ -32,7 +31,7 @@ def test_commit_accept_out_fee(swap, factory_admin, params):
     p = copy.deepcopy(params)
     p["out_fee"] = p["out_fee"] + 1
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     out_fee = swap.internal._unpack(swap._storage.packed_fee_params.get())[1]
     assert out_fee == p["out_fee"]
@@ -43,7 +42,7 @@ def test_commit_accept_fee_gamma(swap, factory_admin, params):
     p = copy.deepcopy(params)
     p["fee_gamma"] = 10**17
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     fee_gamma = swap.internal._unpack(swap._storage.packed_fee_params.get())[2]
     assert fee_gamma == p["fee_gamma"]
@@ -57,7 +56,7 @@ def test_commit_accept_fee_params(swap, factory_admin, params):
     p["fee_gamma"] = 10**17
 
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     fee_params = swap.internal._unpack(swap._storage.packed_fee_params.get())
     assert fee_params[0] == p["mid_fee"]
@@ -70,7 +69,7 @@ def test_commit_accept_allowed_extra_profit(swap, factory_admin, params):
     p = copy.deepcopy(params)
     p["allowed_extra_profit"] = 10**17
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     allowed_extra_profit = swap.internal._unpack(
         swap._storage.packed_rebalancing_params.get()
@@ -83,7 +82,7 @@ def test_commit_accept_adjustment_step(swap, factory_admin, params):
     p = copy.deepcopy(params)
     p["adjustment_step"] = 10**17
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     adjustment_step = swap.internal._unpack(
         swap._storage.packed_rebalancing_params.get()
@@ -96,14 +95,24 @@ def test_commit_accept_ma_time(swap, factory_admin, params):
     p = copy.deepcopy(params)
     p["ma_time"] = 872
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     ma_time = swap.internal._unpack(
         swap._storage.packed_rebalancing_params.get()
     )[2]
     assert ma_time == p["ma_time"]
 
 
+def test_commit_accept_xcp_ma_time(swap, factory_admin, params):
+
+    p = copy.deepcopy(params)
+    p["xcp_ma_time"] = 872541
+    with boa.env.prank(factory_admin):
+        _apply_new_params(swap, p)
+
+    assert swap.xcp_ma_time() == p["xcp_ma_time"]
+
+
 def test_commit_accept_rebalancing_params(swap, factory_admin, params):
 
     p = copy.deepcopy(params)
@@ -112,7 +121,7 @@ def test_commit_accept_rebalancing_params(swap, factory_admin, params):
     p["ma_time"] = 1000
 
     with boa.env.prank(factory_admin):
-        _commit_apply_new_params(swap, p)
+        _apply_new_params(swap, p)
 
     rebalancing_params = swap.internal._unpack(
         swap._storage.packed_rebalancing_params.get()