@hawksightco/hawk-sdk 1.3.207 → 1.3.209
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/CombineTransactions.d.ts.map +1 -1
- package/dist/src/classes/CombineTransactions.js +11 -41
- package/dist/src/classes/CreateTxMetadata.d.ts +18 -1
- package/dist/src/classes/CreateTxMetadata.d.ts.map +1 -1
- package/dist/src/classes/CreateTxMetadata.js +89 -0
- package/dist/src/classes/Transaction.d.ts.map +1 -1
- package/dist/src/classes/TransactionBatchExecute2.js +2 -2
- package/dist/src/classes/Transactions.d.ts +10 -64
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +318 -258
- package/dist/src/classes/TxGenerator.d.ts +5 -40
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/classes/TxGenerator.js +4 -187
- package/dist/src/functions.d.ts +76 -1
- package/dist/src/functions.d.ts.map +1 -1
- package/dist/src/functions.js +161 -0
- package/dist/src/hsToMeteora.d.ts +8 -1
- package/dist/src/hsToMeteora.d.ts.map +1 -1
- package/dist/src/hsToMeteora.js +121 -39
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts +15 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.js +159 -0
- package/dist/src/meteora/liquidityStrategy.d.ts.map +1 -1
- package/dist/src/meteora/liquidityStrategy.js +1 -0
- package/dist/src/meteora.d.ts +79 -1
- package/dist/src/meteora.d.ts.map +1 -1
- package/dist/src/meteora.js +175 -1
- package/dist/src/types.d.ts +40 -0
- package/dist/src/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CombineTransactions.d.ts","sourceRoot":"","sources":["../../../src/classes/CombineTransactions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"CombineTransactions.d.ts","sourceRoot":"","sources":["../../../src/classes/CombineTransactions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE9F,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAAd,cAAc,EAAE,cAAc;IAGjD;;OAEG;IACU,OAAO,CAAC,EACnB,UAAU,EACV,KAAK,EACL,WAAW,EACX,YAAY,EACZ,aAAa,GACd,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;CAkChF"}
|
|
@@ -1,37 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
36
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
37
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -43,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
43
10
|
};
|
|
44
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
12
|
exports.CombineTransactions = void 0;
|
|
46
|
-
const web3 = __importStar(require("@solana/web3.js"));
|
|
47
13
|
const functions_1 = require("../functions");
|
|
48
|
-
const Transaction_1 = require("./Transaction");
|
|
49
14
|
class CombineTransactions {
|
|
50
15
|
constructor(generalUtility) {
|
|
51
16
|
this.generalUtility = generalUtility;
|
|
@@ -55,18 +20,23 @@ class CombineTransactions {
|
|
|
55
20
|
*/
|
|
56
21
|
combine(_a) {
|
|
57
22
|
return __awaiter(this, arguments, void 0, function* ({ connection, payer, description, instructions, additionalAlt, }) {
|
|
23
|
+
var _b;
|
|
58
24
|
const ixs = [];
|
|
59
25
|
for (const ix of instructions) {
|
|
26
|
+
// Duck-type checks instead of instanceof (which breaks across package versions)
|
|
60
27
|
const q = ix;
|
|
61
|
-
if (
|
|
28
|
+
if ('data' in q && ((_b = q.data) === null || _b === void 0 ? void 0 : _b.transaction) && 'instructions' in q.data.transaction && 'alts' in q.data.transaction) {
|
|
29
|
+
// ResponseWithStatus<TransactionMetadata> — has .data.transaction with instructions and alts
|
|
62
30
|
ixs.push(...q.data.transaction.instructions);
|
|
63
|
-
additionalAlt.push(...q.data.transaction.alts.map(alt => alt.key.toBase58()));
|
|
31
|
+
additionalAlt.push(...q.data.transaction.alts.map((alt) => alt.key.toBase58()));
|
|
64
32
|
}
|
|
65
|
-
else if (
|
|
66
|
-
|
|
33
|
+
else if ('instructions' in q && Array.isArray(q.instructions)) {
|
|
34
|
+
// Transaction — has .instructions array
|
|
35
|
+
ixs.push(...q.instructions);
|
|
67
36
|
}
|
|
68
|
-
else if (
|
|
69
|
-
|
|
37
|
+
else if ('keys' in q && 'programId' in q && 'data' in q) {
|
|
38
|
+
// TransactionInstruction — has .keys, .programId, .data
|
|
39
|
+
ixs.push(q);
|
|
70
40
|
}
|
|
71
41
|
else {
|
|
72
42
|
throw new Error("Invalid object");
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
|
-
import { TransactionMetadata, TransactionMetadataResponse } from "../types";
|
|
2
|
+
import { TransactionMetadata, TransactionMetadataWithActions, TransactionMetadataResponse, TransactionMetadataResponse2 } from "../types";
|
|
3
3
|
import { GeneralUtility } from "./GeneralUtility";
|
|
4
4
|
/**
|
|
5
5
|
* The CreateTxMetadata class is responsible for creating and managing transaction metadata,
|
|
@@ -78,6 +78,23 @@ export declare class CreateTxMetadata {
|
|
|
78
78
|
* @throws Error if there is an issue in constructing the transaction or during simulation which includes logs of errors.
|
|
79
79
|
*/
|
|
80
80
|
createTxMetadata(generalUtility: GeneralUtility, connection: web3.Connection, payer: string, data: TransactionMetadataResponse): Promise<TransactionMetadata>;
|
|
81
|
+
/**
|
|
82
|
+
* Asynchronously creates transaction metadata based on the provided transaction parameters and network state.
|
|
83
|
+
* This includes constructing a transaction with given instructions, calculating fees, and optionally handling priority fees.
|
|
84
|
+
*
|
|
85
|
+
* @param generalUtility - The utility object for general helper functions.
|
|
86
|
+
* @param connection - The active Solana blockchain connection used to fetch state and simulate the transaction.
|
|
87
|
+
* @param payer - The public key (as a string) of the payer for the transaction, responsible for fees.
|
|
88
|
+
* @param data - An object containing necessary information to construct the transaction, such as:
|
|
89
|
+
* - addressLookupTableAddresses: Array of addresses for lookup tables.
|
|
90
|
+
* - computeBudgetInstructions: Array of instructions for setting compute budget.
|
|
91
|
+
* - description: Description of the transaction.
|
|
92
|
+
* - estimatedFeeInSOL: Estimated fee in SOL units.
|
|
93
|
+
* @returns A promise resolving to an object containing the transaction metadata including the description,
|
|
94
|
+
* estimated fee, and the transaction object itself.
|
|
95
|
+
* @throws Error if there is an issue in constructing the transaction or during simulation which includes logs of errors.
|
|
96
|
+
*/
|
|
97
|
+
createTxMetadataWithActions(generalUtility: GeneralUtility, connection: web3.Connection, payer: string, data: TransactionMetadataResponse2): Promise<TransactionMetadataWithActions>;
|
|
81
98
|
createTxMetadata2(generalUtility: GeneralUtility, connection: web3.Connection, payer: string, data: TransactionMetadataResponse): Promise<TransactionMetadata[]>;
|
|
82
99
|
}
|
|
83
100
|
//# sourceMappingURL=CreateTxMetadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateTxMetadata.d.ts","sourceRoot":"","sources":["../../../src/classes/CreateTxMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateTxMetadata.d.ts","sourceRoot":"","sources":["../../../src/classes/CreateTxMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAE1I,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;;GAGG;AACH,qBAAa,gBAAgB;IAE3B,OAAO;IAEP,OAAO,CAAC,UAAU,CAAC,CAAkB;IAErC;;;;OAIG;IACH,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAEzC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAmB;IAE3C;;;;OAIG;IACH,MAAM,CAAC,QAAQ,IAAI,gBAAgB;IAOnC,OAAO,CAAC,IAAI,CAaV;IAEF;;OAEG;IACG,IAAI;IAIV;;OAEG;IACG,UAAU;IAUhB;;;;;;;OAOG;IACG,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC;IAcvG;;;;;OAKG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;IAIzE;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,yBAAyB;IAI7D;;;;;;OAMG;IACG,WAAW,CACf,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC;IA8B5C;;;;;;;;;;;;;;;OAeG;IACG,gBAAgB,CACpB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,CAAC;IAoE/B;;;;;;;;;;;;;;;OAeG;IACG,2BAA2B,CAC/B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,4BAA4B,GACjC,OAAO,CAAC,8BAA8B,CAAC;IA6EpC,iBAAiB,CACrB,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,mBAAmB,EAAE,CAAC;CA0ElC"}
|
|
@@ -219,6 +219,7 @@ class CreateTxMetadata {
|
|
|
219
219
|
let startTime = mainStartTime;
|
|
220
220
|
const jupAlts = yield generalUtility.findAltWithTxPost({ transaction: data });
|
|
221
221
|
(0, Logging_1.Log)(`createTxMetadata: Checkpoint: (jupAlts) ${(new Date().getTime() / 1000) - startTime}`);
|
|
222
|
+
(0, Logging_1.Log)(`jupAlts: ${JSON.stringify(jupAlts)}`);
|
|
222
223
|
startTime = new Date().getTime() / 1000;
|
|
223
224
|
for (const alt of data.addressLookupTableAddresses) {
|
|
224
225
|
const _alt = yield this.getAlt(alt);
|
|
@@ -269,8 +270,96 @@ class CreateTxMetadata {
|
|
|
269
270
|
};
|
|
270
271
|
});
|
|
271
272
|
}
|
|
273
|
+
/**
|
|
274
|
+
* Asynchronously creates transaction metadata based on the provided transaction parameters and network state.
|
|
275
|
+
* This includes constructing a transaction with given instructions, calculating fees, and optionally handling priority fees.
|
|
276
|
+
*
|
|
277
|
+
* @param generalUtility - The utility object for general helper functions.
|
|
278
|
+
* @param connection - The active Solana blockchain connection used to fetch state and simulate the transaction.
|
|
279
|
+
* @param payer - The public key (as a string) of the payer for the transaction, responsible for fees.
|
|
280
|
+
* @param data - An object containing necessary information to construct the transaction, such as:
|
|
281
|
+
* - addressLookupTableAddresses: Array of addresses for lookup tables.
|
|
282
|
+
* - computeBudgetInstructions: Array of instructions for setting compute budget.
|
|
283
|
+
* - description: Description of the transaction.
|
|
284
|
+
* - estimatedFeeInSOL: Estimated fee in SOL units.
|
|
285
|
+
* @returns A promise resolving to an object containing the transaction metadata including the description,
|
|
286
|
+
* estimated fee, and the transaction object itself.
|
|
287
|
+
* @throws Error if there is an issue in constructing the transaction or during simulation which includes logs of errors.
|
|
288
|
+
*/
|
|
289
|
+
createTxMetadataWithActions(generalUtility, connection, payer, data) {
|
|
290
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
291
|
+
// Retrieve address lookup table accounts
|
|
292
|
+
const alts = [];
|
|
293
|
+
(0, Logging_1.Log)(`createTxMetadataWithActions`);
|
|
294
|
+
const mainStartTime = new Date().getTime() / 1000;
|
|
295
|
+
// Find jup alts
|
|
296
|
+
let startTime = mainStartTime;
|
|
297
|
+
const jupAlts = yield generalUtility.findAltWithTxPost({ transaction: data });
|
|
298
|
+
(0, Logging_1.Log)(`createTxMetadataWithActions: Checkpoint: (jupAlts) ${(new Date().getTime() / 1000) - startTime}`);
|
|
299
|
+
(0, Logging_1.Log)(`jupAlts: ${JSON.stringify(jupAlts)}`);
|
|
300
|
+
startTime = new Date().getTime() / 1000;
|
|
301
|
+
for (const alt of data.addressLookupTableAddresses) {
|
|
302
|
+
const _alt = yield this.getAlt(alt);
|
|
303
|
+
if (!!_alt) {
|
|
304
|
+
alts.push(_alt);
|
|
305
|
+
}
|
|
306
|
+
else {
|
|
307
|
+
try {
|
|
308
|
+
alts.push(yield this.loadSingleAlt(alt, connection));
|
|
309
|
+
}
|
|
310
|
+
catch (_a) {
|
|
311
|
+
console.error(`The ALT from addressLookupTableAddresses: ${alt} does not exist onchain. Skipping.`);
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
if (jupAlts.status === 200) {
|
|
316
|
+
for (const alt of jupAlts.data) {
|
|
317
|
+
const _alt = yield this.getAlt(alt);
|
|
318
|
+
if (!!_alt) {
|
|
319
|
+
alts.push(_alt);
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
try {
|
|
323
|
+
alts.push(yield this.loadSingleAlt(alt, connection));
|
|
324
|
+
}
|
|
325
|
+
catch (_b) {
|
|
326
|
+
console.error(`The ALT from Jupiter: ${alt} does not exist onchain. Skipping.`);
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
else {
|
|
332
|
+
console.error(jupAlts.data);
|
|
333
|
+
}
|
|
334
|
+
(0, Logging_1.Log)(`createTxMetadataWithActions: Checkpoint: (jupAlts after loop) ${(new Date().getTime() / 1000) - startTime}`);
|
|
335
|
+
// Get the recent blockhash
|
|
336
|
+
startTime = new Date().getTime() / 1000;
|
|
337
|
+
const latestBlockhash = yield connection.getLatestBlockhash();
|
|
338
|
+
(0, Logging_1.Log)(`createTxMetadataWithActions: Checkpoint: (latestBlockhash) ${(new Date().getTime() / 1000) - startTime}`);
|
|
339
|
+
// Create initial transaction instance
|
|
340
|
+
const transaction = new Transaction_1.Transaction({
|
|
341
|
+
// @deprecated
|
|
342
|
+
description: '',
|
|
343
|
+
// @deprecated
|
|
344
|
+
estimatedFeeInSOL: '',
|
|
345
|
+
addressLookupTableAddresses: data.addressLookupTableAddresses, // "alts" is confusing, copied jup's naming
|
|
346
|
+
computeBudgetInstructions: data.computeBudgetInstructions, // this enables for ease of access while also making them optional
|
|
347
|
+
mainInstructions: data.mainInstructions,
|
|
348
|
+
payer: data.payer,
|
|
349
|
+
signature: '',
|
|
350
|
+
}, new web3.PublicKey(payer), latestBlockhash, alts, generalUtility);
|
|
351
|
+
(0, Logging_1.Log)(`createTxMetadataWithActions: Elapsed time: ${(new Date().getTime() / 1000) - mainStartTime}`);
|
|
352
|
+
// Return transaction metadata
|
|
353
|
+
return {
|
|
354
|
+
actions: data.actions,
|
|
355
|
+
transaction,
|
|
356
|
+
};
|
|
357
|
+
});
|
|
358
|
+
}
|
|
272
359
|
createTxMetadata2(generalUtility, connection, payer, data) {
|
|
273
360
|
return __awaiter(this, void 0, void 0, function* () {
|
|
361
|
+
// Ensure connection is available for ALT downloads
|
|
362
|
+
this.setConnection(connection);
|
|
274
363
|
// Retrieve address lookup table accounts
|
|
275
364
|
const alts = [];
|
|
276
365
|
(0, Logging_1.Log)(`createTxMetadata2`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,IAAI,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAClE,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;
|
|
1
|
+
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -352,6 +352,6 @@ _a = TransactionBatchExecute2;
|
|
|
352
352
|
*
|
|
353
353
|
* @param pubkeys
|
|
354
354
|
*/
|
|
355
|
-
TransactionBatchExecute2.jupiterFindAltByPubkeysFn = (
|
|
356
|
-
|
|
355
|
+
TransactionBatchExecute2.jupiterFindAltByPubkeysFn = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
356
|
+
return [];
|
|
357
357
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as web3 from '@solana/web3.js';
|
|
2
|
-
import { MeteoraClaim, MeteoraClaimAll, MeteoraClose, MeteoraCompound, MeteoraRedeposit, MeteoraRedeposit2, MeteoraCreatePositionAndDeposit, MeteoraCreatePositionAndDepositPda, MeteoraDeposit, MeteoraInitializeBinArrays, MeteoraRebalance, MeteoraWithdraw, Register, TxgenParams, InitializeStorageTokenAccount, MeteoraLimitCloseAutomation, MeteoraLimitCloseAutomation2, OrcaOpenPosition, OrcaClosePosition, OrcaDeposit, OrcaWithdraw, OrcaSweepDust, OrcaClaimRewards, TransactionMetadataResponse, MeteoraRebalance2, MeteoraRebalance3, LabeledInstructions, ClaimTokensFromSTA, RaydiumClosePosition, OpenAutomationIx, RelativeOpenAutomationIx, RaydiumWithdrawAndClosePosition, MeteoraCreatePoolAndPosition, ClaimTokenFromPda, MeteoraInitializeLargePosition, MeteoraDepositLargerPosition, MeteoraWithdrawLargerPosition, MeteoraRebalanceForLargerPosition, MeteoraRebalanceLargePositionAutomation2, MeteoraReshapePositionAutomationParams } from '../types';
|
|
2
|
+
import { MeteoraClaim, MeteoraClaimAll, MeteoraClose, MeteoraCompound, MeteoraRedeposit, MeteoraRedeposit2, MeteoraCreatePositionAndDeposit, MeteoraCreatePositionAndDepositPda, MeteoraDeposit, MeteoraInitializeBinArrays, MeteoraRebalance, MeteoraWithdraw, Register, TxgenParams, InitializeStorageTokenAccount, MeteoraLimitCloseAutomation, MeteoraLimitCloseAutomation2, OrcaOpenPosition, OrcaClosePosition, OrcaDeposit, OrcaWithdraw, OrcaSweepDust, OrcaClaimRewards, TransactionMetadataResponse, MeteoraRebalance2, MeteoraRebalance3, LabeledInstructions, ClaimTokensFromSTA, RaydiumClosePosition, OpenAutomationIx, RelativeOpenAutomationIx, RaydiumWithdrawAndClosePosition, MeteoraCreatePoolAndPosition, ClaimTokenFromPda, MeteoraInitializeLargePosition, MeteoraDepositLargerPosition, MeteoraWithdrawLargerPosition, MeteoraRebalanceForLargerPosition, MeteoraRebalanceLargePositionAutomation2, MeteoraReshapePositionAutomationParams, TransactionMetadataResponse2 } from '../types';
|
|
3
3
|
import { RaydiumIncreaseLiquidity, RaydiumOpenPosition, RaydiumDecreaseLiquidity } from '../types';
|
|
4
4
|
import { GeneralUtility } from './GeneralUtility';
|
|
5
5
|
import { MultiTransaction } from './MultiTransaction';
|
|
@@ -63,18 +63,6 @@ export declare class Transactions {
|
|
|
63
63
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
64
64
|
*/
|
|
65
65
|
meteoraCreatePositionAndDeposit({ connection, params, }: TxgenParams<MeteoraCreatePositionAndDeposit>): Promise<TransactionMetadataResponse>;
|
|
66
|
-
/**
|
|
67
|
-
* Creates meteora instruction that creates new position and deposit
|
|
68
|
-
* - Supports larger positions
|
|
69
|
-
*
|
|
70
|
-
* @deprecated Use meteoraCreatePositionAndDepositToLargePosition instead.
|
|
71
|
-
*
|
|
72
|
-
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
73
|
-
* @param payer The public key of the payer for transaction fees.
|
|
74
|
-
* @param params Parameters required
|
|
75
|
-
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
76
|
-
*/
|
|
77
|
-
meteoraCreatePositionAndDeposit2({ connection, params, }: TxgenParams<MeteoraCreatePositionAndDeposit>): Promise<TransactionMetadataResponse>;
|
|
78
66
|
/**
|
|
79
67
|
* Creates meteora instruction that creates new position and deposit.
|
|
80
68
|
*
|
|
@@ -114,17 +102,6 @@ export declare class Transactions {
|
|
|
114
102
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
115
103
|
*/
|
|
116
104
|
meteoraDeposit({ connection, params, }: TxgenParams<MeteoraDeposit>): Promise<TransactionMetadataResponse>;
|
|
117
|
-
/**
|
|
118
|
-
* Creates meteora instruction that deposits to position.
|
|
119
|
-
*
|
|
120
|
-
* @deprecated Use meteoraDepositToLargePosition instead
|
|
121
|
-
*
|
|
122
|
-
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
123
|
-
* @param payer The public key of the payer for transaction fees.
|
|
124
|
-
* @param params Parameters required
|
|
125
|
-
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
126
|
-
*/
|
|
127
|
-
meteoraDeposit2({ connection, params, }: TxgenParams<MeteoraDeposit>): Promise<TransactionMetadataResponse>;
|
|
128
105
|
/**
|
|
129
106
|
* Creates meteora instruction withdraws from a position.
|
|
130
107
|
*
|
|
@@ -145,23 +122,6 @@ export declare class Transactions {
|
|
|
145
122
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
146
123
|
*/
|
|
147
124
|
meteoraWithdrawPda({ connection, params, }: TxgenParams<MeteoraWithdraw>): Promise<TransactionMetadataResponse>;
|
|
148
|
-
/**
|
|
149
|
-
* Withdraws liquidity from a Meteora DLMM position using simple instructions.
|
|
150
|
-
*
|
|
151
|
-
* @deprecated Use meteoraWithdrawLargePosition instead
|
|
152
|
-
*
|
|
153
|
-
* Unlike meteoraWithdraw which uses Meteora SDK (that generates multiple claimFee ixs
|
|
154
|
-
* potentially bloating tx size), this method uses direct instructions:
|
|
155
|
-
* - removeLiquidityByRange2: Withdraw liquidity from the specified bin range
|
|
156
|
-
* - claimFee2: Single instruction to claim fees
|
|
157
|
-
* - claimReward2: N instructions (one per active reward)
|
|
158
|
-
* - closePositionIfEmpty: Closes position if shouldClaimAndClose is true
|
|
159
|
-
*
|
|
160
|
-
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
161
|
-
* @param params Parameters required for withdrawal
|
|
162
|
-
* @returns A ResponseWithStatus containing TransactionMetadataResponse.
|
|
163
|
-
*/
|
|
164
|
-
meteoraWithdrawLargerPosition({ connection, params, fetch, }: TxgenParams<MeteoraWithdrawLargerPosition>): Promise<TransactionMetadataResponse>;
|
|
165
125
|
/**
|
|
166
126
|
* Withdraw liquidity from a large Meteora DLMM position (up to 1400 bins).
|
|
167
127
|
*
|
|
@@ -178,21 +138,6 @@ export declare class Transactions {
|
|
|
178
138
|
connection: web3.Connection;
|
|
179
139
|
params: MeteoraWithdrawLargerPosition;
|
|
180
140
|
}): Promise<TransactionMetadataResponse[]>;
|
|
181
|
-
/**
|
|
182
|
-
* Withdraws liquidity from a Meteora DLMM position using simple instructions.
|
|
183
|
-
*
|
|
184
|
-
* Unlike meteoraWithdraw which uses Meteora SDK (that generates multiple claimFee ixs
|
|
185
|
-
* potentially bloating tx size), this method uses direct instructions:
|
|
186
|
-
* - removeLiquidityByRange2: Withdraw liquidity from the specified bin range
|
|
187
|
-
* - claimFee2: Single instruction to claim fees
|
|
188
|
-
* - claimReward2: N instructions (one per active reward)
|
|
189
|
-
* - closePositionIfEmpty: Closes position if shouldClaimAndClose is true
|
|
190
|
-
*
|
|
191
|
-
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
192
|
-
* @param params Parameters required for withdrawal
|
|
193
|
-
* @returns A ResponseWithStatus containing TransactionMetadataResponse.
|
|
194
|
-
*/
|
|
195
|
-
private _meteoraWithdrawLargerPosition;
|
|
196
141
|
/**
|
|
197
142
|
* Resolves pool data needed for withdraw instructions.
|
|
198
143
|
* Call once, then pass the result to _buildWithdrawInstructions for each chunk.
|
|
@@ -437,7 +382,7 @@ export declare class Transactions {
|
|
|
437
382
|
* claimFee2Automation (≤75 bins from old position)
|
|
438
383
|
* claimReward2Automation × N (≤75 bins from old position, per active reward)
|
|
439
384
|
* [Last old chunk only] closePosition2Automation
|
|
440
|
-
*
|
|
385
|
+
* meteoraDlmmInitializeBinArrayDefault (≤75 bins for new position)
|
|
441
386
|
* rebalanceLiquidityAutomation (≤75 bins deposit to new position)
|
|
442
387
|
*/
|
|
443
388
|
private _buildMergedRebalanceChunks;
|
|
@@ -461,7 +406,7 @@ export declare class Transactions {
|
|
|
461
406
|
* Returns a 2D array where each inner array is one transaction's worth of instructions.
|
|
462
407
|
*/
|
|
463
408
|
private _meteoraInitializeLargePosition;
|
|
464
|
-
meteoraInitializeLargePosition({ connection, params, }: TxgenParams<MeteoraInitializeLargePosition>): Promise<
|
|
409
|
+
meteoraInitializeLargePosition({ connection, params, }: TxgenParams<MeteoraInitializeLargePosition>): Promise<TransactionMetadataResponse2[]>;
|
|
465
410
|
/**
|
|
466
411
|
* Build raw instruction arrays for depositing liquidity to a large Meteora DLMM position.
|
|
467
412
|
* Returns a 2D array where each inner array is one transaction's worth of instructions.
|
|
@@ -476,23 +421,24 @@ export declare class Transactions {
|
|
|
476
421
|
* @param params - MeteoraDepositToLargePosition parameters
|
|
477
422
|
* @returns Array of TransactionMetadataResponse, one per chunk
|
|
478
423
|
*/
|
|
479
|
-
meteoraDepositToLargePosition({ connection, params, }: TxgenParams<MeteoraDeposit>): Promise<
|
|
424
|
+
meteoraDepositToLargePosition({ connection, params, }: TxgenParams<MeteoraDeposit>): Promise<TransactionMetadataResponse2[]>;
|
|
480
425
|
/**
|
|
481
426
|
* Create a position and deposit liquidity for any bin count.
|
|
482
427
|
*
|
|
483
|
-
* - For ≤
|
|
484
|
-
* - For ≥
|
|
428
|
+
* - For ≤70 bins: delegates to meteoraDepositLargerPosition (single tx with position init)
|
|
429
|
+
* - For ≥70 bins: uses _meteoraInitializeLargePosition + _meteoraDepositToLargePosition (multi-tx)
|
|
485
430
|
* When init produces 2 TXs (>1344 bins), the 2nd init TX is merged into the 1st deposit TX.
|
|
486
431
|
*/
|
|
487
432
|
meteoraCreatePositionAndDepositToLargePosition({ connection, params, }: {
|
|
488
433
|
connection: web3.Connection;
|
|
489
434
|
params: MeteoraCreatePositionAndDeposit;
|
|
490
|
-
}): Promise<
|
|
435
|
+
}): Promise<TransactionMetadataResponse2[]>;
|
|
491
436
|
/**
|
|
492
437
|
* Deposit liquidity to a Meteora DLMM position (up to 128 bins) with optional position initialization.
|
|
493
438
|
*
|
|
439
|
+
* TODO: For deprecation. Need to move to the large position deposit flow
|
|
440
|
+
*
|
|
494
441
|
* This method combines:
|
|
495
|
-
* - Initialize bin arrays (meteoraDlmmInitializeBinArray) - idempotent
|
|
496
442
|
* - Optionally initialize position (if initializePosition is true):
|
|
497
443
|
* - For <= 70 bins: uses initializePositionAndAddLiquidityByStrategy
|
|
498
444
|
* - For > 70 bins: uses initializePosition + increasePositionLength + addLiquidityByStrategy
|
|
@@ -505,7 +451,7 @@ export declare class Transactions {
|
|
|
505
451
|
* @param params - MeteoraDepositLargerPosition parameters
|
|
506
452
|
* @returns Single TransactionMetadataResponse
|
|
507
453
|
*/
|
|
508
|
-
meteoraDepositLargerPosition({ connection, params, }: TxgenParams<MeteoraDepositLargerPosition>): Promise<
|
|
454
|
+
meteoraDepositLargerPosition({ connection, params, }: TxgenParams<MeteoraDepositLargerPosition>): Promise<TransactionMetadataResponse2>;
|
|
509
455
|
/**
|
|
510
456
|
* Creates orca instruction that opens new position
|
|
511
457
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAiBxC,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,+BAA+B,EAC/B,kCAAkC,EAClC,cAAc,EACd,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,WAAW,EACX,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EAEjB,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EAEpB,gBAAgB,EAChB,wBAAwB,EACxB,+BAA+B,EAC/B,4BAA4B,EAC5B,iBAAiB,EAEjB,8BAA8B,EAE9B,4BAA4B,EAC5B,6BAA6B,EAC7B,iCAAiC,EACjC,wCAAwC,EAGxC,sCAAsC,
|
|
1
|
+
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
|