fix: double swap scenario using wrong swap fee

Sifchain · Dec 23, 2023 · 6d81a2b · 6d81a2b
1 parent 01542f9
commit 6d81a2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.14.30",
+  "version": "2.14.31",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

diff --git a/core/src/entities/Pool.ts b/core/src/entities/Pool.ts
@@ -363,13 +363,13 @@ export class CompositePool implements IPool {
       ? [this.pool1, this.pool2]
       : [this.pool2, this.pool1];
     const firstSwapFee = first.calcProviderFee(x);
-    const firstSwapOutput = first.calcSwapResult(x);
-    const secondSwapFee = second.calcProviderFee(firstSwapOutput);
+    // const firstSwapOutput = first.calcSwapResult(x);
+    // const secondSwapFee = second.calcProviderFee(firstSwapOutput);
     const firstSwapFeeInOutputAsset = second.calcSwapResult(firstSwapFee);
 
     return AssetAmount(
       second.otherAsset(firstSwapFee),
-      firstSwapFeeInOutputAsset.add(secondSwapFee),
+      firstSwapFeeInOutputAsset.add(firstSwapFeeInOutputAsset),
     );
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sifchain-ui",
-  "version": "2.14.14",
+  "version": "2.14.31",
   "private": true,
   "license": "UNLICENSED",
   "packageManager": "[email protected]",