@carrot-protocol/clend-rpc 0.1.25-fix-partial-w-dev-aa84953 → 0.1.25-fix-partial-w-dev-e5d13ae
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/jupiterUtils.js +13 -2
- package/dist/jupiterUtils.js.map +1 -1
- package/dist/rpc.js +1 -1
- package/package.json +1 -1
package/dist/jupiterUtils.js
CHANGED
|
@@ -52,11 +52,22 @@ class JupiterUtils {
|
|
|
52
52
|
onlyDirectRoutes: true,
|
|
53
53
|
swapMode,
|
|
54
54
|
});
|
|
55
|
+
// conver to UI
|
|
55
56
|
const inAmount = new decimal_js_1.default(quoteResponse.inAmount).div(new decimal_js_1.default(10).pow(inputMintDecimals));
|
|
56
57
|
const minAmountOut = new decimal_js_1.default(quoteResponse.outAmount).div(new decimal_js_1.default(10).pow(outputMintDecimals));
|
|
57
|
-
|
|
58
|
+
let price = new decimal_js_1.default(0);
|
|
59
|
+
if (swapMode === api_1.SwapMode.ExactOut) {
|
|
60
|
+
// Output is fixed (A), Input varies (B) -> Price is B/A
|
|
61
|
+
if (minAmountOut.gt(0))
|
|
62
|
+
price = inAmount.div(minAmountOut);
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
// ExactIn: Input is fixed (A), Output varies (B) -> Price is B/A
|
|
66
|
+
if (inAmount.gt(0))
|
|
67
|
+
price = minAmountOut.div(inAmount);
|
|
68
|
+
}
|
|
58
69
|
return {
|
|
59
|
-
priceAInB:
|
|
70
|
+
priceAInB: price,
|
|
60
71
|
quoteResponse,
|
|
61
72
|
};
|
|
62
73
|
}
|
package/dist/jupiterUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jupiterUtils.js","sourceRoot":"","sources":["../src/jupiterUtils.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"jupiterUtils.js","sourceRoot":"","sources":["../src/jupiterUtils.ts"],"names":[],"mappings":";;;;;;AAsRA,sDAmBC;AAED,oDAIC;AAED,kDAYC;AA7TD,8CAA6C;AAC7C,4DAAiC;AACjC,qCASqB;AACrB,kDAA0B;AAE1B,MAAM,aAAa,GAAG,yBAAyB,CAAC;AAChD,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAC3C,MAAM,UAAU,GAAG,WAAW,CAAC;AAC/B,MAAM,UAAU,GAAG,gBAAgB,CAAC;AACpC,MAAM,SAAS,GAAG,6BAA6B,CAAC;AAiDhD,MAAa,oBAAqB,SAAQ,KAAK;IAC7C,YACS,KAAoB,EACpB,IAAe;QAEtB,KAAK,CAAC,yBAAyB,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QAH3D,UAAK,GAAL,KAAK,CAAe;QACpB,SAAI,GAAJ,IAAI,CAAW;IAGxB,CAAC;CACF;AAPD,oDAOC;AAuBD,yCAAyC;AACzC,MAAa,YAAY;IAIvB,YAAY,MAAe;QACzB,MAAM,cAAc,GAAG;YACrB,cAAc,EAAE,kBAAkB;SACnC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM;YACnB,CAAC,CAAC,EAAE,GAAG,cAAc,EAAE,WAAW,EAAE,MAAM,EAAE;YAC5C,CAAC,CAAC,cAAc,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAA6B;QACjD,MAAM,MAAM,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE;SACrB,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,UAAU,EAAE,EAAE;YAC1D,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,SAAyB,EACzB,UAA0B,EAC1B,iBAAyB,EACzB,kBAA0B,EAC1B,mBAA4B,EAC5B,WAAmB,EACnB,WAAqB,SAAS;QAE9B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CACpC,SAAS,EACT,UAAU,EACV,mBAAmB,EACnB;YACE,WAAW,EAAE,WAAW;YACxB,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,IAAI;YACtB,QAAQ;SACT,CACF,CAAC;QAEF,eAAe;QACf,MAAM,QAAQ,GAAG,IAAI,oBAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CACtD,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CACvC,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,oBAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,GAAG,CAC3D,IAAI,oBAAO,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CACxC,CAAC;QAEF,IAAI,KAAK,GAAG,IAAI,oBAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,QAAQ,KAAK,cAAQ,CAAC,QAAQ,EAAE,CAAC;YACnC,wDAAwD;YACxD,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;gBAAE,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,iEAAiE;YACjE,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;gBAAE,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzD,CAAC;QAED,OAAO;YACL,SAAS,EAAE,KAAK;YAChB,aAAa;SACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,KAAqB,EACrB,MAAkB,EAClB,KAA+B;QAE/B,MAAM,mBAAmB,GAAG,qBAAqB,CAC/C,KAAK,CAAC,aAAc,EACpB,IAAI,oBAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CACxC,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAC1D,KAAK,EACL,mBAAmB,EACnB;YACE,WAAW,EAAE,KAAK,CAAC,aAAc,CAAC,WAAW;YAC7C,gBAAgB,EAAE,KAAK;YACvB,gBAAgB,EAAE,IAAI;YACtB,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;SACxC,CACF,CAAC;QACF,OAAO;YACL,YAAY,EAAE,EAAE;YAChB,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;YAC7B,YAAY;SACb,CAAC;IACJ,CAAC;IACD,mBAAmB;IACX,KAAK,CAAC,KAAK,CACjB,SAAyB,EACzB,UAA0B,EAC1B,MAAe,EACf,UAAsB;QAEtB,MAAM,QAAQ,GAAG,IAAA,4BAAsB,EAAC;YACtC,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,SAAS;SAC/C,CAAC,CAAC;QAEH,MAAM,YAAY,GAAoB;YACpC,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACjC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC;YAC3C,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;SAC9C,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,YAAY,mBAAa,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAc,CAAC;gBACpD,MAAM,IAAI,oBAAoB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,KAAqB,EACrB,KAAoB,EACpB,UAAsB;QAEtB,MAAM,QAAQ,GAAG,IAAA,4BAAsB,EAAC;YACtC,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,SAAS;SAC/C,CAAC,CAAC;QACH,IAAI,CAAC;YACH,MAAM,cAAc,GAAgC;gBAClD,WAAW,EAAE;oBACX,aAAa,EAAE,KAAK,CAAC,QAAQ,EAAE;oBAC/B,aAAa,EAAE,KAAK;oBACpB,6BAA6B,EAAE,CAAC;oBAChC,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,IAAI,KAAK;oBACvD,uBAAuB,EAAE,SAAS;oBAClC,iBAAiB,EAAE,KAAK;oBACxB,UAAU,EAAE,SAAS;oBACrB,wBAAwB,EAAE,IAAI;iBAC/B;aACF,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEjE,MAAM,OAAO,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;YAC5D,OAAO;gBACL,OAAO,EAAE;oBACP,QAAQ,EAAE,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC;oBACtD,OAAO;oBACP,UAAU,EAAE,oBAAoB,CAC9B,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CACzD;iBACF;gBACD,YAAY,EAAE,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAChD,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,aAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B;gBACD,YAAY,EAAE;oBACZ,oBAAoB,EAAE,IAAI,oBAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;oBACjD,qBAAqB,EAAE,IAAI,oBAAO,CAAC,KAAK,CAAC,SAAS,CAAC;oBACnD,wBAAwB,EAAE,IAAI,oBAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC;iBAClE;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,mBAAa,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAc,CAAC;gBACpD,MAAM,IAAI,oBAAoB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;CACF;AAlLD,oCAkLC;AAED,SAAgB,qBAAqB,CACnC,aAA4B,EAC5B,SAAkB;IAElB,MAAM,SAAS,GAAG,IAAI,oBAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE7C,MAAM,gBAAgB,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IAC9C,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACjD,sEAAsE;IACtE,MAAM,YAAY,GAAG,IAAI,oBAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC1D,gBAAgB,CAAC,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtE,gBAAgB,CAAC,oBAAoB,GAAG,IAAI,oBAAO,CACjD,aAAa,CAAC,oBAAoB,CACnC;SACE,GAAG,CAAC,WAAW,CAAC;SAChB,QAAQ,EAAE,CAAC;IAEd,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAgB,oBAAoB,CAClC,YAA2B;IAE3B,OAAO,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,mBAAmB,CACjC,WAAwB;IAExB,OAAO,IAAI,aAAI,CAAC,sBAAsB,CAAC;QACrC,SAAS,EAAE,IAAI,aAAI,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC;QACpD,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,EAAE,IAAI,aAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC;YAC1C,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QACH,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC;KAC9C,CAAC,CAAC;AACL,CAAC"}
|
package/dist/rpc.js
CHANGED
|
@@ -1381,7 +1381,7 @@ class ClendClient {
|
|
|
1381
1381
|
// Re-call to get all values for logging if not all are returned or destructured previously
|
|
1382
1382
|
(0, clend_common_1.computeWithdrawLeverageAmounts)(currentCollateralAmount_UI, estimatedCurrentDebt_UI, desiredNetCollateralToReceive_UI, collateralPrice, debtPrice, initialAssetWeight, initialLiabilityWeight));
|
|
1383
1383
|
const baseDebtToRepay_BN = (0, clend_common_1.uiToAmount)(baseDebtToRepayFromCommonMath_UI, debtDecimals);
|
|
1384
|
-
const timeBufferSec =
|
|
1384
|
+
const timeBufferSec = 60;
|
|
1385
1385
|
debtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(baseDebtToRepay_BN, debtBankData.borrowApy, timeBufferSec);
|
|
1386
1386
|
utils_1.logger.debug("Calculated final debt repay target using common math (Initial Weights)", {
|
|
1387
1387
|
baseDebtToRepayFromCommonMath_UI,
|
package/package.json
CHANGED