@carrot-protocol/clend-rpc 0.1.25-fix-partial-w-dev-5f72358 → 0.1.25-fix-partial-w-dev-bbb7cb9
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 +12 -8
- package/dist/jupiterUtils.js.map +1 -1
- package/package.json +1 -1
package/dist/jupiterUtils.js
CHANGED
|
@@ -52,15 +52,21 @@ class JupiterUtils {
|
|
|
52
52
|
onlyDirectRoutes: true,
|
|
53
53
|
swapMode,
|
|
54
54
|
});
|
|
55
|
-
console.log("quoteResponse", JSON.stringify(quoteResponse, null, 2));
|
|
56
55
|
const inAmount = new decimal_js_1.default(quoteResponse.inAmount).div(new decimal_js_1.default(10).pow(inputMintDecimals));
|
|
57
|
-
console.log("inAmount", inAmount.toString());
|
|
58
56
|
const minAmountOut = new decimal_js_1.default(quoteResponse.outAmount).div(new decimal_js_1.default(10).pow(outputMintDecimals));
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
57
|
+
let price = new decimal_js_1.default(0);
|
|
58
|
+
if (swapMode === api_1.SwapMode.ExactOut) {
|
|
59
|
+
// Output is fixed (A), Input varies (B) -> Price is B/A
|
|
60
|
+
if (minAmountOut.gt(0))
|
|
61
|
+
price = inAmount.div(minAmountOut);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
// ExactIn: Input is fixed (A), Output varies (B) -> Price is B/A
|
|
65
|
+
if (inAmount.gt(0))
|
|
66
|
+
price = minAmountOut.div(inAmount);
|
|
67
|
+
}
|
|
62
68
|
return {
|
|
63
|
-
priceAInB:
|
|
69
|
+
priceAInB: price,
|
|
64
70
|
quoteResponse,
|
|
65
71
|
};
|
|
66
72
|
}
|
|
@@ -84,7 +90,6 @@ class JupiterUtils {
|
|
|
84
90
|
basePath: QUOTE_URL,
|
|
85
91
|
apiKey: this.headers["x-api-key"] ?? undefined,
|
|
86
92
|
});
|
|
87
|
-
console.log("quoteAmount:", amount.toString());
|
|
88
93
|
const quoteRequest = {
|
|
89
94
|
inputMint: inputMint.toBase58(),
|
|
90
95
|
outputMint: outputMint.toBase58(),
|
|
@@ -93,7 +98,6 @@ class JupiterUtils {
|
|
|
93
98
|
swapMode: swapConfig.swapMode,
|
|
94
99
|
onlyDirectRoutes: swapConfig.onlyDirectRoutes,
|
|
95
100
|
};
|
|
96
|
-
console.log("quoteRequest", JSON.stringify(quoteRequest, null, 2));
|
|
97
101
|
try {
|
|
98
102
|
return await quoteApi.quoteGet(quoteRequest);
|
|
99
103
|
}
|
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":"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"}
|
package/package.json
CHANGED