@hawksightco/hawk-sdk 1.2.68 → 1.2.70
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/src/classes/HawkAPI.d.ts +8 -0
- package/dist/src/classes/HawkAPI.d.ts.map +1 -1
- package/dist/src/classes/HawkAPI.js +14 -0
- package/dist/src/classes/RaydiumSDK.d.ts +41 -1
- package/dist/src/classes/RaydiumSDK.d.ts.map +1 -1
- package/dist/src/classes/RaydiumSDK.js +55 -1
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +58 -11
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.js +11 -9
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as web3 from "@solana/web3.js";
|
|
1
2
|
import { General } from "./General";
|
|
2
3
|
import { Health } from "./Health";
|
|
3
4
|
import { TxGenerator } from "./TxGenerator";
|
|
@@ -13,6 +14,7 @@ import { Atomicity } from "./Atomicity";
|
|
|
13
14
|
import { JupiterAlts } from "./JupiterAlts";
|
|
14
15
|
import { JupiterSwap } from "./JupiterSwap";
|
|
15
16
|
import { SimplePdaGenerator } from './SimplePdaGenerator';
|
|
17
|
+
import { RaydiumSDK } from "./RaydiumSDK";
|
|
16
18
|
/**
|
|
17
19
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
18
20
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -86,5 +88,11 @@ export declare class HawkAPI {
|
|
|
86
88
|
* @param flag
|
|
87
89
|
*/
|
|
88
90
|
logging(flag: boolean): void;
|
|
91
|
+
/**
|
|
92
|
+
* Load the Raydium SDK
|
|
93
|
+
*
|
|
94
|
+
* @param connection The Solana connection
|
|
95
|
+
*/
|
|
96
|
+
raydiumSDK(connection: web3.Connection): Promise<RaydiumSDK>;
|
|
89
97
|
}
|
|
90
98
|
//# sourceMappingURL=HawkAPI.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ const JupiterSwap_1 = require("./JupiterSwap");
|
|
|
27
27
|
const Logging_1 = require("./Logging");
|
|
28
28
|
const Transactions_1 = require("./Transactions");
|
|
29
29
|
const CombineTransactions_1 = require("./CombineTransactions");
|
|
30
|
+
const RaydiumSDK_1 = require("./RaydiumSDK");
|
|
30
31
|
/**
|
|
31
32
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
32
33
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -118,5 +119,18 @@ class HawkAPI {
|
|
|
118
119
|
logging(flag) {
|
|
119
120
|
(0, Logging_1.logging)(flag);
|
|
120
121
|
}
|
|
122
|
+
/**
|
|
123
|
+
* Load the Raydium SDK
|
|
124
|
+
*
|
|
125
|
+
* @param connection The Solana connection
|
|
126
|
+
*/
|
|
127
|
+
raydiumSDK(connection) {
|
|
128
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
129
|
+
// Load the Raydium SDK
|
|
130
|
+
yield RaydiumSDK_1.RaydiumSDK.load(connection);
|
|
131
|
+
// Return the Raydium SDK instance
|
|
132
|
+
return RaydiumSDK_1.RaydiumSDK.instance();
|
|
133
|
+
});
|
|
134
|
+
}
|
|
121
135
|
}
|
|
122
136
|
exports.HawkAPI = HawkAPI;
|
|
@@ -1,5 +1,45 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
|
-
import { Raydium } from "@raydium-io/raydium-sdk-v2";
|
|
2
|
+
import { Raydium, ApiV3PoolInfoConcentratedItem } from "@raydium-io/raydium-sdk-v2";
|
|
3
|
+
/**
|
|
4
|
+
* Raydium SDK class
|
|
5
|
+
*
|
|
6
|
+
* This class is used to load the Raydium SDK and get the instance
|
|
7
|
+
*/
|
|
8
|
+
export declare class RaydiumSDK {
|
|
9
|
+
/**
|
|
10
|
+
* The instance of the Raydium SDK
|
|
11
|
+
*/
|
|
12
|
+
private static _instance;
|
|
13
|
+
/**
|
|
14
|
+
* The Raydium SDK instance
|
|
15
|
+
*/
|
|
16
|
+
sdk: Raydium;
|
|
17
|
+
/**
|
|
18
|
+
* Constructor
|
|
19
|
+
*
|
|
20
|
+
* @param sdk The Raydium SDK instance
|
|
21
|
+
*/
|
|
22
|
+
private constructor();
|
|
23
|
+
/**
|
|
24
|
+
* Get the instance of the Raydium SDK
|
|
25
|
+
*
|
|
26
|
+
* @returns The Raydium SDK instance
|
|
27
|
+
*/
|
|
28
|
+
static instance(): RaydiumSDK;
|
|
29
|
+
/**
|
|
30
|
+
* Load the Raydium SDK
|
|
31
|
+
*
|
|
32
|
+
* @param connection The Solana connection
|
|
33
|
+
*/
|
|
34
|
+
static load(connection: web3.Connection): Promise<void>;
|
|
35
|
+
/**
|
|
36
|
+
* Get pool info from Raydium API v3
|
|
37
|
+
*
|
|
38
|
+
* @param poolId The pool id to get the pool info from.
|
|
39
|
+
* @returns The pool info.
|
|
40
|
+
*/
|
|
41
|
+
getPoolInfoFromRpc(poolId: web3.PublicKey): Promise<ApiV3PoolInfoConcentratedItem>;
|
|
42
|
+
}
|
|
3
43
|
/**
|
|
4
44
|
* Load the Raydium SDK
|
|
5
45
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumSDK.d.ts","sourceRoot":"","sources":["../../../src/classes/RaydiumSDK.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"RaydiumSDK.d.ts","sourceRoot":"","sources":["../../../src/classes/RaydiumSDK.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAEpF;;;;GAIG;AACH,qBAAa,UAAU;IAErB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS,CAAa;IAErC;;OAEG;IACI,GAAG,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,OAAO;IAIP;;;;OAIG;IACH,MAAM,CAAC,QAAQ,IAAI,UAAU;IAI7B;;;;OAIG;WACU,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAiB7C;;;;;OAKG;IACG,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC;CAiDzF;AAED;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,iBAErD;AAED;;;;GAIG;AACH,wBAAgB,OAAO,YAEtB"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.raydium = exports.load = void 0;
|
|
12
|
+
exports.raydium = exports.load = exports.RaydiumSDK = void 0;
|
|
13
13
|
const raydium_sdk_v2_1 = require("@raydium-io/raydium-sdk-v2");
|
|
14
14
|
/**
|
|
15
15
|
* Raydium SDK class
|
|
@@ -53,7 +53,61 @@ class RaydiumSDK {
|
|
|
53
53
|
RaydiumSDK._instance = new RaydiumSDK(sdk);
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Get pool info from Raydium API v3
|
|
58
|
+
*
|
|
59
|
+
* @param poolId The pool id to get the pool info from.
|
|
60
|
+
* @returns The pool info.
|
|
61
|
+
*/
|
|
62
|
+
getPoolInfoFromRpc(poolId) {
|
|
63
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
const _poolInfo = yield fetch(`https://api-v3.raydium.io/pools/info/ids?ids=${poolId.toString()}`, {
|
|
65
|
+
method: 'GET',
|
|
66
|
+
headers: {
|
|
67
|
+
'Content-Type': 'application/json',
|
|
68
|
+
},
|
|
69
|
+
});
|
|
70
|
+
const data = yield _poolInfo.json();
|
|
71
|
+
const poolInfo = data.data[0];
|
|
72
|
+
const result = {
|
|
73
|
+
type: "Concentrated",
|
|
74
|
+
programId: poolInfo.programId,
|
|
75
|
+
id: poolInfo.id,
|
|
76
|
+
mintA: poolInfo.mintA,
|
|
77
|
+
mintB: poolInfo.mintB,
|
|
78
|
+
rewardDefaultInfos: poolInfo.rewardDefaultInfos,
|
|
79
|
+
rewardDefaultPoolInfos: poolInfo.rewardDefaultPoolInfos,
|
|
80
|
+
price: poolInfo.price,
|
|
81
|
+
mintAmountA: poolInfo.mintAmountA,
|
|
82
|
+
mintAmountB: poolInfo.mintAmountB,
|
|
83
|
+
feeRate: poolInfo.feeRate,
|
|
84
|
+
openTime: poolInfo.openTime,
|
|
85
|
+
tvl: poolInfo.tvl,
|
|
86
|
+
day: poolInfo.day,
|
|
87
|
+
week: poolInfo.week,
|
|
88
|
+
month: poolInfo.month,
|
|
89
|
+
pooltype: poolInfo.pooltype,
|
|
90
|
+
farmUpcomingCount: poolInfo.farmUpcomingCount,
|
|
91
|
+
farmOngoingCount: poolInfo.farmOngoingCount,
|
|
92
|
+
farmFinishedCount: poolInfo.farmFinishedCount,
|
|
93
|
+
burnPercent: poolInfo.burnPercent,
|
|
94
|
+
config: {
|
|
95
|
+
id: poolInfo.config.id,
|
|
96
|
+
index: poolInfo.config.index,
|
|
97
|
+
protocolFeeRate: poolInfo.config.protocolFeeRate,
|
|
98
|
+
tradeFeeRate: poolInfo.config.tradeFeeRate,
|
|
99
|
+
tickSpacing: poolInfo.config.tickSpacing,
|
|
100
|
+
fundFeeRate: poolInfo.config.fundFeeRate,
|
|
101
|
+
description: poolInfo.config.description,
|
|
102
|
+
defaultRange: poolInfo.config.defaultRange,
|
|
103
|
+
defaultRangePoint: poolInfo.config.defaultRangePoint,
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
return result;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
56
109
|
}
|
|
110
|
+
exports.RaydiumSDK = RaydiumSDK;
|
|
57
111
|
/**
|
|
58
112
|
* Load the Raydium SDK
|
|
59
113
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAoBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,+BAA+B,EAC/B,kCAAkC,EAClC,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,QAAQ,EAGR,WAAW,EACX,6BAA6B,EAC7B,2BAA2B,EAC3B,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EAEpB,gBAAgB,EAChB,+BAA+B,EAChC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const spl_token_1 = require("@solana/spl-token");
|
|
|
56
56
|
const whirlpools_sdk_1 = require("@orca-so/whirlpools-sdk");
|
|
57
57
|
const anchor = __importStar(require("@coral-xyz/anchor"));
|
|
58
58
|
const RaydiumIxGenerator_1 = require("../ixGenerator/RaydiumIxGenerator");
|
|
59
|
+
const RaydiumSDK_1 = require("./RaydiumSDK");
|
|
59
60
|
class Transactions {
|
|
60
61
|
/**
|
|
61
62
|
* Prohibit creating instance other than getInstance
|
|
@@ -2132,12 +2133,19 @@ class Transactions {
|
|
|
2132
2133
|
*/
|
|
2133
2134
|
raydiumOpenPosition(_a) {
|
|
2134
2135
|
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
2135
|
-
//
|
|
2136
|
-
|
|
2137
|
-
//
|
|
2138
|
-
|
|
2139
|
-
//
|
|
2140
|
-
|
|
2136
|
+
// Load the Raydium SDK
|
|
2137
|
+
yield (0, RaydiumSDK_1.load)(connection);
|
|
2138
|
+
// Get the Raydium SDK instance
|
|
2139
|
+
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2140
|
+
// Get the pool keys (for lookup table account)
|
|
2141
|
+
(0, functions_1.benchmark)({ name: `raydiumOpenPosition`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2142
|
+
const poolKeys = yield sdk.clmm.getClmmPoolKeys(params.poolState.toString());
|
|
2143
|
+
(0, functions_1.benchmark)({ name: `raydiumOpenPosition`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2144
|
+
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2145
|
+
const addressLookupTableAddresses = [];
|
|
2146
|
+
if (poolKeys.lookupTableAccount) {
|
|
2147
|
+
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2148
|
+
}
|
|
2141
2149
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2142
2150
|
poolState: params.poolState,
|
|
2143
2151
|
});
|
|
@@ -2202,7 +2210,7 @@ class Transactions {
|
|
|
2202
2210
|
return yield (0, functions_1.createTransactionMeta)({
|
|
2203
2211
|
payer: params.userWallet,
|
|
2204
2212
|
description: `Open Raydium Position`,
|
|
2205
|
-
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2213
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...addressLookupTableAddresses],
|
|
2206
2214
|
mainInstructions,
|
|
2207
2215
|
});
|
|
2208
2216
|
});
|
|
@@ -2220,6 +2228,19 @@ class Transactions {
|
|
|
2220
2228
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2221
2229
|
personalPosition: params.personalPosition,
|
|
2222
2230
|
});
|
|
2231
|
+
// Load the Raydium SDK
|
|
2232
|
+
yield (0, RaydiumSDK_1.load)(connection);
|
|
2233
|
+
// Get the Raydium SDK instance
|
|
2234
|
+
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2235
|
+
// Get the pool keys (for lookup table account)
|
|
2236
|
+
(0, functions_1.benchmark)({ name: `raydiumWithdrawAndClosePosition`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2237
|
+
const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
|
|
2238
|
+
(0, functions_1.benchmark)({ name: `raydiumWithdrawAndClosePosition`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2239
|
+
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2240
|
+
const addressLookupTableAddresses = [];
|
|
2241
|
+
if (poolKeys.lookupTableAccount) {
|
|
2242
|
+
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2243
|
+
}
|
|
2223
2244
|
const withdrawIx = yield this.ix.iyfMain.withdrawMultipleLamportPdaToken({
|
|
2224
2245
|
userWallet: params.userWallet,
|
|
2225
2246
|
withdraw: [
|
|
@@ -2279,7 +2300,7 @@ class Transactions {
|
|
|
2279
2300
|
return (0, functions_1.createTransactionMeta)({
|
|
2280
2301
|
payer: params.userWallet,
|
|
2281
2302
|
description: `Close Raydium Position`,
|
|
2282
|
-
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2303
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...addressLookupTableAddresses],
|
|
2283
2304
|
mainInstructions,
|
|
2284
2305
|
});
|
|
2285
2306
|
}
|
|
@@ -2296,7 +2317,7 @@ class Transactions {
|
|
|
2296
2317
|
return (0, functions_1.createTransactionMeta)({
|
|
2297
2318
|
payer: params.userWallet,
|
|
2298
2319
|
description: `Withdraw and close Raydium Position`,
|
|
2299
|
-
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2320
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...addressLookupTableAddresses],
|
|
2300
2321
|
mainInstructions,
|
|
2301
2322
|
});
|
|
2302
2323
|
}
|
|
@@ -2345,6 +2366,19 @@ class Transactions {
|
|
|
2345
2366
|
});
|
|
2346
2367
|
const tokenMint0 = fetch.poolStateInfo.tokenMint0;
|
|
2347
2368
|
const tokenMint1 = fetch.poolStateInfo.tokenMint1;
|
|
2369
|
+
// Load the Raydium SDK
|
|
2370
|
+
yield (0, RaydiumSDK_1.load)(connection);
|
|
2371
|
+
// Get the Raydium SDK instance
|
|
2372
|
+
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2373
|
+
// Get the pool keys (for lookup table account)
|
|
2374
|
+
(0, functions_1.benchmark)({ name: `raydiumIncreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2375
|
+
const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
|
|
2376
|
+
(0, functions_1.benchmark)({ name: `raydiumIncreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2377
|
+
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2378
|
+
const addressLookupTableAddresses = [];
|
|
2379
|
+
if (poolKeys.lookupTableAccount) {
|
|
2380
|
+
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2381
|
+
}
|
|
2348
2382
|
const { liquidity, amount0Max: amountX, amount1Max: amountY, } = yield (0, RaydiumIxGenerator_1.getLiquidityFromAmounts)(connection, fetch.positionInfo.poolId, params.amountX, params.amountY, fetch.positionInfo.tickLowerIndex, fetch.positionInfo.tickUpperIndex, params.slippage, true);
|
|
2349
2383
|
const wrapIxs = (0, functions_1.wrapSolIfMintIsWsol)(params.userWallet, params.userWallet, [
|
|
2350
2384
|
{ mint: tokenMint0, amount: amountX },
|
|
@@ -2386,7 +2420,7 @@ class Transactions {
|
|
|
2386
2420
|
return (0, functions_1.createTransactionMeta)({
|
|
2387
2421
|
payer: params.userWallet,
|
|
2388
2422
|
description: `Raydium increase liquidity`,
|
|
2389
|
-
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2423
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...addressLookupTableAddresses],
|
|
2390
2424
|
mainInstructions,
|
|
2391
2425
|
});
|
|
2392
2426
|
});
|
|
@@ -2403,6 +2437,19 @@ class Transactions {
|
|
|
2403
2437
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2404
2438
|
personalPosition: params.personalPosition,
|
|
2405
2439
|
});
|
|
2440
|
+
// Load the Raydium SDK
|
|
2441
|
+
yield (0, RaydiumSDK_1.load)(connection);
|
|
2442
|
+
// Get the Raydium SDK instance
|
|
2443
|
+
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2444
|
+
// Get the pool keys (for lookup table account)
|
|
2445
|
+
(0, functions_1.benchmark)({ name: `raydiumDecreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2446
|
+
const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
|
|
2447
|
+
(0, functions_1.benchmark)({ name: `raydiumDecreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2448
|
+
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2449
|
+
const addressLookupTableAddresses = [];
|
|
2450
|
+
if (poolKeys.lookupTableAccount) {
|
|
2451
|
+
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2452
|
+
}
|
|
2406
2453
|
const withdrawIx = yield this.ix.iyfMain.withdrawMultipleLamportPdaToken({
|
|
2407
2454
|
userWallet: params.userWallet,
|
|
2408
2455
|
withdraw: [
|
|
@@ -2446,7 +2493,7 @@ class Transactions {
|
|
|
2446
2493
|
return (0, functions_1.createTransactionMeta)({
|
|
2447
2494
|
payer: params.userWallet,
|
|
2448
2495
|
description: `Raydium decrease liquidity`,
|
|
2449
|
-
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2496
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...addressLookupTableAddresses],
|
|
2450
2497
|
mainInstructions,
|
|
2451
2498
|
});
|
|
2452
2499
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -428,15 +428,16 @@ exports.RaydiumIxGenerator = RaydiumIxGenerator;
|
|
|
428
428
|
function getLiquidityFromAmounts(connection, poolId, amountA, amountB, tickLower, tickUpper, slippage, add) {
|
|
429
429
|
return __awaiter(this, void 0, void 0, function* () {
|
|
430
430
|
// Load the Raydium SDK
|
|
431
|
-
yield
|
|
432
|
-
// Get the Raydium SDK instance
|
|
433
|
-
const sdk =
|
|
431
|
+
yield RaydiumSDK_1.RaydiumSDK.load(connection);
|
|
432
|
+
// // Get the Raydium SDK instance
|
|
433
|
+
// const sdk = RaydiumSDK.instance().sdk;
|
|
434
434
|
// Benchmark the getPoolInfoFromRpc function
|
|
435
435
|
(0, functions_1.benchmark)({ name: `getLiquidityFromAmounts`, msg: `getPoolInfoFromRpc` });
|
|
436
436
|
// Get the pool info
|
|
437
|
-
let { poolInfo } =
|
|
437
|
+
// let { poolInfo } = await sdk.clmm.getPoolInfoFromRpc(poolId.toString());
|
|
438
|
+
let poolInfo = yield RaydiumSDK_1.RaydiumSDK.instance().getPoolInfoFromRpc(poolId);
|
|
438
439
|
// Fallback in case poolInfo is undefined
|
|
439
|
-
poolInfo = poolInfo ? poolInfo : (
|
|
440
|
+
// poolInfo = poolInfo ? poolInfo : (await sdk.clmm.getPoolInfoFromRpc(poolId.toString()))[poolInfo];
|
|
440
441
|
// Benchmark the getPoolInfoFromRpc function (end)
|
|
441
442
|
(0, functions_1.benchmark)({ name: `getLiquidityFromAmounts`, msg: `getPoolInfoFromRpc`, end: true });
|
|
442
443
|
// Benchmark the getEpochInfo function
|
|
@@ -475,13 +476,14 @@ exports.getLiquidityFromAmounts = getLiquidityFromAmounts;
|
|
|
475
476
|
function getAmountsFromLiquidity(connection, poolId, liquidity, tickLower, tickUpper, slippage, add) {
|
|
476
477
|
return __awaiter(this, void 0, void 0, function* () {
|
|
477
478
|
// Load the Raydium SDK
|
|
478
|
-
yield
|
|
479
|
-
// Get the Raydium SDK instance
|
|
480
|
-
const sdk =
|
|
479
|
+
yield RaydiumSDK_1.RaydiumSDK.load(connection);
|
|
480
|
+
// // Get the Raydium SDK instance
|
|
481
|
+
// const sdk = RaydiumSDK.sdk();
|
|
481
482
|
// Benchmark the getPoolInfoFromRpc function
|
|
482
483
|
(0, functions_1.benchmark)({ name: `getAmountsFromLiquidity`, msg: `getPoolInfoFromRpc` });
|
|
483
484
|
// Get the pool info
|
|
484
|
-
let { poolInfo } =
|
|
485
|
+
// let { poolInfo } = await sdk.clmm.getPoolInfoFromRpc(poolId.toString());
|
|
486
|
+
let poolInfo = yield RaydiumSDK_1.RaydiumSDK.instance().getPoolInfoFromRpc(poolId);
|
|
485
487
|
// Benchmark the getPoolInfoFromRpc function (end)
|
|
486
488
|
(0, functions_1.benchmark)({ name: `getAmountsFromLiquidity`, msg: `getPoolInfoFromRpc`, end: true });
|
|
487
489
|
// Benchmark the getEpochInfo function
|