@hawksightco/hawk-sdk 1.2.119 → 1.3.0
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/addresses.d.ts +1 -0
- package/dist/src/addresses.d.ts.map +1 -1
- package/dist/src/addresses.js +2 -1
- package/dist/src/anchor.d.ts +2 -112
- package/dist/src/anchor.d.ts.map +1 -1
- package/dist/src/anchor.js +21 -3
- package/dist/src/classes/Transactions.d.ts.map +1 -1
- package/dist/src/classes/Transactions.js +63 -43
- package/dist/src/classes/TxGenerator.d.ts.map +1 -1
- package/dist/src/classes/TxGenerator.js +2 -0
- package/dist/src/functions.d.ts +18 -1
- package/dist/src/functions.d.ts.map +1 -1
- package/dist/src/functions.js +115 -13
- package/dist/src/hawksight.d.ts +4 -0
- package/dist/src/hawksight.d.ts.map +1 -1
- package/dist/src/hawksight.js +38 -17
- package/dist/src/idl/iyf-extension-idl.d.ts +0 -45
- package/dist/src/idl/iyf-extension-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-extension-idl.js +45 -90
- package/dist/src/idl/iyf-extension-wrapper.d.ts +112 -0
- package/dist/src/idl/iyf-extension-wrapper.d.ts.map +1 -0
- package/dist/src/idl/iyf-extension-wrapper.js +2 -0
- package/dist/src/idl/iyf-main-idl.d.ts +7275 -5865
- package/dist/src/idl/iyf-main-idl.d.ts.map +1 -1
- package/dist/src/idl/iyf-main-idl.js +7449 -6045
- package/dist/src/idl/iyf-main-wrapper.d.ts +112 -0
- package/dist/src/idl/iyf-main-wrapper.d.ts.map +1 -0
- package/dist/src/idl/iyf-main-wrapper.js +2 -0
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts +24 -8
- package/dist/src/ixGenerator/IyfMainIxGenerator.d.ts.map +1 -1
- package/dist/src/ixGenerator/IyfMainIxGenerator.js +152 -12
- package/dist/src/meteora.d.ts +6 -5
- package/dist/src/meteora.d.ts.map +1 -1
- package/dist/src/meteora.js +30 -18
- package/dist/src/pdaGenerator/HawksightPdaGenerator.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { IndexYieldFarming as IndexYieldFarmingNew } from "./iyf-main-idl";
|
|
2
|
+
type IdlInstruction = {
|
|
3
|
+
name: string;
|
|
4
|
+
docs?: string[];
|
|
5
|
+
accounts: IdlAccountItem[];
|
|
6
|
+
args: IdlField[];
|
|
7
|
+
returns?: IdlType;
|
|
8
|
+
};
|
|
9
|
+
type IdlAccountItem = IdlAccount | IdlAccounts;
|
|
10
|
+
type IdlAccount = {
|
|
11
|
+
name: string;
|
|
12
|
+
isMut: boolean;
|
|
13
|
+
isSigner: boolean;
|
|
14
|
+
isOptional?: boolean;
|
|
15
|
+
docs?: string[];
|
|
16
|
+
relations?: string[];
|
|
17
|
+
pda?: IdlPda;
|
|
18
|
+
};
|
|
19
|
+
type IdlPda = {
|
|
20
|
+
seeds: IdlSeed[];
|
|
21
|
+
programId?: IdlSeed;
|
|
22
|
+
};
|
|
23
|
+
type IdlSeed = any;
|
|
24
|
+
type IdlAccounts = {
|
|
25
|
+
name: string;
|
|
26
|
+
docs?: string[];
|
|
27
|
+
accounts: IdlAccountItem[];
|
|
28
|
+
};
|
|
29
|
+
type IdlField = {
|
|
30
|
+
name: string;
|
|
31
|
+
docs?: string[];
|
|
32
|
+
type: IdlType;
|
|
33
|
+
};
|
|
34
|
+
type IdlType = "bool" | "u8" | "i8" | "u16" | "i16" | "u32" | "i32" | "f32" | "u64" | "i64" | "f64" | "u128" | "i128" | "u256" | "i256" | "bytes" | "string" | "publicKey" | IdlTypeDefined | IdlTypeOption | IdlTypeCOption | IdlTypeVec | IdlTypeArray;
|
|
35
|
+
type IdlTypeDefined = {
|
|
36
|
+
defined: string;
|
|
37
|
+
};
|
|
38
|
+
type IdlTypeOption = {
|
|
39
|
+
option: IdlType;
|
|
40
|
+
};
|
|
41
|
+
type IdlTypeCOption = {
|
|
42
|
+
coption: IdlType;
|
|
43
|
+
};
|
|
44
|
+
type IdlTypeVec = {
|
|
45
|
+
vec: IdlType;
|
|
46
|
+
};
|
|
47
|
+
type IdlTypeArray = {
|
|
48
|
+
array: [idlType: IdlType, size: number];
|
|
49
|
+
};
|
|
50
|
+
type IdlAccountDef = {
|
|
51
|
+
name: string;
|
|
52
|
+
docs?: string[];
|
|
53
|
+
type: IdlTypeDefTyStruct;
|
|
54
|
+
};
|
|
55
|
+
type IdlTypeDefTyStruct = {
|
|
56
|
+
kind: "struct";
|
|
57
|
+
fields: IdlTypeDefStruct;
|
|
58
|
+
};
|
|
59
|
+
type IdlTypeDefStruct = Array<IdlField>;
|
|
60
|
+
type IdlTypeDef = {
|
|
61
|
+
name: string;
|
|
62
|
+
docs?: string[];
|
|
63
|
+
type: IdlTypeDefTy;
|
|
64
|
+
};
|
|
65
|
+
type IdlTypeDefTy = IdlTypeDefTyEnum | IdlTypeDefTyStruct | IdlTypeDefTyAlias;
|
|
66
|
+
type IdlTypeDefTyEnum = {
|
|
67
|
+
kind: "enum";
|
|
68
|
+
variants: IdlEnumVariant[];
|
|
69
|
+
};
|
|
70
|
+
type IdlEnumVariant = {
|
|
71
|
+
name: string;
|
|
72
|
+
fields?: IdlEnumFields;
|
|
73
|
+
};
|
|
74
|
+
type IdlTypeDefTyAlias = {
|
|
75
|
+
kind: "alias";
|
|
76
|
+
value: IdlType;
|
|
77
|
+
};
|
|
78
|
+
type IdlEnumFields = IdlEnumFieldsNamed | IdlEnumFieldsTuple;
|
|
79
|
+
type IdlEnumFieldsNamed = IdlField[];
|
|
80
|
+
type IdlEnumFieldsTuple = IdlType[];
|
|
81
|
+
type Instruction<I extends number> = {
|
|
82
|
+
name: IndexYieldFarmingNew["instructions"][I]["name"];
|
|
83
|
+
accounts: IndexYieldFarmingNew["instructions"][I]["accounts"];
|
|
84
|
+
args: IndexYieldFarmingNew["instructions"][I]["args"];
|
|
85
|
+
} & IdlInstruction;
|
|
86
|
+
type GenerateInstructions<T extends any[], I extends number[] = []> = I["length"] extends T["length"] ? [] : [
|
|
87
|
+
Instruction<I["length"]>,
|
|
88
|
+
...GenerateInstructions<T, [...I, I["length"]]>
|
|
89
|
+
];
|
|
90
|
+
type FilteredInstructions = GenerateInstructions<IndexYieldFarmingNew["instructions"]>;
|
|
91
|
+
type FindMatchingType<Name, Types extends any[]> = Types extends Array<infer T> ? T extends {
|
|
92
|
+
name: Name;
|
|
93
|
+
type: infer Type;
|
|
94
|
+
} ? Type : never : never;
|
|
95
|
+
type Account<I extends number> = {
|
|
96
|
+
name: unknown extends IndexYieldFarmingNew["accounts"][I]["name"] ? never : IndexYieldFarmingNew["accounts"][I]["name"];
|
|
97
|
+
type: unknown extends IndexYieldFarmingNew["accounts"][I]["name"] ? never : FindMatchingType<IndexYieldFarmingNew["accounts"][I]["name"], IndexYieldFarmingNew["types"]>;
|
|
98
|
+
} & IdlAccountDef;
|
|
99
|
+
type GenerateAccounts<T extends any[], I extends number[] = []> = I["length"] extends T["length"] ? [] : [
|
|
100
|
+
Account<I["length"]>,
|
|
101
|
+
...GenerateAccounts<T, [...I, I["length"]]>
|
|
102
|
+
];
|
|
103
|
+
type FilteredAccounts = GenerateAccounts<IndexYieldFarmingNew["accounts"]>;
|
|
104
|
+
export type IndexYieldFarming = {
|
|
105
|
+
"version": string;
|
|
106
|
+
"name": string;
|
|
107
|
+
"instructions": FilteredInstructions;
|
|
108
|
+
"accounts": FilteredAccounts;
|
|
109
|
+
"types": IndexYieldFarmingNew["types"] & Array<IdlTypeDef>;
|
|
110
|
+
};
|
|
111
|
+
export {};
|
|
112
|
+
//# sourceMappingURL=iyf-main-wrapper.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iyf-main-wrapper.d.ts","sourceRoot":"","sources":["../../../src/idl/iyf-main-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,IAAI,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3E,KAAK,cAAc,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AACF,KAAK,cAAc,GAAG,UAAU,GAAG,WAAW,CAAC;AAC/C,KAAK,UAAU,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,MAAM,GAAG;IACV,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AACF,KAAK,OAAO,GAAG,GAAG,CAAC;AACnB,KAAK,WAAW,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAC;AACF,KAAK,QAAQ,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,KAAK,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,YAAY,CAAC;AACzP,KAAK,cAAc,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,aAAa,GAAG;IACjB,MAAM,EAAE,OAAO,CAAC;CACnB,CAAC;AACF,KAAK,cAAc,GAAG;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AACF,KAAK,UAAU,GAAG;IACd,GAAG,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,KAAK,YAAY,GAAG;IAChB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CAC3C,CAAC;AACF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,kBAAkB,CAAC;CAC1B,CAAC;AACF,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,gBAAgB,CAAC;CAC1B,CAAC;AACF,KAAK,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AACF,KAAK,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,iBAAiB,CAAC;AAC9E,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B,CAAC;AACF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB,CAAC;AACF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AACF,KAAK,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAC7D,KAAK,kBAAkB,GAAG,QAAQ,EAAE,CAAC;AACrC,KAAK,kBAAkB,GAAG,OAAO,EAAE,CAAC;AAEpC,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI;IACnC,IAAI,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;CACvD,GAAG,cAAc,CAAC;AAEnB,KAAK,oBAAoB,CAAC,CAAC,SAAS,GAAG,EAAE,EAAE,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,IAChE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,GAC3B,EAAE,GACF;IACE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxB,GAAG,oBAAoB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CAChD,CAAC;AAGR,KAAK,oBAAoB,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC;AAEvF,KAAK,gBAAgB,CAAC,IAAI,EAAE,KAAK,SAAS,GAAG,EAAE,IAAI,KAAK,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GAC3E,CAAC,SAAS;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,GACxC,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;AAEV,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI;IAC/B,IAAI,EAAE,OAAO,SAAS,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACxH,IAAI,EAAE,OAAO,SAAS,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;CAC1K,GAAG,aAAa,CAAC;AAElB,KAAK,gBAAgB,CAAC,CAAC,SAAS,GAAG,EAAE,EAAE,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,IAC5D,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,GAC3B,EAAE,GACF;IACE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACpB,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CAC5C,CAAC;AAER,KAAK,gBAAgB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,oBAAoB,CAAC;IACrC,UAAU,EAAE,gBAAgB,CAAC;IAC7B,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;CAC5D,CAAC"}
|
|
@@ -36,6 +36,7 @@ export type JupiterRouteIxReturn = {
|
|
|
36
36
|
ataExists: boolean;
|
|
37
37
|
};
|
|
38
38
|
type DepositMultipleToken = {
|
|
39
|
+
connection: web3.Connection;
|
|
39
40
|
payer: web3.PublicKey;
|
|
40
41
|
deposit: {
|
|
41
42
|
mint: web3.PublicKey;
|
|
@@ -43,6 +44,7 @@ type DepositMultipleToken = {
|
|
|
43
44
|
}[];
|
|
44
45
|
};
|
|
45
46
|
type DepositMultipleTokenV2 = {
|
|
47
|
+
connection: web3.Connection;
|
|
46
48
|
payer: web3.PublicKey;
|
|
47
49
|
deposit: {
|
|
48
50
|
mint: web3.PublicKey;
|
|
@@ -63,6 +65,7 @@ type DepositMultipleLamportPdaToken = {
|
|
|
63
65
|
skipIdempotent?: boolean;
|
|
64
66
|
};
|
|
65
67
|
type WithdrawMultipleToken = {
|
|
68
|
+
connection: web3.Connection;
|
|
66
69
|
payer: web3.PublicKey;
|
|
67
70
|
withdraw: {
|
|
68
71
|
mint: web3.PublicKey;
|
|
@@ -70,6 +73,7 @@ type WithdrawMultipleToken = {
|
|
|
70
73
|
useSta?: boolean;
|
|
71
74
|
};
|
|
72
75
|
type WithdrawMultipleTokenV2 = {
|
|
76
|
+
connection: web3.Connection;
|
|
73
77
|
payer: web3.PublicKey;
|
|
74
78
|
withdraw: {
|
|
75
79
|
mint: web3.PublicKey;
|
|
@@ -180,25 +184,37 @@ export declare class IyfMainIxGenerator {
|
|
|
180
184
|
*
|
|
181
185
|
* @returns DepositMultipleToken instruction
|
|
182
186
|
*/
|
|
183
|
-
depositMultipleToken({ payer, deposit }: DepositMultipleToken): Promise<web3.TransactionInstruction>;
|
|
187
|
+
depositMultipleToken({ connection, payer, deposit }: DepositMultipleToken): Promise<web3.TransactionInstruction>;
|
|
184
188
|
/**
|
|
185
189
|
* Deposit multiple user pda token to passthrough token accountsz
|
|
186
190
|
*
|
|
187
191
|
* @returns DepositMultipleToken instruction
|
|
188
192
|
*/
|
|
189
|
-
withdrawMultipleToken({ payer, withdraw, useSta }: WithdrawMultipleToken): Promise<web3.TransactionInstruction>;
|
|
193
|
+
withdrawMultipleToken({ connection, payer, withdraw, useSta }: WithdrawMultipleToken): Promise<web3.TransactionInstruction>;
|
|
190
194
|
/**
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
depositMultipleTokenV2({ payer, deposit, pdaTokenType }: DepositMultipleTokenV2): Promise<web3.TransactionInstruction>;
|
|
195
|
+
* Deposit multiple user pda token to passthrough token accounts
|
|
196
|
+
*
|
|
197
|
+
* @returns DepositMultipleToken instruction
|
|
198
|
+
*/
|
|
199
|
+
depositMultipleTokenV2({ connection, payer, deposit, pdaTokenType }: DepositMultipleTokenV2): Promise<web3.TransactionInstruction>;
|
|
200
|
+
/**
|
|
201
|
+
* Deposit multiple user pda token to passthrough token accountsz
|
|
202
|
+
*
|
|
203
|
+
* @returns DepositMultipleToken instruction
|
|
204
|
+
*/
|
|
205
|
+
withdrawMultipleTokenV2({ connection, payer, withdraw, useSta, pdaTokenType, hasAmount }: WithdrawMultipleTokenV2): Promise<web3.TransactionInstruction>;
|
|
206
|
+
/**
|
|
207
|
+
* Deposit multiple user pda token to passthrough token accounts
|
|
208
|
+
*
|
|
209
|
+
* @returns DepositMultipleToken instruction
|
|
210
|
+
*/
|
|
211
|
+
depositMultipleTokenWithToken2022({ connection, payer, deposit, pdaTokenType }: DepositMultipleTokenV2): Promise<web3.TransactionInstruction>;
|
|
196
212
|
/**
|
|
197
213
|
* Deposit multiple user pda token to passthrough token accountsz
|
|
198
214
|
*
|
|
199
215
|
* @returns DepositMultipleToken instruction
|
|
200
216
|
*/
|
|
201
|
-
|
|
217
|
+
withdrawMultipleTokenWithToken2022({ connection, payer, withdraw, useSta, pdaTokenType, hasAmount }: WithdrawMultipleTokenV2): Promise<web3.TransactionInstruction>;
|
|
202
218
|
/**
|
|
203
219
|
* Deposit single token from user pda
|
|
204
220
|
*
|
|
@@ -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 util = __importStar(require("../functions"));
|
|
48
49
|
const WSOL_MINT = new web3.PublicKey("So11111111111111111111111111111111111111112");
|
|
49
50
|
/**
|
|
50
51
|
* Iyf Main IX Generator
|
|
@@ -128,6 +129,7 @@ class IyfMainIxGenerator {
|
|
|
128
129
|
const userPda = (0, functions_1.generateUserPda)(params.userWallet);
|
|
129
130
|
const storageTokenAccount = (0, functions_1.generateUserPdaStorageAccount)(userPda, params.mint);
|
|
130
131
|
// Create initialize storage token account instruction
|
|
132
|
+
// @ts-ignore
|
|
131
133
|
return yield anchor_1.Anchor.instance().iyfMain.methods
|
|
132
134
|
.initializeStorageTokenAccount()
|
|
133
135
|
.accounts({
|
|
@@ -303,6 +305,7 @@ class IyfMainIxGenerator {
|
|
|
303
305
|
const p_slippageBps = slippageBps === undefined ? slippageBps_default : slippageBps;
|
|
304
306
|
const p_platformFeeBps = platformFeeBps === undefined ? platformFeeBps_default : platformFeeBps;
|
|
305
307
|
const jupiterRouteIx = (quotedOutAmount) => __awaiter(this, void 0, void 0, function* () {
|
|
308
|
+
// @ts-ignore
|
|
306
309
|
return yield anchor_1.Anchor.instance().iyfMain
|
|
307
310
|
.methods
|
|
308
311
|
.jupiterRouteIx(routePlan, quotedOutAmount, p_slippageBps, p_platformFeeBps)
|
|
@@ -407,8 +410,8 @@ class IyfMainIxGenerator {
|
|
|
407
410
|
* @returns DepositMultipleToken instruction
|
|
408
411
|
*/
|
|
409
412
|
depositMultipleToken(_a) {
|
|
410
|
-
return __awaiter(this, arguments, void 0, function* ({ payer, deposit }) {
|
|
411
|
-
return yield (0, hawksight_1.depositMultipleToken)({ payer, deposit });
|
|
413
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, deposit }) {
|
|
414
|
+
return yield (0, hawksight_1.depositMultipleToken)({ connection, payer, deposit });
|
|
412
415
|
});
|
|
413
416
|
}
|
|
414
417
|
/**
|
|
@@ -417,18 +420,18 @@ class IyfMainIxGenerator {
|
|
|
417
420
|
* @returns DepositMultipleToken instruction
|
|
418
421
|
*/
|
|
419
422
|
withdrawMultipleToken(_a) {
|
|
420
|
-
return __awaiter(this, arguments, void 0, function* ({ payer, withdraw, useSta }) {
|
|
421
|
-
return yield (0, hawksight_1.withdrawMultipleToken)({ payer, withdraw, useSta });
|
|
423
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, withdraw, useSta }) {
|
|
424
|
+
return yield (0, hawksight_1.withdrawMultipleToken)({ connection, payer, withdraw, useSta });
|
|
422
425
|
});
|
|
423
426
|
}
|
|
424
427
|
/**
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
428
|
+
* Deposit multiple user pda token to passthrough token accounts
|
|
429
|
+
*
|
|
430
|
+
* @returns DepositMultipleToken instruction
|
|
431
|
+
*/
|
|
429
432
|
depositMultipleTokenV2(_a) {
|
|
430
|
-
return __awaiter(this, arguments, void 0, function* ({ payer, deposit, pdaTokenType }) {
|
|
431
|
-
return yield (0, hawksight_1.depositMultipleTokenV2)({ payer, deposit, pdaTokenType });
|
|
433
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, deposit, pdaTokenType }) {
|
|
434
|
+
return yield (0, hawksight_1.depositMultipleTokenV2)({ connection, payer, deposit, pdaTokenType });
|
|
432
435
|
});
|
|
433
436
|
}
|
|
434
437
|
/**
|
|
@@ -437,8 +440,145 @@ class IyfMainIxGenerator {
|
|
|
437
440
|
* @returns DepositMultipleToken instruction
|
|
438
441
|
*/
|
|
439
442
|
withdrawMultipleTokenV2(_a) {
|
|
440
|
-
return __awaiter(this, arguments, void 0, function* ({ payer, withdraw, useSta, pdaTokenType, hasAmount }) {
|
|
441
|
-
return yield (0, hawksight_1.withdrawMultipleTokenV2)({ payer, withdraw, useSta, pdaTokenType, hasAmount });
|
|
443
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, withdraw, useSta, pdaTokenType, hasAmount }) {
|
|
444
|
+
return yield (0, hawksight_1.withdrawMultipleTokenV2)({ connection, payer, withdraw, useSta, pdaTokenType, hasAmount });
|
|
445
|
+
});
|
|
446
|
+
}
|
|
447
|
+
/**
|
|
448
|
+
* Deposit multiple user pda token to passthrough token accounts
|
|
449
|
+
*
|
|
450
|
+
* @returns DepositMultipleToken instruction
|
|
451
|
+
*/
|
|
452
|
+
depositMultipleTokenWithToken2022(_a) {
|
|
453
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, deposit, pdaTokenType }) {
|
|
454
|
+
const farm = addresses_1.USDC_FARM;
|
|
455
|
+
const userPda = util.generateUserPda(payer, farm);
|
|
456
|
+
const amounts = deposit.map((d) => d.amount);
|
|
457
|
+
const remainingAccounts = [];
|
|
458
|
+
// Get mint pubkeys
|
|
459
|
+
const mints = deposit.map((d) => d.mint);
|
|
460
|
+
// Get and assert one token program for all mints.
|
|
461
|
+
// Throws an error if there are multiple token programs.
|
|
462
|
+
const tokenProgramMap = yield util.getTokenProgramMapForMints(connection, mints);
|
|
463
|
+
let skipIdempotent = false;
|
|
464
|
+
deposit.map((d) => {
|
|
465
|
+
const mint = d.mint;
|
|
466
|
+
const key = mint.toString();
|
|
467
|
+
const userToken = util.generateAta(payer, d.mint, tokenProgramMap[key]);
|
|
468
|
+
const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint, tokenProgramMap[key]);
|
|
469
|
+
let userPdaToken;
|
|
470
|
+
if (pdaTokenType === types_1.TokenType.LTA) {
|
|
471
|
+
skipIdempotent = true;
|
|
472
|
+
userPdaToken = util.generateLimitToken(userPda, d.mint);
|
|
473
|
+
}
|
|
474
|
+
else if (pdaTokenType === types_1.TokenType.STA) {
|
|
475
|
+
skipIdempotent = true;
|
|
476
|
+
userPdaToken = util.generateUserPdaStorageAccount(userPda, d.mint);
|
|
477
|
+
}
|
|
478
|
+
else {
|
|
479
|
+
userPdaToken = util.generateAta(userPda, d.mint, tokenProgramMap[key]);
|
|
480
|
+
}
|
|
481
|
+
remainingAccounts.push({ pubkey: mint, isSigner: false, isWritable: true });
|
|
482
|
+
remainingAccounts.push({
|
|
483
|
+
pubkey: userToken,
|
|
484
|
+
isSigner: false,
|
|
485
|
+
isWritable: true,
|
|
486
|
+
});
|
|
487
|
+
remainingAccounts.push({
|
|
488
|
+
pubkey: userPdaToken,
|
|
489
|
+
isSigner: false,
|
|
490
|
+
isWritable: true,
|
|
491
|
+
});
|
|
492
|
+
remainingAccounts.push({
|
|
493
|
+
pubkey: ownerFeeToken,
|
|
494
|
+
isSigner: false,
|
|
495
|
+
isWritable: true,
|
|
496
|
+
});
|
|
497
|
+
});
|
|
498
|
+
// @ts-ignore
|
|
499
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
500
|
+
.depositMultipleTokenWithToken2022(amounts, skipIdempotent)
|
|
501
|
+
.accounts({
|
|
502
|
+
farm,
|
|
503
|
+
userPda,
|
|
504
|
+
payer,
|
|
505
|
+
hsFeeOwner: addresses_1.SITE_FEE_OWNER,
|
|
506
|
+
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
507
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
508
|
+
token2022Program: addresses_1.TOKEN_2022_PROGRAM_ID,
|
|
509
|
+
systemProgram: web3.SystemProgram.programId,
|
|
510
|
+
})
|
|
511
|
+
.remainingAccounts(remainingAccounts)
|
|
512
|
+
.instruction();
|
|
513
|
+
return ix;
|
|
514
|
+
});
|
|
515
|
+
}
|
|
516
|
+
/**
|
|
517
|
+
* Deposit multiple user pda token to passthrough token accountsz
|
|
518
|
+
*
|
|
519
|
+
* @returns DepositMultipleToken instruction
|
|
520
|
+
*/
|
|
521
|
+
withdrawMultipleTokenWithToken2022(_a) {
|
|
522
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, payer, withdraw, useSta, pdaTokenType, hasAmount }) {
|
|
523
|
+
const farm = addresses_1.USDC_FARM;
|
|
524
|
+
const userPda = util.generateUserPda(payer, farm);
|
|
525
|
+
const remainingAccounts = [];
|
|
526
|
+
const amounts = withdraw.map((d) => d.amount);
|
|
527
|
+
// Get mint pubkeys
|
|
528
|
+
const mints = withdraw.map((d) => d.mint);
|
|
529
|
+
// Get and assert one token program for all mints.
|
|
530
|
+
// Throws an error if there are multiple token programs.
|
|
531
|
+
const tokenProgramMap = yield util.getTokenProgramMapForMints(connection, mints);
|
|
532
|
+
let skipIdempotent = false;
|
|
533
|
+
withdraw.map((d) => {
|
|
534
|
+
const mint = d.mint;
|
|
535
|
+
const key = mint.toString();
|
|
536
|
+
const userToken = util.generateAta(payer, d.mint, tokenProgramMap[key]);
|
|
537
|
+
const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint, tokenProgramMap[key]);
|
|
538
|
+
let userPdaToken;
|
|
539
|
+
if (pdaTokenType === types_1.TokenType.LTA) {
|
|
540
|
+
skipIdempotent = true;
|
|
541
|
+
userPdaToken = util.generateLimitToken(userPda, d.mint);
|
|
542
|
+
}
|
|
543
|
+
else if (pdaTokenType === types_1.TokenType.STA || useSta) {
|
|
544
|
+
skipIdempotent = true;
|
|
545
|
+
userPdaToken = util.generateUserPdaStorageAccount(userPda, d.mint);
|
|
546
|
+
}
|
|
547
|
+
else {
|
|
548
|
+
userPdaToken = util.generateAta(userPda, d.mint, tokenProgramMap[key]);
|
|
549
|
+
}
|
|
550
|
+
remainingAccounts.push({ pubkey: mint, isSigner: false, isWritable: true });
|
|
551
|
+
remainingAccounts.push({
|
|
552
|
+
pubkey: userToken,
|
|
553
|
+
isSigner: false,
|
|
554
|
+
isWritable: true,
|
|
555
|
+
});
|
|
556
|
+
remainingAccounts.push({
|
|
557
|
+
pubkey: userPdaToken,
|
|
558
|
+
isSigner: false,
|
|
559
|
+
isWritable: true,
|
|
560
|
+
});
|
|
561
|
+
remainingAccounts.push({
|
|
562
|
+
pubkey: ownerFeeToken,
|
|
563
|
+
isSigner: false,
|
|
564
|
+
isWritable: true,
|
|
565
|
+
});
|
|
566
|
+
});
|
|
567
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
568
|
+
.withdrawMultipleTokenV2(skipIdempotent, hasAmount ? amounts : null)
|
|
569
|
+
.accounts({
|
|
570
|
+
farm,
|
|
571
|
+
userPda,
|
|
572
|
+
payer,
|
|
573
|
+
hsFeeOwner: addresses_1.SITE_FEE_OWNER,
|
|
574
|
+
associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
|
|
575
|
+
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
576
|
+
token2022Program: addresses_1.TOKEN_2022_PROGRAM_ID,
|
|
577
|
+
systemProgram: web3.SystemProgram.programId,
|
|
578
|
+
})
|
|
579
|
+
.remainingAccounts(remainingAccounts)
|
|
580
|
+
.instruction();
|
|
581
|
+
return ix;
|
|
442
582
|
});
|
|
443
583
|
}
|
|
444
584
|
/**
|
package/dist/src/meteora.d.ts
CHANGED
|
@@ -5,13 +5,14 @@ import { MeteoraToHawksightFn, TokenType } from './types';
|
|
|
5
5
|
import { SimpleIxGenerator } from './classes/SimpleIxGenerator';
|
|
6
6
|
export declare class MeteoraDLMM {
|
|
7
7
|
readonly dlmm: DLMM;
|
|
8
|
+
readonly ix: SimpleIxGenerator;
|
|
8
9
|
private constructor();
|
|
9
10
|
readonly pubkey: web3.PublicKey;
|
|
10
11
|
private static _program;
|
|
11
12
|
private static _instance;
|
|
12
13
|
private static _poolAddress;
|
|
13
14
|
private static _connection;
|
|
14
|
-
static create(connection: web3.Connection, poolAddress: web3.PublicKey): Promise<MeteoraDLMM>;
|
|
15
|
+
static create(connection: web3.Connection, poolAddress: web3.PublicKey, ix: SimpleIxGenerator): Promise<MeteoraDLMM>;
|
|
15
16
|
/**
|
|
16
17
|
* Meteora DLMM Program
|
|
17
18
|
*
|
|
@@ -52,7 +53,7 @@ export declare class MeteoraDLMM {
|
|
|
52
53
|
*
|
|
53
54
|
* @throws {Error} - Throws an error if input token(s) do not exist on the blockchain.
|
|
54
55
|
*/
|
|
55
|
-
initializePositionAndAddLiquidityByStrategy(userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
56
|
+
initializePositionAndAddLiquidityByStrategy(connection: web3.Connection, userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
56
57
|
positionPubKey: web3.PublicKey;
|
|
57
58
|
totalXAmount: BN;
|
|
58
59
|
totalYAmount: BN;
|
|
@@ -131,7 +132,7 @@ export declare class MeteoraDLMM {
|
|
|
131
132
|
*
|
|
132
133
|
* @throws {Error} - Throws an error if input token(s) do not exist on the blockchain.
|
|
133
134
|
*/
|
|
134
|
-
addLiquidityByStrategy(userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
135
|
+
addLiquidityByStrategy(connection: web3.Connection, userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
135
136
|
positionPubKey: web3.PublicKey;
|
|
136
137
|
totalXAmount: BN;
|
|
137
138
|
totalYAmount: BN;
|
|
@@ -163,7 +164,7 @@ export declare class MeteoraDLMM {
|
|
|
163
164
|
*
|
|
164
165
|
* @returns {Promise<web3.TransactionInstruction[]>} - A promise that resolves to an array of transaction instructions relevant to the Meteora DLMM program.
|
|
165
166
|
*/
|
|
166
|
-
removeLiquidity(userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
167
|
+
removeLiquidity(connection: web3.Connection, userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
167
168
|
user: web3.PublicKey;
|
|
168
169
|
position: web3.PublicKey;
|
|
169
170
|
binIds: number[];
|
|
@@ -216,7 +217,7 @@ export declare class MeteoraDLMM {
|
|
|
216
217
|
*
|
|
217
218
|
* @returns {Promise<ClaimAllRewardsByPositionBuilder>} - A promise that resolves to a `ClaimAllRewardsByPositionBuilder` object.
|
|
218
219
|
*/
|
|
219
|
-
claimAllRewardsByPosition(userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
220
|
+
claimAllRewardsByPosition(connection: web3.Connection, userWallet: web3.PublicKey, payer: web3.PublicKey, params: {
|
|
220
221
|
owner: web3.PublicKey;
|
|
221
222
|
position: LbPosition;
|
|
222
223
|
}, meteoraToHawksight: MeteoraToHawksightFn): Promise<ClaimAllRewardsByPositionBuilder>;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"meteora.d.ts","sourceRoot":"","sources":["../../src/meteora.ts"],"names":[],"mappings":"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"}
|