@hawksightco/hawk-sdk 1.2.96 → 1.2.98
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/classes/HawkAPI.d.ts +0 -8
- package/dist/src/classes/HawkAPI.d.ts.map +1 -1
- package/dist/src/classes/HawkAPI.js +0 -13
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +2 -0
- package/dist/src/functions.d.ts +1 -0
- package/dist/src/functions.d.ts.map +1 -1
- package/dist/src/functions.js +11 -47
- package/dist/src/hsToMeteora.js +25 -2
- package/dist/src/idl/iyf-extension-idl.d.ts +250 -527
- package/dist/src/idl/iyf-extension-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-extension-idl.js +291 -568
- package/dist/src/idl/iyf-main-idl.d.ts +2095 -10
- package/dist/src/idl/iyf-main-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-main-idl.js +2556 -471
- package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts +14 -30
- package/dist/src/ixGenerator/IyfExtensionIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/IyfExtensionIxGenerator.js +2 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts +17 -0
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.js +84 -0
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts +32 -6
- package/dist/src/ixGenerator/RaydiumIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/RaydiumIxGenerator.js +6 -26
- package/dist/src/meteora.d.ts +2 -0
- package/dist/src/meteora.d.ts.map +1 -1
- package/dist/src/meteora.js +6 -2
- package/dist/src/types.d.ts +3 -65
- package/dist/src/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,6 @@ import * as web3 from "@solana/web3.js";
|
|
|
2
2
|
import BN from "bn.js";
|
|
3
3
|
import { IyfMainIxGenerator } from "./IyfMainIxGenerator";
|
|
4
4
|
import { SimplePdaGenerator } from "../classes/SimplePdaGenerator";
|
|
5
|
-
import { RaydiumClosePositionAutomation } from "../types";
|
|
6
5
|
type MoveTokenIx = {
|
|
7
6
|
connection: web3.Connection;
|
|
8
7
|
userWallet: web3.PublicKey;
|
|
@@ -22,9 +21,14 @@ type RaydiumOpenPositionAutomation = {
|
|
|
22
21
|
tickSpacing: number;
|
|
23
22
|
tickLowerIndex: number;
|
|
24
23
|
tickUpperIndex: number;
|
|
25
|
-
liquidity
|
|
26
|
-
amount0Max
|
|
27
|
-
amount1Max
|
|
24
|
+
liquidity: BN;
|
|
25
|
+
amount0Max: BN;
|
|
26
|
+
amount1Max: BN;
|
|
27
|
+
};
|
|
28
|
+
type RaydiumClosePositionAutomation = {
|
|
29
|
+
connection: web3.Connection;
|
|
30
|
+
userWallet: web3.PublicKey;
|
|
31
|
+
positionNftMint: web3.PublicKey;
|
|
28
32
|
};
|
|
29
33
|
type RaydiumDecreaseLiquidity = {
|
|
30
34
|
connection: web3.Connection;
|
|
@@ -47,27 +51,6 @@ type RaydiumDecreaseLiquidity = {
|
|
|
47
51
|
tokenVault: web3.PublicKey;
|
|
48
52
|
}[];
|
|
49
53
|
};
|
|
50
|
-
type RaydiumDecreaseLiquidityAutomation = {
|
|
51
|
-
connection: web3.Connection;
|
|
52
|
-
userWallet: web3.PublicKey;
|
|
53
|
-
nftMint: web3.PublicKey;
|
|
54
|
-
poolState: web3.PublicKey;
|
|
55
|
-
personalPosition: web3.PublicKey;
|
|
56
|
-
tokenVault0: web3.PublicKey;
|
|
57
|
-
tokenVault1: web3.PublicKey;
|
|
58
|
-
vault0Mint: web3.PublicKey;
|
|
59
|
-
vault1Mint: web3.PublicKey;
|
|
60
|
-
tickSpacing: number;
|
|
61
|
-
tickLowerIndex: number;
|
|
62
|
-
tickUpperIndex: number;
|
|
63
|
-
liquidity?: BN;
|
|
64
|
-
amount0Min?: BN;
|
|
65
|
-
amount1Min?: BN;
|
|
66
|
-
rewardInfos: {
|
|
67
|
-
tokenMint: web3.PublicKey;
|
|
68
|
-
tokenVault: web3.PublicKey;
|
|
69
|
-
}[];
|
|
70
|
-
};
|
|
71
54
|
type RaydiumIncreaseLiquidityAutomation = {
|
|
72
55
|
connection: web3.Connection;
|
|
73
56
|
userWallet: web3.PublicKey;
|
|
@@ -80,9 +63,9 @@ type RaydiumIncreaseLiquidityAutomation = {
|
|
|
80
63
|
tickSpacing: number;
|
|
81
64
|
tickLowerIndex: number;
|
|
82
65
|
tickUpperIndex: number;
|
|
83
|
-
liquidity
|
|
84
|
-
amount0Max
|
|
85
|
-
amount1Max
|
|
66
|
+
liquidity: BN;
|
|
67
|
+
amount0Max: BN;
|
|
68
|
+
amount1Max: BN;
|
|
86
69
|
};
|
|
87
70
|
type RaydiumSweepDust = {
|
|
88
71
|
connection: web3.Connection;
|
|
@@ -99,6 +82,7 @@ type RaydiumSweepDust = {
|
|
|
99
82
|
tickSpacing: number;
|
|
100
83
|
tickLowerIndex: number;
|
|
101
84
|
tickUpperIndex: number;
|
|
85
|
+
slippage: BN;
|
|
102
86
|
};
|
|
103
87
|
/**
|
|
104
88
|
* Iyf Extension IX Generator
|
|
@@ -117,9 +101,9 @@ export declare class IyfExtensionIxGenerator {
|
|
|
117
101
|
raydiumOpenPositionAutomation({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Max, amount1Max, }: RaydiumOpenPositionAutomation): Promise<web3.TransactionInstruction>;
|
|
118
102
|
raydiumClosePositionAutomation({ connection, userWallet, positionNftMint, }: RaydiumClosePositionAutomation): Promise<web3.TransactionInstruction>;
|
|
119
103
|
raydiumDecreaseLiquidity({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
|
|
120
|
-
raydiumDecreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }:
|
|
104
|
+
raydiumDecreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, personalPosition, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Min, amount1Min, rewardInfos, }: RaydiumDecreaseLiquidity): Promise<web3.TransactionInstruction>;
|
|
121
105
|
raydiumIncreaseLiquidityAutomation({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, tickSpacing, tickLowerIndex, tickUpperIndex, liquidity, amount0Max, amount1Max, }: RaydiumIncreaseLiquidityAutomation): Promise<web3.TransactionInstruction>;
|
|
122
|
-
raydiumSweepDust({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, ammConfig, observationKey, tickCurrent, tickSpacing, tickLowerIndex, tickUpperIndex, }: RaydiumSweepDust): Promise<web3.TransactionInstruction>;
|
|
106
|
+
raydiumSweepDust({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, ammConfig, observationKey, tickCurrent, tickSpacing, tickLowerIndex, tickUpperIndex, slippage, }: RaydiumSweepDust): Promise<web3.TransactionInstruction>;
|
|
123
107
|
}
|
|
124
108
|
export {};
|
|
125
109
|
//# sourceMappingURL=IyfExtensionIxGenerator.d.ts.map
|
|
@@ -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;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;
|
|
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;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,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,KAAK,8BAA8B,GAAG;IACpC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC;CACjC,CAAA;AAED,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC;IACjC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,EAAE,CAAC;IACd,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,EAAE,CAAC;IACf,WAAW,EAAE;QACX,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;KAC5B,EAAE,CAAA;CACJ,CAAA;AAED,KAAK,kCAAkC,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,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,KAAK,gBAAgB,GAAG;IACtB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1B,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,EAAE,CAAC;CACd,CAAA;AAED;;GAEG;AACH,qBAAa,uBAAuB;IAGhC,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;gBADP,GAAG,EAAE,kBAAkB,EACvB,OAAO,EAAE,kBAAkB;IAGrC;;;;;OAKG;IACG,WAAW,CAAC,EAChB,UAAU,EACV,UAAU,EACV,IAAI,EACJ,eAAe,EACf,MAAM,GACP,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IA0C/C,6BAA6B,CAAC,EAClC,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,SAAS,EACT,UAAU,EACV,UAAU,GACX,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IAyDjE,8BAA8B,CAAC,EACnC,UAAU,EACV,UAAU,EACV,eAAe,GAChB,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IA2BlE,wBAAwB,CAAC,EAC7B,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IA2F5D,kCAAkC,CAAC,EACvC,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,SAAS,EACT,UAAU,EACV,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IA2F5D,kCAAkC,CAAC,EACvC,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,EACd,cAAc,EACd,SAAS,EACT,UAAU,EACV,UAAU,GACX,EAAE,kCAAkC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;IA8CtE,gBAAgB,CAAC,EACrB,UAAU,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,cAAc,EACd,cAAc,EACd,QAAQ,GACT,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;CA2D3D"}
|
|
@@ -388,7 +388,7 @@ class IyfExtensionIxGenerator {
|
|
|
388
388
|
});
|
|
389
389
|
}
|
|
390
390
|
raydiumSweepDust(_a) {
|
|
391
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, ammConfig, observationKey, tickCurrent, tickSpacing, tickLowerIndex, tickUpperIndex, }) {
|
|
391
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, nftMint, poolState, tokenVault0, tokenVault1, vault0Mint, vault1Mint, ammConfig, observationKey, tickCurrent, tickSpacing, tickLowerIndex, tickUpperIndex, slippage, }) {
|
|
392
392
|
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
393
393
|
const nftOwner = (0, functions_1.generateUserPdaLamport)(userWallet);
|
|
394
394
|
const tickArrayLowerStartIndex = (0, functions_1.raydiumStartTickIndex)(tickLowerIndex, tickSpacing);
|
|
@@ -441,6 +441,7 @@ class IyfExtensionIxGenerator {
|
|
|
441
441
|
],
|
|
442
442
|
data: Buffer.concat([
|
|
443
443
|
new Uint8Array((0, functions_1.sighash)('raydium_sweep_dust')),
|
|
444
|
+
new Uint8Array(slippage.toBuffer('le', 8)),
|
|
444
445
|
]),
|
|
445
446
|
})
|
|
446
447
|
});
|
|
@@ -215,6 +215,23 @@ export declare class IyfMainIxGenerator {
|
|
|
215
215
|
withdrawMultipleLamportPdaToken({ userWallet, withdraw, skipIdempotent }: WithdrawMultipleLamportPdaToken): Promise<web3.TransactionInstruction>;
|
|
216
216
|
createLimitToken({ payer, userWallet, mint, }: CreateLimitTokenParams): Promise<web3.TransactionInstruction>;
|
|
217
217
|
closeLimitToken({ userWallet, mint, }: CloseLimitTokenParams): Promise<web3.TransactionInstruction>;
|
|
218
|
+
fuelDeposit({ userWallet, amount, }: {
|
|
219
|
+
userWallet: web3.PublicKey;
|
|
220
|
+
amount: BN;
|
|
221
|
+
}): Promise<web3.TransactionInstruction>;
|
|
222
|
+
fuelWithdraw(connection: web3.Connection, { userWallet, amount, }: {
|
|
223
|
+
userWallet: web3.PublicKey;
|
|
224
|
+
amount: BN;
|
|
225
|
+
}): Promise<web3.TransactionInstruction>;
|
|
226
|
+
wrapFromFuel(connection: web3.Connection, { userWallet, authority, amount, }: {
|
|
227
|
+
userWallet: web3.PublicKey;
|
|
228
|
+
authority: web3.PublicKey;
|
|
229
|
+
amount?: BN;
|
|
230
|
+
}): Promise<web3.TransactionInstruction>;
|
|
231
|
+
unwrapToFuel(connection: web3.Connection, { userWallet, authority, }: {
|
|
232
|
+
userWallet: web3.PublicKey;
|
|
233
|
+
authority: web3.PublicKey;
|
|
234
|
+
}): Promise<web3.TransactionInstruction>;
|
|
218
235
|
}
|
|
219
236
|
export {};
|
|
220
237
|
//# sourceMappingURL=IyfMainIxGenerator.d.ts.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"IyfMainIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/IyfMainIxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,7 @@ const types_1 = require("../types");
|
|
|
45
45
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
46
46
|
const token_1 = require("@coral-xyz/anchor/dist/cjs/utils/token");
|
|
47
47
|
const web3_js_1 = require("@solana/web3.js");
|
|
48
|
+
const WSOL_MINT = new web3.PublicKey("So11111111111111111111111111111111111111112");
|
|
48
49
|
/**
|
|
49
50
|
* Iyf Main IX Generator
|
|
50
51
|
*/
|
|
@@ -701,5 +702,88 @@ class IyfMainIxGenerator {
|
|
|
701
702
|
return ix;
|
|
702
703
|
});
|
|
703
704
|
}
|
|
705
|
+
fuelDeposit(_a) {
|
|
706
|
+
return __awaiter(this, arguments, void 0, function* ({ userWallet, amount, }) {
|
|
707
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
708
|
+
const fuelAccount = (0, functions_1.generateFuelAccount)(userWallet);
|
|
709
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
710
|
+
.fuelDeposit(amount)
|
|
711
|
+
.accounts({
|
|
712
|
+
userPda,
|
|
713
|
+
authority: userWallet,
|
|
714
|
+
fuelAccount,
|
|
715
|
+
systemProgram: web3.SystemProgram.programId,
|
|
716
|
+
})
|
|
717
|
+
.instruction();
|
|
718
|
+
return ix;
|
|
719
|
+
});
|
|
720
|
+
}
|
|
721
|
+
fuelWithdraw(connection_1, _a) {
|
|
722
|
+
return __awaiter(this, arguments, void 0, function* (connection, { userWallet, amount, }) {
|
|
723
|
+
// Initialize anchor
|
|
724
|
+
anchor_1.Anchor.initialize(connection);
|
|
725
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
726
|
+
const fuelAccount = (0, functions_1.generateFuelAccount)(userWallet);
|
|
727
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
728
|
+
.fuelWithdraw(amount)
|
|
729
|
+
.accounts({
|
|
730
|
+
userPda,
|
|
731
|
+
authority: userWallet,
|
|
732
|
+
fuelAccount,
|
|
733
|
+
systemProgram: web3.SystemProgram.programId,
|
|
734
|
+
})
|
|
735
|
+
.instruction();
|
|
736
|
+
return ix;
|
|
737
|
+
});
|
|
738
|
+
}
|
|
739
|
+
wrapFromFuel(connection_1, _a) {
|
|
740
|
+
return __awaiter(this, arguments, void 0, function* (connection, { userWallet, authority, amount, }) {
|
|
741
|
+
// Initialize anchor
|
|
742
|
+
anchor_1.Anchor.initialize(connection);
|
|
743
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
744
|
+
const fuelAccount = (0, functions_1.generateFuelAccount)(userWallet);
|
|
745
|
+
const userWrappedSol = (0, functions_1.generateLimitToken)(userPda, WSOL_MINT);
|
|
746
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
747
|
+
.wrapFromFuel(amount || null)
|
|
748
|
+
.accounts({
|
|
749
|
+
userPda,
|
|
750
|
+
authority,
|
|
751
|
+
fuelAccount,
|
|
752
|
+
userWrappedSol,
|
|
753
|
+
wsolMint: WSOL_MINT,
|
|
754
|
+
rent: web3.SYSVAR_RENT_PUBKEY,
|
|
755
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
756
|
+
associatedTokenProgram: token_1.ASSOCIATED_PROGRAM_ID,
|
|
757
|
+
systemProgram: web3.SystemProgram.programId,
|
|
758
|
+
})
|
|
759
|
+
.instruction();
|
|
760
|
+
return ix;
|
|
761
|
+
});
|
|
762
|
+
}
|
|
763
|
+
unwrapToFuel(connection_1, _a) {
|
|
764
|
+
return __awaiter(this, arguments, void 0, function* (connection, { userWallet, authority, }) {
|
|
765
|
+
// Initialize anchor
|
|
766
|
+
anchor_1.Anchor.initialize(connection);
|
|
767
|
+
const userPda = (0, functions_1.generateUserPda)(userWallet);
|
|
768
|
+
const fuelAccount = (0, functions_1.generateFuelAccount)(userWallet);
|
|
769
|
+
// Only supports LTA for now
|
|
770
|
+
const userWrappedSol = (0, functions_1.generateLimitToken)(userPda, WSOL_MINT);
|
|
771
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
772
|
+
.unwrapToFuel()
|
|
773
|
+
.accounts({
|
|
774
|
+
userPda,
|
|
775
|
+
authority,
|
|
776
|
+
fuelAccount,
|
|
777
|
+
userWrappedSol,
|
|
778
|
+
wsolMint: WSOL_MINT,
|
|
779
|
+
rent: web3.SYSVAR_RENT_PUBKEY,
|
|
780
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
781
|
+
associatedTokenProgram: token_1.ASSOCIATED_PROGRAM_ID,
|
|
782
|
+
systemProgram: web3.SystemProgram.programId,
|
|
783
|
+
})
|
|
784
|
+
.instruction();
|
|
785
|
+
return ix;
|
|
786
|
+
});
|
|
787
|
+
}
|
|
704
788
|
}
|
|
705
789
|
exports.IyfMainIxGenerator = IyfMainIxGenerator;
|
|
@@ -1,10 +1,36 @@
|
|
|
1
1
|
import * as web3 from "@solana/web3.js";
|
|
2
2
|
import { IyfMainIxGenerator } from "./IyfMainIxGenerator";
|
|
3
|
-
import { RaydiumClosePosition, RaydiumDecreaseLiquidity, RaydiumIncreaseLiquidity, RaydiumOpenPosition, RaydiumSweepDust, TxgenParams
|
|
3
|
+
import { RaydiumClosePosition, RaydiumDecreaseLiquidity, RaydiumIncreaseLiquidity, RaydiumOpenPosition, RaydiumSweepDust, TxgenParams } from '../types';
|
|
4
4
|
import { IyfExtensionIxGenerator } from "./IyfExtensionIxGenerator";
|
|
5
5
|
import { SimplePdaGenerator } from "../classes/SimplePdaGenerator";
|
|
6
6
|
import BN from "bn.js";
|
|
7
|
-
|
|
7
|
+
export type RaydiumFetch = {
|
|
8
|
+
poolStateInfo: {
|
|
9
|
+
tokenMint0: web3.PublicKey;
|
|
10
|
+
tokenMint1: web3.PublicKey;
|
|
11
|
+
tokenVault0: web3.PublicKey;
|
|
12
|
+
tokenVault1: web3.PublicKey;
|
|
13
|
+
ammConfig: web3.PublicKey;
|
|
14
|
+
observationKey: web3.PublicKey;
|
|
15
|
+
tickCurrent: number;
|
|
16
|
+
tickSpacing: number;
|
|
17
|
+
rewardInfos: {
|
|
18
|
+
tokenMint: web3.PublicKey;
|
|
19
|
+
tokenVault: web3.PublicKey;
|
|
20
|
+
}[];
|
|
21
|
+
};
|
|
22
|
+
positionInfo?: {
|
|
23
|
+
poolId: web3.PublicKey;
|
|
24
|
+
tickLowerIndex: number;
|
|
25
|
+
tickUpperIndex: number;
|
|
26
|
+
nftMint: web3.PublicKey;
|
|
27
|
+
liquidity: BN;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
export type RaydiumFetchParams = {
|
|
31
|
+
personalPosition?: web3.PublicKey;
|
|
32
|
+
poolState?: web3.PublicKey;
|
|
33
|
+
};
|
|
8
34
|
/**
|
|
9
35
|
* Meteora related instructions executed via iyf extension or iyf main
|
|
10
36
|
*/
|
|
@@ -29,7 +55,7 @@ export declare class RaydiumIxGenerator {
|
|
|
29
55
|
* @param params Parameters required
|
|
30
56
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
31
57
|
*/
|
|
32
|
-
raydiumOpenPositionAutomation({ connection, params }: TxgenParams<
|
|
58
|
+
raydiumOpenPositionAutomation({ connection, params }: TxgenParams<RaydiumOpenPosition>): Promise<web3.TransactionInstruction>;
|
|
33
59
|
/**
|
|
34
60
|
*
|
|
35
61
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -45,7 +71,7 @@ export declare class RaydiumIxGenerator {
|
|
|
45
71
|
* @param params Parameters required
|
|
46
72
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
47
73
|
*/
|
|
48
|
-
raydiumClosePositionAutomation({ connection, params }: TxgenParams<
|
|
74
|
+
raydiumClosePositionAutomation({ connection, params }: TxgenParams<RaydiumOpenPosition>): Promise<web3.TransactionInstruction>;
|
|
49
75
|
/**
|
|
50
76
|
*
|
|
51
77
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -61,7 +87,7 @@ export declare class RaydiumIxGenerator {
|
|
|
61
87
|
* @param params Parameters required
|
|
62
88
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
63
89
|
*/
|
|
64
|
-
raydiumIncreaseLiquidityAutomation({ connection, params, fetch }: TxgenParams<
|
|
90
|
+
raydiumIncreaseLiquidityAutomation({ connection, params, fetch }: TxgenParams<RaydiumIncreaseLiquidity, RaydiumFetch>): Promise<web3.TransactionInstruction>;
|
|
65
91
|
/**
|
|
66
92
|
*
|
|
67
93
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -77,7 +103,7 @@ export declare class RaydiumIxGenerator {
|
|
|
77
103
|
* @param params Parameters required
|
|
78
104
|
* @returns A ResponseWithStatus containing either TransactionMetadataResponse.
|
|
79
105
|
*/
|
|
80
|
-
raydiumDecreaseLiquidityAutomation({ connection, params, fetch }: TxgenParams<
|
|
106
|
+
raydiumDecreaseLiquidityAutomation({ connection, params, fetch }: TxgenParams<RaydiumDecreaseLiquidity, RaydiumFetch>): Promise<web3.TransactionInstruction>;
|
|
81
107
|
/**
|
|
82
108
|
*
|
|
83
109
|
* @param connection The Solana web3 connection object for blockchain interactions.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,
|
|
1
|
+
{"version":3,"file":"RaydiumIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/RaydiumIxGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -148,15 +148,7 @@ class RaydiumIxGenerator {
|
|
|
148
148
|
const vault1Mint = fetch.poolStateInfo.tokenMint1;
|
|
149
149
|
const tokenVault0 = fetch.poolStateInfo.tokenVault0;
|
|
150
150
|
const tokenVault1 = fetch.poolStateInfo.tokenVault1;
|
|
151
|
-
|
|
152
|
-
let amount0Max;
|
|
153
|
-
let amount1Max;
|
|
154
|
-
if (params.amountX && params.amountY && params.slippage) {
|
|
155
|
-
const { liquidity: a, amount0Max: b, amount1Max: c } = yield getLiquidityFromAmounts(connection, poolState, params.amountX, params.amountY, params.tickLowerIndex, params.tickUpperIndex, params.slippage, true);
|
|
156
|
-
liquidity = a;
|
|
157
|
-
amount0Max = b;
|
|
158
|
-
amount1Max = c;
|
|
159
|
-
}
|
|
151
|
+
const { liquidity, amount0Max, amount1Max } = yield getLiquidityFromAmounts(connection, poolState, params.amountX, params.amountY, params.tickLowerIndex, params.tickUpperIndex, params.slippage, true);
|
|
160
152
|
return yield this.iyfExtension.raydiumOpenPositionAutomation({
|
|
161
153
|
connection,
|
|
162
154
|
userWallet: params.userWallet,
|
|
@@ -219,7 +211,7 @@ class RaydiumIxGenerator {
|
|
|
219
211
|
return yield this.iyfExtension.raydiumClosePositionAutomation({
|
|
220
212
|
connection,
|
|
221
213
|
userWallet: params.userWallet,
|
|
222
|
-
positionNftMint: params.
|
|
214
|
+
positionNftMint: params.nftMint,
|
|
223
215
|
});
|
|
224
216
|
});
|
|
225
217
|
}
|
|
@@ -296,15 +288,7 @@ class RaydiumIxGenerator {
|
|
|
296
288
|
const tokenVault1 = fetch.poolStateInfo.tokenVault1;
|
|
297
289
|
const tickLowerIndex = fetch.positionInfo.tickLowerIndex;
|
|
298
290
|
const tickUpperIndex = fetch.positionInfo.tickUpperIndex;
|
|
299
|
-
|
|
300
|
-
let amount0Max;
|
|
301
|
-
let amount1Max;
|
|
302
|
-
if (params.amountX && params.amountY && params.slippage) {
|
|
303
|
-
const { liquidity: a, amount0Max: b, amount1Max: c } = params.getLiquidityFromAmounts ? params.getLiquidityFromAmounts : yield getLiquidityFromAmounts(connection, poolState, params.amountX, params.amountY, tickLowerIndex, tickUpperIndex, params.slippage, true);
|
|
304
|
-
liquidity = a;
|
|
305
|
-
amount0Max = b;
|
|
306
|
-
amount1Max = c;
|
|
307
|
-
}
|
|
291
|
+
const { liquidity, amount0Max, amount1Max } = params.getLiquidityFromAmounts ? params.getLiquidityFromAmounts : yield getLiquidityFromAmounts(connection, poolState, params.amountX, params.amountY, tickLowerIndex, tickUpperIndex, params.slippage, true);
|
|
308
292
|
return yield this.iyfExtension.raydiumIncreaseLiquidityAutomation({
|
|
309
293
|
connection,
|
|
310
294
|
userWallet: params.userWallet,
|
|
@@ -376,13 +360,7 @@ class RaydiumIxGenerator {
|
|
|
376
360
|
const vault1Mint = fetch.poolStateInfo.tokenMint1;
|
|
377
361
|
const tokenVault0 = fetch.poolStateInfo.tokenVault0;
|
|
378
362
|
const tokenVault1 = fetch.poolStateInfo.tokenVault1;
|
|
379
|
-
|
|
380
|
-
let amount1Min;
|
|
381
|
-
if (params.liquidity) {
|
|
382
|
-
const { amount0Min: a, amount1Min: b } = yield getAmountsFromLiquidity(connection, fetch.positionInfo.poolId, params.liquidity, fetch.positionInfo.tickLowerIndex, fetch.positionInfo.tickUpperIndex, params.slippage, false);
|
|
383
|
-
amount0Min = a;
|
|
384
|
-
amount1Min = b;
|
|
385
|
-
}
|
|
363
|
+
const { amount0Min, amount1Min } = yield getAmountsFromLiquidity(connection, fetch.positionInfo.poolId, fetch.positionInfo.liquidity, fetch.positionInfo.tickLowerIndex, fetch.positionInfo.tickUpperIndex, params.slippage, false);
|
|
386
364
|
return yield this.iyfExtension.raydiumDecreaseLiquidityAutomation({
|
|
387
365
|
connection,
|
|
388
366
|
liquidity: params.liquidity,
|
|
@@ -425,6 +403,7 @@ class RaydiumIxGenerator {
|
|
|
425
403
|
const tickSpacing = fetch.poolStateInfo.tickSpacing;
|
|
426
404
|
const tickLowerIndex = fetch.positionInfo.tickLowerIndex;
|
|
427
405
|
const tickUpperIndex = fetch.positionInfo.tickUpperIndex;
|
|
406
|
+
const slippage = params.slippage;
|
|
428
407
|
return yield this.iyfExtension.raydiumSweepDust({
|
|
429
408
|
connection,
|
|
430
409
|
userWallet,
|
|
@@ -440,6 +419,7 @@ class RaydiumIxGenerator {
|
|
|
440
419
|
tickSpacing,
|
|
441
420
|
tickLowerIndex,
|
|
442
421
|
tickUpperIndex,
|
|
422
|
+
slippage,
|
|
443
423
|
});
|
|
444
424
|
});
|
|
445
425
|
}
|
package/dist/src/meteora.d.ts
CHANGED
|
@@ -70,6 +70,7 @@ export declare class MeteoraDLMM {
|
|
|
70
70
|
userTokenXAmount: BN | null;
|
|
71
71
|
userTokenYAmount: BN | null;
|
|
72
72
|
};
|
|
73
|
+
fuelAccount?: boolean;
|
|
73
74
|
};
|
|
74
75
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<InitializePositionAndAddLiquidityByStrategyBuilder>;
|
|
75
76
|
/**
|
|
@@ -169,6 +170,7 @@ export declare class MeteoraDLMM {
|
|
|
169
170
|
bps: BN;
|
|
170
171
|
shouldClaimAndClose?: boolean;
|
|
171
172
|
pdaTokenType?: TokenType;
|
|
173
|
+
fuelAccount?: boolean;
|
|
172
174
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<RemoveLiquidityBuilder>;
|
|
173
175
|
/**
|
|
174
176
|
* Removes liquidity from an existing position to the user pda.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../../src/meteora.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAuF,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAiB,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACjN,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAUxC,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,qBAAa,WAAW;aACc,IAAI,EAAE,IAAI;IAA9C,OAAO;IAEP,QAAQ,CAAC,MAAM,iBAAoB;IAEnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IACrC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAc;IACtC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAiB;IAC5C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAkB;WAE/B,MAAM,CACjB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,WAAW,EAAE,IAAI,CAAC,SAAS,GAC1B,OAAO,CAAC,WAAW,CAAC;IAUvB;;;;OAIG;WACU,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAQvE,uBAAuB,CACrB,YAAY,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,EAC1C,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAC3C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM;;;;;IA0Bd,YAAY;IAIZ,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS;;;;IAI5D;;;;;;;;;;;;;;;;;;;;OAoBG;IACG,2CAA2C,CAC/C,UAAU,EAAE,IAAI,CAAC,SAAS,EAC1B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,MAAM,EAAE;QACN,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC;QAC/B,YAAY,EAAE,EAAE,CAAC;QACjB,YAAY,EAAE,EAAE,CAAC;QACjB,QAAQ,EAAE;YACR,QAAQ,EAAE,MAAM,CAAC;YACjB,QAAQ,EAAE,MAAM,CAAC;YACjB,YAAY,EAAE,YAAY,CAAC;SAC5B,CAAC;QACF,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,GAAG,CAAC,EAAE;YACJ,YAAY,CAAC,EAAE,SAAS,CAAC;YACzB,UAAU,CAAC,EAAE;gBACX,gBAAgB,EAAE,EAAE,GAAG,IAAI,CAAC;gBAC5B,gBAAgB,EAAE,EAAE,GAAG,IAAI,CAAC;aAC7B,CAAA;
|
|
1
|
+
{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../../src/meteora.ts"],"names":[],"mappings":"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"}
|
package/dist/src/meteora.js
CHANGED
|
@@ -133,7 +133,7 @@ class MeteoraDLMM {
|
|
|
133
133
|
*/
|
|
134
134
|
initializePositionAndAddLiquidityByStrategy(userWallet, payer, params, meteoraToHawksight) {
|
|
135
135
|
return __awaiter(this, void 0, void 0, function* () {
|
|
136
|
-
var _a, _b, _c, _d;
|
|
136
|
+
var _a, _b, _c, _d, _e;
|
|
137
137
|
if (!!!params.skipInputTokenCheck) {
|
|
138
138
|
// Throw error if input token(s) do not exist on blockchain
|
|
139
139
|
yield (0, functions_1.inputTokenExists)(anchor_1.Anchor.instance().connection, userWallet, [
|
|
@@ -183,6 +183,7 @@ class MeteoraDLMM {
|
|
|
183
183
|
pdaTokenType: (_b = params.opt) === null || _b === void 0 ? void 0 : _b.pdaTokenType,
|
|
184
184
|
params: {
|
|
185
185
|
withAmount: (_c = params.opt) === null || _c === void 0 ? void 0 : _c.withAmount,
|
|
186
|
+
fuelAccount: (_d = params.opt) === null || _d === void 0 ? void 0 : _d.fuelAccount,
|
|
186
187
|
},
|
|
187
188
|
},
|
|
188
189
|
}),
|
|
@@ -192,7 +193,7 @@ class MeteoraDLMM {
|
|
|
192
193
|
withdraw: mints.map((mint) => {
|
|
193
194
|
return { mint, amount: new bn_js_1.default(0) };
|
|
194
195
|
}),
|
|
195
|
-
pdaTokenType: (
|
|
196
|
+
pdaTokenType: (_e = params.opt) === null || _e === void 0 ? void 0 : _e.pdaTokenType,
|
|
196
197
|
hasAmount: false,
|
|
197
198
|
}),
|
|
198
199
|
// Step 5: Close wSOL account (if there's any)
|
|
@@ -406,6 +407,9 @@ class MeteoraDLMM {
|
|
|
406
407
|
authority: userWallet,
|
|
407
408
|
opt: {
|
|
408
409
|
pdaTokenType: params.pdaTokenType,
|
|
410
|
+
params: {
|
|
411
|
+
fuelAccount: params.fuelAccount,
|
|
412
|
+
},
|
|
409
413
|
},
|
|
410
414
|
}),
|
|
411
415
|
// Step 3: Withdraw tokens to user wallet
|
package/dist/src/types.d.ts
CHANGED
|
@@ -328,6 +328,7 @@ export type OpenAutomationIx = {
|
|
|
328
328
|
userTokenXAmount: BN | null;
|
|
329
329
|
userTokenYAmount: BN | null;
|
|
330
330
|
};
|
|
331
|
+
fuelAccount?: boolean;
|
|
331
332
|
};
|
|
332
333
|
};
|
|
333
334
|
export type MeteoraCreatePositionAndDepositPda = {
|
|
@@ -400,6 +401,7 @@ export type MeteoraClose = {
|
|
|
400
401
|
userWallet: web3.PublicKey;
|
|
401
402
|
position: web3.PublicKey;
|
|
402
403
|
pdaTokenType?: TokenType;
|
|
404
|
+
fuelAccount?: boolean;
|
|
403
405
|
};
|
|
404
406
|
export type MeteoraCompound = {
|
|
405
407
|
userWallet: web3.PublicKey;
|
|
@@ -560,21 +562,6 @@ export type RaydiumOpenPosition = {
|
|
|
560
562
|
amount1Max: BN;
|
|
561
563
|
};
|
|
562
564
|
};
|
|
563
|
-
export type RaydiumOpenPositionAutomation = {
|
|
564
|
-
userWallet: web3.PublicKey;
|
|
565
|
-
nftMint: web3.PublicKey;
|
|
566
|
-
poolState: web3.PublicKey;
|
|
567
|
-
tickLowerIndex: number;
|
|
568
|
-
tickUpperIndex: number;
|
|
569
|
-
amountX?: BN;
|
|
570
|
-
amountY?: BN;
|
|
571
|
-
slippage?: number;
|
|
572
|
-
getLiquidityFromAmounts?: {
|
|
573
|
-
liquidity: BN;
|
|
574
|
-
amount0Max: BN;
|
|
575
|
-
amount1Max: BN;
|
|
576
|
-
};
|
|
577
|
-
};
|
|
578
565
|
export type RaydiumClosePosition = {
|
|
579
566
|
userWallet: web3.PublicKey;
|
|
580
567
|
personalPosition: web3.PublicKey;
|
|
@@ -596,33 +583,16 @@ export type RaydiumIncreaseLiquidity = {
|
|
|
596
583
|
amount1Max: BN;
|
|
597
584
|
};
|
|
598
585
|
};
|
|
599
|
-
export type RaydiumIncreaseLiquidityAutomation = {
|
|
600
|
-
userWallet: web3.PublicKey;
|
|
601
|
-
personalPosition: web3.PublicKey;
|
|
602
|
-
amountX?: BN;
|
|
603
|
-
amountY?: BN;
|
|
604
|
-
slippage?: number;
|
|
605
|
-
getLiquidityFromAmounts?: {
|
|
606
|
-
liquidity: BN;
|
|
607
|
-
amount0Max: BN;
|
|
608
|
-
amount1Max: BN;
|
|
609
|
-
};
|
|
610
|
-
};
|
|
611
586
|
export type RaydiumDecreaseLiquidity = {
|
|
612
587
|
userWallet: web3.PublicKey;
|
|
613
588
|
personalPosition: web3.PublicKey;
|
|
614
589
|
liquidity: BN;
|
|
615
590
|
slippage: number;
|
|
616
591
|
};
|
|
617
|
-
export type RaydiumDecreaseLiquidityAutomation = {
|
|
618
|
-
userWallet: web3.PublicKey;
|
|
619
|
-
personalPosition: web3.PublicKey;
|
|
620
|
-
liquidity?: BN;
|
|
621
|
-
slippage: number;
|
|
622
|
-
};
|
|
623
592
|
export type RaydiumSweepDust = {
|
|
624
593
|
userWallet: web3.PublicKey;
|
|
625
594
|
personalPosition: web3.PublicKey;
|
|
595
|
+
slippage: BN;
|
|
626
596
|
};
|
|
627
597
|
export type CreateLimitTokenParams = {
|
|
628
598
|
userWallet: web3.PublicKey;
|
|
@@ -645,36 +615,4 @@ export type CombineTransactionsParams = {
|
|
|
645
615
|
instructions: (web3.TransactionInstruction | TransactionClass | ResponseWithStatus<TransactionMetadata>)[];
|
|
646
616
|
additionalAlt: string[];
|
|
647
617
|
};
|
|
648
|
-
export type RaydiumClosePositionAutomation = {
|
|
649
|
-
connection: web3.Connection;
|
|
650
|
-
userWallet: web3.PublicKey;
|
|
651
|
-
positionNftMint: web3.PublicKey;
|
|
652
|
-
};
|
|
653
|
-
export type RaydiumFetch = {
|
|
654
|
-
poolStateInfo: {
|
|
655
|
-
tokenMint0: web3.PublicKey;
|
|
656
|
-
tokenMint1: web3.PublicKey;
|
|
657
|
-
tokenVault0: web3.PublicKey;
|
|
658
|
-
tokenVault1: web3.PublicKey;
|
|
659
|
-
ammConfig: web3.PublicKey;
|
|
660
|
-
observationKey: web3.PublicKey;
|
|
661
|
-
tickCurrent: number;
|
|
662
|
-
tickSpacing: number;
|
|
663
|
-
rewardInfos: {
|
|
664
|
-
tokenMint: web3.PublicKey;
|
|
665
|
-
tokenVault: web3.PublicKey;
|
|
666
|
-
}[];
|
|
667
|
-
};
|
|
668
|
-
positionInfo?: {
|
|
669
|
-
poolId: web3.PublicKey;
|
|
670
|
-
tickLowerIndex: number;
|
|
671
|
-
tickUpperIndex: number;
|
|
672
|
-
nftMint: web3.PublicKey;
|
|
673
|
-
liquidity: BN;
|
|
674
|
-
};
|
|
675
|
-
};
|
|
676
|
-
export type RaydiumFetchParams = {
|
|
677
|
-
personalPosition?: web3.PublicKey;
|
|
678
|
-
poolState?: web3.PublicKey;
|
|
679
|
-
};
|
|
680
618
|
//# sourceMappingURL=types.d.ts.map
|