@kamino-finance/kliquidity-sdk 8.4.6 → 8.4.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupService.d.ts","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE9F,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,aAAa,EACb,wBAAwB,IAAI,2BAA2B,EAEvD,WAAW,EACZ,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,wBAAwB,4BAA4B,CAAC;AAClE,eAAO,MAAM,oBAAoB,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"JupService.d.ts","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,OAAO,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE9F,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,aAAa,EACb,wBAAwB,IAAI,2BAA2B,EAEvD,WAAW,EACZ,MAAM,aAAa,CAAC;AAIrB,eAAO,MAAM,wBAAwB,4BAA4B,CAAC;AAClE,eAAO,MAAM,oBAAoB,oCAAoC,CAAC;AAItE,MAAM,MAAM,wBAAwB,GAAG;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,CAAC;AAEF,UAAU,wBAAwB;IAChC,sBAAsB,CAAC,EAAE,iBAAiB,CAAC;IAC3C,yBAAyB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpD,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC5C,eAAe,EAAE,iBAAiB,CAAC;IACnC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IACvC,2BAA2B,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CAC7C;AAED,qBAAa,UAAU;IAErB,MAAM,CAAC,cAAc,GACnB,aAAa,OAAO,EACpB,QAAQ,OAAO,EACf,WAAW,OAAO,EAClB,YAAY,OAAO,EACnB,aAAa,MAAM,EACnB,sBAAsB,OAAO,EAC7B,cAAc,MAAM,EACpB,mBAAmB,OAAO,KACzB,OAAO,CAAC,wBAAwB,CAAC,CAoClC;IAEF,MAAM,CAAC,mBAAmB,GACxB,QAAQ,OAAO,EACf,WAAW,OAAO,EAClB,YAAY,OAAO,EACnB,aAAa,MAAM,EACnB,sBAAsB,OAAO,EAC7B,cAAc,MAAM,EACpB,mBAAmB,OAAO,EAC1B,cAAc,MAAM,KACnB,OAAO,CAAC,aAAa,CAAC,CAmBvB;IAEF,MAAM,CAAC,mBAAmB,GACxB,aAAa,OAAO,EACpB,OAAO,aAAa,EACpB,uBAAoB,EACpB,sBAAsB,OAAO,KAC5B,OAAO,CAAC,2BAA2B,CAAC,CAcrC;IAEF,MAAM,CAAC,QAAQ,GACb,WAAW,OAAO,GAAG,MAAM,EAC3B,YAAY,OAAO,GAAG,MAAM,EAC5B,cAAc,MAAM,KACnB,OAAO,CAAC,MAAM,CAAC,CAWhB;IAEF,MAAM,CAAC,SAAS,GACd,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,EAChC,YAAY,OAAO,GAAG,MAAM,EAC5B,cAAc,MAAM,KACnB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAyB/B;IAEF,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAI9G,MAAM,CAAC,cAAc,GAAU,WAAW,OAAO,GAAG,MAAM,EAAE,cAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAEhG;CACH;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,WAAW,GAAG,iBAAiB,CAStE;AAED,wBAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG,WAAW,CAWtG"}
|
|
@@ -13,9 +13,7 @@ const api_1 = require("@jup-ag/api");
|
|
|
13
13
|
const USDC_MINT = (0, kit_1.address)('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
|
|
14
14
|
exports.DEFAULT_JUP_API_ENDPOINT = 'https://lite-api.jup.ag';
|
|
15
15
|
exports.DEFAULT_JUP_SWAP_API = 'https://lite-api.jup.ag/swap/v1';
|
|
16
|
-
const jupiterSwapApi = (0, api_1.createJupiterApiClient)({
|
|
17
|
-
basePath: exports.DEFAULT_JUP_SWAP_API,
|
|
18
|
-
});
|
|
16
|
+
const jupiterSwapApi = (0, api_1.createJupiterApiClient)({ basePath: exports.DEFAULT_JUP_SWAP_API });
|
|
19
17
|
class JupService {
|
|
20
18
|
// the amounts has to be in lamports
|
|
21
19
|
static getBestRouteV6 = async (userAddress, amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes) => {
|
|
@@ -23,11 +21,7 @@ class JupService {
|
|
|
23
21
|
// https://lite-api.jup.ag/swap/v1/quote?inputMint=7dHbWXmci3dT8UFYWYZweBLXgycu7Y3iL6trKn1Y7ARj&outputMint=mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So&amount=71101983&slippageBps=10&onlyDirectRoutes=false&asLegacyTransaction=false&maxAccounts=33
|
|
24
22
|
const res = await this.getBestRouteQuoteV6(amount, inputMint, outputMint, slippageBps, asLegacyTransaction, maxAccounts, onlyDirectRoutes);
|
|
25
23
|
const ixsResponse = await jupiterSwapApi.swapInstructionsPost({
|
|
26
|
-
swapRequest: {
|
|
27
|
-
quoteResponse: res,
|
|
28
|
-
userPublicKey: userAddress,
|
|
29
|
-
wrapAndUnwrapSol: false,
|
|
30
|
-
},
|
|
24
|
+
swapRequest: { quoteResponse: res, userPublicKey: userAddress, wrapAndUnwrapSol: false },
|
|
31
25
|
});
|
|
32
26
|
const swapIxs = {
|
|
33
27
|
tokenLedgerInstruction: ixsResponse.tokenLedgerInstruction
|
|
@@ -85,26 +79,18 @@ class JupService {
|
|
|
85
79
|
}
|
|
86
80
|
};
|
|
87
81
|
static getPrice = async (inputMint, outputMint, jupEndpoint) => {
|
|
88
|
-
const params = {
|
|
89
|
-
ids: inputMint.toString(),
|
|
90
|
-
vsToken: outputMint.toString(),
|
|
91
|
-
vsAmount: 1,
|
|
92
|
-
};
|
|
82
|
+
const params = { ids: inputMint.toString(), vsToken: outputMint.toString(), vsAmount: 1 };
|
|
93
83
|
// BONK token
|
|
94
84
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
95
85
|
params.vsAmount = 100;
|
|
96
86
|
}
|
|
97
87
|
const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
|
|
98
|
-
const res = await axios_1.default.get(`${baseURL}/price/
|
|
99
|
-
return res.data
|
|
88
|
+
const res = await axios_1.default.get(`${baseURL}/price/v3`, { params });
|
|
89
|
+
return res.data[inputMint.toString()].usdPrice;
|
|
100
90
|
};
|
|
101
91
|
static getPrices = async (inputMints, outputMint, jupEndpoint) => {
|
|
102
92
|
const mintsCommaSeparated = inputMints.map((mint) => mint.toString()).join(',');
|
|
103
|
-
const params = {
|
|
104
|
-
ids: mintsCommaSeparated,
|
|
105
|
-
vsToken: outputMint.toString(),
|
|
106
|
-
vsAmount: 1,
|
|
107
|
-
};
|
|
93
|
+
const params = { ids: mintsCommaSeparated, vsToken: outputMint.toString(), vsAmount: 1 };
|
|
108
94
|
// BONK token
|
|
109
95
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
110
96
|
params.vsAmount = 100;
|
|
@@ -112,10 +98,10 @@ class JupService {
|
|
|
112
98
|
const baseURL = jupEndpoint || exports.DEFAULT_JUP_API_ENDPOINT;
|
|
113
99
|
const prices = new Map();
|
|
114
100
|
try {
|
|
115
|
-
const res = await axios_1.default.get(`${baseURL}/price/
|
|
101
|
+
const res = await axios_1.default.get(`${baseURL}/price/v3`, { params });
|
|
116
102
|
for (const mint of inputMints) {
|
|
117
103
|
try {
|
|
118
|
-
prices.set((0, kit_1.address)(mint), new decimal_js_1.default(res.data
|
|
104
|
+
prices.set((0, kit_1.address)(mint), new decimal_js_1.default(res.data[mint.toString()].usdPrice));
|
|
119
105
|
}
|
|
120
106
|
catch (e) {
|
|
121
107
|
prices.set((0, kit_1.address)(mint), new decimal_js_1.default(0));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupService.js","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"JupService.js","sourceRoot":"","sources":["../../src/services/JupService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,9 +13,7 @@ const USDC_MINT = address('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
|
|
|
13
13
|
export const DEFAULT_JUP_API_ENDPOINT = 'https://lite-api.jup.ag';
|
|
14
14
|
export const DEFAULT_JUP_SWAP_API = 'https://lite-api.jup.ag/swap/v1';
|
|
15
15
|
|
|
16
|
-
const jupiterSwapApi = createJupiterApiClient({
|
|
17
|
-
basePath: DEFAULT_JUP_SWAP_API,
|
|
18
|
-
});
|
|
16
|
+
const jupiterSwapApi = createJupiterApiClient({ basePath: DEFAULT_JUP_SWAP_API });
|
|
19
17
|
|
|
20
18
|
export type SwapTransactionsResponse = {
|
|
21
19
|
setupTransaction: string | undefined;
|
|
@@ -58,11 +56,7 @@ export class JupService {
|
|
|
58
56
|
);
|
|
59
57
|
|
|
60
58
|
const ixsResponse = await jupiterSwapApi.swapInstructionsPost({
|
|
61
|
-
swapRequest: {
|
|
62
|
-
quoteResponse: res,
|
|
63
|
-
userPublicKey: userAddress,
|
|
64
|
-
wrapAndUnwrapSol: false,
|
|
65
|
-
},
|
|
59
|
+
swapRequest: { quoteResponse: res, userPublicKey: userAddress, wrapAndUnwrapSol: false },
|
|
66
60
|
});
|
|
67
61
|
|
|
68
62
|
const swapIxs: SwapInstructionsResponse = {
|
|
@@ -141,11 +135,7 @@ export class JupService {
|
|
|
141
135
|
outputMint: Address | string,
|
|
142
136
|
jupEndpoint?: string
|
|
143
137
|
): Promise<number> => {
|
|
144
|
-
const params = {
|
|
145
|
-
ids: inputMint.toString(),
|
|
146
|
-
vsToken: outputMint.toString(),
|
|
147
|
-
vsAmount: 1,
|
|
148
|
-
};
|
|
138
|
+
const params = { ids: inputMint.toString(), vsToken: outputMint.toString(), vsAmount: 1 };
|
|
149
139
|
|
|
150
140
|
// BONK token
|
|
151
141
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
@@ -153,8 +143,8 @@ export class JupService {
|
|
|
153
143
|
}
|
|
154
144
|
|
|
155
145
|
const baseURL = jupEndpoint || DEFAULT_JUP_API_ENDPOINT;
|
|
156
|
-
const res = await axios.get(`${baseURL}/price/
|
|
157
|
-
return res.data
|
|
146
|
+
const res = await axios.get(`${baseURL}/price/v3`, { params });
|
|
147
|
+
return res.data[inputMint.toString()].usdPrice;
|
|
158
148
|
};
|
|
159
149
|
|
|
160
150
|
static getPrices = async (
|
|
@@ -163,11 +153,7 @@ export class JupService {
|
|
|
163
153
|
jupEndpoint?: string
|
|
164
154
|
): Promise<Map<Address, Decimal>> => {
|
|
165
155
|
const mintsCommaSeparated = inputMints.map((mint) => mint.toString()).join(',');
|
|
166
|
-
const params = {
|
|
167
|
-
ids: mintsCommaSeparated,
|
|
168
|
-
vsToken: outputMint.toString(),
|
|
169
|
-
vsAmount: 1,
|
|
170
|
-
};
|
|
156
|
+
const params = { ids: mintsCommaSeparated, vsToken: outputMint.toString(), vsAmount: 1 };
|
|
171
157
|
|
|
172
158
|
// BONK token
|
|
173
159
|
if (outputMint.toString() === 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263') {
|
|
@@ -177,10 +163,10 @@ export class JupService {
|
|
|
177
163
|
const baseURL = jupEndpoint || DEFAULT_JUP_API_ENDPOINT;
|
|
178
164
|
const prices = new Map<Address, Decimal>();
|
|
179
165
|
try {
|
|
180
|
-
const res = await axios.get(`${baseURL}/price/
|
|
166
|
+
const res = await axios.get(`${baseURL}/price/v3`, { params });
|
|
181
167
|
for (const mint of inputMints) {
|
|
182
168
|
try {
|
|
183
|
-
prices.set(address(mint), new Decimal(res.data
|
|
169
|
+
prices.set(address(mint), new Decimal(res.data[mint.toString()].usdPrice));
|
|
184
170
|
} catch (e) {
|
|
185
171
|
prices.set(address(mint), new Decimal(0));
|
|
186
172
|
}
|