@hawksightco/hawk-sdk 1.2.14 → 1.2.16
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/TxGenerator.d.ts +36 -0
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/classes/TxGenerator.js +111 -30
- package/dist/src/functions.d.ts +15 -2
- package/dist/src/functions.d.ts.map +1 -1
- package/dist/src/functions.js +28 -3
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -3,9 +3,22 @@ import * as _client from "@hawksightco/swagger-client";
|
|
|
3
3
|
import { InitializeStorageTokenAccount, ClaimTokensFromSTA, ClaimTokenFromSTA, MeteoraTxWithdraw, ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards, MeteoraClaimAll, MeteoraCreatePositionAndDepositPda, RaydiumOpenPosition, RaydiumClosePosition, RaydiumIncreaseLiquidity, RaydiumDecreaseLiquidity, OrcaSweepDust, CreateLimitTokenParams, CloseLimitTokenParams, TokenType } from "../types";
|
|
4
4
|
import { Client } from "./Client";
|
|
5
5
|
import { GeneralUtility } from "./GeneralUtility";
|
|
6
|
+
import BN from "bn.js";
|
|
6
7
|
import { MultiTransaction } from "./MultiTransaction";
|
|
7
8
|
import { SimpleIxGenerator } from "./SimpleIxGenerator";
|
|
8
9
|
import { SimplePdaGenerator } from "./SimplePdaGenerator";
|
|
10
|
+
type DepositToLtaParams = {
|
|
11
|
+
userWallet: web3.PublicKey;
|
|
12
|
+
mintX: web3.PublicKey;
|
|
13
|
+
mintY: web3.PublicKey;
|
|
14
|
+
amountX: BN;
|
|
15
|
+
amountY: BN;
|
|
16
|
+
};
|
|
17
|
+
type WithdrawFromLtaParams = {
|
|
18
|
+
userWallet: web3.PublicKey;
|
|
19
|
+
mintX: web3.PublicKey;
|
|
20
|
+
mintY: web3.PublicKey;
|
|
21
|
+
};
|
|
9
22
|
/**
|
|
10
23
|
* The `TxGenerator` class encapsulates methods to generate transactions with various trading operations
|
|
11
24
|
* on decentralized market making platforms like Meteora and Orca within the Solana ecosystem. It allows
|
|
@@ -59,6 +72,28 @@ export declare class TxGenerator {
|
|
|
59
72
|
initializeStorageTokenAccounts(connection: web3.Connection, payer: string, params: InitializeStorageTokenAccount): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
60
73
|
createLimitToken(connection: web3.Connection, params: CreateLimitTokenParams): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
61
74
|
closeLimitToken(connection: web3.Connection, params: CloseLimitTokenParams): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
75
|
+
/**
|
|
76
|
+
* Create executable instructions to initialize and deposit to limit token accounts.
|
|
77
|
+
*
|
|
78
|
+
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
79
|
+
* @param params Parameters required
|
|
80
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
81
|
+
*/
|
|
82
|
+
depositToLta(connection: web3.Connection, params: DepositToLtaParams): Promise<{
|
|
83
|
+
status: number;
|
|
84
|
+
data: TransactionMetadata;
|
|
85
|
+
}>;
|
|
86
|
+
/**
|
|
87
|
+
* Creates executable instruction to withdraw from limit token accounts.
|
|
88
|
+
*
|
|
89
|
+
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
90
|
+
* @param params Parameters required
|
|
91
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
92
|
+
*/
|
|
93
|
+
withdrawFromLta(connection: web3.Connection, params: WithdrawFromLtaParams): Promise<{
|
|
94
|
+
status: number;
|
|
95
|
+
data: TransactionMetadata;
|
|
96
|
+
}>;
|
|
62
97
|
/**
|
|
63
98
|
* Creates meteora instruction that creates new position and deposit.
|
|
64
99
|
*
|
|
@@ -229,4 +264,5 @@ export declare class TxGenerator {
|
|
|
229
264
|
data: any;
|
|
230
265
|
}>;
|
|
231
266
|
}
|
|
267
|
+
export {};
|
|
232
268
|
//# sourceMappingURL=TxGenerator.d.ts.map
|
|
@@ -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,EACV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
34
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
38
|
exports.TxGenerator = void 0;
|
|
36
39
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
@@ -38,11 +41,10 @@ const types_1 = require("../types");
|
|
|
38
41
|
const functions_1 = require("../functions");
|
|
39
42
|
const anchor_1 = require("../anchor");
|
|
40
43
|
const Transactions_1 = require("./Transactions");
|
|
41
|
-
const bn_js_1 = require("bn.js");
|
|
44
|
+
const bn_js_1 = __importDefault(require("bn.js"));
|
|
42
45
|
const Logging_1 = require("./Logging");
|
|
43
46
|
const SimpleIxGenerator_1 = require("./SimpleIxGenerator");
|
|
44
47
|
const SimplePdaGenerator_1 = require("./SimplePdaGenerator");
|
|
45
|
-
const addresses_1 = require("../addresses");
|
|
46
48
|
/**
|
|
47
49
|
* The `TxGenerator` class encapsulates methods to generate transactions with various trading operations
|
|
48
50
|
* on decentralized market making platforms like Meteora and Orca within the Solana ecosystem. It allows
|
|
@@ -171,47 +173,126 @@ class TxGenerator {
|
|
|
171
173
|
return __awaiter(this, void 0, void 0, function* () {
|
|
172
174
|
// Initialize anchor
|
|
173
175
|
anchor_1.Anchor.initialize(connection);
|
|
174
|
-
// Generate
|
|
175
|
-
const
|
|
176
|
+
// Generate instructions
|
|
177
|
+
const ixs = [];
|
|
178
|
+
// Create limit token account
|
|
179
|
+
ixs.push(yield this.ix.iyfMain.createLimitToken({
|
|
176
180
|
userWallet: params.userWallet,
|
|
177
181
|
payer: params.payer,
|
|
178
182
|
mintX: params.mintX,
|
|
179
183
|
mintY: params.mintY,
|
|
180
|
-
});
|
|
181
|
-
//
|
|
182
|
-
|
|
184
|
+
}));
|
|
185
|
+
// Return executable instructions
|
|
186
|
+
return yield (0, functions_1.legacyTxMetadata)({
|
|
187
|
+
connection,
|
|
188
|
+
generalUtility: this.generalUtility,
|
|
183
189
|
payer: params.payer,
|
|
184
190
|
description: "Create Limit Token",
|
|
185
|
-
|
|
186
|
-
mainInstructions: [ix],
|
|
191
|
+
ixs,
|
|
187
192
|
});
|
|
188
|
-
return {
|
|
189
|
-
status: 200,
|
|
190
|
-
data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, params.payer.toString(), result),
|
|
191
|
-
};
|
|
192
193
|
});
|
|
193
194
|
}
|
|
194
195
|
closeLimitToken(connection, params) {
|
|
195
196
|
return __awaiter(this, void 0, void 0, function* () {
|
|
196
197
|
// Initialize anchor
|
|
197
198
|
anchor_1.Anchor.initialize(connection);
|
|
198
|
-
// Generate
|
|
199
|
-
const
|
|
199
|
+
// Generate instructions
|
|
200
|
+
const ixs = [];
|
|
201
|
+
// Close limit token account
|
|
202
|
+
ixs.push(yield this.ix.iyfMain.closeLimitToken({
|
|
200
203
|
userWallet: params.userWallet,
|
|
201
204
|
mintX: params.mintX,
|
|
202
205
|
mintY: params.mintY,
|
|
206
|
+
}));
|
|
207
|
+
// Return executable instructions
|
|
208
|
+
return yield (0, functions_1.legacyTxMetadata)({
|
|
209
|
+
connection,
|
|
210
|
+
generalUtility: this.generalUtility,
|
|
211
|
+
payer: params.userWallet,
|
|
212
|
+
description: "Close Limit Token",
|
|
213
|
+
ixs,
|
|
203
214
|
});
|
|
204
|
-
|
|
205
|
-
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
/**
|
|
218
|
+
* Create executable instructions to initialize and deposit to limit token accounts.
|
|
219
|
+
*
|
|
220
|
+
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
221
|
+
* @param params Parameters required
|
|
222
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
223
|
+
*/
|
|
224
|
+
depositToLta(connection, params) {
|
|
225
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
226
|
+
// Initialize anchor
|
|
227
|
+
anchor_1.Anchor.initialize(connection);
|
|
228
|
+
// Instructions
|
|
229
|
+
const ixs = [];
|
|
230
|
+
// Idempotently create limit token accounts (generate instruction)
|
|
231
|
+
ixs.push(yield this.ix.iyfMain.createLimitToken({
|
|
232
|
+
userWallet: params.userWallet,
|
|
206
233
|
payer: params.userWallet,
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
234
|
+
mintX: params.mintX,
|
|
235
|
+
mintY: params.mintY,
|
|
236
|
+
}));
|
|
237
|
+
// Deposit to limit token accounts
|
|
238
|
+
ixs.push(yield this.ix.iyfMain.depositMultipleTokenV2({
|
|
239
|
+
payer: params.userWallet,
|
|
240
|
+
deposit: [
|
|
241
|
+
{
|
|
242
|
+
mint: params.mintX,
|
|
243
|
+
amount: params.amountX,
|
|
244
|
+
},
|
|
245
|
+
{
|
|
246
|
+
mint: params.mintY,
|
|
247
|
+
amount: params.amountY,
|
|
248
|
+
},
|
|
249
|
+
],
|
|
250
|
+
pdaTokenType: types_1.TokenType.LTA,
|
|
251
|
+
}));
|
|
252
|
+
// Return executable instructions
|
|
253
|
+
return yield (0, functions_1.legacyTxMetadata)({
|
|
254
|
+
connection,
|
|
255
|
+
generalUtility: this.generalUtility,
|
|
256
|
+
payer: params.userWallet,
|
|
257
|
+
description: "Deposit to limit token accounts",
|
|
258
|
+
ixs,
|
|
259
|
+
});
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* Creates executable instruction to withdraw from limit token accounts.
|
|
264
|
+
*
|
|
265
|
+
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
266
|
+
* @param params Parameters required
|
|
267
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
268
|
+
*/
|
|
269
|
+
withdrawFromLta(connection, params) {
|
|
270
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
271
|
+
// Initialize anchor
|
|
272
|
+
anchor_1.Anchor.initialize(connection);
|
|
273
|
+
// Instructions
|
|
274
|
+
const ixs = [];
|
|
275
|
+
// Withdraw from limit token accounts
|
|
276
|
+
ixs.push(yield this.ix.iyfMain.withdrawMultipleTokenV2({
|
|
277
|
+
payer: params.userWallet,
|
|
278
|
+
withdraw: [
|
|
279
|
+
{
|
|
280
|
+
mint: params.mintX,
|
|
281
|
+
},
|
|
282
|
+
{
|
|
283
|
+
mint: params.mintY,
|
|
284
|
+
},
|
|
285
|
+
],
|
|
286
|
+
pdaTokenType: types_1.TokenType.LTA,
|
|
287
|
+
}));
|
|
288
|
+
// Return executable instructions
|
|
289
|
+
return yield (0, functions_1.legacyTxMetadata)({
|
|
290
|
+
connection,
|
|
291
|
+
generalUtility: this.generalUtility,
|
|
292
|
+
payer: params.userWallet,
|
|
293
|
+
description: "Withdraw from limit token accounts",
|
|
294
|
+
ixs,
|
|
210
295
|
});
|
|
211
|
-
return {
|
|
212
|
-
status: 200,
|
|
213
|
-
data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, params.userWallet.toString(), result),
|
|
214
|
-
};
|
|
215
296
|
});
|
|
216
297
|
}
|
|
217
298
|
/**
|
|
@@ -233,8 +314,8 @@ class TxGenerator {
|
|
|
233
314
|
position: new web3.PublicKey(params.position),
|
|
234
315
|
pool: new web3.PublicKey(params.pool),
|
|
235
316
|
userWallet: new web3.PublicKey(params.userWallet),
|
|
236
|
-
totalXAmount: new bn_js_1.
|
|
237
|
-
totalYAmount: new bn_js_1.
|
|
317
|
+
totalXAmount: new bn_js_1.default(params.totalXAmount),
|
|
318
|
+
totalYAmount: new bn_js_1.default(params.totalYAmount),
|
|
238
319
|
binRange: {
|
|
239
320
|
lowerRange: params.lowerBinRange,
|
|
240
321
|
upperRange: params.upperBinRange,
|
|
@@ -327,8 +408,8 @@ class TxGenerator {
|
|
|
327
408
|
params: {
|
|
328
409
|
position: new web3.PublicKey(params.position),
|
|
329
410
|
userWallet: new web3.PublicKey(params.userWallet),
|
|
330
|
-
totalXAmount: new bn_js_1.
|
|
331
|
-
totalYAmount: new bn_js_1.
|
|
411
|
+
totalXAmount: new bn_js_1.default(params.totalXAmount),
|
|
412
|
+
totalYAmount: new bn_js_1.default(params.totalYAmount),
|
|
332
413
|
distribution: params.distribution,
|
|
333
414
|
slippage: params.slippage,
|
|
334
415
|
skipInputTokenCheck: params.skipInputTokenCheck,
|
|
@@ -374,7 +455,7 @@ class TxGenerator {
|
|
|
374
455
|
params: {
|
|
375
456
|
position: new web3.PublicKey(params.position),
|
|
376
457
|
userWallet: new web3.PublicKey(params.userWallet),
|
|
377
|
-
amountBps: new bn_js_1.
|
|
458
|
+
amountBps: new bn_js_1.default(params.amountBps),
|
|
378
459
|
shouldClaimAndClose: params.shouldClaimAndClose,
|
|
379
460
|
fastGeneration: params.fastGeneration
|
|
380
461
|
? {
|
|
@@ -421,7 +502,7 @@ class TxGenerator {
|
|
|
421
502
|
params: {
|
|
422
503
|
position: new web3.PublicKey(params.position),
|
|
423
504
|
userWallet: new web3.PublicKey(params.userWallet),
|
|
424
|
-
amountBps: new bn_js_1.
|
|
505
|
+
amountBps: new bn_js_1.default(params.amountBps),
|
|
425
506
|
shouldClaimAndClose: params.shouldClaimAndClose,
|
|
426
507
|
fastGeneration: params.fastGeneration
|
|
427
508
|
? {
|
package/dist/src/functions.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as client from "@hawksightco/swagger-client";
|
|
3
3
|
import * as web3 from "@solana/web3.js";
|
|
4
|
-
import { MeteoraPoolInfo, ResponseWithStatus, TransactionMetadata, TransactionMetadataResponse, TokenAccountData, CreateAtaIdempotentParams, GetMintsFromInstructionParams, Instruction, PriorityFeeEstimate } from "./types";
|
|
5
|
-
import { GeneralUtility } from
|
|
4
|
+
import { MeteoraPoolInfo, ResponseWithStatus, TransactionMetadata, TransactionMetadataResponse, TokenAccountData, CreateAtaIdempotentParams, GetMintsFromInstructionParams, Instruction, PriorityFeeEstimate, TokenType } from "./types";
|
|
5
|
+
import { GeneralUtility } from './classes/GeneralUtility';
|
|
6
6
|
import BN from "bn.js";
|
|
7
7
|
export declare const METEORA_API_URL = "https://dlmm-api.meteora.ag";
|
|
8
8
|
/**
|
|
@@ -62,6 +62,18 @@ export declare function createTransactionMeta(params: {
|
|
|
62
62
|
addressLookupTableAddresses: string[];
|
|
63
63
|
mainInstructions: web3.TransactionInstruction[];
|
|
64
64
|
}): Promise<TransactionMetadataResponse>;
|
|
65
|
+
export type LegacyTxMetadataParams = {
|
|
66
|
+
connection: web3.Connection;
|
|
67
|
+
generalUtility: GeneralUtility;
|
|
68
|
+
payer: web3.PublicKey;
|
|
69
|
+
description: string;
|
|
70
|
+
ixs: web3.TransactionInstruction[];
|
|
71
|
+
additionalAlt?: string[];
|
|
72
|
+
};
|
|
73
|
+
export declare function legacyTxMetadata({ connection, generalUtility, payer, description, ixs, additionalAlt, }: LegacyTxMetadataParams): Promise<{
|
|
74
|
+
status: number;
|
|
75
|
+
data: TransactionMetadata;
|
|
76
|
+
}>;
|
|
65
77
|
/**
|
|
66
78
|
* Generate UserPDA
|
|
67
79
|
*
|
|
@@ -133,6 +145,7 @@ export declare function tokenAccountExists(connection: web3.Connection, params:
|
|
|
133
145
|
owner: web3.PublicKey;
|
|
134
146
|
mint: web3.PublicKey;
|
|
135
147
|
isSta?: boolean;
|
|
148
|
+
tokenType?: TokenType;
|
|
136
149
|
}[]): Promise<{
|
|
137
150
|
mint: web3.PublicKey;
|
|
138
151
|
tokenKey: web3.PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/functions.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,2BAA2B,EAC3B,gBAAgB,EAChB,yBAAyB,EACzB,6BAA6B,EAC7B,WAAW,EACX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../../src/functions.ts"],"names":[],"mappings":"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"}
|
package/dist/src/functions.js
CHANGED
|
@@ -35,10 +35,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.
|
|
38
|
+
exports.createAssociatedTokenAccountIdempotentInstruction = exports.simulateTransaction = exports.extractPrimitives = exports.resolveDefined = exports.resolveArray = exports.resolveVec = exports.resolveOption = exports.resolveEnum = exports.resolveStruct = exports.extractValue = exports.deserializeParametersFromIDL = exports.tokenizer = exports.benchmark = exports.findNonceOwnedBy = exports.generateNonceAddressesOwnedBy = exports.generateNonceAddressFromIndex = exports.mid = exports.getPriorityFeeEstimate2 = exports.getPriorityFeeEstimate = exports.stringToAlt = exports.ixStrToWeb3Ix = exports.toVersionedTransaction = exports.getJupiterRouteIxParams = exports.inputTokenExists = exports.unwrapWsolToSol = exports.unwrapSolIfMintIsWsol = exports.wrapSolToWsol = exports.wrapSolIfMintIsWsol = exports.getMintsFromInstruction = exports.createAtaIdempotentIxs = exports.parseTokenAccountData = exports.tokenAccountExists = exports.sighash = exports.sighashMatch = exports.getIxs = exports.generateUserPdaStorageAccount = exports.generateOrcaPositionPDA = exports.generateAta2022 = exports.generateLimitToken = exports.generateAta = exports.generateUserPdaLamport = exports.generateUserPda = exports.legacyTxMetadata = exports.createTransactionMeta = exports.getMeteoraPool = exports.getFeeEstimate = exports.resultOrError = exports.createTxMetadata2 = exports.createTxMetadata = exports.METEORA_API_URL = void 0;
|
|
39
|
+
exports.raydiumStartTickIndex = void 0;
|
|
39
40
|
const client = __importStar(require("@hawksightco/swagger-client"));
|
|
40
41
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
41
42
|
const axios_1 = __importDefault(require("axios"));
|
|
43
|
+
const types_1 = require("./types");
|
|
42
44
|
const CreateTxMetadata_1 = require("./classes/CreateTxMetadata");
|
|
43
45
|
const addresses_1 = require("./addresses");
|
|
44
46
|
const addresses_2 = require("./addresses");
|
|
@@ -197,6 +199,22 @@ function createTransactionMeta(params) {
|
|
|
197
199
|
});
|
|
198
200
|
}
|
|
199
201
|
exports.createTransactionMeta = createTransactionMeta;
|
|
202
|
+
function legacyTxMetadata(_a) {
|
|
203
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, generalUtility, payer, description, ixs, additionalAlt, }) {
|
|
204
|
+
// Create transaction meta
|
|
205
|
+
const result = yield createTransactionMeta({
|
|
206
|
+
payer,
|
|
207
|
+
description,
|
|
208
|
+
addressLookupTableAddresses: [...addresses_1.GLOBAL_ALT, ...(additionalAlt || [])],
|
|
209
|
+
mainInstructions: ixs,
|
|
210
|
+
});
|
|
211
|
+
return {
|
|
212
|
+
status: 200,
|
|
213
|
+
data: yield createTxMetadata(generalUtility, connection, payer.toString(), result),
|
|
214
|
+
};
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
exports.legacyTxMetadata = legacyTxMetadata;
|
|
200
218
|
/**
|
|
201
219
|
* Generate UserPDA
|
|
202
220
|
*
|
|
@@ -337,8 +355,15 @@ exports.sighash = sighash;
|
|
|
337
355
|
function tokenAccountExists(connection, params) {
|
|
338
356
|
return __awaiter(this, void 0, void 0, function* () {
|
|
339
357
|
const tokenKeys = params.map((p) => {
|
|
340
|
-
|
|
341
|
-
|
|
358
|
+
if (p.tokenType === types_1.TokenType.STA || p.isSta) {
|
|
359
|
+
return generateUserPdaStorageAccount(p.owner, p.mint);
|
|
360
|
+
}
|
|
361
|
+
else if (p.tokenType === types_1.TokenType.LTA) {
|
|
362
|
+
return generateLimitToken(p.owner, p.mint);
|
|
363
|
+
}
|
|
364
|
+
else {
|
|
365
|
+
return generateAta(p.owner, p.mint);
|
|
366
|
+
}
|
|
342
367
|
});
|
|
343
368
|
const accountInfos = yield connection.getMultipleAccountsInfo(tokenKeys);
|
|
344
369
|
const result = accountInfos.map((accountInfo, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IyfMainIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfMainIxGenerator.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAA6C,sBAAsB,EAAc,uBAAuB,EAAgG,MAAM,cAAc,CAAC;AAGpO,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACpF,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,cAAc,EAAE,IAAI,CAAC,sBAAsB,CAAC;CAC7C,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,EAAE,EAAE,IAAI,CAAC,sBAAsB,CAAC;CACjC,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC;IACnC,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC;IACxC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC;IACnC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;IAC/B,iBAAiB,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,wBAAwB,CAAC,EAAE,EAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;CAExB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,IAAI,CAAC,sBAAsB,CAAC;IACpC,WAAW,EAAE,IAAI,CAAC,sBAAsB,CAAC;IACzC,UAAU,EAAE,IAAI,CAAC,sBAAsB,CAAC;IACxC,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IAAE,OAAO,EAAE;QAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"IyfMainIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfMainIxGenerator.ts"],"names":[],"mappings":"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"}
|