@hawksightco/hawk-sdk 1.2.0 → 1.2.2
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/Transactions.d.ts +15 -15
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +260 -112
- package/dist/src/classes/TxGenerator.d.ts +9 -9
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/classes/TxGenerator.js +22 -10
- package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/IyfExtensionIxGenerator.js +1 -2
- package/dist/src/types.d.ts +19 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js +0 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
|
-
import { MeteoraClaim, MeteoraClaimAll, MeteoraClose, MeteoraCompound, MeteoraCreatePositionAndDeposit, MeteoraCreatePositionAndDepositPda, MeteoraDeposit, MeteoraInitializeBinArrays, MeteoraRebalance, MeteoraWithdraw, Register, TxgenParams, InitializeStorageTokenAccount, MeteoraLimitCloseAutomation, OrcaOpenPosition, OrcaClosePosition, OrcaDeposit, OrcaWithdraw, OrcaClaimRewards, TransactionMetadataResponse, MeteoraRebalance2, ClaimTokenFromSTA, ClaimTokensFromSTA, RaydiumClosePosition } from
|
|
3
|
-
import { RaydiumIncreaseLiquidity, RaydiumOpenPosition, RaydiumDecreaseLiquidity } from
|
|
2
|
+
import { MeteoraClaim, MeteoraClaimAll, MeteoraClose, MeteoraCompound, MeteoraCreatePositionAndDeposit, MeteoraCreatePositionAndDepositPda, MeteoraDeposit, MeteoraInitializeBinArrays, MeteoraRebalance, MeteoraWithdraw, Register, TxgenParams, InitializeStorageTokenAccount, MeteoraLimitCloseAutomation, OrcaOpenPosition, OrcaClosePosition, OrcaDeposit, OrcaWithdraw, OrcaSweepDust, OrcaClaimRewards, TransactionMetadataResponse, MeteoraRebalance2, ClaimTokenFromSTA, ClaimTokensFromSTA, RaydiumClosePosition } from "../types";
|
|
3
|
+
import { RaydiumIncreaseLiquidity, RaydiumOpenPosition, RaydiumDecreaseLiquidity } from "../types";
|
|
4
4
|
import { GeneralUtility } from "./GeneralUtility";
|
|
5
5
|
import { MultiTransaction } from "./MultiTransaction";
|
|
6
6
|
import { SimpleIxGenerator } from "./SimpleIxGenerator";
|
|
@@ -119,7 +119,7 @@ export declare class Transactions {
|
|
|
119
119
|
* @param params Parameters required
|
|
120
120
|
* @returns Array of transaction instructions (simplified output)
|
|
121
121
|
*/
|
|
122
|
-
meteoraClaimAll({ connection, params
|
|
122
|
+
meteoraClaimAll({ connection, params }: TxgenParams<MeteoraClaimAll>, payer: web3.PublicKey, generalUtility: GeneralUtility): Promise<MultiTransaction>;
|
|
123
123
|
/**
|
|
124
124
|
* Creates meteora instruction that closes position.
|
|
125
125
|
*
|
|
@@ -159,7 +159,7 @@ export declare class Transactions {
|
|
|
159
159
|
* @param params Parameters required
|
|
160
160
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
161
161
|
*/
|
|
162
|
-
orcaOpenPosition({ connection, params }: TxgenParams<OrcaOpenPosition>): Promise<TransactionMetadataResponse>;
|
|
162
|
+
orcaOpenPosition({ connection, params, }: TxgenParams<OrcaOpenPosition>): Promise<TransactionMetadataResponse>;
|
|
163
163
|
/**
|
|
164
164
|
* Creates orca instruction that closes position
|
|
165
165
|
*
|
|
@@ -168,7 +168,7 @@ export declare class Transactions {
|
|
|
168
168
|
* @param params Parameters required
|
|
169
169
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
170
170
|
*/
|
|
171
|
-
orcaClosePosition({ connection, params }: TxgenParams<OrcaClosePosition>): Promise<TransactionMetadataResponse>;
|
|
171
|
+
orcaClosePosition({ connection, params, }: TxgenParams<OrcaClosePosition>): Promise<TransactionMetadataResponse>;
|
|
172
172
|
/**
|
|
173
173
|
* Creates orca instruction that deposits to a position
|
|
174
174
|
*
|
|
@@ -177,7 +177,7 @@ export declare class Transactions {
|
|
|
177
177
|
* @param params Parameters required
|
|
178
178
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
179
179
|
*/
|
|
180
|
-
orcaDeposit({ connection, params }: TxgenParams<OrcaDeposit>): Promise<TransactionMetadataResponse>;
|
|
180
|
+
orcaDeposit({ connection, params, }: TxgenParams<OrcaDeposit>): Promise<TransactionMetadataResponse>;
|
|
181
181
|
/**
|
|
182
182
|
* Creates orca instruction that deposits to a position
|
|
183
183
|
*
|
|
@@ -186,7 +186,7 @@ export declare class Transactions {
|
|
|
186
186
|
* @param params Parameters required
|
|
187
187
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
188
188
|
*/
|
|
189
|
-
orcaDepositPda({ connection, params }: TxgenParams<OrcaDeposit>): Promise<TransactionMetadataResponse>;
|
|
189
|
+
orcaDepositPda({ connection, params, }: TxgenParams<OrcaDeposit>): Promise<TransactionMetadataResponse>;
|
|
190
190
|
/**
|
|
191
191
|
* Creates orca instruction that sweeps dust into a position
|
|
192
192
|
*
|
|
@@ -195,7 +195,7 @@ export declare class Transactions {
|
|
|
195
195
|
* @param params Parameters required
|
|
196
196
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
197
197
|
*/
|
|
198
|
-
orcaSweepDust({ connection, params }: TxgenParams<
|
|
198
|
+
orcaSweepDust({ connection, params, }: TxgenParams<OrcaSweepDust>): Promise<TransactionMetadataResponse>;
|
|
199
199
|
/**
|
|
200
200
|
* Creates orca instruction that withdraws from a position
|
|
201
201
|
*
|
|
@@ -204,7 +204,7 @@ export declare class Transactions {
|
|
|
204
204
|
* @param params Parameters required
|
|
205
205
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
206
206
|
*/
|
|
207
|
-
orcaWithdraw({ connection, params }: TxgenParams<OrcaWithdraw>): Promise<TransactionMetadataResponse>;
|
|
207
|
+
orcaWithdraw({ connection, params, }: TxgenParams<OrcaWithdraw>): Promise<TransactionMetadataResponse>;
|
|
208
208
|
/**
|
|
209
209
|
* Creates orca instruction that withdraws from a position
|
|
210
210
|
*
|
|
@@ -213,7 +213,7 @@ export declare class Transactions {
|
|
|
213
213
|
* @param params Parameters required
|
|
214
214
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
215
215
|
*/
|
|
216
|
-
orcaWithdrawPda({ connection, params }: TxgenParams<OrcaWithdraw>): Promise<TransactionMetadataResponse>;
|
|
216
|
+
orcaWithdrawPda({ connection, params, }: TxgenParams<OrcaWithdraw>): Promise<TransactionMetadataResponse>;
|
|
217
217
|
/**
|
|
218
218
|
* Creates orca instruction that claims fees and rewards
|
|
219
219
|
*
|
|
@@ -222,7 +222,7 @@ export declare class Transactions {
|
|
|
222
222
|
* @param params Parameters required
|
|
223
223
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
224
224
|
*/
|
|
225
|
-
orcaClaimRewards({ connection, params }: TxgenParams<OrcaClaimRewards>): Promise<TransactionMetadataResponse>;
|
|
225
|
+
orcaClaimRewards({ connection, params, }: TxgenParams<OrcaClaimRewards>): Promise<TransactionMetadataResponse>;
|
|
226
226
|
/**
|
|
227
227
|
*
|
|
228
228
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -230,7 +230,7 @@ export declare class Transactions {
|
|
|
230
230
|
* @param params Parameters required
|
|
231
231
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
232
232
|
*/
|
|
233
|
-
raydiumOpenPosition({ connection, params }: TxgenParams<RaydiumOpenPosition>): Promise<TransactionMetadataResponse>;
|
|
233
|
+
raydiumOpenPosition({ connection, params, }: TxgenParams<RaydiumOpenPosition>): Promise<TransactionMetadataResponse>;
|
|
234
234
|
/**
|
|
235
235
|
*
|
|
236
236
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -238,7 +238,7 @@ export declare class Transactions {
|
|
|
238
238
|
* @param params Parameters required
|
|
239
239
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
240
240
|
*/
|
|
241
|
-
raydiumClosePosition({ connection, params }: TxgenParams<RaydiumClosePosition>): Promise<TransactionMetadataResponse>;
|
|
241
|
+
raydiumClosePosition({ connection, params, }: TxgenParams<RaydiumClosePosition>): Promise<TransactionMetadataResponse>;
|
|
242
242
|
/**
|
|
243
243
|
*
|
|
244
244
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -246,7 +246,7 @@ export declare class Transactions {
|
|
|
246
246
|
* @param params Parameters required
|
|
247
247
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
248
248
|
*/
|
|
249
|
-
raydiumIncreaseLiquidity({ connection, params }: TxgenParams<RaydiumIncreaseLiquidity>): Promise<TransactionMetadataResponse>;
|
|
249
|
+
raydiumIncreaseLiquidity({ connection, params, }: TxgenParams<RaydiumIncreaseLiquidity>): Promise<TransactionMetadataResponse>;
|
|
250
250
|
/**
|
|
251
251
|
*
|
|
252
252
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -254,7 +254,7 @@ export declare class Transactions {
|
|
|
254
254
|
* @param params Parameters required
|
|
255
255
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
256
256
|
*/
|
|
257
|
-
raydiumDecreaseLiquidity({ connection, params }: TxgenParams<RaydiumDecreaseLiquidity>): Promise<TransactionMetadataResponse>;
|
|
257
|
+
raydiumDecreaseLiquidity({ connection, params, }: TxgenParams<RaydiumDecreaseLiquidity>): Promise<TransactionMetadataResponse>;
|
|
258
258
|
}
|
|
259
259
|
export declare const txgen: Transactions;
|
|
260
260
|
//# sourceMappingURL=Transactions.d.ts.map
|
|
@@ -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,gBAAgB,EAChB,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Transactions.d.ts","sourceRoot":"","sources":["../../../src/classes/Transactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,8 +118,8 @@ class Transactions {
|
|
|
118
118
|
description: "Register User",
|
|
119
119
|
addressLookupTableAddresses: addresses_1.GLOBAL_ALT,
|
|
120
120
|
mainInstructions: [
|
|
121
|
-
yield anchor_1.Anchor.instance()
|
|
122
|
-
.newUser()
|
|
121
|
+
yield anchor_1.Anchor.instance()
|
|
122
|
+
.iyfMain.methods.newUser()
|
|
123
123
|
.accounts({
|
|
124
124
|
farm,
|
|
125
125
|
user,
|
|
@@ -431,7 +431,7 @@ class Transactions {
|
|
|
431
431
|
withdrawPdaBuilder.replaceClaimFeeTokenToSTA();
|
|
432
432
|
// withdrawPdaBuilder.replaceClaimRewardToSTA();
|
|
433
433
|
}
|
|
434
|
-
const mainInstructions =
|
|
434
|
+
const mainInstructions = withdrawPdaBuilder.default();
|
|
435
435
|
let description;
|
|
436
436
|
if (params.shouldClaimAndClose) {
|
|
437
437
|
description =
|
|
@@ -496,7 +496,7 @@ class Transactions {
|
|
|
496
496
|
* @returns Array of transaction instructions (simplified output)
|
|
497
497
|
*/
|
|
498
498
|
meteoraClaimAll(_a, payer_1, generalUtility_1) {
|
|
499
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params
|
|
499
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params }, payer, generalUtility) {
|
|
500
500
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
501
501
|
const fn = new meteora_1.MeteoraFunctions();
|
|
502
502
|
// Step 1: Get all user position
|
|
@@ -507,13 +507,13 @@ class Transactions {
|
|
|
507
507
|
// Step 2.5: Generate transactions
|
|
508
508
|
const mainInstructions = builder.default();
|
|
509
509
|
const latestBlockhash = yield connection.getLatestBlockhash();
|
|
510
|
-
const batchGenerator = new TransactionBatchExecute2_1.TransactionBatchExecute2(addresses_1.GLOBAL_ALT.map(p => new web3.PublicKey(p)), mainInstructions, connection, CreateTxMetadata_1.CreateTxMetadata.instance(), latestBlockhash, payer);
|
|
510
|
+
const batchGenerator = new TransactionBatchExecute2_1.TransactionBatchExecute2(addresses_1.GLOBAL_ALT.map((p) => new web3.PublicKey(p)), mainInstructions, connection, CreateTxMetadata_1.CreateTxMetadata.instance(), latestBlockhash, payer);
|
|
511
511
|
// Insert nonce advance tx at end of transaction
|
|
512
512
|
batchGenerator.insertNonceAt({
|
|
513
513
|
onlyEndOfTx: true,
|
|
514
514
|
});
|
|
515
515
|
// Generate batch of transactions
|
|
516
|
-
const txs = yield batchGenerator.buildBatchWithAlts(
|
|
516
|
+
const txs = yield batchGenerator.buildBatchWithAlts("Claim all fees / rewards from Meteora DLMM position", generalUtility);
|
|
517
517
|
// Simplified return value
|
|
518
518
|
return txs;
|
|
519
519
|
});
|
|
@@ -585,7 +585,10 @@ class Transactions {
|
|
|
585
585
|
useSta: true,
|
|
586
586
|
}));
|
|
587
587
|
}
|
|
588
|
-
mainInstructions.push(yield this.ix.iyfMain.withdrawTokenFromUserPda({
|
|
588
|
+
mainInstructions.push(yield this.ix.iyfMain.withdrawTokenFromUserPda({
|
|
589
|
+
userWallet: params.userWallet,
|
|
590
|
+
mint: params.mint,
|
|
591
|
+
}));
|
|
589
592
|
return (0, functions_1.createTransactionMeta)({
|
|
590
593
|
payer: params.userWallet,
|
|
591
594
|
description: "Withdraw token from PDA",
|
|
@@ -641,7 +644,7 @@ class Transactions {
|
|
|
641
644
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
|
|
642
645
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
643
646
|
const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
|
|
644
|
-
const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.position));
|
|
647
|
+
const userPosition = userPositions.find((userPosition) => userPosition.publicKey.equals(params.position));
|
|
645
648
|
if (userPosition === undefined) {
|
|
646
649
|
throw new Error(`Position: ${params.position} does not exist.`);
|
|
647
650
|
}
|
|
@@ -688,7 +691,7 @@ class Transactions {
|
|
|
688
691
|
const dlmmPool = yield meteora_1.MeteoraDLMM.create(connection, position.lbPair);
|
|
689
692
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
690
693
|
const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
|
|
691
|
-
const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.position));
|
|
694
|
+
const userPosition = userPositions.find((userPosition) => userPosition.publicKey.equals(params.position));
|
|
692
695
|
if (userPosition === undefined) {
|
|
693
696
|
throw new Error(`Position: ${params.position} does not exist.`);
|
|
694
697
|
}
|
|
@@ -724,7 +727,7 @@ class Transactions {
|
|
|
724
727
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
725
728
|
// Step 1: Claim all fees/rewards, remove all liquidity and close current position
|
|
726
729
|
const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
|
|
727
|
-
const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.currentPosition));
|
|
730
|
+
const userPosition = userPositions.find((userPosition) => userPosition.publicKey.equals(params.currentPosition));
|
|
728
731
|
if (userPosition === undefined) {
|
|
729
732
|
throw new Error(`Position: ${params.currentPosition} does not exist.`);
|
|
730
733
|
}
|
|
@@ -781,7 +784,7 @@ class Transactions {
|
|
|
781
784
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
782
785
|
// Step 1: Claim all fees/rewards, remove all liquidity and close current position
|
|
783
786
|
const { userPositions } = yield dlmmPool.getPositionsByUserAndLbPair(userPda);
|
|
784
|
-
const userPosition = userPositions.find(userPosition => userPosition.publicKey.equals(params.currentPosition));
|
|
787
|
+
const userPosition = userPositions.find((userPosition) => userPosition.publicKey.equals(params.currentPosition));
|
|
785
788
|
if (userPosition === undefined) {
|
|
786
789
|
throw new Error(`Position: ${params.currentPosition} does not exist.`);
|
|
787
790
|
}
|
|
@@ -802,7 +805,7 @@ class Transactions {
|
|
|
802
805
|
removeLiquidityBuilder.replaceClaimRewardToSTA();
|
|
803
806
|
}
|
|
804
807
|
// Re-deposit fees (TODO: How to re-deposit reward tokens that is not X or Y token?)
|
|
805
|
-
const { userWallet, newPosition, relativeBinRange, distribution, checkRange } = params;
|
|
808
|
+
const { userWallet, newPosition, relativeBinRange, distribution, checkRange, } = params;
|
|
806
809
|
const redepositIx = yield this.ix.meteoraDlmm.redepositAutomation(connection, {
|
|
807
810
|
userWallet,
|
|
808
811
|
lbPair: position.lbPair,
|
|
@@ -866,13 +869,17 @@ class Transactions {
|
|
|
866
869
|
const hawksightAuthority = addresses_1.HS_AUTHORITY;
|
|
867
870
|
const { params: _params, data } = this.removeLiquidityByRangeInfo(ixs);
|
|
868
871
|
const { position: _position, lbPair, binArrayBitmapExtension, reserveX, reserveY, tokenXMint, tokenYMint, tokenXProgram, tokenYProgram, binArrayLower, binArrayUpper, eventAuthority, program: meteoraDlmmProgram, } = _params;
|
|
869
|
-
let userTokenX = params.useAta
|
|
870
|
-
|
|
872
|
+
let userTokenX = params.useAta
|
|
873
|
+
? (0, functions_1.generateAta)(userPda, tokenXMint.pubkey)
|
|
874
|
+
: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenXMint.pubkey);
|
|
875
|
+
let userTokenY = params.useAta
|
|
876
|
+
? (0, functions_1.generateAta)(userPda, tokenYMint.pubkey)
|
|
877
|
+
: (0, functions_1.generateUserPdaStorageAccount)(userPda, tokenYMint.pubkey);
|
|
871
878
|
let limitCloseAutomationIx;
|
|
872
879
|
if (params.isLimitOrder) {
|
|
873
880
|
// @ts-ignore
|
|
874
|
-
limitCloseAutomationIx = yield anchor_1.Anchor.instance()
|
|
875
|
-
.limitOrderClose(data, params.minBinId, params.maxBinId)
|
|
881
|
+
limitCloseAutomationIx = yield anchor_1.Anchor.instance()
|
|
882
|
+
.iyfExtension.methods.limitOrderClose(data, params.minBinId, params.maxBinId)
|
|
876
883
|
.accounts({
|
|
877
884
|
farm,
|
|
878
885
|
userPda,
|
|
@@ -901,8 +908,8 @@ class Transactions {
|
|
|
901
908
|
}
|
|
902
909
|
else {
|
|
903
910
|
// @ts-ignore
|
|
904
|
-
limitCloseAutomationIx = yield anchor_1.Anchor.instance()
|
|
905
|
-
.meteoraDlmmLimitCloseAutomation(data, params.minBinId, params.maxBinId)
|
|
911
|
+
limitCloseAutomationIx = yield anchor_1.Anchor.instance()
|
|
912
|
+
.iyfExtension.methods.meteoraDlmmLimitCloseAutomation(data, params.minBinId, params.maxBinId)
|
|
906
913
|
.accounts({
|
|
907
914
|
farm,
|
|
908
915
|
userPda,
|
|
@@ -930,8 +937,8 @@ class Transactions {
|
|
|
930
937
|
.instruction();
|
|
931
938
|
}
|
|
932
939
|
// Instruction via main hawksight contract
|
|
933
|
-
const ix = yield anchor_1.Anchor.instance()
|
|
934
|
-
.iyfExtensionExecute(limitCloseAutomationIx.data)
|
|
940
|
+
const ix = yield anchor_1.Anchor.instance()
|
|
941
|
+
.iyfMain.methods.iyfExtensionExecute(limitCloseAutomationIx.data)
|
|
935
942
|
.accounts({
|
|
936
943
|
farm,
|
|
937
944
|
userPda,
|
|
@@ -1011,13 +1018,13 @@ class Transactions {
|
|
|
1011
1018
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1012
1019
|
*/
|
|
1013
1020
|
orcaOpenPosition(_a) {
|
|
1014
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1021
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1015
1022
|
const farm = addresses_1.USDC_FARM;
|
|
1016
1023
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1017
1024
|
const position = (0, functions_1.generateOrcaPositionPDA)(params.positionMint);
|
|
1018
1025
|
const positionTokenAccount = (0, functions_1.generateAta)(userPda, params.positionMint);
|
|
1019
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1020
|
-
.orcaOpenPosition(params.tickLowerIndex, params.tickUpperIndex)
|
|
1026
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1027
|
+
.iyfExtension.methods.orcaOpenPosition(params.tickLowerIndex, params.tickUpperIndex)
|
|
1021
1028
|
.accounts({
|
|
1022
1029
|
farm,
|
|
1023
1030
|
userPda,
|
|
@@ -1034,8 +1041,8 @@ class Transactions {
|
|
|
1034
1041
|
systemProgram: web3.SystemProgram.programId,
|
|
1035
1042
|
})
|
|
1036
1043
|
.instruction();
|
|
1037
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1038
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1044
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1045
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1039
1046
|
.accounts({
|
|
1040
1047
|
farm,
|
|
1041
1048
|
userPda,
|
|
@@ -1074,7 +1081,7 @@ class Transactions {
|
|
|
1074
1081
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1075
1082
|
*/
|
|
1076
1083
|
orcaClosePosition(_a) {
|
|
1077
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1084
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1078
1085
|
const farm = addresses_1.USDC_FARM;
|
|
1079
1086
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1080
1087
|
const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
|
|
@@ -1082,8 +1089,8 @@ class Transactions {
|
|
|
1082
1089
|
throw new Error(`Position: ${params.position} does not exist or already closed.`);
|
|
1083
1090
|
}
|
|
1084
1091
|
const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionData.positionMint);
|
|
1085
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1086
|
-
.orcaClosePosition()
|
|
1092
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1093
|
+
.iyfExtension.methods.orcaClosePosition()
|
|
1087
1094
|
.accounts({
|
|
1088
1095
|
farm,
|
|
1089
1096
|
userPda,
|
|
@@ -1097,8 +1104,8 @@ class Transactions {
|
|
|
1097
1104
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1098
1105
|
})
|
|
1099
1106
|
.instruction();
|
|
1100
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1101
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1107
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1108
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1102
1109
|
.accounts({
|
|
1103
1110
|
farm,
|
|
1104
1111
|
userPda,
|
|
@@ -1134,7 +1141,7 @@ class Transactions {
|
|
|
1134
1141
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1135
1142
|
*/
|
|
1136
1143
|
orcaDeposit(_a) {
|
|
1137
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1144
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1138
1145
|
const farm = addresses_1.USDC_FARM;
|
|
1139
1146
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1140
1147
|
let position;
|
|
@@ -1150,7 +1157,7 @@ class Transactions {
|
|
|
1150
1157
|
position = (0, functions_1.generateOrcaPositionPDA)(positionMint);
|
|
1151
1158
|
}
|
|
1152
1159
|
else {
|
|
1153
|
-
throw new Error(
|
|
1160
|
+
throw new Error("Position mint or orca position needs to be provided.");
|
|
1154
1161
|
}
|
|
1155
1162
|
const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
|
|
1156
1163
|
if (params.newPosition) {
|
|
@@ -1179,7 +1186,8 @@ class Transactions {
|
|
|
1179
1186
|
resultMap.map((result, index) => {
|
|
1180
1187
|
const tokenKey = result.tokenKey;
|
|
1181
1188
|
const token = tokenSeeds[index];
|
|
1182
|
-
if (!result.exists &&
|
|
1189
|
+
if (!result.exists &&
|
|
1190
|
+
`${token.mint}` !== "So11111111111111111111111111111111111111112") {
|
|
1183
1191
|
throw new Error(`Token: ${tokenKey} owned by ${token.owner} does not exist. Mint: ${token.mint}`);
|
|
1184
1192
|
}
|
|
1185
1193
|
});
|
|
@@ -1205,11 +1213,11 @@ class Transactions {
|
|
|
1205
1213
|
mint: mintB,
|
|
1206
1214
|
amount: params.totalYAmount,
|
|
1207
1215
|
},
|
|
1208
|
-
]
|
|
1216
|
+
],
|
|
1209
1217
|
});
|
|
1210
1218
|
// @ts-ignore
|
|
1211
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1212
|
-
.orcaDeposit()
|
|
1219
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1220
|
+
.iyfExtension.methods.orcaDeposit()
|
|
1213
1221
|
.accounts({
|
|
1214
1222
|
farm,
|
|
1215
1223
|
userPda,
|
|
@@ -1232,8 +1240,8 @@ class Transactions {
|
|
|
1232
1240
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1233
1241
|
})
|
|
1234
1242
|
.instruction();
|
|
1235
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1236
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1243
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1244
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1237
1245
|
.accounts({
|
|
1238
1246
|
farm,
|
|
1239
1247
|
userPda,
|
|
@@ -1261,13 +1269,15 @@ class Transactions {
|
|
|
1261
1269
|
.instruction();
|
|
1262
1270
|
const clearRemainingTokensIxs = yield (0, hawksight_1.withdrawMultipleToken)({
|
|
1263
1271
|
payer: params.userWallet,
|
|
1264
|
-
withdraw: [
|
|
1265
|
-
{ mint: mintA },
|
|
1266
|
-
{ mint: mintB },
|
|
1267
|
-
],
|
|
1272
|
+
withdraw: [{ mint: mintA }, { mint: mintB }],
|
|
1268
1273
|
});
|
|
1269
1274
|
orcaIx.keys[2].isSigner = true; // authority must be signer.
|
|
1270
|
-
const mainInstructions = [
|
|
1275
|
+
const mainInstructions = [
|
|
1276
|
+
...wrapSolIx,
|
|
1277
|
+
depositIx,
|
|
1278
|
+
orcaIx,
|
|
1279
|
+
clearRemainingTokensIxs,
|
|
1280
|
+
];
|
|
1271
1281
|
return (0, functions_1.createTransactionMeta)({
|
|
1272
1282
|
payer: params.userWallet,
|
|
1273
1283
|
description: `Deposit to Orca Position: ${position}`,
|
|
@@ -1285,7 +1295,7 @@ class Transactions {
|
|
|
1285
1295
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1286
1296
|
*/
|
|
1287
1297
|
orcaDepositPda(_a) {
|
|
1288
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1298
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1289
1299
|
const farm = addresses_1.USDC_FARM;
|
|
1290
1300
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1291
1301
|
let position;
|
|
@@ -1301,7 +1311,7 @@ class Transactions {
|
|
|
1301
1311
|
position = (0, functions_1.generateOrcaPositionPDA)(positionMint);
|
|
1302
1312
|
}
|
|
1303
1313
|
else {
|
|
1304
|
-
throw new Error(
|
|
1314
|
+
throw new Error("Position mint or orca position needs to be provided.");
|
|
1305
1315
|
}
|
|
1306
1316
|
const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
|
|
1307
1317
|
if (params.newPosition) {
|
|
@@ -1330,7 +1340,8 @@ class Transactions {
|
|
|
1330
1340
|
resultMap.map((result, index) => {
|
|
1331
1341
|
const tokenKey = result.tokenKey;
|
|
1332
1342
|
const token = tokenSeeds[index];
|
|
1333
|
-
if (!result.exists &&
|
|
1343
|
+
if (!result.exists &&
|
|
1344
|
+
`${token.mint}` !== "So11111111111111111111111111111111111111112") {
|
|
1334
1345
|
throw new Error(`Token: ${tokenKey} owned by ${token.owner} does not exist. Mint: ${token.mint}`);
|
|
1335
1346
|
}
|
|
1336
1347
|
});
|
|
@@ -1359,8 +1370,8 @@ class Transactions {
|
|
|
1359
1370
|
// ]
|
|
1360
1371
|
// });
|
|
1361
1372
|
// @ts-ignore
|
|
1362
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1363
|
-
.orcaDeposit()
|
|
1373
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1374
|
+
.iyfExtension.methods.orcaDeposit()
|
|
1364
1375
|
.accounts({
|
|
1365
1376
|
farm,
|
|
1366
1377
|
userPda,
|
|
@@ -1383,8 +1394,8 @@ class Transactions {
|
|
|
1383
1394
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1384
1395
|
})
|
|
1385
1396
|
.instruction();
|
|
1386
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1387
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1397
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1398
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1388
1399
|
.accounts({
|
|
1389
1400
|
farm,
|
|
1390
1401
|
userPda,
|
|
@@ -1436,7 +1447,7 @@ class Transactions {
|
|
|
1436
1447
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1437
1448
|
*/
|
|
1438
1449
|
orcaSweepDust(_a) {
|
|
1439
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1450
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1440
1451
|
const farm = addresses_1.USDC_FARM;
|
|
1441
1452
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1442
1453
|
let position;
|
|
@@ -1452,7 +1463,7 @@ class Transactions {
|
|
|
1452
1463
|
position = (0, functions_1.generateOrcaPositionPDA)(positionMint);
|
|
1453
1464
|
}
|
|
1454
1465
|
else {
|
|
1455
|
-
throw new Error(
|
|
1466
|
+
throw new Error("Position mint or orca position needs to be provided.");
|
|
1456
1467
|
}
|
|
1457
1468
|
const positionTokenAccount = (0, functions_1.generateAta)(userPda, positionMint);
|
|
1458
1469
|
if (params.newPosition) {
|
|
@@ -1481,7 +1492,8 @@ class Transactions {
|
|
|
1481
1492
|
resultMap.map((result, index) => {
|
|
1482
1493
|
const tokenKey = result.tokenKey;
|
|
1483
1494
|
const token = tokenSeeds[index];
|
|
1484
|
-
if (!result.exists &&
|
|
1495
|
+
if (!result.exists &&
|
|
1496
|
+
`${token.mint}` !== "So11111111111111111111111111111111111111112") {
|
|
1485
1497
|
throw new Error(`Token: ${tokenKey} owned by ${token.owner} does not exist. Mint: ${token.mint}`);
|
|
1486
1498
|
}
|
|
1487
1499
|
});
|
|
@@ -1493,7 +1505,7 @@ class Transactions {
|
|
|
1493
1505
|
const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
|
|
1494
1506
|
const [oracle] = web3.PublicKey.findProgramAddressSync([anchor.utils.bytes.utf8.encode("oracle"), whirlpool.toBuffer()], addresses_1.ORCA_WHIRLPOOL_PROGRAM);
|
|
1495
1507
|
// TODO: Derive based on amountToSwap calculation
|
|
1496
|
-
let aToB =
|
|
1508
|
+
let aToB = params.aToB;
|
|
1497
1509
|
const tickArrays = whirlpools_sdk_1.SwapUtils.getTickArrayPublicKeys(whirlpoolData.tickCurrentIndex, whirlpoolData.tickSpacing, aToB, addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool);
|
|
1498
1510
|
// Step 1: Init wSOL token account for user wallet (if X or Y token is wSOL)
|
|
1499
1511
|
// const wrapSolIx = wrapSolIfMintIsWsol(params.userWallet, params.userWallet, [
|
|
@@ -1514,10 +1526,12 @@ class Transactions {
|
|
|
1514
1526
|
// ]
|
|
1515
1527
|
// });
|
|
1516
1528
|
// @ts-ignore
|
|
1517
|
-
|
|
1518
|
-
|
|
1529
|
+
// TODO: make slippage configurable
|
|
1530
|
+
const slippage = new bn_js_1.default(params.slippageBps); // 1%
|
|
1531
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1532
|
+
.iyfExtension.methods.orcaSweepDust(slippage)
|
|
1519
1533
|
.accounts({
|
|
1520
|
-
farm,
|
|
1534
|
+
farm: farm,
|
|
1521
1535
|
userPda,
|
|
1522
1536
|
authority: params.userWallet,
|
|
1523
1537
|
iyfProgram: addresses_1.IYF_MAIN,
|
|
@@ -1541,10 +1555,10 @@ class Transactions {
|
|
|
1541
1555
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1542
1556
|
})
|
|
1543
1557
|
.instruction();
|
|
1544
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1545
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1558
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1559
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1546
1560
|
.accounts({
|
|
1547
|
-
farm,
|
|
1561
|
+
farm: farm,
|
|
1548
1562
|
userPda,
|
|
1549
1563
|
authority: params.userWallet,
|
|
1550
1564
|
iyfProgram: addresses_1.IYF_MAIN,
|
|
@@ -1566,6 +1580,9 @@ class Transactions {
|
|
|
1566
1580
|
extensionIx.keys[16],
|
|
1567
1581
|
extensionIx.keys[17],
|
|
1568
1582
|
extensionIx.keys[18],
|
|
1583
|
+
extensionIx.keys[19],
|
|
1584
|
+
extensionIx.keys[20],
|
|
1585
|
+
extensionIx.keys[21],
|
|
1569
1586
|
])
|
|
1570
1587
|
.instruction();
|
|
1571
1588
|
// const clearRemainingTokensIxs = await withdrawMultipleToken({
|
|
@@ -1576,6 +1593,10 @@ class Transactions {
|
|
|
1576
1593
|
// ],
|
|
1577
1594
|
// });
|
|
1578
1595
|
orcaIx.keys[2].isSigner = true; // authority must be signer.
|
|
1596
|
+
orcaIx.keys[5].isSigner = true; // authority must be signer.
|
|
1597
|
+
orcaIx.keys[7].isWritable = true;
|
|
1598
|
+
orcaIx.keys[11].isWritable = true;
|
|
1599
|
+
orcaIx.keys[19].isWritable = true;
|
|
1579
1600
|
const mainInstructions = [orcaIx];
|
|
1580
1601
|
return (0, functions_1.createTransactionMeta)({
|
|
1581
1602
|
payer: params.userWallet,
|
|
@@ -1594,7 +1615,7 @@ class Transactions {
|
|
|
1594
1615
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1595
1616
|
*/
|
|
1596
1617
|
orcaWithdraw(_a) {
|
|
1597
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1618
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1598
1619
|
const farm = addresses_1.USDC_FARM;
|
|
1599
1620
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1600
1621
|
const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
|
|
@@ -1616,8 +1637,8 @@ class Transactions {
|
|
|
1616
1637
|
const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
|
|
1617
1638
|
const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
|
|
1618
1639
|
// @ts-ignore
|
|
1619
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1620
|
-
.orcaWithdraw(liquidityAmount)
|
|
1640
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1641
|
+
.iyfExtension.methods.orcaWithdraw(liquidityAmount)
|
|
1621
1642
|
.accounts({
|
|
1622
1643
|
farm,
|
|
1623
1644
|
userPda,
|
|
@@ -1640,8 +1661,8 @@ class Transactions {
|
|
|
1640
1661
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1641
1662
|
})
|
|
1642
1663
|
.instruction();
|
|
1643
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1644
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1664
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1665
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1645
1666
|
.accounts({
|
|
1646
1667
|
farm,
|
|
1647
1668
|
userPda,
|
|
@@ -1669,10 +1690,7 @@ class Transactions {
|
|
|
1669
1690
|
.instruction();
|
|
1670
1691
|
const withdrawFromPda = yield (0, hawksight_1.withdrawMultipleToken)({
|
|
1671
1692
|
payer: params.userWallet,
|
|
1672
|
-
withdraw: [
|
|
1673
|
-
{ mint: mintA },
|
|
1674
|
-
{ mint: mintB },
|
|
1675
|
-
],
|
|
1693
|
+
withdraw: [{ mint: mintA }, { mint: mintB }],
|
|
1676
1694
|
});
|
|
1677
1695
|
orcaIx.keys[2].isSigner = true; // authority must be signer.
|
|
1678
1696
|
const mainInstructions = [orcaIx, withdrawFromPda];
|
|
@@ -1693,7 +1711,7 @@ class Transactions {
|
|
|
1693
1711
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1694
1712
|
*/
|
|
1695
1713
|
orcaWithdrawPda(_a) {
|
|
1696
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1714
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1697
1715
|
const farm = addresses_1.USDC_FARM;
|
|
1698
1716
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1699
1717
|
const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
|
|
@@ -1710,13 +1728,15 @@ class Transactions {
|
|
|
1710
1728
|
const mintB = whirlpoolData.tokenMintB;
|
|
1711
1729
|
const tokenOwnerAccountA = (0, functions_1.generateAta)(userPda, mintA);
|
|
1712
1730
|
const tokenOwnerAccountB = (0, functions_1.generateAta)(userPda, mintB);
|
|
1731
|
+
const tokenOwnerStaAtaA = (0, functions_1.generateAta)((0, functions_1.generateUserPdaStorageAccount)(userPda, mintA), mintA);
|
|
1732
|
+
const tokenOwnerStaAtaB = (0, functions_1.generateAta)((0, functions_1.generateUserPdaStorageAccount)(userPda, mintB), mintB);
|
|
1713
1733
|
const { publicKey: tickArrayLower } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickLowerIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
|
|
1714
1734
|
const { publicKey: tickArrayUpper } = (0, orca_1.getTickArrayFromTickIndex)(positionData.tickUpperIndex, whirlpoolData.tickSpacing, whirlpool, addresses_1.ORCA_WHIRLPOOL_PROGRAM);
|
|
1715
1735
|
const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintA);
|
|
1716
1736
|
const ownerFeeB = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, mintB);
|
|
1717
1737
|
// @ts-ignore
|
|
1718
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1719
|
-
.orcaWithdraw(liquidityAmount)
|
|
1738
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1739
|
+
.iyfExtension.methods.orcaWithdraw(liquidityAmount)
|
|
1720
1740
|
.accounts({
|
|
1721
1741
|
farm,
|
|
1722
1742
|
userPda,
|
|
@@ -1739,8 +1759,8 @@ class Transactions {
|
|
|
1739
1759
|
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1740
1760
|
})
|
|
1741
1761
|
.instruction();
|
|
1742
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1743
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
1762
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1763
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1744
1764
|
.accounts({
|
|
1745
1765
|
farm,
|
|
1746
1766
|
userPda,
|
|
@@ -1774,7 +1794,112 @@ class Transactions {
|
|
|
1774
1794
|
// ],
|
|
1775
1795
|
// });
|
|
1776
1796
|
orcaIx.keys[2].isSigner = true; // authority must be signer.
|
|
1777
|
-
|
|
1797
|
+
let mainInstructions = [orcaIx];
|
|
1798
|
+
// If full withdrawal, claim and close the position
|
|
1799
|
+
if (params.percentage >= 100) {
|
|
1800
|
+
const rewardMints = [];
|
|
1801
|
+
const remainingAccounts = [];
|
|
1802
|
+
for (const rewardInfo of whirlpoolData.rewardInfos) {
|
|
1803
|
+
if (rewardInfo.mint.toString() !== web3.SystemProgram.programId.toString()) {
|
|
1804
|
+
const rewardOwnerAccount = (0, functions_1.generateAta)(userPda, rewardInfo.mint);
|
|
1805
|
+
const rewardVault = rewardInfo.vault;
|
|
1806
|
+
const rewardFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, rewardInfo.mint);
|
|
1807
|
+
rewardMints.push(rewardInfo.mint);
|
|
1808
|
+
remainingAccounts.push({
|
|
1809
|
+
pubkey: rewardOwnerAccount,
|
|
1810
|
+
isSigner: false,
|
|
1811
|
+
isWritable: true,
|
|
1812
|
+
});
|
|
1813
|
+
remainingAccounts.push({
|
|
1814
|
+
pubkey: rewardVault,
|
|
1815
|
+
isSigner: false,
|
|
1816
|
+
isWritable: true,
|
|
1817
|
+
});
|
|
1818
|
+
remainingAccounts.push({
|
|
1819
|
+
pubkey: rewardFee,
|
|
1820
|
+
isSigner: false,
|
|
1821
|
+
isWritable: true,
|
|
1822
|
+
});
|
|
1823
|
+
}
|
|
1824
|
+
}
|
|
1825
|
+
const claimIx = yield anchor_1.Anchor.instance()
|
|
1826
|
+
.iyfExtension.methods.orcaClaimRewards()
|
|
1827
|
+
.accounts({
|
|
1828
|
+
farm,
|
|
1829
|
+
userPda,
|
|
1830
|
+
authority: params.userWallet,
|
|
1831
|
+
iyfProgram: addresses_1.IYF_MAIN,
|
|
1832
|
+
whirlpool,
|
|
1833
|
+
positionMint: positionData.positionMint,
|
|
1834
|
+
position: params.position,
|
|
1835
|
+
tickArrayLower,
|
|
1836
|
+
tickArrayUpper,
|
|
1837
|
+
positionTokenAccount,
|
|
1838
|
+
tokenVaultA: whirlpoolData.tokenVaultA,
|
|
1839
|
+
tokenVaultB: whirlpoolData.tokenVaultB,
|
|
1840
|
+
tokenOwnerAccountA: params.useAta !== undefined && !params.useAta
|
|
1841
|
+
? tokenOwnerStaAtaA
|
|
1842
|
+
: tokenOwnerAccountA,
|
|
1843
|
+
tokenOwnerAccountB: params.useAta !== undefined && !params.useAta
|
|
1844
|
+
? tokenOwnerStaAtaB
|
|
1845
|
+
: tokenOwnerAccountB,
|
|
1846
|
+
ownerFeeA,
|
|
1847
|
+
ownerFeeB,
|
|
1848
|
+
orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
|
|
1849
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
1850
|
+
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1851
|
+
})
|
|
1852
|
+
.remainingAccounts(remainingAccounts)
|
|
1853
|
+
.instruction();
|
|
1854
|
+
const orcaClaimIx = yield anchor_1.Anchor.instance()
|
|
1855
|
+
.iyfMain.methods.iyfExtensionExecute(claimIx.data)
|
|
1856
|
+
.accounts({
|
|
1857
|
+
farm,
|
|
1858
|
+
userPda,
|
|
1859
|
+
authority: params.userWallet,
|
|
1860
|
+
iyfProgram: addresses_1.IYF_MAIN,
|
|
1861
|
+
iyfExtensionProgram: addresses_1.IYF_EXTENSION,
|
|
1862
|
+
})
|
|
1863
|
+
.remainingAccounts([...claimIx.keys.slice(4)])
|
|
1864
|
+
.instruction();
|
|
1865
|
+
// mainInstructions.push(orcaClaimIx);
|
|
1866
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1867
|
+
.iyfExtension.methods.orcaClosePosition()
|
|
1868
|
+
.accounts({
|
|
1869
|
+
farm,
|
|
1870
|
+
userPda,
|
|
1871
|
+
authority: params.userWallet,
|
|
1872
|
+
iyfProgram: addresses_1.IYF_MAIN,
|
|
1873
|
+
positionMint: positionData.positionMint,
|
|
1874
|
+
position: params.position,
|
|
1875
|
+
positionTokenAccount,
|
|
1876
|
+
orcaWhirlpoolProgram: addresses_1.ORCA_WHIRLPOOL_PROGRAM,
|
|
1877
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
1878
|
+
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
1879
|
+
})
|
|
1880
|
+
.instruction();
|
|
1881
|
+
let orcaCloseIx = yield anchor_1.Anchor.instance()
|
|
1882
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1883
|
+
.accounts({
|
|
1884
|
+
farm,
|
|
1885
|
+
userPda,
|
|
1886
|
+
authority: params.userWallet,
|
|
1887
|
+
iyfProgram: addresses_1.IYF_MAIN,
|
|
1888
|
+
iyfExtensionProgram: addresses_1.IYF_EXTENSION,
|
|
1889
|
+
})
|
|
1890
|
+
.remainingAccounts([
|
|
1891
|
+
extensionIx.keys[4],
|
|
1892
|
+
extensionIx.keys[5],
|
|
1893
|
+
extensionIx.keys[6],
|
|
1894
|
+
extensionIx.keys[7],
|
|
1895
|
+
extensionIx.keys[8],
|
|
1896
|
+
extensionIx.keys[9],
|
|
1897
|
+
])
|
|
1898
|
+
.instruction();
|
|
1899
|
+
orcaCloseIx.keys[2].isSigner = true; // authority must be signer.
|
|
1900
|
+
// mainInstructions.push(orcaCloseIx);
|
|
1901
|
+
mainInstructions = [orcaClaimIx, ...mainInstructions, orcaCloseIx];
|
|
1902
|
+
}
|
|
1778
1903
|
return (0, functions_1.createTransactionMeta)({
|
|
1779
1904
|
payer: params.userWallet,
|
|
1780
1905
|
description: `Withdraw deposits from Orca Position to Pda: ${params.position}`,
|
|
@@ -1792,7 +1917,7 @@ class Transactions {
|
|
|
1792
1917
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1793
1918
|
*/
|
|
1794
1919
|
orcaClaimRewards(_a) {
|
|
1795
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
1920
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1796
1921
|
const farm = addresses_1.USDC_FARM;
|
|
1797
1922
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet, farm);
|
|
1798
1923
|
const positionData = yield anchor_1.Anchor.instance().orcaProgram.account.position.fetch(params.position);
|
|
@@ -1818,26 +1943,40 @@ class Transactions {
|
|
|
1818
1943
|
const rewardVault = rewardInfo.vault;
|
|
1819
1944
|
const rewardFee = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, rewardInfo.mint);
|
|
1820
1945
|
rewardMints.push(rewardInfo.mint);
|
|
1821
|
-
remainingAccounts.push({
|
|
1822
|
-
|
|
1823
|
-
|
|
1946
|
+
remainingAccounts.push({
|
|
1947
|
+
pubkey: rewardOwnerAccount,
|
|
1948
|
+
isSigner: false,
|
|
1949
|
+
isWritable: true,
|
|
1950
|
+
});
|
|
1951
|
+
remainingAccounts.push({
|
|
1952
|
+
pubkey: rewardVault,
|
|
1953
|
+
isSigner: false,
|
|
1954
|
+
isWritable: true,
|
|
1955
|
+
});
|
|
1956
|
+
remainingAccounts.push({
|
|
1957
|
+
pubkey: rewardFee,
|
|
1958
|
+
isSigner: false,
|
|
1959
|
+
isWritable: true,
|
|
1960
|
+
});
|
|
1824
1961
|
}
|
|
1825
1962
|
}
|
|
1826
|
-
const result = yield (0, functions_1.tokenAccountExists)(connection, rewardMints.map(mint => {
|
|
1963
|
+
const result = yield (0, functions_1.tokenAccountExists)(connection, rewardMints.map((mint) => {
|
|
1827
1964
|
return { owner: userPda, mint, isSta: false };
|
|
1828
1965
|
}));
|
|
1829
|
-
const initRewardATA = result
|
|
1966
|
+
const initRewardATA = result
|
|
1967
|
+
.map((result) => {
|
|
1830
1968
|
if (!result.exists) {
|
|
1831
1969
|
return (0, spl_token_1.createAssociatedTokenAccountInstruction)(params.userWallet, result.tokenKey, userPda, result.mint, addresses_1.TOKEN_PROGRAM_ID, addresses_1.ASSOCIATED_TOKEN_PROGRAM);
|
|
1832
1970
|
}
|
|
1833
1971
|
else {
|
|
1834
1972
|
return null;
|
|
1835
1973
|
}
|
|
1836
|
-
})
|
|
1974
|
+
})
|
|
1975
|
+
.filter((result) => result !== null);
|
|
1837
1976
|
whirlpoolData.rewardInfos[0].mint;
|
|
1838
1977
|
// @ts-ignore
|
|
1839
|
-
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1840
|
-
.orcaClaimRewards()
|
|
1978
|
+
const extensionIx = yield anchor_1.Anchor.instance()
|
|
1979
|
+
.iyfExtension.methods.orcaClaimRewards()
|
|
1841
1980
|
.accounts({
|
|
1842
1981
|
farm,
|
|
1843
1982
|
userPda,
|
|
@@ -1861,8 +2000,8 @@ class Transactions {
|
|
|
1861
2000
|
})
|
|
1862
2001
|
.remainingAccounts(remainingAccounts)
|
|
1863
2002
|
.instruction();
|
|
1864
|
-
const orcaIx = yield anchor_1.Anchor.instance()
|
|
1865
|
-
.iyfExtensionExecute(extensionIx.data)
|
|
2003
|
+
const orcaIx = yield anchor_1.Anchor.instance()
|
|
2004
|
+
.iyfMain.methods.iyfExtensionExecute(extensionIx.data)
|
|
1866
2005
|
.accounts({
|
|
1867
2006
|
farm,
|
|
1868
2007
|
userPda,
|
|
@@ -1870,19 +2009,18 @@ class Transactions {
|
|
|
1870
2009
|
iyfProgram: addresses_1.IYF_MAIN,
|
|
1871
2010
|
iyfExtensionProgram: addresses_1.IYF_EXTENSION,
|
|
1872
2011
|
})
|
|
1873
|
-
.remainingAccounts([
|
|
1874
|
-
...extensionIx.keys.slice(4)
|
|
1875
|
-
])
|
|
2012
|
+
.remainingAccounts([...extensionIx.keys.slice(4)])
|
|
1876
2013
|
.instruction();
|
|
1877
2014
|
const withdrawFromPda = yield (0, hawksight_1.withdrawMultipleToken)({
|
|
1878
2015
|
payer: params.userWallet,
|
|
1879
|
-
withdraw: [
|
|
1880
|
-
{ mint: mintA },
|
|
1881
|
-
{ mint: mintB },
|
|
1882
|
-
],
|
|
2016
|
+
withdraw: [{ mint: mintA }, { mint: mintB }],
|
|
1883
2017
|
});
|
|
1884
2018
|
orcaIx.keys[2].isSigner = true; // authority must be signer.
|
|
1885
|
-
const mainInstructions = [
|
|
2019
|
+
const mainInstructions = [
|
|
2020
|
+
...initRewardATA,
|
|
2021
|
+
orcaIx,
|
|
2022
|
+
withdrawFromPda,
|
|
2023
|
+
];
|
|
1886
2024
|
return (0, functions_1.createTransactionMeta)({
|
|
1887
2025
|
payer: params.userWallet,
|
|
1888
2026
|
description: `Claim rewards from Orca Position: ${params.position}`,
|
|
@@ -1899,21 +2037,21 @@ class Transactions {
|
|
|
1899
2037
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1900
2038
|
*/
|
|
1901
2039
|
raydiumOpenPosition(_a) {
|
|
1902
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
2040
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1903
2041
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
1904
|
-
poolState: params.poolState
|
|
2042
|
+
poolState: params.poolState,
|
|
1905
2043
|
});
|
|
1906
2044
|
const depositIx = yield this.ix.iyfMain.depositMultipleLamportPdaToken({
|
|
1907
2045
|
userWallet: params.userWallet,
|
|
1908
2046
|
deposit: [
|
|
1909
2047
|
{ mint: fetch.poolStateInfo.tokenMint0, amount: params.amount0Max },
|
|
1910
2048
|
{ mint: fetch.poolStateInfo.tokenMint1, amount: params.amount1Max },
|
|
1911
|
-
]
|
|
2049
|
+
],
|
|
1912
2050
|
});
|
|
1913
2051
|
const raydiumOpenPositionIxViaHawksight = yield this.ix.raydium.raydiumOpenPosition({ connection, params, fetch });
|
|
1914
2052
|
const mainInstructions = [
|
|
1915
2053
|
depositIx,
|
|
1916
|
-
raydiumOpenPositionIxViaHawksight
|
|
2054
|
+
raydiumOpenPositionIxViaHawksight,
|
|
1917
2055
|
];
|
|
1918
2056
|
return (0, functions_1.createTransactionMeta)({
|
|
1919
2057
|
payer: params.userWallet,
|
|
@@ -1931,13 +2069,13 @@ class Transactions {
|
|
|
1931
2069
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1932
2070
|
*/
|
|
1933
2071
|
raydiumClosePosition(_a) {
|
|
1934
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
2072
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1935
2073
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
1936
|
-
personalPosition: params.personalPosition
|
|
2074
|
+
personalPosition: params.personalPosition,
|
|
1937
2075
|
});
|
|
1938
2076
|
const raydiumClosePositionIxViaHawksight = yield this.ix.raydium.raydiumClosePosition({ connection, params, fetch });
|
|
1939
2077
|
const mainInstructions = [
|
|
1940
|
-
raydiumClosePositionIxViaHawksight
|
|
2078
|
+
raydiumClosePositionIxViaHawksight,
|
|
1941
2079
|
];
|
|
1942
2080
|
return (0, functions_1.createTransactionMeta)({
|
|
1943
2081
|
payer: params.userWallet,
|
|
@@ -1955,21 +2093,25 @@ class Transactions {
|
|
|
1955
2093
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1956
2094
|
*/
|
|
1957
2095
|
raydiumIncreaseLiquidity(_a) {
|
|
1958
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
2096
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1959
2097
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
1960
|
-
personalPosition: params.personalPosition
|
|
2098
|
+
personalPosition: params.personalPosition,
|
|
1961
2099
|
});
|
|
1962
2100
|
const depositIx = yield this.ix.iyfMain.depositMultipleLamportPdaToken({
|
|
1963
2101
|
userWallet: params.userWallet,
|
|
1964
2102
|
deposit: [
|
|
1965
2103
|
{ mint: fetch.poolStateInfo.tokenMint0, amount: params.amount0Max },
|
|
1966
2104
|
{ mint: fetch.poolStateInfo.tokenMint1, amount: params.amount1Max },
|
|
1967
|
-
]
|
|
2105
|
+
],
|
|
2106
|
+
});
|
|
2107
|
+
const raydiumIncreaseLiquidityIxViaHawksight = yield this.ix.raydium.raydiumIncreaseLiquidity({
|
|
2108
|
+
connection,
|
|
2109
|
+
params,
|
|
2110
|
+
fetch,
|
|
1968
2111
|
});
|
|
1969
|
-
const raydiumIncreaseLiquidityIxViaHawksight = yield this.ix.raydium.raydiumIncreaseLiquidity({ connection, params, fetch });
|
|
1970
2112
|
const mainInstructions = [
|
|
1971
2113
|
depositIx,
|
|
1972
|
-
raydiumIncreaseLiquidityIxViaHawksight
|
|
2114
|
+
raydiumIncreaseLiquidityIxViaHawksight,
|
|
1973
2115
|
];
|
|
1974
2116
|
return (0, functions_1.createTransactionMeta)({
|
|
1975
2117
|
payer: params.userWallet,
|
|
@@ -1987,9 +2129,9 @@ class Transactions {
|
|
|
1987
2129
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
1988
2130
|
*/
|
|
1989
2131
|
raydiumDecreaseLiquidity(_a) {
|
|
1990
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, params }) {
|
|
2132
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, params, }) {
|
|
1991
2133
|
const fetch = yield this.ix.raydium.raydiumFetch({
|
|
1992
|
-
personalPosition: params.personalPosition
|
|
2134
|
+
personalPosition: params.personalPosition,
|
|
1993
2135
|
});
|
|
1994
2136
|
const withdrawIx = yield this.ix.iyfMain.withdrawMultipleLamportPdaToken({
|
|
1995
2137
|
userWallet: params.userWallet,
|
|
@@ -1997,11 +2139,17 @@ class Transactions {
|
|
|
1997
2139
|
{ mint: fetch.poolStateInfo.tokenMint0 },
|
|
1998
2140
|
{ mint: fetch.poolStateInfo.tokenMint1 },
|
|
1999
2141
|
...fetch.poolStateInfo.rewardInfos
|
|
2000
|
-
.filter(v => !v.tokenMint.equals(web3.SystemProgram.programId))
|
|
2001
|
-
.map(v => {
|
|
2002
|
-
|
|
2142
|
+
.filter((v) => !v.tokenMint.equals(web3.SystemProgram.programId))
|
|
2143
|
+
.map((v) => {
|
|
2144
|
+
return { mint: v.tokenMint };
|
|
2145
|
+
}),
|
|
2146
|
+
],
|
|
2147
|
+
});
|
|
2148
|
+
const raydiumDecreaseLiquidityIxViaHawksight = yield this.ix.raydium.raydiumDecreaseLiquidity({
|
|
2149
|
+
connection,
|
|
2150
|
+
params,
|
|
2151
|
+
fetch,
|
|
2003
2152
|
});
|
|
2004
|
-
const raydiumDecreaseLiquidityIxViaHawksight = yield this.ix.raydium.raydiumDecreaseLiquidity({ connection, params, fetch });
|
|
2005
2153
|
const mainInstructions = [
|
|
2006
2154
|
raydiumDecreaseLiquidityIxViaHawksight,
|
|
2007
2155
|
withdrawIx,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
2
|
import * as _client from "@hawksightco/swagger-client";
|
|
3
|
-
import { InitializeStorageTokenAccount, ClaimTokensFromSTA, ClaimTokenFromSTA, MeteoraTxWithdraw, ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards, MeteoraClaimAll, MeteoraCreatePositionAndDepositPda, RaydiumOpenPosition, RaydiumClosePosition, RaydiumIncreaseLiquidity, RaydiumDecreaseLiquidity } from "../types";
|
|
3
|
+
import { InitializeStorageTokenAccount, ClaimTokensFromSTA, ClaimTokenFromSTA, MeteoraTxWithdraw, ResponseWithStatus, TransactionMetadata, OrcaWithdraw, OrcaDeposit, OrcaClosePosition, OrcaOpenPosition, OrcaClaimRewards, MeteoraClaimAll, MeteoraCreatePositionAndDepositPda, RaydiumOpenPosition, RaydiumClosePosition, RaydiumIncreaseLiquidity, RaydiumDecreaseLiquidity, OrcaSweepDust } from "../types";
|
|
4
4
|
import { Client } from "./Client";
|
|
5
5
|
import { GeneralUtility } from "./GeneralUtility";
|
|
6
6
|
import { MultiTransaction } from "./MultiTransaction";
|
|
@@ -49,13 +49,13 @@ export declare class TxGenerator {
|
|
|
49
49
|
*/
|
|
50
50
|
claimTokensFromSta(connection: web3.Connection, payer: string, params: ClaimTokensFromSTA): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
51
51
|
/**
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
52
|
+
* Creates instructions to initialize storage token accounts
|
|
53
|
+
*
|
|
54
|
+
* @param connection A Solana web3 connection for interacting with the blockchain.
|
|
55
|
+
* @param payer The public key of the payer for transaction fees.
|
|
56
|
+
* @param params Parameters required.
|
|
57
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
58
|
+
*/
|
|
59
59
|
initializeStorageTokenAccounts(connection: web3.Connection, payer: string, params: InitializeStorageTokenAccount): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
60
60
|
/**
|
|
61
61
|
* Creates meteora instruction that creates new position and deposit.
|
|
@@ -200,7 +200,7 @@ export declare class TxGenerator {
|
|
|
200
200
|
* @param params Parameters required
|
|
201
201
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
202
202
|
*/
|
|
203
|
-
orcaSweepDust(connection: web3.Connection, payer: string, params:
|
|
203
|
+
orcaSweepDust(connection: web3.Connection, payer: string, params: OrcaSweepDust): Promise<ResponseWithStatus<TransactionMetadata>>;
|
|
204
204
|
/**
|
|
205
205
|
* Creates orca instruction that claims fees and rewards
|
|
206
206
|
*
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"TxGenerator.d.ts","sourceRoot":"","sources":["../../../src/classes/TxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,11 @@ class TxGenerator {
|
|
|
72
72
|
// Initialize anchor
|
|
73
73
|
anchor_1.Anchor.initialize(connection);
|
|
74
74
|
try {
|
|
75
|
-
const result = yield Transactions_1.txgen.claimTokenFromSta({
|
|
75
|
+
const result = yield Transactions_1.txgen.claimTokenFromSta({
|
|
76
|
+
connection,
|
|
77
|
+
params,
|
|
78
|
+
fetch: undefined,
|
|
79
|
+
});
|
|
76
80
|
return {
|
|
77
81
|
status: 200,
|
|
78
82
|
data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, payer, result),
|
|
@@ -104,7 +108,11 @@ class TxGenerator {
|
|
|
104
108
|
// Initialize anchor
|
|
105
109
|
anchor_1.Anchor.initialize(connection);
|
|
106
110
|
try {
|
|
107
|
-
const result = yield Transactions_1.txgen.claimTokensFromSta({
|
|
111
|
+
const result = yield Transactions_1.txgen.claimTokensFromSta({
|
|
112
|
+
connection,
|
|
113
|
+
params,
|
|
114
|
+
fetch: undefined,
|
|
115
|
+
});
|
|
108
116
|
return {
|
|
109
117
|
status: 200,
|
|
110
118
|
data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, payer, result),
|
|
@@ -123,19 +131,23 @@ class TxGenerator {
|
|
|
123
131
|
});
|
|
124
132
|
}
|
|
125
133
|
/**
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
134
|
+
* Creates instructions to initialize storage token accounts
|
|
135
|
+
*
|
|
136
|
+
* @param connection A Solana web3 connection for interacting with the blockchain.
|
|
137
|
+
* @param payer The public key of the payer for transaction fees.
|
|
138
|
+
* @param params Parameters required.
|
|
139
|
+
* @returns A ResponseWithStatus containing either TransactionMetadataResponse or TransactionMetadata.
|
|
140
|
+
*/
|
|
133
141
|
initializeStorageTokenAccounts(connection, payer, params) {
|
|
134
142
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
143
|
// Initialize anchor
|
|
136
144
|
anchor_1.Anchor.initialize(connection);
|
|
137
145
|
try {
|
|
138
|
-
const result = yield Transactions_1.txgen.initializeStorageTokenAccounts({
|
|
146
|
+
const result = yield Transactions_1.txgen.initializeStorageTokenAccounts({
|
|
147
|
+
connection,
|
|
148
|
+
params,
|
|
149
|
+
fetch: undefined,
|
|
150
|
+
});
|
|
139
151
|
return {
|
|
140
152
|
status: 200,
|
|
141
153
|
data: yield (0, functions_1.createTxMetadata)(this.generalUtility, connection, payer, result),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IyfExtensionIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfExtensionIxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"IyfExtensionIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfExtensionIxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,6 @@ const anchor_1 = require("../anchor");
|
|
|
41
41
|
const functions_1 = require("../functions");
|
|
42
42
|
const addresses_1 = require("../addresses");
|
|
43
43
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
44
|
-
const node_buffer_1 = require("node:buffer");
|
|
45
44
|
/**
|
|
46
45
|
* Iyf Extension IX Generator
|
|
47
46
|
*/
|
|
@@ -348,7 +347,7 @@ class IyfExtensionIxGenerator {
|
|
|
348
347
|
{ pubkey: addresses_1.TOKEN_2022, isSigner: false, isWritable: false },
|
|
349
348
|
{ pubkey: addresses_1.MEMO_PROGRAM, isSigner: false, isWritable: false },
|
|
350
349
|
],
|
|
351
|
-
data:
|
|
350
|
+
data: Buffer.concat([
|
|
352
351
|
new Uint8Array((0, functions_1.sighash)('raydium_sweep_dust')),
|
|
353
352
|
new Uint8Array(slippage.toBuffer('le', 8)),
|
|
354
353
|
]),
|
package/dist/src/types.d.ts
CHANGED
|
@@ -273,7 +273,10 @@ export interface SearchTokenStore {
|
|
|
273
273
|
tokenIndices: SearchIndices;
|
|
274
274
|
tokens: Token[];
|
|
275
275
|
}
|
|
276
|
-
export type LoadFromPersistenceFn = () => Promise<[
|
|
276
|
+
export type LoadFromPersistenceFn = () => Promise<[
|
|
277
|
+
SearchIndices | undefined,
|
|
278
|
+
Token[] | undefined
|
|
279
|
+
]>;
|
|
277
280
|
export type StoreToPersistenceFn = (tokenIndices: SearchIndices, tokens: Token[]) => Promise<void>;
|
|
278
281
|
export type TxgenParams<T, DeserializedAccounts = undefined> = {
|
|
279
282
|
connection: web3.Connection;
|
|
@@ -427,10 +430,25 @@ export type OrcaDeposit = {
|
|
|
427
430
|
tickUpperIndex: number;
|
|
428
431
|
};
|
|
429
432
|
};
|
|
433
|
+
export type OrcaSweepDust = {
|
|
434
|
+
userWallet: web3.PublicKey;
|
|
435
|
+
mintOrPosition: {
|
|
436
|
+
positionMint?: web3.PublicKey;
|
|
437
|
+
position?: web3.PublicKey;
|
|
438
|
+
};
|
|
439
|
+
newPosition?: {
|
|
440
|
+
whirlpool: web3.PublicKey;
|
|
441
|
+
tickLowerIndex: number;
|
|
442
|
+
tickUpperIndex: number;
|
|
443
|
+
};
|
|
444
|
+
aToB: boolean;
|
|
445
|
+
slippageBps: number;
|
|
446
|
+
};
|
|
430
447
|
export type OrcaWithdraw = {
|
|
431
448
|
userWallet: web3.PublicKey;
|
|
432
449
|
position: web3.PublicKey;
|
|
433
450
|
percentage: number;
|
|
451
|
+
useAta?: boolean;
|
|
434
452
|
};
|
|
435
453
|
export type OrcaClaimRewards = {
|
|
436
454
|
userWallet: web3.PublicKey;
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;AAEnD,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;AAE5D,MAAM,MAAM,QAAQ,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,OAAO,GACP,SAAS,GACT,iBAAiB,GACjB,kBAAkB,GAClB,oBAAoB,CAAA;AAKxB,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,MAAM,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,oBAAY,IAAI;IACd,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,UAAU,eAAe;IACzB,GAAG,QAAQ;CACZ;AAED,oBAAY,QAAQ;IAClB,KAAK,UAAU;IACf,IAAI,SAAS;IACb,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,IAAI,EAAE,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,MAAM,IAAI,GACZ,CAAC,QAAQ,GAAG;IACV,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;IACzB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC,GACF,CAAC,QAAQ,GAAG;IACV,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;IACxB,MAAM,EAAE,cAAc,CAAC;CACxB,CAAC,GACF,CAAC,QAAQ,GAAG;IACV,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC3B,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC,CAAC;AAEP,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC;AACjC,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC;AAC1C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC;QAClB,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,MAAM,CAAC;AAE5G,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG,CAAC;IACrD,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC3B,IAAI,EAAE;QACJ,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAA;CACF,GAAG;IACF,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;IACxB,IAAI,EAAE,IAAI,CAAA;CACX,GAAG;IACF,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;IACzB,IAAI,EAAE,IAAI,CAAA;CACX,CAAC,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,gBAAgB,GAAG;IACvC,eAAe,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;CAClC,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;KACd,CAAA;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,KAAK,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QACpC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;KACpC,CAAC;IACF,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,UAAU,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,UAAU,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,OAAO,CAAC;KACtB,CAAA;IACD,MAAM,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,kBAAkB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,kBAAkB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACjE,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,YAAY,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,MAAM,EAAE,EAAE,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,CAAA;CACR,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,yBAAyB,EAAE,WAAW,EAAE,CAAC;IACzC,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,gBAAgB,CAAC;CAC/B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;CAC5C,CAAA;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,CAAC,aAAa,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;AACpG,MAAM,MAAM,oBAAoB,GAAG,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnG,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,oBAAoB,GAAG,SAAS,IAAI;IAC7D,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,oBAAoB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;CACtB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;CACzB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG;IAC5C,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC;IACd,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IACF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,EAAE,MAAM,EAAE,CAAC;KAC1B,CAAC;IACF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,cAAc,CAAC,EAAE;QACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,gBAAgB,EAAE,QAAQ,CAAC;IAC3B,UAAU,EAAE,QAAQ,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC;IAC7B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,cAAc,EAAE;QACd,YAAY,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;QAC9B,QAAQ,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;KAC3B,CAAA;IACD,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE;QACZ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,cAAc,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,MAAM,CAAC;KACxB,CAAA;CACF,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;CAC1B,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,YAAY,EAAE,YAAY,CAU9D,CAAC;AAEF,oBAAY,eAAe;IACzB,WAAW,IAAI;IACf,YAAY,IAAI;IAChB,aAAa,IAAI;IACjB,YAAY,IAAI;IAChB,aAAa,IAAI;IACjB,cAAc,IAAI;IAClB,cAAc,IAAI;IAClB,eAAe,IAAI;IACnB,gBAAgB,IAAI;CACrB;AAED,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,YAAY,EAAE,eAAe,CAUpE,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,MAAM,EAAE,EAAE,CAAC;CACZ;AAED,MAAM,WAAW,wBAAwB;IACvC,GAAG,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACnC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;CAC3B;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,EAClC,GAAG,EACH,OAAO,EACP,SAAS,GACV,EAAE,wBAAwB,KAAK,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;AAEvE,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE;QACR,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;QACtB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;KACvB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC5C,IAAI,EAAE,MAAM,CACV,MAAM,EACN;QACE,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,EAAE,CAAC;KACvB,CACF,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAC1G,MAAM,MAAM,aAAa,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;AAC/G,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAElH,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,EAAE,CAAC;IACd,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;CAClC,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;IACjC,SAAS,EAAE,EAAE,CAAC;IACd,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;IACjC,SAAS,EAAE,EAAE,CAAC;IACd,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,EAAE,CAAC;CACd,CAAA"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.js
CHANGED
|
@@ -19,7 +19,6 @@ var Protocol;
|
|
|
19
19
|
Protocol["Meteora"] = "meteora";
|
|
20
20
|
Protocol["Raydium"] = "raydium";
|
|
21
21
|
})(Protocol || (exports.Protocol = Protocol = {}));
|
|
22
|
-
;
|
|
23
22
|
exports.StrategyTypeMap = {
|
|
24
23
|
SPOT: dlmm_1.StrategyType.SpotImBalanced,
|
|
25
24
|
CURVE: dlmm_1.StrategyType.CurveImBalanced,
|