fix: double swap scenario using wrong swap fee (#863)

snobbee · web-flow · commit 893bcd685877 · 2023-12-23T07:07:06.000+01:00
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": "yarn@3.2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "app",`
`3`		`- "version": "2.14.30",`
	`3`	`+ "version": "2.14.31",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"bump": "bump patch --tag --commit 'testnet release '",`