From 5203b2cddbc9bcfcf6c335ee7be777c8b58533e6 Mon Sep 17 00:00:00 2001
From: none00y <mich_smyk@wp.pl>
Date: Fri, 20 Sep 2024 14:23:31 +0200
Subject: [PATCH 1/2] restore rounding in get_delta_x fix intermediate names in
 wasm

---
 sdk/contracts/invariant/invariant.json |   2 +-
 sdk/contracts/invariant/invariant.wasm | Bin 140652 -> 140943 bytes
 sdk/contracts/psp22/psp22.json         |   2 +-
 sdk/contracts/psp22/psp22.wasm         | Bin 15123 -> 15123 bytes
 sdk/package-lock.json                  |  12 ++++++------
 sdk/package.json                       |   4 ++--
 sdk/src/abis/invariant.ts              |   2 +-
 sdk/src/abis/psp22.ts                  |   2 +-
 sdk/src/wasm/clamm.rs                  |   4 +++-
 sdk/src/wasm/types/sqrt_price.rs       |   8 ++++----
 src/contracts/storage/pool.rs          |   2 +-
 src/math/clamm.rs                      |  23 ++++++++++++++---------
 12 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/sdk/contracts/invariant/invariant.json b/sdk/contracts/invariant/invariant.json
index 4a3f9bca..2ffc8448 100644
--- a/sdk/contracts/invariant/invariant.json
+++ b/sdk/contracts/invariant/invariant.json
@@ -1,6 +1,6 @@
 {
   "source": {
-    "hash": "0x6535e78f66cf026b69bf940c0439337244baa2e34a6e9059a4730e00f9783811",
+    "hash": "0x8dc9df28bd121964ee2a8bb81ea6945b0d5ac58dfa67869ea48dcabdba92dc07",
     "language": "ink! 5.0.0",
     "compiler": "rustc 1.77.0",
     "build_info": {
diff --git a/sdk/contracts/invariant/invariant.wasm b/sdk/contracts/invariant/invariant.wasm
index ddd1bf3a325ef276a9babfc01d1dcf965ef4a736..8270a6e2dbb7feb2e045a91ad11a7be34d21e216 100644
GIT binary patch
delta 16936
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

delta 16469
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
AssI20

diff --git a/sdk/contracts/psp22/psp22.json b/sdk/contracts/psp22/psp22.json
index 9d94e68b..874e2bab 100644
--- a/sdk/contracts/psp22/psp22.json
+++ b/sdk/contracts/psp22/psp22.json
@@ -1,6 +1,6 @@
 {
   "source": {
-    "hash": "0xb4082b7d4aedb8479925aa96a383ea722dc1a7e9b29ad5a4d5f95ad707db4e09",
+    "hash": "0xc286df19a483e4b4fcb2b2342b14e33cdb6dade49ebe0dea80f4fab27ae200ba",
     "language": "ink! 5.0.0",
     "compiler": "rustc 1.77.0",
     "build_info": {
diff --git a/sdk/contracts/psp22/psp22.wasm b/sdk/contracts/psp22/psp22.wasm
index f4950a15682a0cf4021a1a6093a617be064fa18e..3ec472fda0c8639a9fe90e569617f282f0460d0e 100644
GIT binary patch
delta 319
zcmbPSHo0tr7b6QV69emJKgRQnlg(HjOuoq+J6V=_&*XmAd6UIhD>v)1En?qn&8NgT
z`8;pV=2(7t=E?oS`zB8i`Y#~N;5en3#j%menvubg(UEDhr-&^pqw?f-$rOG*9!72j
zMgd`N1vUjH0p-cRB<&daHd{)SG6EH>mj-d(Nk3+1)Z2VXIh_e8W~FAps69DbEt64u
z^HnuJkTMmGH;h7)1vPsaMJCVJbQJ@e$>8{dAq!+KgQG&00yD^HO|a2go0x#={0)0q
zg%tz@geE^U+%@^XKKo{SJu5~=q0LqLR~W(a6M>wEhGLA2x|4qxg#zvLGu|n!0(7em
r1IW-0rYt2!ApM0gO8_i7S;^!KQ0;pYBSziLN~VihfNnl!>B|TJKR{P>

delta 320
zcmbPSHo0tr7b6QR125BNKgRQnlcQMnO#aIpJ6V?b!Q?Hhm6OF-=WW(yTf{#3BVW$u
z^Snxon`8OqnFWLy9H%t1I5sj_Gcq_bIx=lG6J}<dTqCq^v#*FHE2GNfcF7ceAs$9<
z1x5i8ZUr_4CIOYnza;G#g*IDCl`;Yqtd|CH-bp`ZXVl(&NjaSfC}yQ*z^FSpTP>4O
zck@*>KaesNjW>*ZlLa+<8HFd$*K`#Fo5|q#gCPrKE`y^&mI5=#Xic!uTAP@F>ii9R
zS%nn@1o$RDG~6}$zdrkBdp#>gM!wBe`d1ji@)LoahlXN|j5?El7=;4u^fTTmtqgRl
s9s|hG4yG(6Mj-u#F-rg}I$6o&3{dTR6C*~Q%}S<=S%7XnX6efa06}n9R{#J2

diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 3e035c3f..75e2cb9b 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "@invariant-labs/a0-sdk",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@invariant-labs/a0-sdk",
-      "version": "0.2.24",
+      "version": "0.2.25",
       "license": "ISC",
       "dependencies": {
-        "@invariant-labs/a0-sdk-wasm": "0.1.26",
+        "@invariant-labs/a0-sdk-wasm": "file:src/wasm/pkg",
         "@polkadot/api": "^10.12.4",
         "@polkadot/api-contract": "^10.12.4",
         "@scio-labs/use-inkathon": "^0.6.3",
@@ -524,9 +524,8 @@
       "dev": true
     },
     "node_modules/@invariant-labs/a0-sdk-wasm": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk-wasm/-/a0-sdk-wasm-0.1.26.tgz",
-      "integrity": "sha512-Y2OjXpKzrqpBbkgUyVLQvDoNyOsa5AsadGRUJVOVsesZ8771W3CEURrJTrZyh8HtMZEeVUUtA30dU8+YppsTNw=="
+      "resolved": "src/wasm/pkg",
+      "link": true
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
@@ -5414,6 +5413,7 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "src/wasm/pkg": {},
     "wasm/pkg": {
       "name": "invariant-a0-wasm",
       "version": "0.1.1",
diff --git a/sdk/package.json b/sdk/package.json
index 8d3b912b..8bdf301e 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@invariant-labs/a0-sdk",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "collaborators": [
     "Invariant Labs"
   ],
@@ -60,7 +60,7 @@
     "test:update-position-seconds-per-liquidity": "mocha ./tests/update-position-seconds-per-liquidity.test.ts -g update-position-seconds-per-liquidity"
   },
   "dependencies": {
-    "@invariant-labs/a0-sdk-wasm": "0.1.26",
+    "@invariant-labs/a0-sdk-wasm": "file:src/wasm/pkg",
     "@polkadot/api": "^10.12.4",
     "@polkadot/api-contract": "^10.12.4",
     "@scio-labs/use-inkathon": "^0.6.3",
diff --git a/sdk/src/abis/invariant.ts b/sdk/src/abis/invariant.ts
index 46f6f30f..8f5e6272 100644
--- a/sdk/src/abis/invariant.ts
+++ b/sdk/src/abis/invariant.ts
@@ -1,7 +1,7 @@
 export const abi = `
 {
   "source": {
-    "hash": "0x6535e78f66cf026b69bf940c0439337244baa2e34a6e9059a4730e00f9783811",
+    "hash": "0x8dc9df28bd121964ee2a8bb81ea6945b0d5ac58dfa67869ea48dcabdba92dc07",
     "language": "ink! 5.0.0",
     "compiler": "rustc 1.77.0",
     "build_info": {
diff --git a/sdk/src/abis/psp22.ts b/sdk/src/abis/psp22.ts
index 5e314bf1..2b74032f 100644
--- a/sdk/src/abis/psp22.ts
+++ b/sdk/src/abis/psp22.ts
@@ -1,7 +1,7 @@
 export const abi = `
 {
   "source": {
-    "hash": "0xb4082b7d4aedb8479925aa96a383ea722dc1a7e9b29ad5a4d5f95ad707db4e09",
+    "hash": "0xc286df19a483e4b4fcb2b2342b14e33cdb6dade49ebe0dea80f4fab27ae200ba",
     "language": "ink! 5.0.0",
     "compiler": "rustc 1.77.0",
     "build_info": {
diff --git a/sdk/src/wasm/clamm.rs b/sdk/src/wasm/clamm.rs
index 8acb1be7..7d3f07f2 100644
--- a/sdk/src/wasm/clamm.rs
+++ b/sdk/src/wasm/clamm.rs
@@ -179,7 +179,9 @@ pub fn get_delta_x(
             sqrt_price_a
                 .cast::<U256>()
                 .checked_mul(sqrt_price_b.here())
-                .ok_or_else(|| err!(TrackableError::MUL))?,
+                .ok_or_else(|| err!(TrackableError::MUL))?
+                .checked_add(SqrtPrice::almost_one().here())
+                .ok_or_else(|| err!(TrackableError::ADD))?,
         ),
     })
 }
diff --git a/sdk/src/wasm/types/sqrt_price.rs b/sdk/src/wasm/types/sqrt_price.rs
index d75a4513..ec9c414f 100644
--- a/sdk/src/wasm/types/sqrt_price.rs
+++ b/sdk/src/wasm/types/sqrt_price.rs
@@ -30,7 +30,7 @@ impl SqrtPrice {
         let nominator = U448::uint_cast(nominator);
         let denominator = U448::uint_cast(denominator);
 
-        let intermediate_u320 = nominator
+        let intermediate_u448 = nominator
             .checked_mul(Self::one().cast::<U448>())
             .ok_or_else(|| err!(TrackableError::MUL))?
             .checked_mul(Self::one().cast::<U448>())
@@ -38,7 +38,7 @@ impl SqrtPrice {
             .checked_div(denominator)
             .ok_or_else(|| err!(TrackableError::DIV))?;
 
-        let result = U256::uint_checked_cast(intermediate_u320)
+        let result = U256::uint_checked_cast(intermediate_u448)
             .map_err(|e| err!(&e))?
             .checked_div(U256::from(Self::one().get()))
             .ok_or_else(|| err!(TrackableError::DIV))?
@@ -54,7 +54,7 @@ impl SqrtPrice {
         let nominator = U448::uint_cast(nominator);
         let denominator = U448::uint_cast(denominator);
 
-        let intermediate_u320 = nominator
+        let intermediate_u448 = nominator
             .checked_mul(Self::one().cast::<U448>())
             .ok_or_else(|| err!(TrackableError::MUL))?
             .checked_mul(Self::one().cast::<U448>())
@@ -64,7 +64,7 @@ impl SqrtPrice {
             .checked_div(denominator)
             .ok_or_else(|| err!(TrackableError::DIV))?;
 
-        let result = U256::uint_checked_cast(intermediate_u320)
+        let result = U256::uint_checked_cast(intermediate_u448)
             .map_err(|e| err!(&e))?
             .checked_add(U256::from(Self::almost_one().get()))
             .ok_or_else(|| err!(TrackableError::ADD))?
diff --git a/src/contracts/storage/pool.rs b/src/contracts/storage/pool.rs
index fee3abb6..693e68b8 100644
--- a/src/contracts/storage/pool.rs
+++ b/src/contracts/storage/pool.rs
@@ -622,7 +622,7 @@ mod tests {
                 .update_liquidity(liquidity_delta, liquidity_sign, upper_tick, lower_tick)
                 .unwrap();
 
-            assert_eq!(x, TokenAmount(4999999999999999999999995));
+            assert_eq!(x, TokenAmount(2500187490625273443357761));
             assert_eq!(y, TokenAmount(5));
             assert_eq!(pool.liquidity, Liquidity::from_integer(5))
         }
diff --git a/src/math/clamm.rs b/src/math/clamm.rs
index c62ad8bd..c4766533 100644
--- a/src/math/clamm.rs
+++ b/src/math/clamm.rs
@@ -164,7 +164,9 @@ pub fn get_delta_x(
             sqrt_price_a
                 .cast::<U256>()
                 .checked_mul(sqrt_price_b.here())
-                .ok_or_else(|| err!(TrackableError::MUL))?,
+                .ok_or_else(|| err!(TrackableError::MUL))?
+                .checked_add(SqrtPrice::almost_one().here())
+                .ok_or_else(|| err!(TrackableError::ADD))?,
         ),
     })
 }
@@ -1030,7 +1032,7 @@ mod tests {
                 SwapResult {
                     next_sqrt_price: SqrtPrice::new(2000000000000000000000000),
                     amount_in: TokenAmount(340282366920938463463374607431769),
-                    amount_out: TokenAmount(170141183460469231731687303715884),
+                    amount_out: TokenAmount(170141183460469231731687218645292),
                     fee_amount: TokenAmount(0)
                 }
             )
@@ -1064,7 +1066,7 @@ mod tests {
             let expected_result = SwapResult {
                 next_sqrt_price: SqrtPrice::new(1000018999999999999999999),
                 amount_in: TokenAmount(6465364971497830805463835175),
-                amount_out: TokenAmount(6465242131897324756293472063),
+                amount_out: TokenAmount(6465242131897324756293465598),
                 fee_amount: TokenAmount(340282366914473098491876776626304376280),
             };
 
@@ -1127,7 +1129,7 @@ mod tests {
                     SwapResult {
                         next_sqrt_price: SqrtPrice::new(MAX_SQRT_PRICE),
                         amount_in: TokenAmount(340282366891153598040639304410374383019),
-                        amount_out: TokenAmount(340282366920938463463374607431551802886),
+                        amount_out: TokenAmount(340282366920938463463374267149184852163),
                         fee_amount: TokenAmount(0)
                     }
                 )
@@ -1203,7 +1205,7 @@ mod tests {
                     SwapResult {
                         next_sqrt_price: SqrtPrice::new(MAX_SQRT_PRICE),
                         amount_in: TokenAmount(79230632432451957492634392915),
-                        amount_out: TokenAmount(79230632439387003072335686522),
+                        amount_out: TokenAmount(79230632439387003072335607291),
                         fee_amount: TokenAmount(0)
                     }
                 );
@@ -1548,7 +1550,7 @@ mod tests {
             let result = get_delta_x(
                 SqrtPrice::from_integer(1u8),
                 SqrtPrice::from_integer(2u8),
-                Liquidity::from_integer(2u8),
+                Liquidity::from_integer(2u8) + Liquidity::new(1),
                 false,
             )
             .unwrap();
@@ -1576,7 +1578,10 @@ mod tests {
             let result_down = get_delta_x(sqrt_price_a, sqrt_price_b, liquidity, false).unwrap();
             let result_up = get_delta_x(sqrt_price_a, sqrt_price_b, liquidity, true).unwrap();
 
-            assert_eq!(result_down, TokenAmount::from_decimal(liquidity));
+            assert_eq!(
+                result_down,
+                TokenAmount::from_decimal(liquidity) - TokenAmount::new(1)
+            );
             assert_eq!(result_up, TokenAmount::from_decimal(liquidity));
         }
         // no more overflow after extending the type to U320 in intermediate operations
@@ -1627,7 +1632,7 @@ mod tests {
                 let result =
                     get_delta_x(max_sqrt_price, min_sqrt_price, max_liquidity, false).unwrap();
 
-                assert_eq!(result, TokenAmount(340282366920938463463374468856710103650))
+                assert_eq!(result, TokenAmount(340282366920938463463374128574343152927))
             }
         }
         {
@@ -1661,7 +1666,7 @@ mod tests {
                     false,
                 )
                 .unwrap();
-                assert_eq!(TokenAmount(340282366920938463463374607431768146213), result);
+                assert_eq!(TokenAmount(4294940505789835294958676759947697), result);
             }
         }
         // minimize denominator on minimize liquidity which fits into TokenAmount

From 5c67c06b81fa39b2ed9dad4682c346d01574187d Mon Sep 17 00:00:00 2001
From: none00y <mich_smyk@wp.pl>
Date: Fri, 20 Sep 2024 15:54:00 +0200
Subject: [PATCH 2/2] publish sdk and wasm

---
 sdk/package-lock.json | 7 +++++--
 sdk/package.json      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sdk/package-lock.json b/sdk/package-lock.json
index 75e2cb9b..bca1147b 100644
--- a/sdk/package-lock.json
+++ b/sdk/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.25",
       "license": "ISC",
       "dependencies": {
-        "@invariant-labs/a0-sdk-wasm": "file:src/wasm/pkg",
+        "@invariant-labs/a0-sdk-wasm": "0.1.27",
         "@polkadot/api": "^10.12.4",
         "@polkadot/api-contract": "^10.12.4",
         "@scio-labs/use-inkathon": "^0.6.3",
@@ -5413,7 +5413,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "src/wasm/pkg": {},
+    "src/wasm/pkg": {
+      "name": "@invariant-labs/a0-sdk-wasm",
+      "version": "0.1.27"
+    },
     "wasm/pkg": {
       "name": "invariant-a0-wasm",
       "version": "0.1.1",
diff --git a/sdk/package.json b/sdk/package.json
index 8bdf301e..f3905dd8 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -60,7 +60,7 @@
     "test:update-position-seconds-per-liquidity": "mocha ./tests/update-position-seconds-per-liquidity.test.ts -g update-position-seconds-per-liquidity"
   },
   "dependencies": {
-    "@invariant-labs/a0-sdk-wasm": "file:src/wasm/pkg",
+    "@invariant-labs/a0-sdk-wasm": "0.1.27",
     "@polkadot/api": "^10.12.4",
     "@polkadot/api-contract": "^10.12.4",
     "@scio-labs/use-inkathon": "^0.6.3",