aftermath-ts-sdk 0.0.162 → 0.0.164

package/dist/packages/pools/utils/cmmmCalculations.js

@@ -70,7 +70,7 @@ CmmmCalculations.calcInvariant = (pool) => {
     let balance;
     let weight;
     for (let coin of Object.values(pool.coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         sum += weight * balance;
         prod += weight * Math.log(balance);
@@ -104,7 +104,7 @@ CmmmCalculations.calcInvariantComponents = (pool, index) => {
     let p;
     let s;
     for (let [coinType, coin] of Object.entries(pool.coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         p = weight * Math.log(balance);
         s = weight * balance;
@@ -133,8 +133,8 @@ CmmmCalculations.calcSpotPriceWithFees = (pool, coinTypeIn, coinTypeOut, ignoreF
     let part1 = CmmmCalculations.calcSpotPriceBody(pool);
     let coinIn = pool.coins[coinTypeIn];
     let coinOut = pool.coins[coinTypeOut];
-    let balanceIn = fixed_1.Fixed.convertFromInt(coinIn.balance);
-    let balanceOut = fixed_1.Fixed.convertFromInt(coinOut.balance);
+    let balanceIn = fixed_1.Fixed.directCast(coinIn.normalizedBalance);
+    let balanceOut = fixed_1.Fixed.directCast(coinOut.normalizedBalance);
     let weightIn = fixed_1.Fixed.directCast(coinIn.weight);
     let weightOut = fixed_1.Fixed.directCast(coinOut.weight);
     let swapFeeIn = ignoreFees ? 0 : fixed_1.Fixed.directCast(coinIn.tradeFeeIn);
@@ -157,7 +157,7 @@ CmmmCalculations.calcSpotPriceBody = (pool) => {
     // The spot price formula requires knowing the value of the invariant. We need the prod and sum parts
     // also later on so no need to compute them twice by calling calcInvariant, just evaluate here.
     for (let coin of Object.values(pool.coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         prod += weight * Math.log(balance);
         sum += weight * balance;
@@ -179,11 +179,12 @@ CmmmCalculations.calcOutGivenIn = (pool, coinTypeIn, coinTypeOut, amountIn) => {
         return BigInt(0);
     }
     let flatness = fixed_1.Fixed.directCast(pool.flatness);
-    let oldIn = fixed_1.Fixed.convertFromInt(coinIn.balance);
-    let oldOut = fixed_1.Fixed.convertFromInt(coinOut.balance);
+    let oldIn = fixed_1.Fixed.directCast(coinIn.normalizedBalance);
+    let oldOut = fixed_1.Fixed.directCast(coinOut.normalizedBalance);
     let wIn = fixed_1.Fixed.directCast(coinIn.weight);
     let [prod, _sum, p0, s0, h] = CmmmCalculations.calcInvariantComponents(pool, coinTypeOut);
-    let feedAmountIn = (1 - swapFeeIn) * fixed_1.Fixed.convertFromInt(amountIn);
+    let feedAmountIn = (1 - swapFeeIn) *
+        fixed_1.Fixed.castAndNormalize(coinIn.decimalsScalar, amountIn);
     let newIn = oldIn + feedAmountIn;
     let prodRatio = Math.pow(newIn / oldIn, wIn);
     let newP0 = p0 * prodRatio;
@@ -195,7 +196,7 @@ CmmmCalculations.calcOutGivenIn = (pool, coinTypeIn, coinTypeOut, amountIn) => {
     newP0, // P(B) / xi^(1/n) (everything but the missing part)
     newS0 // S(B) - xi / n (everything but the missing part)
     );
-    let amountOut = fixed_1.Fixed.convertToInt((oldOut - tokenAmountOut) * (1 - swapFeeOut));
+    let amountOut = fixed_1.Fixed.uncastAndUnnormalize(coinOut.decimalsScalar, (oldOut - tokenAmountOut) * (1 - swapFeeOut));
     if (!CmmmCalculations.checkValid1dSwap(pool, coinTypeIn, coinTypeOut, amountIn, amountOut))
         throw Error("invalid 1d swap");
     return amountOut;
@@ -215,11 +216,12 @@ CmmmCalculations.calcInGivenOut = (pool, coinTypeIn, coinTypeOut, amountOut) =>
         throw Error("this swap is disabled");
     }
     let flatness = fixed_1.Fixed.directCast(pool.flatness);
-    let oldIn = fixed_1.Fixed.convertFromInt(coinIn.balance);
-    let oldOut = fixed_1.Fixed.convertFromInt(coinOut.balance);
+    let oldIn = fixed_1.Fixed.directCast(coinIn.normalizedBalance);
+    let oldOut = fixed_1.Fixed.directCast(coinOut.normalizedBalance);
     let wOut = fixed_1.Fixed.directCast(coinOut.weight);
     let [prod, _sum, p0, s0, h] = CmmmCalculations.calcInvariantComponents(pool, coinTypeIn);
-    let feedAmountOut = fixed_1.Fixed.convertFromInt(amountOut) / (1 - swapFeeOut);
+    let feedAmountOut = fixed_1.Fixed.castAndNormalize(coinIn.decimalsScalar, amountOut) /
+        (1 - swapFeeOut);
     let newOut = oldOut - feedAmountOut;
     let prodRatio = Math.pow(newOut / oldOut, wOut);
     let newP0 = p0 * prodRatio;
@@ -231,7 +233,7 @@ CmmmCalculations.calcInGivenOut = (pool, coinTypeIn, coinTypeOut, amountOut) =>
     newP0, // P(B) / xi^(1/n) (everything but the missing part)
     newS0 // S(B) - xi / n (everything but the missing part)
     );
-    let amountIn = fixed_1.Fixed.convertToInt((tokenAmountIn - oldIn) / (1 - swapFeeIn));
+    let amountIn = fixed_1.Fixed.uncastAndUnnormalize(coinOut.decimalsScalar, (tokenAmountIn - oldIn) / (1 - swapFeeIn));
     if (!CmmmCalculations.checkValid1dSwap(pool, coinTypeIn, coinTypeOut, amountIn, amountOut))
         throw Error("invalid 1d swap");
     return amountIn;
@@ -267,7 +269,7 @@ CmmmCalculations.calcSwapFixedIn = (pool, amountsIn, amountsOutDirection) => {
     let shifter = 1;
     // make sure no disabled coin type is expected
     for (let [coinType, coin] of Object.entries(coins)) {
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
         feeOut = fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeOut));
         if (amountOut > 0) {
             if (feeOut == 0) {
@@ -276,8 +278,8 @@ CmmmCalculations.calcSwapFixedIn = (pool, amountsIn, amountsOutDirection) => {
             else {
                 // pool is drained when b + Ain * (1 - Sin) - t * Aout / (1 - Sout) = 0, or t = (b + Ain * (1 - Sin)) * (1 - So) / Aout
                 t =
-                    ((fixed_1.Fixed.convertFromInt(coin.balance) +
-                        fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0)) *
+                    ((fixed_1.Fixed.directCast(coin.normalizedBalance) +
+                        fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0)) *
                             fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeIn))) /
                         amountOut) *
                         feeOut;
@@ -298,10 +300,10 @@ CmmmCalculations.calcSwapFixedIn = (pool, amountsIn, amountsOutDirection) => {
         sum1 = 0;
         skip = false;
         for (let [coinType, coin] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin.balance);
+            balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin.weight);
-            amountIn = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
-            amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+            amountIn = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
+            amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
             feeIn = fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeIn));
             feeOut = fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeOut));
             // pseudoin
@@ -377,10 +379,10 @@ CmmmCalculations.calcSwapFixedOut = (pool, amountsInDirection, amountsOut) => {
         sum = 0;
         sum1 = 0;
         for (let [coinType, coin] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin.balance);
+            balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin.weight);
-            amountIn = fixed_1.Fixed.convertFromInt(amountsInDirection[coinType] || BigInt(0));
-            amountOut = fixed_1.Fixed.convertFromInt(amountsOut[coinType] || BigInt(0));
+            amountIn = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsInDirection[coinType] || BigInt(0));
+            amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOut[coinType] || BigInt(0));
             feeIn = 1 - fixed_1.Fixed.directCast(coin.tradeFeeIn);
             feeOut = 1 - fixed_1.Fixed.directCast(coin.tradeFeeOut);
             // pseudoin expected
@@ -429,8 +431,8 @@ CmmmCalculations.calcDepositFixedAmounts = (pool, amountsIn) => {
     let prevR = r;
     let fees = {};
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         fees[coinType] =
             r * (balance + amount) >= balance
                 ? 1 - fixed_1.Fixed.directCast(coin.tradeFeeIn)
@@ -450,9 +452,9 @@ CmmmCalculations.calcDepositFixedAmounts = (pool, amountsIn) => {
         sum = 0;
         sum1 = 0;
         for (let [coinType, coin] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin.balance);
+            balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin.weight);
-            amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+            amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
             fee = fees[coinType];
             part1 = balance + amount;
             part2 = fee * r * part1 + balance - fee * balance;
@@ -497,15 +499,17 @@ CmmmCalculations.calcDepositFixedAmountsInitialEstimate = (pool, amountsIn) => {
     let part1;
     // start cf_max as corresponding to r = 1
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         weight = fixed_1.Fixed.directCast(coin.weight);
         // this is all in so use fees in
         part1 = balance + (1 - fixed_1.Fixed.directCast(coin.tradeFeeIn)) * amount;
         prod += weight * Math.log(part1);
         sum += weight * part1;
         // r_min portion of the loop
-        r = fixed_1.Fixed.directCast(coin.tradeFeeOut) * balance / (balance + amount);
+        r =
+            (fixed_1.Fixed.directCast(coin.tradeFeeOut) * balance) /
+                (balance + amount);
         rMin = Math.max(r, rMin);
     }
     prod = Math.exp(prod);
@@ -513,18 +517,18 @@ CmmmCalculations.calcDepositFixedAmountsInitialEstimate = (pool, amountsIn) => {
     let rMax = 1;
     let cf;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
-        amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+        amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         r = balance / (balance + amount);
         if (r <= rMin)
             continue;
         prod = 0;
         sum = 0;
         for (let [coinType2, coin2] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin2.balance);
+            balance = fixed_1.Fixed.directCast(coin2.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin2.weight);
-            amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType2]);
+            amount = fixed_1.Fixed.castAndNormalize(coin2.decimalsScalar, amountsIn[coinType2] || BigInt(0));
             part1 = r * (balance + amount);
             if (part1 >= balance) {
                 // r * (B0 + Din) >= B0 so use fees in
@@ -536,8 +540,9 @@ CmmmCalculations.calcDepositFixedAmountsInitialEstimate = (pool, amountsIn) => {
             else {
                 // r * (B0 + Din) < B0 so use fees out
                 part1 =
-                    balance - (balance - part1) /
-                        fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeOut));
+                    balance -
+                        (balance - part1) /
+                            fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeOut));
             }
             prod += weight * Math.log(part1);
             sum += weight * part1;
