feat: WXDEFI-58 different decimals in lp_stable

Author: epicwavesrider

ride/lp_stable.ride

@@ -36,6 +36,8 @@
 #-----------------
 # GLOBAL VARIABLES
 #-----------------
+let defaultDecimals = 1_000_000
+
 let scale8 = 100_000_000
 let scale8BigInt = 100_000_000.toBigInt()
 let scale18 = 1_000_000_000_000_000_000.toBigInt()
@@ -248,21 +250,18 @@ func estimateGetOperation(txId58: String, paymentAssetId: String, paymentLpAmoun
   let lpEmission = assetInfo(lpAssetId.fromBase58String()).valueOrErrorMessage("Wrong LP id").quantity
 
   strict validationBlock = lpAssetId == paymentAssetId || throwErr("Wrong payment asset")
+  let amountBalance = getAccBalance(amountId)
+  let priceBalance  = getAccBalance(priceId)
 
-  strict decimals = if amountDecimals >= priceDecimals then {
-    amountDecimals
-  } else {
-    priceDecimals
-  }
+  let amountBalanceDefaultDecimals  = fraction(amountBalance, defaultDecimals, amountDecimals)
+  let priceBalanceDefaultDecimals   = fraction(priceBalance, defaultDecimals, priceDecimals)
 
-  let amountBalance     = getAccBalance(amountId)
-  let amountBalanceX18  = amountBalance.toX18(decimals)
-  let priceBalance      = getAccBalance(priceId)
-  let priceBalanceX18   = priceBalance.toX18(decimals)
+  let amountBalanceX18  = amountBalanceDefaultDecimals.toX18(defaultDecimals)
+  let priceBalanceX18   = priceBalanceDefaultDecimals.toX18(defaultDecimals)
 
   let currentPriceX18 = calcPriceBigInt(priceBalanceX18, amountBalanceX18)
   let curPrice = currentPriceX18.fromX18(scale8)
-  
+
   let paymentLpAmountX18 = paymentLpAmount.toX18(scale8)
   let lpEmissionX18 = lpEmission.toX18(scale8)
 
@@ -271,8 +270,11 @@ func estimateGetOperation(txId58: String, paymentAssetId: String, paymentLpAmoun
   let outPriceAmountX18 = fraction(priceBalanceX18, paymentLpAmountX18, lpEmissionX18)
 
   # cast amounts to asset decimals
-  let outAmountAmount = outAmountAmountX18.fromX18(decimals)
-  let outPriceAmount = outPriceAmountX18.fromX18(decimals)
+  let outAmountAmountDefaultDecimals  = outAmountAmountX18.fromX18(defaultDecimals)
+  let outPriceAmountDefaultDecimals  = outPriceAmountX18.fromX18(defaultDecimals)
+
+  let outAmountAmount = fraction(outAmountAmountDefaultDecimals, amountDecimals, defaultDecimals)
+  let outPriceAmount  = fraction(outPriceAmountDefaultDecimals, priceDecimals, defaultDecimals)
 
   let state = if (txId58 == "") then [] else
   [
@@ -332,26 +334,25 @@ func estimatePutOperation(
       if(isOneAsset && paymentId == amountIdStr) then getAccBalance(amountIdStr) - paymentAmount else
       if(isOneAsset) then getAccBalance(amountIdStr) else getAccBalance(amountIdStr) - inAmountAssetAmount
 
-    # calc pool price
     let priceBalance = if(isEvaluate) then getAccBalance(priceIdStr) else
       if(isOneAsset && paymentId == priceIdStr) then getAccBalance(priceIdStr) - paymentAmount else
       if(isOneAsset) then getAccBalance(priceIdStr) else getAccBalance(priceIdStr) - inPriceAssetAmount
 
-    strict decimals = if amountDecimals >= priceDecimals then {
-      amountDecimals
-    } else {
-      priceDecimals
-    }
+    let amountBalanceDefaultDecimals  = fraction(amountBalance, defaultDecimals, amountDecimals)
+    let priceBalanceDefaultDecimals   = fraction(priceBalance, defaultDecimals, priceDecimals)
+
+    let inAmountAssetAmountDefaultDecimals  = fraction(inAmountAssetAmount, defaultDecimals, amountDecimals)
+    let inPriceAssetAmountDefaultDecimals   = fraction(inPriceAssetAmount, defaultDecimals, priceDecimals)
 
     # cast amounts to the lp decimals
-    let inAmountAssetAmountX18 = inAmountAssetAmount.toX18(decimals)
-    let inPriceAssetAmountX18 = inPriceAssetAmount.toX18(decimals)
+    let inAmountAssetAmountX18 = inAmountAssetAmountDefaultDecimals.toX18(defaultDecimals)
+    let inPriceAssetAmountX18 = inPriceAssetAmountDefaultDecimals.toX18(defaultDecimals)
 
     # calc user expected price
     let userPriceX18 = calcPriceBigInt(inPriceAssetAmountX18, inAmountAssetAmountX18)
 
-    let amountBalanceX18 = amountBalance.toX18(decimals)
-    let priceBalanceX18 = priceBalance.toX18(decimals)
+    let amountBalanceX18 = amountBalanceDefaultDecimals.toX18(defaultDecimals)
+    let priceBalanceX18 = priceBalanceDefaultDecimals.toX18(defaultDecimals)
 
     # case of the initial or first deposit
     # result is a tuple containing the following:
@@ -366,8 +367,8 @@ func estimatePutOperation(
       let lpAmountX18 = pow(inAmountAssetAmountX18 * inPriceAssetAmountX18, 0, 5.toBigInt(), 1, 0, DOWN)
       (
         lpAmountX18.fromX18(scale8),
-        inAmountAssetAmountX18.fromX18(decimals),
-        inPriceAssetAmountX18.fromX18(decimals),
+        inAmountAssetAmountX18.fromX18(defaultDecimals),
+        inPriceAssetAmountX18.fromX18(defaultDecimals),
         calcPriceBigInt(priceBalanceX18 + inPriceAssetAmountX18, amountBalanceX18 + inAmountAssetAmountX18),
         slippageX18
       )
@@ -395,16 +396,16 @@ func estimatePutOperation(
       let lpAmountX18 = fraction(lpEmissionX18, expectedPriceAssetAmountX18, priceBalanceX18)
       (
         lpAmountX18.fromX18(scale8),
-        expectedAmountAssetAmountX18.fromX18(decimals),
-        expectedPriceAssetAmountX18.fromX18(decimals),
+        expectedAmountAssetAmountX18.fromX18(defaultDecimals),
+        expectedPriceAssetAmountX18.fromX18(defaultDecimals),
         currentPriceX18,
         slippageX18
       )
     }
 
     let calculateLpAmount           = r._1
-    let calculateAmountAssetPayment = r._2
-    let calculatePriceAssetPayment  = r._3
+    let calculateAmountAssetPayment = fraction(r._2, amountDecimals, defaultDecimals)
+    let calculatePriceAssetPayment  = fraction(r._3, priceDecimals, defaultDecimals)
     let currentPrice                = r._4.fromX18(scale8)
     let slippageCalculate           = r._5.fromX18(scale8)
 

test/lp_stable/decimals_case/estimatePutOperationWrapperREADONLY.mjs

@@ -25,14 +25,14 @@ describe(
       const isEval = true;
       const emitLp = false;
 
-      const expected1 = { type: 'Int', value: 100000000 };
-      const expected2 = { type: 'Int', value: 0 };
-      const expected3 = { type: 'Int', value: 100000000 };
-      const expected4 = { type: 'Int', value: 0 };
-      const expected5 = { type: 'Int', value: 0 };
-      const expected6 = { type: 'Int', value: 0 };
-      const expected7 = { type: 'ByteVector', value: this.lpStableAssetId };
-      const expected8 = { type: 'String', value: '1' };
+      const expected1 = { type: 'Int', value: 1000000000 }; // outLp
+      const expected2 = { type: 'Int', value: 0 }; // emitLpAmount
+      const expected3 = { type: 'Int', value: 10000000000 }; // currentPrice
+      const expected4 = { type: 'Int', value: 0 }; // amountBalance
+      const expected5 = { type: 'Int', value: 0 }; // priceBalance
+      const expected6 = { type: 'Int', value: 0 }; // lpEmission
+      const expected7 = { type: 'ByteVector', value: this.lpStableAssetId }; // lpAssetId
+      const expected8 = { type: 'String', value: '1' }; // sts
       const expected9 = {
         type: 'IntegerEntry',
         value: {
@@ -42,15 +42,15 @@ describe(
           },
           value: {
             type: 'Int',
-            value: 100000000,
+            value: 10000000000,
           },
         },
       };
 
-      const expected10 = { type: 'Int', value: 0 };
-      const expected11 = { type: 'Int', value: 0 };
-      const expected12 = { type: 'String', value: this.usdtAssetId };
-      const expected13 = { type: 'String', value: this.usdnAssetId };
+      const expected10 = { type: 'Int', value: 0 }; // amountDiff
+      const expected11 = { type: 'Int', value: 0 }; // priceDiff
+      const expected12 = { type: 'String', value: this.usdtAssetId }; // inAmountAssetId
+      const expected13 = { type: 'String', value: this.usdnAssetId }; // inPriceAssetId
 
       const lpStable = address(this.accounts.lpStable, chainId);
 

test/lp_stable/decimals_case/get.mjs

@@ -18,10 +18,10 @@ describe('lp_stable: get.mjs', /** @this {MochaSuiteModified} */() => {
     async function () {
       const usdnAmount = 1e16 / 10;
       const usdtAmount = 1e8 / 10;
-      const lpStableAmount = 1e10;
+      const lpStableAmount = 1e11;
       const shouldAutoStake = false;
-      const priceLast = 1e16;
-      const priceHistory = 1e16;
+      const priceLast = 1e18;
+      const priceHistory = 1e18;
 
       const lpStable = address(this.accounts.lpStable, chainId);
 

test/lp_stable/decimals_case/getOneTkn.mjs

@@ -16,7 +16,7 @@ describe('lp_stable: getOneTkn.mjs', /** @this {MochaSuiteModified} */() => {
   it('should successfully getOneTkn.', async function () {
     const amAssetPart = 1e10;
     const prAssetPart = 1e10;
-    const outLp = 1e10;
+    const outLp = 1e11;
     const slippage = 1e3;
     const autoStake = false;
     const usdtAmount = 1e10;

test/lp_stable/decimals_case/put.mjs

@@ -16,10 +16,10 @@ describe('lp_stable: put.mjs', /** @this {MochaSuiteModified} */() => {
   it('should successfully put with shouldAutoStake false', async function () {
     const usdnAmount = 1e16 / 10;
     const usdtAmount = 1e8 / 10;
-    const expectedLpAmount = 1e11;
+    const expectedLpAmount = 1e12;
     const shouldAutoStake = false;
-    const priceLast = 1e16;
-    const priceHistory = 1e16;
+    const priceLast = 1e18;
+    const priceHistory = 1e18;
 
     const lpStable = address(this.accounts.lpStable, chainId);
 

test/lp_stable/decimals_case/putOneTkn.mjs

@@ -16,16 +16,16 @@ describe('lp_stable: putOneTkn.mjs', /** @this {MochaSuiteModified} */() => {
   it('should successfully putOneTkn with autoStake false', async function () {
     const amAssetPart = 1e10;
     const prAssetPart = 1e10;
-    const outLp = 1e10;
+    const outLp = 1e11;
     const slippage = 1e3;
     const autoStake = false;
     const usdtAmount = 1e10;
 
-    const expectedPriceLast = 1e8;
-    const expectedPriceHistory = 1e8;
+    const expectedPriceLast = 1e10;
+    const expectedPriceHistory = 1e10;
     const expectedWriteAmAmt = 1e10;
     const expectedWritePrAmt = 0;
-    const expectedEmitLpAmt = 1e10;
+    const expectedEmitLpAmt = 1e11;
     const expectedslippageCalc = 0;
     const expectedAmDiff = 0;
     const expectedPrDiff = 0;