🐛 Improvement & Bug Fixes

.config/dotnet-tools.json

@@ -13,6 +13,12 @@
       "commands": [
         "dotnet-format"
       ]
+    },
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.1.15",
+      "commands": [
+        "reportgenerator"
+      ]
     }
   }
 }

.gitignore

@@ -615,3 +615,4 @@ riderModule.iml
 /_ReSharper.Caches/
 _site/
 api/
+test-ledger/

src/Solana.Unity.Dex/Math/DecimalUtil.cs

@@ -0,0 +1,26 @@
+using System.Numerics;
+
+namespace Solana.Unity.Dex.Math;
+
+public class DecimalUtil
+{
+    public static double FromUlong(ulong value, int shift = 0)
+    {
+        return value / System.Math.Pow(10, shift);
+    }
+
+    public static double FromBigInteger(BigInteger value, int shift = 0)
+    {
+        return FromUlong((ulong)value, shift);
+    }
+
+    public static ulong ToUlong(double value, int shift = 0)
+    {
+        return (ulong)(value * System.Math.Pow(10, shift));
+    }
+
+    public static ulong ToUlong(float value, int shift = 0)
+    {
+        return ToUlong((double)value, shift);
+    }
+}

src/Solana.Unity.Dex/Models/Pool.cs

@@ -0,0 +1,16 @@
+using Solana.Unity.Wallet;
+using System.Numerics;
+
+namespace Solana.Unity.Dex.Models;
+
+public class Pool
+{
+    public PublicKey Address { get; set; }
+
+    public PublicKey TokenMintA { get; set; }
+    public PublicKey TokenMintB { get; set; }
+
+    public BigInteger Liquidity { get; set; }
+    public ushort Fee { get; set; }
+    public ushort TickSpacing { get; set; }
+}

src/Solana.Unity.Dex/Orca/Math/SwapMath.cs

@@ -127,8 +127,8 @@ bool aToB
         )
         {
             return (aToB == amountSpecifiedIsInput)
-                ? TokenMath.GetAmountDeltaB(currentSqrtPrice, targetSqrtPrice, currentLiquidity, amountSpecifiedIsInput)
-                : TokenMath.GetAmountDeltaA(currentSqrtPrice, targetSqrtPrice, currentLiquidity, amountSpecifiedIsInput);
+                ? TokenMath.GetAmountDeltaB(currentSqrtPrice, targetSqrtPrice, currentLiquidity, !amountSpecifiedIsInput)
+                : TokenMath.GetAmountDeltaA(currentSqrtPrice, targetSqrtPrice, currentLiquidity, !amountSpecifiedIsInput);
         }
     }
 }

src/Solana.Unity.Dex/Orca/Math/TokenMath.cs

@@ -21,8 +21,8 @@ bool roundUp
             BigInteger numerator = currentLiquidity * sqrtPriceDiff << 64;
             BigInteger denominator = sqrtPriceLower * sqrtPriceUpper;
 
-            BigInteger quotient = numerator / (denominator);
-            BigInteger remainder = numerator % (denominator);
+            BigInteger quotient = numerator / denominator;
+            BigInteger remainder = numerator % denominator;
 
             var result = roundUp && remainder != 0 ? quotient + BigInteger.One : quotient;
 
@@ -59,8 +59,8 @@ BigInteger sqrtPrice1
         )
         {
             return (sqrtPrice0 > sqrtPrice1) ? 
-                Tuple.Create<BigInteger, BigInteger>(sqrtPrice1, sqrtPrice0) : 
-                Tuple.Create<BigInteger, BigInteger>(sqrtPrice0, sqrtPrice1);
+                Tuple.Create(sqrtPrice1, sqrtPrice0) : 
+                Tuple.Create(sqrtPrice0, sqrtPrice1);
         }
 
         public static BigInteger GetNextSqrtPrice(
@@ -108,7 +108,7 @@ bool amountSpecifiedIsInput
 
             BigInteger denominator = amountSpecifiedIsInput
                 ? currLiquidityShiftLeft + p
-                : currLiquidityShiftLeft + p;
+                : currLiquidityShiftLeft - p;
 
             BigInteger price = BitMath.DivRoundUp(numerator, denominator);