Renaming

Move.toml

@@ -7,13 +7,13 @@ upgrade_policy = "immutable"
 liquidswap_v05 = "0x0163df34fccbf003ce219d3f1d9e70d140b60622cb9dd47599c25fb2f797ba6e"
 
 # Admins
-dao_admin = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
-emergency_admin = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
-fee_admin = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
+dao_admin_v05 = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
+emergency_admin_v05 = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
+fee_admin_v05 = "0xb247ddeee87e848315caf9a33b8e4c71ac53db888cb88143d62d2370cca0ead2"
 
 # Resource accounts: should be the same as @liquidswap_lp in lp_coin
-liquidswap_pool_account = "0x61d2c22a6cb7831bee0f48363b0eec92369357aece0d1142062f7d5d85c7bef8"
-liquidswap_emergency_account = "0x40f545e01332a00225e74a369eda3aed76a32dc6dccf6c08fba4499476d329"
+liquidswap_pool_account_v05 = "0x61d2c22a6cb7831bee0f48363b0eec92369357aece0d1142062f7d5d85c7bef8"
+liquidswap_emergency_account_v05 = "0x40f545e01332a00225e74a369eda3aed76a32dc6dccf6c08fba4499476d329"
 
 # Addresses for tests.
 test_coin_admin = "0x11"
@@ -35,4 +35,4 @@ subdir = "aptos-move/framework/aptos-framework"
 
 [dependencies.UQ64x64]
 git = "https://github.com/pontem-network/UQ64x64.git"
-rev = "v0.3.8"
+rev = "v0.3.9"

liquidswap_lp/Move.toml

@@ -4,7 +4,7 @@ version = '1.0.0'
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap_lp = "0x61d2c22a6cb7831bee0f48363b0eec92369357aece0d1142062f7d5d85c7bef8"
+liquidswap_lp_v05 = "0x61d2c22a6cb7831bee0f48363b0eec92369357aece0d1142062f7d5d85c7bef8"
 
 [dev-dependencies.MoveStdlib]
 git = "https://github.com/aptos-labs/aptos-core.git"

liquidswap_lp/sources/lp_coin.move

@@ -1,5 +1,5 @@
 /// Liquidswap LP coin.
