update aptos to latest main, update addresses (#111)

* update aptos to latest main, update addresses * testnet aptos version * disable prover CI for now * uncomment prover in ci * changed addresses, bumped version * update readme Co-authored-by: borispovod <[email protected]>
pontem-network · Oct 13, 2022 · bf1326b · bf1326b
1 parent 4cc22f9
commit bf1326b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 51 deletions.
diff --git a/Move.toml b/Move.toml
@@ -1,19 +1,19 @@
 [package]
 name = "Liquidswap"
-version = "0.4.0"
+version = "0.4.1"
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap = "0x4e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81"
+liquidswap = "0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12"
 
 # 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"
+liquidswap_pool_account = "0x05a97986a9d031c4567e15b797be516910cfcb4156312482efc6a19c0a30c948"
+liquidswap_emergency_account = "0xa6d6e549b917e454464ff6c63f91386d98769ea512bc778bdaca00969f896764"
 
 # Addresses for tests.
 test_coin_admin = "0x11"
@@ -30,7 +30,7 @@ local = "./liquidswap_init/"
 
 [dependencies.AptosFramework]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "985f19d40457a5f09f2d741b1feca6bf7ba1f8a6"
+rev = "a2a3bf79b68823287f962bded2abfaefc688e71c"
 subdir = "aptos-move/framework/aptos-framework"
 
 [dependencies.UQ64x64]

diff --git a/README.md b/README.md
@@ -2,51 +2,13 @@
 
 **Liquidswap** is AMM protocol for [Aptos](https://www.aptos.com/) blockchain. 
 
-We support two curves:
+## Documentation
 
-* For uncorrelated swaps.
-* For stable swaps.
-
-The current repository contains: 
-
-* Low level core.
-* Base router.
-* Scripts.
-* Tests.
+Vist our [docs](https://docs.liquidswap.com) portal.
 
 ## Add as dependency
 
-Update your `Move.toml` with
-
-```toml
-[dependencies.Liquidswap]
-git = 'https://github.com/pontem-network/liquidswap.git'
-rev = 'v0.4.0'
-
-[dependencies.TestCoins]
-git = 'https://github.com/pontem-network/test-coins.git'
-rev = 'v0.1.0'
-```
-
-And use in code:
-
-```move
-use liquidswap::router;
-use liquidswap::curves::Uncorrelated;
-
-use test_coins::coins::{USDT, BTC};
-
-...
-let usdt_coins_to_get = 5292719411;
-let btc_coins_to_swap_val = router::get_amount_in<BTC, USDT, Uncorrelated>(usdt_coins_to_get);
-let btc_coins_to_swap = coin::withdraw<BTC>(account, btc_coins_to_swap_val);
-
-let (coin_x, coin_y) = router::swap_coin_for_exact_coin<BTC, USDT, Uncorrelated>(
-    btc_coins_to_swap,
-    usdt_coins_to_get
-);
-```
-
+To integrate Liquidswap into your project vist [integration](https://docs.liquidswap.com/integration) docs.
 
 ### Build
 

diff --git a/liquidswap_init/Move.toml b/liquidswap_init/Move.toml
@@ -4,9 +4,9 @@ version = '1.0.0'
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap = "0x4e9fce03284c0ce0b86c88dd5a46f050cad2f4f33c4cdd29d98f501868558c81"
+liquidswap = "0x190d44266241744264b964a37b8f09863167a12d3e70cda39376cfb4e3561e12"
 
 [dependencies.AptosFramework]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "985f19d40457a5f09f2d741b1feca6bf7ba1f8a6"
+rev = "a2a3bf79b68823287f962bded2abfaefc688e71c"
 subdir = "aptos-move/framework/aptos-framework"
diff --git a/liquidswap_lp/Move.toml b/liquidswap_lp/Move.toml
@@ -4,10 +4,9 @@ version = '1.0.0'
 upgrade_policy = "immutable"
 
 [addresses]
-liquidswap_lp = "0x8aa500cd155a6087509fa84bc7f0deed3363dd253ecb62b2f110885dacf01c67"
+liquidswap_lp = "0x05a97986a9d031c4567e15b797be516910cfcb4156312482efc6a19c0a30c948"
 
 [dev-dependencies.MoveStdlib]
 git = "https://github.com/aptos-labs/aptos-core.git"
-rev = "985f19d40457a5f09f2d741b1feca6bf7ba1f8a6"
+rev = "a2a3bf79b68823287f962bded2abfaefc688e71c"
 subdir = "aptos-move/framework/move-stdlib"
-