Pre mainnet addresses (#109)

* update to pre-mainnet addresses * bump version * add tests for resource accounts Co-authored-by: Maksim Kurnikov <[email protected]>
pontem-network · Oct 4, 2022 · ace8d40 · ace8d40
1 parent 2a189ba
commit ace8d40
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 16 deletions.
diff --git a/Move.toml b/Move.toml
@@ -1,17 +1,19 @@
 [package]
 name = "Liquidswap"
-version = "0.3.1"
+version = "0.4.0"
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap = "0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9"
-dao_admin = "0xd932dceea6c05c56e29735da9bee581e4038576e677ecadd42b5b5c871fc55b9"
-emergency_admin = "0xb4d7b2466d211c1f4629e8340bb1a9e75e7f8fb38cc145c54c5c9f9d5017a318"
-fee_admin = "0xb4d7b2466d211c1f4629e8340bb1a9e75e7f8fb38cc145c54c5c9f9d5017a318"
+liquidswap = "0x4e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81"
 
-# should be the same as @liquidswap_lp in lp_coin
-liquidswap_pool_account = "0x385068db10693e06512ed54b1e6e8f1fb9945bb7a78c28a45585939ce953f99e"
-liquidswap_emergency_account = "0xda070b4be57128cf3a8e265d77338a3743e5ff06c2834bf7cda2a05aaf30c204"
+# Admins
+dao_admin = "0x4dd8990e4133ac30abee14bca0736988a8ec37bdef33952e99aa055289826501"
+emergency_admin = "0x4dd8990e4133ac30abee14bca0736988a8ec37bdef33952e99aa055289826501"
+fee_admin = "0x4dd8990e4133ac30abee14bca0736988a8ec37bdef33952e99aa055289826501"
+
+# Resource accounts: should be the same as @liquidswap_lp in lp_coin
+liquidswap_pool_account = "0x8aa500cd155a6087509fa84bc7f0deed3363dd253ecb62b2f110885dacf01c67"
+liquidswap_emergency_account = "0x65f12ace6df9511f3b5b59c17ea5961808034965a439a9d2cdc3f810616f5156"
 
 # Addresses for tests.
 test_coin_admin = "0x11"
@@ -33,8 +35,8 @@ subdir = "aptos-move/framework/aptos-framework"
 
 [dependencies.UQ64x64]
 git = "https://github.com/pontem-network/UQ64x64.git"
-rev = "v0.3.6"
+rev = "v0.3.7"
 
 [dependencies.U256]
 git = "https://github.com/pontem-network/U256.git"
-rev = "v0.3.6"
+rev = "v0.3.8"
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Update your `Move.toml` with
 ```toml
 [dependencies.Liquidswap]
 git = 'https://github.com/pontem-network/liquidswap.git'
-rev = 'v0.3.0'
+rev = 'v0.4.0'
 
 [dependencies.TestCoins]
 git = 'https://github.com/pontem-network/test-coins.git'

diff --git a/liquidswap_init/Move.toml b/liquidswap_init/Move.toml
@@ -4,7 +4,7 @@ version = '1.0.0'
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap = "0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9"
+liquidswap = "0x4e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81"
 
 [dependencies.AptosFramework]
 git = "https://github.com/aptos-labs/aptos-core.git"

diff --git a/liquidswap_lp/Move.toml b/liquidswap_lp/Move.toml
@@ -4,7 +4,7 @@ version = '1.0.0'
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap_lp = "0x385068db10693e06512ed54b1e6e8f1fb9945bb7a78c28a45585939ce953f99e"
+liquidswap_lp = "0x8aa500cd155a6087509fa84bc7f0deed3363dd253ecb62b2f110885dacf01c67"
 
 [dev-dependencies.MoveStdlib]
 git = "https://github.com/aptos-labs/aptos-core.git"

diff --git a/tests/emergency_tests.move b/tests/emergency_tests.move
@@ -1,8 +1,12 @@
 #[test_only]
 module liquidswap::emergency_tests {
-    use liquidswap::global_config;
+    use std::signer;
+
+    use aptos_framework::account;
+
     use liquidswap::emergency;
-    use test_helpers::test_pool;
+    use liquidswap::global_config;
+    use test_helpers::test_pool::{Self, create_liquidswap_admin};
 
     #[test(emergency_acc = @emergency_admin, coin_admin = @test_coin_admin)]
     public fun test_end_to_end(emergency_acc: signer, coin_admin: signer) {
@@ -27,6 +31,14 @@ module liquidswap::emergency_tests {
         assert!(emergency::is_disabled() == true, 4);
     }
 
+    #[test]
+    fun test_emergency_account_address_equality() {
+        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);
+    }
+
     #[test(emergency_acc = @0x13)]
     #[expected_failure(abort_code = 4000)]
     public fun test_wrong_account_fails(emergency_acc: signer) {

diff --git a/tests/liquidity_pool_tests.move b/tests/liquidity_pool_tests.move
@@ -4,6 +4,7 @@ module liquidswap::liquidity_pool_tests {
     use std::signer;
     use std::string::utf8;
 
+    use aptos_framework::account;
     use aptos_framework::coin;
     use aptos_framework::timestamp;
     use liquidswap_lp::lp_coin::LP;
@@ -14,7 +15,7 @@ module liquidswap::liquidity_pool_tests {
     use liquidswap::global_config;
     use liquidswap::liquidity_pool;
     use test_coin_admin::test_coins::{Self, USDT, BTC, USDC};
-    use test_helpers::test_pool::{Self, initialize_liquidity_pool};
+    use test_helpers::test_pool::{Self, initialize_liquidity_pool, create_liquidswap_admin};
 
     fun setup_btc_usdt_pool(): (signer, signer) {
         let (coin_admin, lp_owner) = test_pool::setup_coins_and_lp_owner();
@@ -30,6 +31,14 @@ module liquidswap::liquidity_pool_tests {
 
     // Register pool tests.
 
+    #[test]
+    fun test_liquidswap_pool_account_address() {
+        let liquidswap_admin = create_liquidswap_admin();
+        let (liquidswap_pool_acc, _) =
+            account::create_resource_account(&liquidswap_admin, b"liquidswap_account_seed");
+        assert!(signer::address_of(&liquidswap_pool_acc) == @liquidswap_pool_account, 1);
+    }
+
     #[test]
     fun test_liquidswap_lp_and_liquidswap_pool_account_are_the_same() {
         assert!(@liquidswap_lp == @liquidswap_pool_account, 1);