-module liquidswap_lp::lp_coin {
+module liquidswap_lp_v05::lp_coin {
     /// LP coin type for Liquidswap.
     struct LP<phantom X, phantom Y, phantom Curve> {}
 }

sources/swap/emergency.move

@@ -60,12 +60,12 @@ module liquidswap_v05::emergency {
         assert!(account_addr == global_config::get_emergency_admin(), ERR_NO_PERMISSIONS);
         assert!(is_emergency(), ERR_NOT_EMERGENCY);
 
-        let IsEmergency {} = move_from<IsEmergency>(@liquidswap_emergency_account);
+        let IsEmergency {} = move_from<IsEmergency>(@liquidswap_emergency_account_v05);
     }
 
     /// Get if it's paused or not.
     public fun is_emergency(): bool {
-        exists<IsEmergency>(@liquidswap_emergency_account)
+        exists<IsEmergency>(@liquidswap_emergency_account_v05)
     }
 
     /// Would abort if currently paused.
@@ -75,7 +75,7 @@ module liquidswap_v05::emergency {
 
     /// Get if it's disabled or not.
     public fun is_disabled(): bool {
-        exists<IsDisabled>(@liquidswap_emergency_account)
+        exists<IsDisabled>(@liquidswap_emergency_account_v05)
     }
 
     /// Disable condition forever.

sources/swap/global_config.move

@@ -59,9 +59,9 @@ module liquidswap_v05::global_config {
         assert!(signer::address_of(liquidswap_admin) == @liquidswap_v05, ERR_UNREACHABLE);
 
         move_to(liquidswap_admin, GlobalConfig {
-            dao_admin_address: @dao_admin,
-            emergency_admin_address: @emergency_admin,
-            fee_admin_address: @fee_admin,
+            dao_admin_address: @dao_admin_v05,
+            emergency_admin_address: @emergency_admin_v05,
+            fee_admin_address: @fee_admin_v05,
             default_uncorrelated_fee: 30,   // 0.3%
             default_stable_fee: 4,          // 0.04%
             default_dao_fee: 33,            // 33%

sources/swap/router.move

@@ -7,7 +7,7 @@ module liquidswap_v05::router {
     use liquidswap_v05::math;
     use liquidswap_v05::stable_curve;
     use liquidswap_v05::liquidity_pool;
-    use liquidswap_lp::lp_coin::LP;
+    use liquidswap_lp_v05::lp_coin::LP;
 
     // Errors codes.
 

sources/swap/scripts.move

@@ -5,7 +5,7 @@ module liquidswap_v05::scripts {
     use aptos_framework::coin;
 
     use liquidswap_v05::router;
-    use liquidswap_lp::lp_coin::LP;
+    use liquidswap_lp_v05::lp_coin::LP;
 
     /// Register a new liquidity pool for `X`/`Y` pair.
     ///

sources/test_helpers/test_pool.move

@@ -5,7 +5,7 @@ module test_helpers::test_pool {
     use aptos_framework::account;
     use aptos_framework::coin::{Self, Coin};
     use aptos_framework::genesis;
-    use liquidswap_lp::lp_coin::LP;
+    use liquidswap_lp_v05::lp_coin::LP;
 
     use liquidswap_v05::liquidity_pool;
     use liquidswap_v05::lp_account;

tests/dao_storage_tests.move

@@ -3,7 +3,7 @@ module liquidswap_v05::dao_storage_tests {
     use std::signer;
 
     use aptos_framework::coin;
-    use liquidswap_lp::lp_coin::LP;
+    use liquidswap_lp_v05::lp_coin::LP;
 
     use liquidswap_v05::curves::Uncorrelated;
     use liquidswap_v05::dao_storage;
@@ -57,7 +57,7 @@ module liquidswap_v05::dao_storage_tests {
         dao_storage::deposit_for_test<BTC, USDT, Uncorrelated>(lp_owner_addr, btc_coins, usdt_coins);
     }
 
-    #[test(dao_admin_acc = @dao_admin)]
+    #[test(dao_admin_acc = @dao_admin_v05)]
     fun test_withdraw(dao_admin_acc: signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -92,7 +92,7 @@ module liquidswap_v05::dao_storage_tests {
         test_coins::burn(&coin_admin, y0);
     }
 
-    #[test(dao_admin_acc = @dao_admin)]
+    #[test(dao_admin_acc = @dao_admin_v05)]
     #[expected_failure(abort_code = 65542, location = aptos_framework::coin)]
     fun test_withdraw_fail_if_more_deposited(dao_admin_acc: signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
@@ -136,7 +136,7 @@ module liquidswap_v05::dao_storage_tests {
         test_coins::burn(&coin_admin, y);
     }
 
-    #[test(dao_admin_acc = @dao_admin)]
+    #[test(dao_admin_acc = @dao_admin_v05)]
     fun test_split_third_of_fees_into_dao_storage_account(dao_admin_acc: signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
 
@@ -164,12 +164,12 @@ module liquidswap_v05::dao_storage_tests {
         assert!(x_res == 100999, 2);
         assert!(y_res == 99040, 3);
 
-        let (dao_x, dao_y) = dao_storage::get_storage_size<BTC, USDT, Uncorrelated>(@liquidswap_pool_account);
+        let (dao_x, dao_y) = dao_storage::get_storage_size<BTC, USDT, Uncorrelated>(@liquidswap_pool_account_v05);
         assert!(dao_x == 1, 4);
         assert!(dao_y == 0, 5);
 
         let (x, y) =
-            dao_storage::withdraw<BTC, USDT, Uncorrelated>(&dao_admin_acc, @liquidswap_pool_account, 1, 0);
+            dao_storage::withdraw<BTC, USDT, Uncorrelated>(&dao_admin_acc, @liquidswap_pool_account_v05, 1, 0);
         assert!(coin::value(&x) == 1, 6);
         assert!(coin::value(&y) == 0, 7);
 

tests/emergency_tests.move

@@ -8,7 +8,7 @@ module liquidswap_v05::emergency_tests {
     use liquidswap_v05::global_config;
     use test_helpers::test_pool::{Self, create_liquidswap_admin};
 
-    #[test(emergency_acc = @emergency_admin, coin_admin = @test_coin_admin)]
+    #[test(emergency_acc = @emergency_admin_v05, coin_admin = @test_coin_admin)]
     public fun test_end_to_end(emergency_acc: signer, coin_admin: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -36,7 +36,7 @@ module liquidswap_v05::emergency_tests {
         let liquidswap_admin = create_liquidswap_admin();
         let (emergency_acc, _) =
             account::create_resource_account(&liquidswap_admin, b"emergency_account_seed");
-        assert!(signer::address_of(&emergency_acc) == @liquidswap_emergency_account, 1);
+        assert!(signer::address_of(&emergency_acc) == @liquidswap_emergency_account_v05, 1);
     }
 
     #[test(emergency_acc = @0x13)]
@@ -47,7 +47,7 @@ module liquidswap_v05::emergency_tests {
         emergency::pause(&emergency_acc);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     public fun test_emergency_second_time_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
@@ -56,7 +56,7 @@ module liquidswap_v05::emergency_tests {
         emergency::pause(&emergency_acc);
     }
 
-    #[test(emergency_acc = @emergency_admin, tmp = @0x13)]
+    #[test(emergency_acc = @emergency_admin_v05, tmp = @0x13)]
     #[expected_failure(abort_code = emergency::ERR_NO_PERMISSIONS)]
     public fun test_resume_wrong_account_fails(emergency_acc: signer, tmp: signer) {
         test_pool::initialize_liquidity_pool();
@@ -66,15 +66,15 @@ module liquidswap_v05::emergency_tests {
         emergency::resume(&tmp);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_NOT_EMERGENCY)]
     public fun test_resume_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
         emergency::resume(&emergency_acc);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     public fun test_emergency_assert_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
@@ -90,7 +90,7 @@ module liquidswap_v05::emergency_tests {
         emergency::assert_no_emergency();
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     public fun test_is_emergency(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -100,7 +100,7 @@ module liquidswap_v05::emergency_tests {
         assert!(emergency::is_emergency() == false, 1);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     public fun test_disable(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -109,7 +109,7 @@ module liquidswap_v05::emergency_tests {
         assert!(emergency::is_disabled() == true, 1);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     public fun test_disable_during_pause(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
 
@@ -119,7 +119,7 @@ module liquidswap_v05::emergency_tests {
         assert!(emergency::is_disabled() == true, 1);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_resume_after_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
@@ -129,7 +129,7 @@ module liquidswap_v05::emergency_tests {
         emergency::resume(&emergency_acc);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_pause_after_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();
@@ -138,7 +138,7 @@ module liquidswap_v05::emergency_tests {
         emergency::pause(&emergency_acc);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_DISABLED)]
     public fun test_disable_fails(emergency_acc: signer) {
         test_pool::initialize_liquidity_pool();

tests/flashloan_tests.move

@@ -3,7 +3,7 @@ module liquidswap_v05::flashloan_tests {
     use std::signer;
 
     use aptos_framework::coin;
-    use liquidswap_lp::lp_coin::LP;
+    use liquidswap_lp_v05::lp_coin::LP;
 
     use liquidswap_v05::curves::{Uncorrelated, Stable};
     use liquidswap_v05::emergency;
@@ -335,7 +335,7 @@ module liquidswap_v05::flashloan_tests {
         assert!(y_res == 292999999999901, 3);
     }
 
-    #[test(emergency_acc = @emergency_admin)]
+    #[test(emergency_acc = @emergency_admin_v05)]
     #[expected_failure(abort_code = emergency::ERR_EMERGENCY)]
     fun test_fail_if_emergency(emergency_acc: signer) {
         let (_, _) = register_pool_with_liquidity(100000000, 28000000000);
@@ -538,7 +538,7 @@ module liquidswap_v05::flashloan_tests {
         test_coins::burn(&coin_admin, usdt_coins);
     }
 
-    #[test(fee_admin = @fee_admin)]
+    #[test(fee_admin = @fee_admin_v05)]
     #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_set_fee_fail_if_pool_is_locked(fee_admin: signer) {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);
@@ -557,7 +557,7 @@ module liquidswap_v05::flashloan_tests {
         test_coins::burn(&coin_admin, usdt_coins);
     }
 
-    #[test(fee_admin = @fee_admin)]
+    #[test(fee_admin = @fee_admin_v05)]
     #[expected_failure(abort_code = liquidity_pool::ERR_POOL_IS_LOCKED)]
     fun test_set_dao_fee_fail_if_pool_is_locked(fee_admin: signer) {
         let (coin_admin, _) = register_pool_with_liquidity(100000000, 28000000000);