@@ -596,8 +601,8 @@ CmmmCalculations.calcWithdrawFlpAmountsOut = (pool, amountsOutDirection, lpRatio
         shrinker /= 2;
     let fees = {};
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
         fees[coinType] =
             balance * lpc >= r * amountOut
                 ? 1 - fixed_1.Fixed.directCast(coin.tradeFeeIn)
@@ -611,9 +616,9 @@ CmmmCalculations.calcWithdrawFlpAmountsOut = (pool, amountsOutDirection, lpRatio
         sum1 = 0;
         skip = false;
         for (let [coinType, coin] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin.balance);
+            balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin.weight);
-            amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+            amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
             fee = fees[coinType];
             part1 = balance * (lpr + lpc * fee);
             part2 = fee * r * amountOut;
@@ -651,8 +656,8 @@ CmmmCalculations.calcWithdrawFlpAmountsOut = (pool, amountsOutDirection, lpRatio
         if (utils_1.Helpers.closeEnough(r, prevR, CmmmCalculations.convergenceBound)) {
             let returner = {};
             for (let coinType of Object.keys(coins)) {
-                returner[coinType] = fixed_1.Fixed.convertToInt(r *
-                    fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0)));
+                returner[coinType] = fixed_1.Fixed.directUncast(r *
+                    fixed_1.Fixed.directCast(amountsOutDirection[coinType] || BigInt(0)));
             }
             if (!CmmmCalculations.checkValidWithdraw(pool, returner, lpRatio))
                 throw Error("invalid withdraw");
@@ -693,7 +698,7 @@ CmmmCalculations.calcWithdrawFlpAmountsOutInitialEstimate = (pool, amountsOutDir
     prod = 0;
     sum = 0;
     for (let coin of Object.values(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         fee = fixed_1.Fixed.directCast(coin.tradeFeeIn);
         part1 = balance * (1 + lpr * fee - fee);
@@ -706,11 +711,11 @@ CmmmCalculations.calcWithdrawFlpAmountsOutInitialEstimate = (pool, amountsOutDir
     cfMin = 0;
     tMin = Number.POSITIVE_INFINITY;
     for (let [coinType, coin] of Object.entries(coins)) {
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
         if (amountOut == 0)
             continue;
         t =
-            (fixed_1.Fixed.convertFromInt(coin.balance) *
+            (fixed_1.Fixed.directCast(coin.normalizedBalance) *
                 fixed_1.Fixed.complement(fixed_1.Fixed.directCast(coin.tradeFeeOut) * lpRatio)) /
                 amountOut;
         if (t < tMin)
@@ -719,18 +724,18 @@ CmmmCalculations.calcWithdrawFlpAmountsOutInitialEstimate = (pool, amountsOutDir
     tDrain = tMin;
     // remaining test points are the CF discontinuities: where B0 - t*D = R*B0
     for (let [coinTypeT, coinT] of Object.entries(coins)) {
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinTypeT] || BigInt(0));
+        amountOut = fixed_1.Fixed.castAndNormalize(coinT.decimalsScalar, amountsOutDirection[coinTypeT] || BigInt(0));
         if (amountOut == 0)
             continue;
-        balance = fixed_1.Fixed.convertFromInt(coinT.balance);
+        balance = fixed_1.Fixed.directCast(coinT.normalizedBalance);
         t = (balance * lpc) / amountOut;
         prod = 0;
         sum = 0;
         keepT = true;
         for (let [coinType, coin] of Object.entries(coins)) {
-            balance = fixed_1.Fixed.convertFromInt(coin.balance);
+            balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
             weight = fixed_1.Fixed.directCast(coin.weight);
-            amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+            amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
             part1 = t * amountOut;
             if (part1 >= balance) {
                 // this t is too large to be a bound because B0 - t*D overdraws the pool
@@ -792,8 +797,8 @@ CmmmCalculations.calcAllCoinDeposit = (pool, amountsIn) => {
     let s;
     let sMin = Number.POSITIVE_INFINITY;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amountIn = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amountIn = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         s = amountIn / balance;
         if (s < sMin)
             sMin = s;
@@ -815,8 +820,8 @@ CmmmCalculations.calcAllCoinWithdraw = (pool, amountsOut) => {
     let s;
     let sMax = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOut[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOut[coinType] || BigInt(0));
         s = amountOut / balance;
         if (s > sMax)
             sMax = s;
@@ -934,14 +939,12 @@ CmmmCalculations.checkValidSwap = (pool, amountsIn, amountsInScalar, amountsOut,
     let postprod = 0;
     let postsum = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         amountIn =
-            fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0)) *
-                amountsInScalar;
+            fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0)) * amountsInScalar;
         amountOut =
-            fixed_1.Fixed.convertFromInt(amountsOut[coinType] || BigInt(0)) *
-                amountsOutScalar;
+            fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOut[coinType] || BigInt(0)) * amountsOutScalar;
         if (amountIn > 0 && amountOut > 0)
             return false;
         feedAmountIn = amountIn * (1 - fixed_1.Fixed.directCast(coin.tradeFeeIn));
@@ -981,6 +984,8 @@ CmmmCalculations.checkValid1dSwap = (pool, coinTypeIn, coinTypeOut, amountInB, a
     if (coinTypeIn == coinTypeOut)
         return false;
     let coins = pool.coins;
+    let coinIn = coins[coinTypeIn];
+    let coinOut = coins[coinTypeOut];
     let flatness = fixed_1.Fixed.directCast(pool.flatness);
     // balance = balances[i]
     let balance;
@@ -989,13 +994,12 @@ CmmmCalculations.checkValid1dSwap = (pool, coinTypeIn, coinTypeOut, amountInB, a
     // postbalance = balance + amount in - amount out
     let postbalance;
     let weight;
-    let amountIn = fixed_1.Fixed.convertFromInt(amountInB);
-    let amountOut = fixed_1.Fixed.convertFromInt(amountOutB);
-    let feedAmountIn = amountIn * (1 - fixed_1.Fixed.directCast(coins[coinTypeIn].tradeFeeIn));
+    let amountIn = fixed_1.Fixed.castAndNormalize(coinIn.decimalsScalar, amountInB);
+    let amountOut = fixed_1.Fixed.castAndNormalize(coinOut.decimalsScalar, amountOutB);
+    let feedAmountIn = amountIn * (1 - fixed_1.Fixed.directCast(coinIn.tradeFeeIn));
     let feedAmountOut = amountOut == 0
         ? 0
-        : amountOut /
-            (1 - fixed_1.Fixed.directCast(coins[coinTypeOut].tradeFeeOut));
+        : amountOut / (1 - fixed_1.Fixed.directCast(coinOut.tradeFeeOut));
     let preprod = 0;
     let presum = 0;
     let pseudoprod = 0;
@@ -1005,7 +1009,7 @@ CmmmCalculations.checkValid1dSwap = (pool, coinTypeIn, coinTypeOut, amountInB, a
     let p;
     let s;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         p = weight * Math.log(balance);
         s = weight * balance;
@@ -1078,9 +1082,9 @@ CmmmCalculations.checkValidDeposit = (pool, amountsIn, lpRatioRaw) => {
     let postprod = 0;
     let postsum = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
-        amount = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+        amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         postbalance = lpRatio * (balance + amount);
         if (postbalance >= balance) {
             // use fee in
@@ -1144,10 +1148,10 @@ CmmmCalculations.checkValidWithdraw = (pool, amountsOutSrc, lpRatio) => {
     let postprod = 0;
     let postsum = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         scaledBalance = lpRatio * balance;
         weight = fixed_1.Fixed.directCast(coin.weight);
-        amount = fixed_1.Fixed.convertFromInt(amountsOutSrc[coinType] || BigInt(0));
+        amount = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutSrc[coinType] || BigInt(0));
         if (amount > scaledBalance + 1)
             return false;
         postbalance = balance - amount;
@@ -1210,9 +1214,9 @@ CmmmCalculations.getEstimateSwapFixedIn = (pool, amountsIn, amountsOutDirection)
     let inDotGrad = 0;
     let outDotGrad = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amountIn = fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amountIn = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
         grad =
             amountIn == 0
                 ? (fixed_1.Fixed.directCast(coin.weight) *
@@ -1245,9 +1249,9 @@ CmmmCalculations.getEstimateSwapFixedOut = (pool, amountsInDirection, amountsOut
     let inDotGrad = 0;
     let outDotGrad = 0;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
-        amountIn = fixed_1.Fixed.convertFromInt(amountsInDirection[coinType] || BigInt(0));
-        amountOut = fixed_1.Fixed.convertFromInt(amountsOut[coinType] || BigInt(0));
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
+        amountIn = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsInDirection[coinType] || BigInt(0));
+        amountOut = fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOut[coinType] || BigInt(0));
         grad =
             amountIn == 0
                 ? (fixed_1.Fixed.directCast(coin.weight) *
@@ -1287,11 +1291,11 @@ CmmmCalculations.getEstimateDepositFixedAmounts = (pool, amountsIn) => {
     let grad;
     let scaledAmount;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         amount =
             balance +
-                fixed_1.Fixed.convertFromInt(amountsIn[coinType] || BigInt(0));
+                fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsIn[coinType] || BigInt(0));
         scaledAmount = amount * r0;
         grad =
             scaledAmount < balance
@@ -1335,11 +1339,11 @@ CmmmCalculations.getEstimateWithdrawFlpAmountsOut = (pool, amountsOutDirection,
     let amount;
     let grad;
     for (let [coinType, coin] of Object.entries(coins)) {
-        balance = fixed_1.Fixed.convertFromInt(coin.balance);
+        balance = fixed_1.Fixed.directCast(coin.normalizedBalance);
         weight = fixed_1.Fixed.directCast(coin.weight);
         amount =
             balance +
-                fixed_1.Fixed.convertFromInt(amountsOutDirection[coinType] || BigInt(0));
+                fixed_1.Fixed.castAndNormalize(coin.decimalsScalar, amountsOutDirection[coinType] || BigInt(0));
         scaledAmount = amount * r0;
         grad =
             scaledAmount < balance

package/dist/packages/referralVault/api/referralVaultApi.d.ts

@@ -1,11 +1,173 @@
-import { SuiAddress } from "@mysten/sui.js";
+import { SuiAddress, TransactionBlock } from "@mysten/sui.js";
 import { AftermathApi } from "../../../general/providers/aftermathApi";
-import { Balance, CoinType } from "../../../types";
-import { ReferralVaultApiHelpers } from "./referralVaultApiHelpers";
+import { Balance, CoinType, ReferralVaultAddresses } from "../../../types";
 export declare class ReferralVaultApi {
     private readonly Provider;
-    readonly Helpers: ReferralVaultApiHelpers;
+    private static readonly constants;
+    readonly addresses: ReferralVaultAddresses;
     constructor(Provider: AftermathApi);
+    updateReferrerTx: (inputs: {
+        tx: TransactionBlock;
+        referrer: SuiAddress;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    withdrawRebateTx: (inputs: {
+        tx: TransactionBlock;
+        coinType: CoinType;
+        withTransfer?: boolean;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    balanceOfRebateTx: (inputs: {
+        tx: TransactionBlock;
+        coinType: CoinType;
+        referrer: SuiAddress;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    referrerForTx: (inputs: {
+        tx: TransactionBlock;
+        referee: SuiAddress;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
+    hasReffererTx: (inputs: {
+        tx: TransactionBlock;
+        referee: SuiAddress;
+    }) => ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    }) & ({
+        kind: "Input";
+        index: number;
+        type?: "object" | "pure" | undefined;
+        value?: any;
+    } | {
+        kind: "GasCoin";
+    } | {
+        kind: "Result";
+        index: number;
+    } | {
+        kind: "NestedResult";
+        index: number;
+        resultIndex: number;
+    })[];
     fetchBalanceOfRebate: (inputs: {
         coinType: CoinType;
         referrer: SuiAddress;

package/dist/packages/referralVault/api/referralVaultApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"referralVaultApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/referralVault/api/referralVaultApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAoB,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAGpE,qBAAa,gBAAgB;IAWhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IANrC,SAAgB,OAAO,0BAAC;gBAMK,QAAQ,EAAE,YAAY;IAa5C,oBAAoB,WAAkB;QAC5C,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,EAAE,UAAU,CAAC;KACrB,KAAG,QAAQ,OAAO,CAAC,CAMlB;IAEK,aAAa,WAAkB;QACrC,OAAO,EAAE,UAAU,CAAC;KACpB,KAAG,QAAQ,UAAU,GAAG,MAAM,CAAC,CAO9B;CACF"}
+{"version":3,"file":"referralVaultApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/referralVault/api/referralVaultApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAG3E,qBAAa,gBAAgB;IAqBhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhBrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAI/B;IAMF,SAAgB,SAAS,EAAE,sBAAsB,CAAC;gBAMrB,QAAQ,EAAE,YAAY;IAkB5C,gBAAgB,WAAY;QAClC,EAAE,EAAE,gBAAgB,CAAC;QACrB,QAAQ,EAAE,UAAU,CAAC;KACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAcC;IAEK,gBAAgB,WAAY;QAClC,EAAE,EAAE,gBAAgB,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;QACnB,YAAY,CAAC,EAAE,OAAO,CAAC;KACvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAaC;IAEK,iBAAiB,WAAY;QACnC,EAAE,EAAE,gBAAgB,CAAC;QACrB,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,EAAE,UAAU,CAAC;KACrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAcC;IAEK,aAAa,WAAY;QAC/B,EAAE,EAAE,gBAAgB,CAAC;QACrB,OAAO,EAAE,UAAU,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAcC;IAEK,aAAa,WAAY;QAC/B,EAAE,EAAE,gBAAgB,CAAC;QACrB,OAAO,EAAE,UAAU,CAAC;KACpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAcC;IAMK,oBAAoB,WAAkB;QAC5C,QAAQ,EAAE,QAAQ,CAAC;QACnB,QAAQ,EAAE,UAAU,CAAC;KACrB,KAAG,QAAQ,OAAO,CAAC,CAMlB;IAEK,aAAa,WAAkB;QACrC,OAAO,EAAE,UAAU,CAAC;KACpB,KAAG,QAAQ,UAAU,GAAG,MAAM,CAAC,CAO9B;CACF"}