@hawksightco/hawk-sdk 1.2.72 → 1.2.73
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 +0 -8
- package/dist/src/classes/HawkAPI.d.ts.map +1 -1
- package/dist/src/classes/HawkAPI.js +0 -14
- package/dist/src/classes/RaydiumSDK.d.ts +1 -41
- package/dist/src/classes/RaydiumSDK.d.ts.map +1 -1
- package/dist/src/classes/RaydiumSDK.js +1 -55
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +7 -60
- package/dist/src/classes/TxGenerator.d.ts +0 -1
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/hawksight.d.ts +0 -1
- package/dist/src/hawksight.d.ts.map +1 -1
- package/dist/src/hawksight.js +2 -8
- package/dist/src/hsToMeteora.js +2 -1
- package/dist/src/idl/iyf-main-idl.d.ts +134 -10
- package/dist/src/idl/iyf-main-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-main-idl.js +134 -10
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts +0 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts +2 -2
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.js +22 -24
- package/package.json +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import * as web3 from "@solana/web3.js";
|
|
2
1
|
import { General } from "./General";
|
|
3
2
|
import { Health } from "./Health";
|
|
4
3
|
import { TxGenerator } from "./TxGenerator";
|
|
@@ -14,7 +13,6 @@ import { Atomicity } from "./Atomicity";
|
|
|
14
13
|
import { JupiterAlts } from "./JupiterAlts";
|
|
15
14
|
import { JupiterSwap } from "./JupiterSwap";
|
|
16
15
|
import { SimplePdaGenerator } from './SimplePdaGenerator';
|
|
17
|
-
import { RaydiumSDK } from "./RaydiumSDK";
|
|
18
16
|
/**
|
|
19
17
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
20
18
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -88,11 +86,5 @@ export declare class HawkAPI {
|
|
|
88
86
|
* @param flag
|
|
89
87
|
*/
|
|
90
88
|
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>;
|
|
97
89
|
}
|
|
98
90
|
//# 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":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D;;;;;;;;GAQG;AACH,qBAAa,OAAO;IA2ChB,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IA3C7B,+BAA+B;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC,iEAAiE;IACjE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,6GAA6G;IAC7G,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,+BAA+B;IAC/B,SAAgB,cAAc,EAAE,cAAc,CAAC;IAE/C,0FAA0F;IAC1F,SAAgB,IAAI,EAAE,IAAI,CAAC;IAE3B,mFAAmF;IACnF,OAAO,CAAC,YAAY,CAAc;IAClC,IAAI,WAAW,gBAAgC;IAE/C,kGAAkG;IAClG,SAAgB,qBAAqB,EAAE,sBAAsB,CAAC;IAE9D,mDAAmD;IACnD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,mCAAmC;IACnC,SAAgB,EAAE,EAAE,iBAAiB,CAAC;IAEtC,mBAAmB;IACnB,SAAgB,OAAO,EAAE,WAAW,CAAC;IAErC,mBAAmB;IACnB,SAAgB,WAAW,EAAE,WAAW,CAAC;IAEzC,2BAA2B;IAC3B,SAAgB,GAAG,EAAE,kBAAkB,CAAC;IAExC;;;OAGG;gBAEkB,GAAG,GAAE,MAAoC,EACzC,OAAO,CAAC,4BAAgB;IA4B7C;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,KAAK,WAAW;IAI9F;;;;;OAKG;IACG,OAAO,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;IAWzJ;;;;OAIG;IACH,YAAY,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;IAW5G;;;;OAIG;IACH,SAAS,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;IAYzG;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,OAAO;CAGtB"}
|
|
@@ -27,7 +27,6 @@ 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");
|
|
31
30
|
/**
|
|
32
31
|
* HawkAPI is a central gateway class that aggregates access to various functional modules
|
|
33
32
|
* for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
|
|
@@ -119,18 +118,5 @@ class HawkAPI {
|
|
|
119
118
|
logging(flag) {
|
|
120
119
|
(0, Logging_1.logging)(flag);
|
|
121
120
|
}
|
|
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
|
-
}
|
|
135
121
|
}
|
|
136
122
|
exports.HawkAPI = HawkAPI;
|
|
@@ -1,45 +1,5 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
|
-
import { Raydium
|
|
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
|
-
}
|
|
2
|
+
import { Raydium } from "@raydium-io/raydium-sdk-v2";
|
|
43
3
|
/**
|
|
44
4
|
* Load the Raydium SDK
|
|
45
5
|
*
|
|
@@ -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,
|
|
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;AA4DrD;;;;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 =
|
|
12
|
+
exports.raydium = exports.load = void 0;
|
|
13
13
|
const raydium_sdk_v2_1 = require("@raydium-io/raydium-sdk-v2");
|
|
14
14
|
/**
|
|
15
15
|
* Raydium SDK class
|
|
@@ -53,61 +53,7 @@ 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
|
-
}
|
|
109
56
|
}
|
|
110
|
-
exports.RaydiumSDK = RaydiumSDK;
|
|
111
57
|
/**
|
|
112
58
|
* Load the Raydium SDK
|
|
113
59
|
*
|
|
@@ -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,7 +56,6 @@ 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");
|
|
60
59
|
class Transactions {
|
|
61
60
|
/**
|
|
62
61
|
* Prohibit creating instance other than getInstance
|
|
@@ -2133,19 +2132,6 @@ class Transactions {
|
|
|
2133
2132
|
*/
|
|
2134
2133
|
raydiumOpenPosition(_a) {
|
|
2135
2134
|
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
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
|
-
}
|
|
2149
2135
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2150
2136
|
poolState: params.poolState,
|
|
2151
2137
|
});
|
|
@@ -2163,7 +2149,7 @@ class Transactions {
|
|
|
2163
2149
|
toPubkey: userPdaLamport,
|
|
2164
2150
|
lamports,
|
|
2165
2151
|
});
|
|
2166
|
-
const { liquidity, amount0Max: amountX, amount1Max: amountY, } = yield (0, RaydiumIxGenerator_1.getLiquidityFromAmounts)(connection, params.poolState, params.amountX, params.amountY, params.tickLowerIndex, params.tickUpperIndex, params.slippage
|
|
2152
|
+
const { liquidity, amount0Max: amountX, amount1Max: amountY, } = yield (0, RaydiumIxGenerator_1.getLiquidityFromAmounts)(connection, params.poolState, params.amountX, params.amountY, params.tickLowerIndex, params.tickUpperIndex, params.slippage);
|
|
2167
2153
|
const wrapIxs = (0, functions_1.wrapSolIfMintIsWsol)(params.userWallet, params.userWallet, [
|
|
2168
2154
|
{ mint: tokenMint0, amount: amountX },
|
|
2169
2155
|
{ mint: tokenMint1, amount: amountY },
|
|
@@ -2210,7 +2196,7 @@ class Transactions {
|
|
|
2210
2196
|
return yield (0, functions_1.createTransactionMeta)({
|
|
2211
2197
|
payer: params.userWallet,
|
|
2212
2198
|
description: `Open Raydium Position`,
|
|
2213
|
-
addressLookupTableAddresses:
|
|
2199
|
+
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2214
2200
|
mainInstructions,
|
|
2215
2201
|
});
|
|
2216
2202
|
});
|
|
@@ -2228,19 +2214,6 @@ class Transactions {
|
|
|
2228
2214
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2229
2215
|
personalPosition: params.personalPosition,
|
|
2230
2216
|
});
|
|
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
|
-
}
|
|
2244
2217
|
const withdrawIx = yield this.ix.iyfMain.withdrawMultipleLamportPdaToken({
|
|
2245
2218
|
userWallet: params.userWallet,
|
|
2246
2219
|
withdraw: [
|
|
@@ -2293,7 +2266,7 @@ class Transactions {
|
|
|
2293
2266
|
return (0, functions_1.createTransactionMeta)({
|
|
2294
2267
|
payer: params.userWallet,
|
|
2295
2268
|
description: `Close Raydium Position`,
|
|
2296
|
-
addressLookupTableAddresses:
|
|
2269
|
+
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2297
2270
|
mainInstructions,
|
|
2298
2271
|
});
|
|
2299
2272
|
}
|
|
@@ -2309,7 +2282,7 @@ class Transactions {
|
|
|
2309
2282
|
return (0, functions_1.createTransactionMeta)({
|
|
2310
2283
|
payer: params.userWallet,
|
|
2311
2284
|
description: `Withdraw and close Raydium Position`,
|
|
2312
|
-
addressLookupTableAddresses:
|
|
2285
|
+
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2313
2286
|
mainInstructions,
|
|
2314
2287
|
});
|
|
2315
2288
|
}
|
|
@@ -2358,20 +2331,7 @@ class Transactions {
|
|
|
2358
2331
|
});
|
|
2359
2332
|
const tokenMint0 = fetch.poolStateInfo.tokenMint0;
|
|
2360
2333
|
const tokenMint1 = fetch.poolStateInfo.tokenMint1;
|
|
2361
|
-
|
|
2362
|
-
yield (0, RaydiumSDK_1.load)(connection);
|
|
2363
|
-
// Get the Raydium SDK instance
|
|
2364
|
-
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2365
|
-
// Get the pool keys (for lookup table account)
|
|
2366
|
-
(0, functions_1.benchmark)({ name: `raydiumIncreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2367
|
-
const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
|
|
2368
|
-
(0, functions_1.benchmark)({ name: `raydiumIncreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2369
|
-
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2370
|
-
const addressLookupTableAddresses = [];
|
|
2371
|
-
if (poolKeys.lookupTableAccount) {
|
|
2372
|
-
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2373
|
-
}
|
|
2374
|
-
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);
|
|
2334
|
+
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);
|
|
2375
2335
|
const wrapIxs = (0, functions_1.wrapSolIfMintIsWsol)(params.userWallet, params.userWallet, [
|
|
2376
2336
|
{ mint: tokenMint0, amount: amountX },
|
|
2377
2337
|
{ mint: tokenMint1, amount: amountY },
|
|
@@ -2412,7 +2372,7 @@ class Transactions {
|
|
|
2412
2372
|
return (0, functions_1.createTransactionMeta)({
|
|
2413
2373
|
payer: params.userWallet,
|
|
2414
2374
|
description: `Raydium increase liquidity`,
|
|
2415
|
-
addressLookupTableAddresses:
|
|
2375
|
+
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2416
2376
|
mainInstructions,
|
|
2417
2377
|
});
|
|
2418
2378
|
});
|
|
@@ -2429,19 +2389,6 @@ class Transactions {
|
|
|
2429
2389
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
2430
2390
|
personalPosition: params.personalPosition,
|
|
2431
2391
|
});
|
|
2432
|
-
// Load the Raydium SDK
|
|
2433
|
-
yield (0, RaydiumSDK_1.load)(connection);
|
|
2434
|
-
// Get the Raydium SDK instance
|
|
2435
|
-
const sdk = (0, RaydiumSDK_1.raydium)();
|
|
2436
|
-
// Get the pool keys (for lookup table account)
|
|
2437
|
-
(0, functions_1.benchmark)({ name: `raydiumDecreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys` });
|
|
2438
|
-
const poolKeys = yield sdk.clmm.getClmmPoolKeys(fetch.positionInfo.poolId.toString());
|
|
2439
|
-
(0, functions_1.benchmark)({ name: `raydiumDecreaseLiquidity`, msg: `sdk.clmm.getClmmPoolKeys`, end: true });
|
|
2440
|
-
console.log("pool lookup table account:", poolKeys.lookupTableAccount);
|
|
2441
|
-
const addressLookupTableAddresses = [];
|
|
2442
|
-
if (poolKeys.lookupTableAccount) {
|
|
2443
|
-
addressLookupTableAddresses.push(poolKeys.lookupTableAccount);
|
|
2444
|
-
}
|
|
2445
2392
|
const withdrawIx = yield this.ix.iyfMain.withdrawMultipleLamportPdaToken({
|
|
2446
2393
|
userWallet: params.userWallet,
|
|
2447
2394
|
withdraw: [
|
|
@@ -2485,7 +2432,7 @@ class Transactions {
|
|
|
2485
2432
|
return (0, functions_1.createTransactionMeta)({
|
|
2486
2433
|
payer: params.userWallet,
|
|
2487
2434
|
description: `Raydium decrease liquidity`,
|
|
2488
|
-
addressLookupTableAddresses:
|
|
2435
|
+
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
2489
2436
|
mainInstructions,
|
|
2490
2437
|
});
|
|
2491
2438
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAC;AACvD,OAAO,EACL,6BAA6B,EAC7B,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EAInB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kCAAkC,EAClC,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,wBAAwB,EACxB,aAAa,EACb,sBAAsB,EACtB,qBAAqB,EACrB,SAAS,EACT,+BAA+B,EAChC,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,MAAM,OAAO,CAAC;AAEvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
|
package/dist/src/hawksight.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,wCAyCA;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,wCAyCA;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,wCAyCA;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,wCAyCA;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUrH;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUxH;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,wBAAsB,UAAU,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAkBtG"}
|
package/dist/src/hawksight.js
CHANGED
|
@@ -190,11 +190,11 @@ function withdrawMultipleTokenV2(params) {
|
|
|
190
190
|
const farm = addresses_1.USDC_FARM;
|
|
191
191
|
const userPda = util.generateUserPda(params.payer, farm);
|
|
192
192
|
const remainingAccounts = [];
|
|
193
|
-
let amounts = [];
|
|
194
193
|
let skipIdempotent = false;
|
|
195
194
|
params.withdraw.map((d) => {
|
|
196
195
|
const mint = d.mint;
|
|
197
196
|
const userToken = util.generateAta(params.payer, d.mint);
|
|
197
|
+
// const userPdaToken = params.useSta ? util.generateUserPdaStorageAccount(userPda, d.mint) : util.generateAta(userPda, d.mint);
|
|
198
198
|
const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint);
|
|
199
199
|
let userPdaToken;
|
|
200
200
|
if (params.pdaTokenType === types_1.TokenType.LTA) {
|
|
@@ -224,15 +224,9 @@ function withdrawMultipleTokenV2(params) {
|
|
|
224
224
|
isSigner: false,
|
|
225
225
|
isWritable: true,
|
|
226
226
|
});
|
|
227
|
-
if (d.amount && amounts !== null) {
|
|
228
|
-
amounts.push(d.amount);
|
|
229
|
-
}
|
|
230
|
-
else {
|
|
231
|
-
amounts = null;
|
|
232
|
-
}
|
|
233
227
|
});
|
|
234
228
|
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
235
|
-
.withdrawMultipleTokenV2(skipIdempotent
|
|
229
|
+
.withdrawMultipleTokenV2(skipIdempotent)
|
|
236
230
|
.accounts({
|
|
237
231
|
farm,
|
|
238
232
|
userPda,
|
package/dist/src/hsToMeteora.js
CHANGED
|
@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.meteoraToHawksightPdaIxs = exports.meteoraToHawksightAutomationIxs = exports.meteoraToHawksight = void 0;
|
|
39
|
+
const web3 = __importStar(require("@solana/web3.js"));
|
|
39
40
|
const types_1 = require("./types");
|
|
40
41
|
const addresses_1 = require("./addresses");
|
|
41
42
|
const anchor_1 = require("./anchor");
|
|
@@ -1274,7 +1275,7 @@ class RemoveLiquidityAutomation extends HawksightMeteoraAutomationCpi {
|
|
|
1274
1275
|
hawksightAuthority,
|
|
1275
1276
|
position: this.ix.keys[0].pubkey,
|
|
1276
1277
|
lbPair: this.ix.keys[1].pubkey,
|
|
1277
|
-
binArrayBitmapExtension: this.ix.keys[2].pubkey,
|
|
1278
|
+
binArrayBitmapExtension: new web3.PublicKey("LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo"), //this.ix.keys[2].pubkey,
|
|
1278
1279
|
userTokenX: this.ix.keys[3].pubkey,
|
|
1279
1280
|
userTokenY: this.ix.keys[4].pubkey,
|
|
1280
1281
|
reserveX: this.ix.keys[5].pubkey,
|
|
@@ -6260,14 +6260,6 @@ export type IndexYieldFarming = {
|
|
|
6260
6260
|
{
|
|
6261
6261
|
"name": "skipIdempotent";
|
|
6262
6262
|
"type": "bool";
|
|
6263
|
-
},
|
|
6264
|
-
{
|
|
6265
|
-
"name": "amount";
|
|
6266
|
-
"type": {
|
|
6267
|
-
"option": {
|
|
6268
|
-
"vec": "u64";
|
|
6269
|
-
};
|
|
6270
|
-
};
|
|
6271
6263
|
}
|
|
6272
6264
|
];
|
|
6273
6265
|
},
|
|
@@ -7064,6 +7056,138 @@ export type IndexYieldFarming = {
|
|
|
7064
7056
|
}
|
|
7065
7057
|
];
|
|
7066
7058
|
"args": [];
|
|
7059
|
+
},
|
|
7060
|
+
{
|
|
7061
|
+
"name": "fuelDeposit";
|
|
7062
|
+
"accounts": [
|
|
7063
|
+
{
|
|
7064
|
+
"name": "userPda";
|
|
7065
|
+
"isMut": false;
|
|
7066
|
+
"isSigner": false;
|
|
7067
|
+
"pda": {
|
|
7068
|
+
"seeds": [
|
|
7069
|
+
{
|
|
7070
|
+
"kind": "const";
|
|
7071
|
+
"type": "string";
|
|
7072
|
+
"value": "multi-user";
|
|
7073
|
+
},
|
|
7074
|
+
{
|
|
7075
|
+
"kind": "account";
|
|
7076
|
+
"type": "publicKey";
|
|
7077
|
+
"account": "UserAccountMulti";
|
|
7078
|
+
"path": "user_pda.farm";
|
|
7079
|
+
},
|
|
7080
|
+
{
|
|
7081
|
+
"kind": "account";
|
|
7082
|
+
"type": "publicKey";
|
|
7083
|
+
"path": "authority";
|
|
7084
|
+
}
|
|
7085
|
+
];
|
|
7086
|
+
};
|
|
7087
|
+
},
|
|
7088
|
+
{
|
|
7089
|
+
"name": "authority";
|
|
7090
|
+
"isMut": true;
|
|
7091
|
+
"isSigner": true;
|
|
7092
|
+
},
|
|
7093
|
+
{
|
|
7094
|
+
"name": "fuelAccount";
|
|
7095
|
+
"isMut": true;
|
|
7096
|
+
"isSigner": false;
|
|
7097
|
+
"pda": {
|
|
7098
|
+
"seeds": [
|
|
7099
|
+
{
|
|
7100
|
+
"kind": "const";
|
|
7101
|
+
"type": "string";
|
|
7102
|
+
"value": "fuel";
|
|
7103
|
+
},
|
|
7104
|
+
{
|
|
7105
|
+
"kind": "account";
|
|
7106
|
+
"type": "publicKey";
|
|
7107
|
+
"account": "UserAccountMulti";
|
|
7108
|
+
"path": "user_pda.authority";
|
|
7109
|
+
}
|
|
7110
|
+
];
|
|
7111
|
+
};
|
|
7112
|
+
},
|
|
7113
|
+
{
|
|
7114
|
+
"name": "systemProgram";
|
|
7115
|
+
"isMut": false;
|
|
7116
|
+
"isSigner": false;
|
|
7117
|
+
}
|
|
7118
|
+
];
|
|
7119
|
+
"args": [
|
|
7120
|
+
{
|
|
7121
|
+
"name": "amount";
|
|
7122
|
+
"type": "u64";
|
|
7123
|
+
}
|
|
7124
|
+
];
|
|
7125
|
+
},
|
|
7126
|
+
{
|
|
7127
|
+
"name": "fuelWithdraw";
|
|
7128
|
+
"accounts": [
|
|
7129
|
+
{
|
|
7130
|
+
"name": "userPda";
|
|
7131
|
+
"isMut": false;
|
|
7132
|
+
"isSigner": false;
|
|
7133
|
+
"pda": {
|
|
7134
|
+
"seeds": [
|
|
7135
|
+
{
|
|
7136
|
+
"kind": "const";
|
|
7137
|
+
"type": "string";
|
|
7138
|
+
"value": "multi-user";
|
|
7139
|
+
},
|
|
7140
|
+
{
|
|
7141
|
+
"kind": "account";
|
|
7142
|
+
"type": "publicKey";
|
|
7143
|
+
"account": "UserAccountMulti";
|
|
7144
|
+
"path": "user_pda.farm";
|
|
7145
|
+
},
|
|
7146
|
+
{
|
|
7147
|
+
"kind": "account";
|
|
7148
|
+
"type": "publicKey";
|
|
7149
|
+
"path": "authority";
|
|
7150
|
+
}
|
|
7151
|
+
];
|
|
7152
|
+
};
|
|
7153
|
+
},
|
|
7154
|
+
{
|
|
7155
|
+
"name": "authority";
|
|
7156
|
+
"isMut": true;
|
|
7157
|
+
"isSigner": true;
|
|
7158
|
+
},
|
|
7159
|
+
{
|
|
7160
|
+
"name": "fuelAccount";
|
|
7161
|
+
"isMut": true;
|
|
7162
|
+
"isSigner": false;
|
|
7163
|
+
"pda": {
|
|
7164
|
+
"seeds": [
|
|
7165
|
+
{
|
|
7166
|
+
"kind": "const";
|
|
7167
|
+
"type": "string";
|
|
7168
|
+
"value": "fuel";
|
|
7169
|
+
},
|
|
7170
|
+
{
|
|
7171
|
+
"kind": "account";
|
|
7172
|
+
"type": "publicKey";
|
|
7173
|
+
"account": "UserAccountMulti";
|
|
7174
|
+
"path": "user_pda.authority";
|
|
7175
|
+
}
|
|
7176
|
+
];
|
|
7177
|
+
};
|
|
7178
|
+
},
|
|
7179
|
+
{
|
|
7180
|
+
"name": "systemProgram";
|
|
7181
|
+
"isMut": false;
|
|
7182
|
+
"isSigner": false;
|
|
7183
|
+
}
|
|
7184
|
+
];
|
|
7185
|
+
"args": [
|
|
7186
|
+
{
|
|
7187
|
+
"name": "amount";
|
|
7188
|
+
"type": "u64";
|
|
7189
|
+
}
|
|
7190
|
+
];
|
|
7067
7191
|
}
|
|
7068
7192
|
];
|
|
7069
7193
|
"accounts": [
|
|
@@ -7701,8 +7825,8 @@ export type IndexYieldFarming = {
|
|
|
7701
7825
|
},
|
|
7702
7826
|
{
|
|
7703
7827
|
"code": 6036;
|
|
7704
|
-
"name": "
|
|
7705
|
-
"msg": "Invalid
|
|
7828
|
+
"name": "InvalidFuelAccount";
|
|
7829
|
+
"msg": "Invalid fuel account";
|
|
7706
7830
|
}
|
|
7707
7831
|
];
|
|
7708
7832
|
};
|