@augustdigital/sdk 4.24.6 → 4.24.8
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/lib/adapters/solana/getters.js +4 -0
- package/lib/adapters/solana/getters.js.map +1 -1
- package/lib/adapters/solana/index.d.ts +5 -8
- package/lib/adapters/solana/types.d.ts +1 -7
- package/lib/adapters/solana/utils.d.ts +5 -6
- package/lib/adapters/solana/utils.js +29 -59
- package/lib/adapters/solana/utils.js.map +1 -1
- package/lib/adapters/solana/vault.actions.js +4 -4
- package/lib/adapters/solana/vault.actions.js.map +1 -1
- package/lib/adapters/sui/transformer.js +4 -0
- package/lib/adapters/sui/transformer.js.map +1 -1
- package/lib/core/helpers/vaults.d.ts +2 -1
- package/lib/core/helpers/vaults.js +8 -0
- package/lib/core/helpers/vaults.js.map +1 -1
- package/lib/modules/vaults/getters.js +56 -36
- package/lib/modules/vaults/getters.js.map +1 -1
- package/lib/modules/vaults/utils.js +4 -0
- package/lib/modules/vaults/utils.js.map +1 -1
- package/lib/services/debank/utils.d.ts +6 -0
- package/lib/services/debank/utils.js.map +1 -1
- package/lib/services/octavfi/utils.d.ts +2 -1
- package/lib/services/octavfi/utils.js.map +1 -1
- package/lib/types/user.d.ts +1 -1
- package/lib/types/vaults.d.ts +5 -0
- package/lib/types/vaults.js.map +1 -1
- package/lib/types/webserver.d.ts +4 -0
- package/package.json +1 -1
|
@@ -150,7 +150,11 @@ const getSolanaVault = async (tokenizedVault, options) => {
|
|
|
150
150
|
performance: tokenizedVault?.weekly_performance_fee_bps || 0,
|
|
151
151
|
management: tokenizedVault?.platform_fee_override?.management_fee || 0,
|
|
152
152
|
isManagementWaived: false,
|
|
153
|
+
managementFeeWaivedUntilDate: tokenizedVault?.management_fee_waived_until_date ?? null,
|
|
154
|
+
managementFeeWaivedUntilTvl: tokenizedVault?.management_fee_waived_until_tvl ?? null,
|
|
153
155
|
isPerformanceWaived: false,
|
|
156
|
+
performanceFeeWaivedUntilDate: tokenizedVault?.performance_fee_waived_until_date ?? null,
|
|
157
|
+
performanceFeeWaivedUntilTvl: tokenizedVault?.performance_fee_waived_until_tvl ?? null,
|
|
154
158
|
},
|
|
155
159
|
lagDuration: 0,
|
|
156
160
|
maxDailyDrawdown: tokenizedVault?.max_daily_drawdown || 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/getters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getters.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/getters.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare const Solana: {
|
|
|
24
24
|
getReadOnlyProvider: ({ connection }: import("./types").ISolanaConnectionOptions) => AnchorProvider;
|
|
25
25
|
deriveShareMintPda: (vaultProgramId: PublicKey | string) => web3.PublicKey;
|
|
26
26
|
deriveVaultStatePda: (vaultProgramId: PublicKey | string) => web3.PublicKey;
|
|
27
|
-
deriveVaultTokenAtaPda: (vaultProgramId: PublicKey | string, depositMint: PublicKey) => web3.PublicKey;
|
|
27
|
+
deriveVaultTokenAtaPda: (vaultProgramId: PublicKey | string, depositMint: PublicKey, vaultVersion?: number) => web3.PublicKey;
|
|
28
28
|
getVaultState: ({ provider, connection, vaultProgramId, vaultAddress, idl, }: {
|
|
29
29
|
vaultProgramId: PublicKey | string;
|
|
30
30
|
vaultAddress?: PublicKey | string;
|
|
@@ -32,7 +32,6 @@ export declare const Solana: {
|
|
|
32
32
|
} & import("./types").ISolanaConnectionOptions) => Promise<{
|
|
33
33
|
vaultState: unknown | null;
|
|
34
34
|
depositMintDecimals: number | null;
|
|
35
|
-
vaultToken: import("./types").ISolanaTokenBalance;
|
|
36
35
|
}>;
|
|
37
36
|
getVaultStateReadOnly: ({ vaultProgramId, vaultAddress, connection, idl, }: {
|
|
38
37
|
vaultProgramId: PublicKey | string;
|
|
@@ -41,7 +40,6 @@ export declare const Solana: {
|
|
|
41
40
|
} & import("./types").ISolanaConnectionOptions) => Promise<{
|
|
42
41
|
vaultState: unknown | null;
|
|
43
42
|
depositMintDecimals: number | null;
|
|
44
|
-
vaultToken: import("./types").ISolanaTokenBalance;
|
|
45
43
|
}>;
|
|
46
44
|
getToken: ({ mintAddress, endpoint, connection, }: {
|
|
47
45
|
mintAddress: string | PublicKey;
|
|
@@ -59,10 +57,10 @@ export declare const Solana: {
|
|
|
59
57
|
publicKey: PublicKey | string;
|
|
60
58
|
depositMint?: PublicKey | string;
|
|
61
59
|
} & import("./types").ISolanaConnectionOptions) => Promise<any>;
|
|
62
|
-
fetchUserShareBalance: ({ connection, publicKey, shareMint,
|
|
60
|
+
fetchUserShareBalance: ({ connection, publicKey, shareMint, }: {
|
|
63
61
|
publicKey: PublicKey | string;
|
|
64
62
|
shareMint?: PublicKey | string;
|
|
65
|
-
} & import("./types").ISolanaConnectionOptions) => Promise<
|
|
63
|
+
} & import("./types").ISolanaConnectionOptions) => Promise<any>;
|
|
66
64
|
getBestRpcEndpoint: ({ endpoint, network, connection, }: import("./types").ISolanaConnectionOptions) => Promise<`https://${string}` | "http://127.0.0.1:8899">;
|
|
67
65
|
fallbackDecimals: number;
|
|
68
66
|
fallbackNetwork: import("../..").ISolanaNetwork;
|
|
@@ -87,6 +85,7 @@ export declare const Solana: {
|
|
|
87
85
|
} & import("./types").ISolanaConnectionOptions) => Promise<{
|
|
88
86
|
depositMint: string;
|
|
89
87
|
shareMint: string;
|
|
88
|
+
vaultVersion: number | undefined;
|
|
90
89
|
}>;
|
|
91
90
|
resolveProgramId: (vaultAddress: string, solanaMetadata?: {
|
|
92
91
|
program_id?: string;
|
|
@@ -111,12 +110,10 @@ declare class SolanaAdapter {
|
|
|
111
110
|
getVaultState(vaultProgramId: PublicKey | string, idl: any, vaultAddress?: PublicKey | string): Promise<{
|
|
112
111
|
vaultState: unknown | null;
|
|
113
112
|
depositMintDecimals: number | null;
|
|
114
|
-
vaultToken: import("./types").ISolanaTokenBalance;
|
|
115
113
|
}>;
|
|
116
114
|
getVaultStateReadOnly(vaultProgramId: PublicKey | string, idl: any, vaultAddress?: PublicKey | string): Promise<{
|
|
117
115
|
vaultState: unknown | null;
|
|
118
116
|
depositMintDecimals: number | null;
|
|
119
|
-
vaultToken: import("./types").ISolanaTokenBalance;
|
|
120
117
|
}>;
|
|
121
118
|
getToken(mintAddress: string | PublicKey): Promise<{
|
|
122
119
|
address: string;
|
|
@@ -127,7 +124,7 @@ declare class SolanaAdapter {
|
|
|
127
124
|
}>;
|
|
128
125
|
getTokenSymbol(mintAddress: string | PublicKey): Promise<string>;
|
|
129
126
|
fetchUserTokenBalance(publicKey: PublicKey | string, depositMint: PublicKey | string): Promise<any>;
|
|
130
|
-
fetchUserShareBalance(publicKey: PublicKey | string, shareMint: PublicKey | string): Promise<
|
|
127
|
+
fetchUserShareBalance(publicKey: PublicKey | string, shareMint: PublicKey | string): Promise<any>;
|
|
131
128
|
vaultDeposit(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, depositAmount: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>, vaultAddress?: PublicKey | string): Promise<any>;
|
|
132
129
|
vaultRedeem(vaultProgramId: PublicKey | string, idl: any, publicKey: PublicKey | string, redeemShares: number, sendTransaction: (transaction: Transaction | web3.VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<web3.TransactionSignature>, vaultAddress?: PublicKey | string): Promise<any>;
|
|
133
130
|
getProgramId(type: 'vault'): string;
|
|
@@ -18,6 +18,7 @@ export interface ISolanaVaultState {
|
|
|
18
18
|
deployedAum: number | null;
|
|
19
19
|
pdaBump: number[] | null;
|
|
20
20
|
paused: boolean | null;
|
|
21
|
+
vaultVersion: number[] | null;
|
|
21
22
|
}
|
|
22
23
|
export interface ISolanaToken {
|
|
23
24
|
address: string;
|
|
@@ -39,13 +40,6 @@ export interface ISolanaVaultConfig {
|
|
|
39
40
|
depositMint: string;
|
|
40
41
|
network: ISolanaNetwork;
|
|
41
42
|
}
|
|
42
|
-
export interface ISolanaTokenBalance {
|
|
43
|
-
balance: number;
|
|
44
|
-
decimals: number;
|
|
45
|
-
rawAmount: string;
|
|
46
|
-
symbol?: string;
|
|
47
|
-
name?: string;
|
|
48
|
-
}
|
|
49
43
|
export interface ISolanaDepositResult {
|
|
50
44
|
success: boolean;
|
|
51
45
|
signature?: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnchorProvider, Program, web3 } from '@coral-xyz/anchor';
|
|
2
2
|
import { PublicKey, Transaction } from '@solana/web3.js';
|
|
3
|
-
import { ISolanaConnectionOptions
|
|
3
|
+
import { ISolanaConnectionOptions } from './types';
|
|
4
4
|
declare function getExplorerLink({ signature, type, network, }: {
|
|
5
5
|
signature: string;
|
|
6
6
|
type: 'tx' | 'address' | 'token';
|
|
@@ -19,7 +19,7 @@ declare function getProvider({ connection, publicKey, signTransaction, }: {
|
|
|
19
19
|
declare function getReadOnlyProvider({ connection }: ISolanaConnectionOptions): AnchorProvider;
|
|
20
20
|
declare function deriveVaultStatePda(vaultProgramId: PublicKey | string): web3.PublicKey;
|
|
21
21
|
declare function deriveShareMintPda(vaultProgramId: PublicKey | string): web3.PublicKey;
|
|
22
|
-
declare function deriveVaultTokenAtaPda(vaultProgramId: PublicKey | string, depositMint: PublicKey): web3.PublicKey;
|
|
22
|
+
declare function deriveVaultTokenAtaPda(vaultProgramId: PublicKey | string, depositMint: PublicKey, vaultVersion?: number): web3.PublicKey;
|
|
23
23
|
declare function getVaultState({ provider, connection, vaultProgramId, vaultAddress, idl, }: {
|
|
24
24
|
vaultProgramId: PublicKey | string;
|
|
25
25
|
vaultAddress?: PublicKey | string;
|
|
@@ -27,7 +27,6 @@ declare function getVaultState({ provider, connection, vaultProgramId, vaultAddr
|
|
|
27
27
|
} & ISolanaConnectionOptions): Promise<{
|
|
28
28
|
vaultState: unknown | null;
|
|
29
29
|
depositMintDecimals: number | null;
|
|
30
|
-
vaultToken: ISolanaTokenBalance;
|
|
31
30
|
}>;
|
|
32
31
|
declare function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connection, idl, }: {
|
|
33
32
|
vaultProgramId: PublicKey | string;
|
|
@@ -36,7 +35,6 @@ declare function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connectio
|
|
|
36
35
|
} & ISolanaConnectionOptions): Promise<{
|
|
37
36
|
vaultState: unknown | null;
|
|
38
37
|
depositMintDecimals: number | null;
|
|
39
|
-
vaultToken: ISolanaTokenBalance;
|
|
40
38
|
}>;
|
|
41
39
|
declare function getVaultMints({ vaultProgramId, vaultAddress, connection, idl, }: {
|
|
42
40
|
vaultProgramId: PublicKey | string;
|
|
@@ -45,6 +43,7 @@ declare function getVaultMints({ vaultProgramId, vaultAddress, connection, idl,
|
|
|
45
43
|
} & ISolanaConnectionOptions): Promise<{
|
|
46
44
|
depositMint: string;
|
|
47
45
|
shareMint: string;
|
|
46
|
+
vaultVersion: number | undefined;
|
|
48
47
|
}>;
|
|
49
48
|
declare function getToken({ mintAddress, endpoint, connection, }: {
|
|
50
49
|
mintAddress: string | PublicKey;
|
|
@@ -62,10 +61,10 @@ declare function fetchUserTokenBalance({ connection, publicKey, depositMint, }:
|
|
|
62
61
|
publicKey: PublicKey | string;
|
|
63
62
|
depositMint?: PublicKey | string;
|
|
64
63
|
} & ISolanaConnectionOptions): Promise<any>;
|
|
65
|
-
declare function fetchUserShareBalance({ connection, publicKey, shareMint,
|
|
64
|
+
declare function fetchUserShareBalance({ connection, publicKey, shareMint, }: {
|
|
66
65
|
publicKey: PublicKey | string;
|
|
67
66
|
shareMint?: PublicKey | string;
|
|
68
|
-
} & ISolanaConnectionOptions): Promise<
|
|
67
|
+
} & ISolanaConnectionOptions): Promise<any>;
|
|
69
68
|
declare function resolveProgramId(vaultAddress: string, solanaMetadata?: {
|
|
70
69
|
program_id?: string;
|
|
71
70
|
} | null): string;
|
|
@@ -111,24 +111,29 @@ function deriveShareMintPda(vaultProgramId) {
|
|
|
111
111
|
const [pda] = web3_js_1.PublicKey.findProgramAddressSync([new TextEncoder().encode('mint')], _vaultProgramId);
|
|
112
112
|
return pda;
|
|
113
113
|
}
|
|
114
|
-
function deriveVaultTokenAtaPda(vaultProgramId, depositMint) {
|
|
114
|
+
function deriveVaultTokenAtaPda(vaultProgramId, depositMint, vaultVersion) {
|
|
115
115
|
if (!(vaultProgramId && depositMint))
|
|
116
116
|
throw new Error('Vault program ID or deposit mint missing');
|
|
117
117
|
const _vaultProgramId = new web3_js_1.PublicKey(vaultProgramId);
|
|
118
|
-
const
|
|
118
|
+
const seeds = [
|
|
119
|
+
Buffer.from('token_vault'),
|
|
120
|
+
depositMint.toBuffer(),
|
|
121
|
+
];
|
|
122
|
+
if (vaultVersion !== undefined) {
|
|
123
|
+
if (!Number.isInteger(vaultVersion) ||
|
|
124
|
+
vaultVersion < 0 ||
|
|
125
|
+
vaultVersion > 255) {
|
|
126
|
+
throw new Error(`Invalid vault version ${vaultVersion}: must be an integer between 0 and 255`);
|
|
127
|
+
}
|
|
128
|
+
seeds.push(Buffer.from([vaultVersion]));
|
|
129
|
+
}
|
|
130
|
+
const [pda] = web3_js_1.PublicKey.findProgramAddressSync(seeds, _vaultProgramId);
|
|
119
131
|
return pda;
|
|
120
132
|
}
|
|
121
133
|
async function getVaultState({ provider, connection, vaultProgramId, vaultAddress, idl, }) {
|
|
122
134
|
const returnObj = {
|
|
123
135
|
vaultState: null,
|
|
124
136
|
depositMintDecimals: null,
|
|
125
|
-
vaultToken: {
|
|
126
|
-
balance: 0,
|
|
127
|
-
decimals: 0,
|
|
128
|
-
rawAmount: '0',
|
|
129
|
-
symbol: '',
|
|
130
|
-
name: '',
|
|
131
|
-
},
|
|
132
137
|
};
|
|
133
138
|
try {
|
|
134
139
|
const cacheKey = `vaultState-${vaultAddress || vaultProgramId}`;
|
|
@@ -154,23 +159,11 @@ async function getVaultState({ provider, connection, vaultProgramId, vaultAddres
|
|
|
154
159
|
const mintInfo = await connection.getParsedAccountInfo(state.depositMint);
|
|
155
160
|
if (mintInfo.value) {
|
|
156
161
|
const parsedData = mintInfo.value.data;
|
|
157
|
-
|
|
158
|
-
returnObj.depositMintDecimals = decimals;
|
|
159
|
-
}
|
|
160
|
-
const vaultTokenAtaPda = deriveVaultTokenAtaPda(vaultProgramId, state.depositMint);
|
|
161
|
-
const tokenAccountInfo = await connection.getTokenAccountBalance(vaultTokenAtaPda);
|
|
162
|
-
if (tokenAccountInfo.value) {
|
|
163
|
-
returnObj.vaultToken = {
|
|
164
|
-
balance: Number(tokenAccountInfo.value.uiAmount),
|
|
165
|
-
decimals: Number(tokenAccountInfo.value.decimals),
|
|
166
|
-
rawAmount: tokenAccountInfo.value.amount.toString(),
|
|
167
|
-
symbol: '',
|
|
168
|
-
name: '',
|
|
169
|
-
};
|
|
162
|
+
returnObj.depositMintDecimals = parsedData.parsed.info.decimals;
|
|
170
163
|
}
|
|
171
164
|
}
|
|
172
|
-
catch (
|
|
173
|
-
console.error('Error fetching
|
|
165
|
+
catch (mintError) {
|
|
166
|
+
console.error('Error fetching deposit mint decimals:', mintError);
|
|
174
167
|
}
|
|
175
168
|
}
|
|
176
169
|
await (0, core_1.setSafeCache)(cacheKey, returnObj);
|
|
@@ -186,13 +179,6 @@ async function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connection,
|
|
|
186
179
|
const returnObj = {
|
|
187
180
|
vaultState: null,
|
|
188
181
|
depositMintDecimals: null,
|
|
189
|
-
vaultToken: {
|
|
190
|
-
balance: 0,
|
|
191
|
-
decimals: 0,
|
|
192
|
-
rawAmount: '0',
|
|
193
|
-
symbol: '',
|
|
194
|
-
name: '',
|
|
195
|
-
},
|
|
196
182
|
};
|
|
197
183
|
try {
|
|
198
184
|
const cacheKey = `vaultState-${vaultAddress || vaultProgramId}`;
|
|
@@ -225,23 +211,11 @@ async function getVaultStateReadOnly({ vaultProgramId, vaultAddress, connection,
|
|
|
225
211
|
const mintInfo = await connection.getParsedAccountInfo(state.depositMint);
|
|
226
212
|
if (mintInfo.value) {
|
|
227
213
|
const parsedData = mintInfo.value.data;
|
|
228
|
-
|
|
229
|
-
returnObj.depositMintDecimals = decimals;
|
|
230
|
-
}
|
|
231
|
-
const vaultTokenAtaPda = deriveVaultTokenAtaPda(_vaultProgramId, state.depositMint);
|
|
232
|
-
const tokenAccountInfo = await connection.getTokenAccountBalance(vaultTokenAtaPda);
|
|
233
|
-
if (tokenAccountInfo.value) {
|
|
234
|
-
returnObj.vaultToken = {
|
|
235
|
-
balance: Number(tokenAccountInfo.value.uiAmount),
|
|
236
|
-
decimals: Number(tokenAccountInfo.value.decimals),
|
|
237
|
-
rawAmount: tokenAccountInfo.value.amount.toString(),
|
|
238
|
-
symbol: '',
|
|
239
|
-
name: '',
|
|
240
|
-
};
|
|
214
|
+
returnObj.depositMintDecimals = parsedData.parsed.info.decimals;
|
|
241
215
|
}
|
|
242
216
|
}
|
|
243
|
-
catch (
|
|
244
|
-
console.error('Error fetching
|
|
217
|
+
catch (mintError) {
|
|
218
|
+
console.error('Error fetching deposit mint decimals:', mintError);
|
|
245
219
|
}
|
|
246
220
|
}
|
|
247
221
|
}
|
|
@@ -288,16 +262,20 @@ async function getVaultMints({ vaultProgramId, vaultAddress, connection, idl, })
|
|
|
288
262
|
const returnObj = {
|
|
289
263
|
depositMint: state.depositMint.toString(),
|
|
290
264
|
shareMint: state.shareMint.toString(),
|
|
265
|
+
vaultVersion: Array.isArray(state.vaultVersion)
|
|
266
|
+
? state.vaultVersion[0]
|
|
267
|
+
: undefined,
|
|
291
268
|
};
|
|
292
269
|
await (0, core_1.setSafeCache)(cacheKey, returnObj);
|
|
293
270
|
return returnObj;
|
|
294
271
|
}
|
|
295
272
|
catch (e) {
|
|
296
273
|
const error = e;
|
|
297
|
-
console.error('Error reading vault
|
|
274
|
+
console.error('Error reading vault mints:', error);
|
|
298
275
|
return {
|
|
299
276
|
depositMint: '',
|
|
300
277
|
shareMint: '',
|
|
278
|
+
vaultVersion: undefined,
|
|
301
279
|
};
|
|
302
280
|
}
|
|
303
281
|
}
|
|
@@ -423,27 +401,19 @@ async function fetchUserTokenBalance({ connection, publicKey, depositMint, }) {
|
|
|
423
401
|
return '0';
|
|
424
402
|
}
|
|
425
403
|
}
|
|
426
|
-
async function fetchUserShareBalance({ connection, publicKey, shareMint,
|
|
404
|
+
async function fetchUserShareBalance({ connection, publicKey, shareMint, }) {
|
|
427
405
|
if (!publicKey || !shareMint)
|
|
428
406
|
return 0;
|
|
429
407
|
try {
|
|
430
408
|
const _publicKey = new web3_js_1.PublicKey(publicKey);
|
|
431
409
|
const _shareMint = new web3_js_1.PublicKey(shareMint);
|
|
432
|
-
const shareMintPda = deriveShareMintPda(new web3_js_1.PublicKey(constants_1.programIds[network].vault));
|
|
433
|
-
const shareMintInfo = await connection.getParsedAccountInfo(shareMintPda);
|
|
434
|
-
if (!shareMintInfo.value) {
|
|
435
|
-
console.error('#fetchUserShareBalance:Could not fetch share mint info');
|
|
436
|
-
return 0;
|
|
437
|
-
}
|
|
438
|
-
const parsedData = shareMintInfo.value.data;
|
|
439
|
-
const shareDecimals = parsedData.parsed.info.decimals || constants_1.fallbackDecimals + 2;
|
|
440
410
|
const shareAccounts = await connection.getParsedTokenAccountsByOwner(_publicKey, {
|
|
441
411
|
mint: _shareMint,
|
|
442
412
|
});
|
|
443
413
|
if (shareAccounts.value.length > 0) {
|
|
444
|
-
const
|
|
445
|
-
|
|
446
|
-
return balance;
|
|
414
|
+
const balance = shareAccounts?.value?.[0]?.account.data.parsed.info.tokenAmount
|
|
415
|
+
.uiAmount;
|
|
416
|
+
return balance ?? 0;
|
|
447
417
|
}
|
|
448
418
|
return 0;
|
|
449
419
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/utils.ts"],"names":[],"mappings":";;;AAAA,8CAAkE;AAClE,6CAAyD;AACzD,mCAAmC;AAEnC,2CAMqB;AACrB,qCAAwD;AAMxD,SAAS,eAAe,CAAC,EACvB,SAAS,EACT,IAAI,GAAG,IAAI,EACX,OAAO,GAAG,2BAAe,GAIC;IAC1B,MAAM,OAAO,GAAG,oBAAoB,CAAC;IACrC,OAAO,GAAG,OAAO,IAAI,IAAI,IAAI,SAAS,YAAY,OAAO,EAAE,CAAC;AAC9D,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,IAAA,kBAAS,EAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,CAAC;QACH,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB;IACjC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAG9D,IAAI,IAAA,kBAAS,EAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IAGvC,IAAI,eAAe,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IAI7C,MAAM,WAAW,GACf,4DAA4D,CAAC;IAC/D,MAAM,aAAa,GAAI,SAAoB;SACxC,KAAK,CAAC,EAAE,CAAC;SACT,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/C,IAAI,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IAGjC,OAAO,CACJ,SAAoB,CAAC,MAAM,IAAI,EAAE,IAAK,SAAoB,CAAC,MAAM,IAAI,GAAG,CAC1E,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,EAClB,QAAQ,EACR,GAAG,EACH,SAAS,EACT,OAAO,GAImB;IAC1B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,gBAAO,CAAC,oBAAQ,EAAE,QAAQ,CAAiB,CAAC;IACzD,CAAC;IAGD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,WAAW,GAAG;YAClB,GAAG,GAAG;YACN,OAAO,EAAE,SAAS;SACnB,CAAC;QACF,OAAO,IAAI,gBAAO,CAAC,WAAW,EAAE,QAAQ,CAAiB,CAAC;IAC5D,CAAC;IAED,OAAO,IAAI,gBAAO,CAAC,GAAG,EAAE,QAAQ,CAAiB,CAAC;AACpD,CAAC;AAKD,KAAK,UAAU,eAAe,CAAC,EAAE,UAAU,EAA4B;IACrE,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,CAAC;QACtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACnC,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,kBAAkB,CAAC,EAChC,QAAQ,EACR,OAAO,GAAG,2BAAe,EACzB,UAAU,GACe;IACzB,MAAM,eAAe,GAAG,QAAQ,CAAC;IACjC,MAAM,gBAAgB,GACpB,gCAAoB,CAAC,OAA4C,CAAC,CAAC;IAGrE,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1D,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,eAAe,CAAC;IACzB,CAAC;IAGD,OAAO,CAAC,IAAI,CACV,iDAAiD,EACjD,gBAAgB,CACjB,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,WAAW,CAAC,EACnB,UAAU,EACV,SAAS,EACT,eAAe,GAQW;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,eAAe,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,IAAI,uBAAc,CACvB,UAAU,EACV;QACE,SAAS;QACT,eAAe;QACf,mBAAmB,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YAEtC,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAO,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAChD,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC;KACF,EACD,EAAE,UAAU,EAAE,WAAW,EAAE,CAC5B,CAAC;AACJ,CAAC;AAGD,SAAS,mBAAmB,CAAC,EAAE,UAAU,EAA4B;IAEnE,MAAM,WAAW,GAAG;QAClB,SAAS,EAAE,mBAAS,CAAC,OAAO;QAC5B,eAAe,EAAE,KAAK,EACpB,GAAM,EACM,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,mBAAmB,EAAE,KAAK,EAGxB,IAAS,EACK,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,uBAAc,CAAC,UAAU,EAAE,WAAW,EAAE;QACjD,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;AACL,CAAC;AAMD,SAAS,mBAAmB,CAAC,cAAkC;IAC7D,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EACzC,eAAe,CAChB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,kBAAkB,CAAC,cAAkC;IAC5D,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC5C,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAClC,eAAe,CAChB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,sBAAsB,CAC7B,cAAkC,EAClC,WAAsB,EACtB,YAAqB;IAErB,IAAI,CAAC,CAAC,cAAc,IAAI,WAAW,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,KAAK,GAA4B;QACrC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,WAAW,CAAC,QAAQ,EAAE;KACvB,CAAC;IACF,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC;YAC/B,YAAY,GAAG,CAAC;YAChB,YAAY,GAAG,GAAG,EAClB,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yBAAyB,YAAY,wCAAwC,CAC9E,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACvE,OAAO,GAAG,CAAC;AACb,CAAC;AAMD,KAAK,UAAU,aAAa,CAAC,EAC3B,QAAQ,EACR,UAAU,EACV,cAAc,EACd,YAAY,EACZ,GAAG,GAKuB;IAI1B,MAAM,SAAS,GAGX;QACF,UAAU,EAAE,IAAI;QAChB,mBAAmB,EAAE,IAAI;KAC1B,CAAC;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,YAAY,IAAI,cAAc,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAGN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,aAAa,GAAG,YAAY;YAChC,CAAC,CAAC,IAAI,mBAAS,CAAC,YAAY,CAAC;YAC7B,CAAC,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,UAAU,CAAC;YACzB,QAAQ;YACR,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;QACF,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;QAE7B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACpD,KAAK,CAAC,WAAW,CAClB,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAEjC,CAAC;oBACF,SAAS,CAAC,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAClE,CAAC;YACH,CAAC;YAAC,OAAO,SAAS,EAAE,CAAC;gBACnB,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,SAAS,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,MAAM,IAAA,mBAAY,EAGf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,qBAAqB,CAAC,EACnC,cAAc,EACd,YAAY,EACZ,UAAU,EACV,GAAG,GAKuB;IAI1B,MAAM,SAAS,GAGX;QACF,UAAU,EAAE,IAAI;QAChB,mBAAmB,EAAE,IAAI;KAC1B,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,YAAY,IAAI,cAAc,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAGN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,YAAY;YAChC,CAAC,CAAC,IAAI,mBAAS,CAAC,YAAY,CAAC;YAC7B,CAAC,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAGzC,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAEnE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC;QACnB,CAAC;QAGD,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,UAAU,CAAC;gBACzB,QAAQ,EAAE,gBAAgB;gBAC1B,GAAG;gBACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;YACF,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC;YAE7B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACpD,KAAK,CAAC,WAAW,CAClB,CAAC;oBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;wBACnB,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAEjC,CAAC;wBACF,SAAS,CAAC,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAClE,CAAC;gBACH,CAAC;gBAAC,OAAO,SAAS,EAAE,CAAC;oBACnB,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,SAAS,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACX,iDAAiD,EACjD,YAAY,CACb,CAAC;YAEF,SAAS,CAAC,UAAU,GAAG;gBACrB,OAAO,EAAE,aAAa,CAAC,QAAQ,EAAE;gBACjC,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACnC,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,SAAS,EAAE,WAAW,CAAC,SAAS;aACjC,CAAC;QACJ,CAAC;QAED,MAAM,IAAA,mBAAY,EAGf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,aAAa,CAAC,EAC3B,cAAc,EACd,YAAY,EACZ,UAAU,EACV,GAAG,GAKuB;IAK1B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,cAAc,YAAY,IAAI,cAAc,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YACZ,OAAO,UAIN,CAAC;QAEJ,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,aAAa,GAAG,YAAY;YAChC,CAAC,CAAC,IAAI,mBAAS,CAAC,YAAY,CAAC;YAC7B,CAAC,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAEzC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,UAAU,CAAC;YACzB,QAAQ,EAAE,gBAAgB;YAC1B,GAAG;YACH,SAAS,EAAE,eAAe,CAAC,QAAQ,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAO,OAAO,CAAC,OAAe,CAAC,UAAU,CAAC,KAAK,CAC3D,aAAa,CACd,CAAC;QAEF,MAAM,SAAS,GAAG;YAChB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE;YACzC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;YAErC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;gBAC7C,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvB,CAAC,CAAC,SAAS;SACd,CAAC;QACF,MAAM,IAAA,mBAAY,EAIf,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACnD,OAAO;YACL,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,SAAS;SACxB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,EACtB,WAAW,EACX,QAAQ,EACR,UAAU,GAGgB;IAO1B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,gBAAgB,WAAW,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,UAAU;YAAE,OAAO,UAA0B,CAAC;QAGlD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO,EAAE,KAAK;gBACd,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,UAAU;gBAClB,MAAM,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE;aACvC,CAAC;SACH,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAQ,CAAC;QAG5C,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO;gBACL,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;gBACvD,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ;gBAC3C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,IAAI,SAAS;gBACvD,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK;gBAC3C,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa;gBAC/C,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc;gBACtD,eAAe,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB;gBAC1D,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM;aACxB,CAAC;QACpB,CAAC;QAID,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;gBAGlD,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC;oBAC7C,cAAc;oBACd,UAAU;oBACV,GAAG,EAAE,oBAAQ;iBACd,CAAC,CAAC;gBAGH,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAC;oBAGxD,MAAM,aAAa,GACjB,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;oBAEtD,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;wBACxB,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,IAEtC,CAAC;wBAGF,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;4BAC9C,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;6BACnC;4BACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACnB,OAAO,EAAE,KAAK;gCACd,EAAE,EAAE,MAAM;gCACV,MAAM,EAAE,UAAU;gCAClB,MAAM,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,QAAQ,EAAE,EAAE;6BACxC,CAAC;yBACH,CAAC,CAAC;wBACH,MAAM,aAAa,GAAG,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAQ,CAAC;wBAE9D,MAAM,SAAS,GAAG;4BAChB,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE;4BAC/B,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;4BAChE,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ;4BACzC,IAAI,EACF,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI;gCAC7C,mBAAmB;4BACrB,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK;4BACrD,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa;4BACxD,aAAa,EAAE,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc;4BAC/D,eAAe,EACb,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,gBAAgB;4BACpD,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM;4BACrC,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE;yBAC1B,CAAC;wBAClB,MAAM,IAAA,mBAAY,EAAe,QAAQ,EAAE,SAAS,CAAC,CAAC;wBACtD,OAAO,SAAS,CAAC;oBACnB,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBAEpB,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,UAAU,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAGD,KAAK,UAAU,cAAc,CAAC,EAC5B,QAAQ,EACR,WAAW,GAGe;IAC1B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QAChE,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,MAAM,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,EACnC,UAAU,EACV,SAAS,EACT,WAAW,GAIe;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW;QAAE,OAAO,GAAG,CAAC;IAE3C,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAClE,UAAU,EACV;YACE,IAAI,EAAE,YAAY;SACnB,CACF,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,OAAO,GACX,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW;iBAC5D,QAAQ,CAAC;YACd,OAAO,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC;QACpC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,EACnC,UAAU,EACV,SAAS,EACT,SAAS,GAIiB;IAC1B,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAClE,UAAU,EACV;YACE,IAAI,EAAE,UAAU;SACjB,CACF,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,OAAO,GACX,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW;iBAC5D,QAAQ,CAAC;YACd,OAAO,OAAO,IAAI,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,CAAU,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAOD,SAAS,gBAAgB,CACvB,YAAoB,EACpB,cAA+C;IAE/C,OAAO,cAAc,EAAE,UAAU,IAAI,YAAY,CAAC;AACpD,CAAC;AAEY,QAAA,WAAW,GAAG;IACzB,eAAe;IACf,eAAe;IACf,QAAQ;IACR,UAAU;IACV,WAAW;IACX,mBAAmB;IACnB,kBAAkB;IAClB,mBAAmB;IACnB,sBAAsB;IACtB,aAAa;IACb,qBAAqB;IACrB,QAAQ;IACR,cAAc;IACd,qBAAqB;IACrB,qBAAqB;IACrB,kBAAkB;IAClB,gBAAgB,EAAhB,4BAAgB;IAChB,eAAe,EAAf,2BAAe;IACf,UAAU,EAAV,sBAAU;IACV,aAAa;IACb,gBAAgB;CACjB,CAAC"}
|
|
@@ -15,7 +15,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
|
|
|
15
15
|
throw new Error('Please enter an amount to deposit');
|
|
16
16
|
if (!vaultProgramId)
|
|
17
17
|
throw new Error('Please enter a vault program ID');
|
|
18
|
-
const { depositMint, shareMint } = await utils_1.SolanaUtils.getVaultMints({
|
|
18
|
+
const { depositMint, shareMint, vaultVersion } = await utils_1.SolanaUtils.getVaultMints({
|
|
19
19
|
network,
|
|
20
20
|
connection,
|
|
21
21
|
vaultProgramId,
|
|
@@ -38,7 +38,7 @@ async function handleSolanaDeposit({ provider, connection, network = constants_1
|
|
|
38
38
|
? new web3_js_1.PublicKey(vaultAddress)
|
|
39
39
|
: utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
|
|
40
40
|
console.log('Vault state PDA', vaultStatePda.toBase58());
|
|
41
|
-
const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint);
|
|
41
|
+
const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint, vaultVersion);
|
|
42
42
|
console.log('Vault token ATA PDA', vaultTokenAtaPda.toBase58());
|
|
43
43
|
const shareMintAddr = new web3_js_1.PublicKey(shareMint);
|
|
44
44
|
console.log('Share mint', shareMintAddr.toBase58());
|
|
@@ -133,7 +133,7 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, vaultA
|
|
|
133
133
|
throw new Error('Please enter shares to redeem');
|
|
134
134
|
if (!vaultProgramId)
|
|
135
135
|
throw new Error('Please enter a vault program ID');
|
|
136
|
-
const { depositMint, shareMint } = await utils_1.SolanaUtils.getVaultMints({
|
|
136
|
+
const { depositMint, shareMint, vaultVersion } = await utils_1.SolanaUtils.getVaultMints({
|
|
137
137
|
network: provider.connection.rpcEndpoint.includes('devnet')
|
|
138
138
|
? 'devnet'
|
|
139
139
|
: 'mainnet-beta',
|
|
@@ -156,7 +156,7 @@ async function handleSolanaRedeem({ provider, connection, vaultProgramId, vaultA
|
|
|
156
156
|
const vaultStatePda = vaultAddress
|
|
157
157
|
? new web3_js_1.PublicKey(vaultAddress)
|
|
158
158
|
: utils_1.SolanaUtils.deriveVaultStatePda(_vaultProgramId);
|
|
159
|
-
const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint);
|
|
159
|
+
const vaultTokenAtaPda = utils_1.SolanaUtils.deriveVaultTokenAtaPda(_vaultProgramId, _depositMint, vaultVersion);
|
|
160
160
|
const shareMintAddr = new web3_js_1.PublicKey(shareMint);
|
|
161
161
|
const shareMintInfo = await connection.getParsedAccountInfo(shareMintAddr);
|
|
162
162
|
if (!shareMintInfo.value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vault.actions.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/vault.actions.ts"],"names":[],"mappings":";;AAYA,
|
|
1
|
+
{"version":3,"file":"vault.actions.js","sourceRoot":"","sources":["../../../src.ts/adapters/solana/vault.actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,11 @@ function transformEmberVaultToIVault(emberVault) {
|
|
|
44
44
|
constants_1.EMBER_DEFAULTS.BPS_TO_PERCENT,
|
|
45
45
|
management: (0, utils_1.convertFromE9)(emberVault.managementFeePercentE9 || 0) * 100,
|
|
46
46
|
isManagementWaived: false,
|
|
47
|
+
managementFeeWaivedUntilDate: null,
|
|
48
|
+
managementFeeWaivedUntilTvl: null,
|
|
47
49
|
isPerformanceWaived: false,
|
|
50
|
+
performanceFeeWaivedUntilDate: null,
|
|
51
|
+
performanceFeeWaivedUntilTvl: null,
|
|
48
52
|
},
|
|
49
53
|
rewards: {
|
|
50
54
|
points: '5x Upshift Points',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src.ts/adapters/sui/transformer.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src.ts/adapters/sui/transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { IAddress, IContractRunner, ITokenizedVault, IVaultVersion } from '../../types';
|
|
1
|
+
import { ChainType, IAddress, IContractRunner, ITokenizedVault, IVaultVersion } from '../../types';
|
|
2
2
|
export declare const isBadTransaction: (hash: string, chainId: number) => boolean;
|
|
3
3
|
export declare const isBadVault: (address?: string) => boolean;
|
|
4
4
|
export declare function getVaultVersion(vault: string): IVaultVersion | undefined;
|
|
5
5
|
export declare function getVaultVersionV2(vault: ITokenizedVault): IVaultVersion | undefined;
|
|
6
|
+
export declare function getAddressChainType(address: string): ChainType;
|
|
6
7
|
export declare const REWARD_DISTRIBUTOR_ADDRESS: (chainId: number) => string[];
|
|
7
8
|
export declare const AVAX_PRICE_FEED_ADDRESS: (chainId: number) => "0xFF3EEb22B5E3dE6e705b44749C2559d704923FD7" | "0x";
|
|
8
9
|
export declare function getVaultSymbol(vault: IAddress, provider: IContractRunner): Promise<string | undefined>;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getDefaultSubgraphUrl = exports.SUBGRAPH_POOL_URLS = exports.AVAX_PRICE_FEED_ADDRESS = exports.REWARD_DISTRIBUTOR_ADDRESS = exports.isBadVault = exports.isBadTransaction = void 0;
|
|
4
4
|
exports.getVaultVersion = getVaultVersion;
|
|
5
5
|
exports.getVaultVersionV2 = getVaultVersionV2;
|
|
6
|
+
exports.getAddressChainType = getAddressChainType;
|
|
6
7
|
exports.getVaultSymbol = getVaultSymbol;
|
|
7
8
|
const ethers_1 = require("ethers");
|
|
8
9
|
const vaults_1 = require("../constants/vaults");
|
|
@@ -100,6 +101,13 @@ function getVaultVersionV2(vault) {
|
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
}
|
|
104
|
+
function getAddressChainType(address) {
|
|
105
|
+
if (utils_1.SolanaUtils.isSolanaAddress(address))
|
|
106
|
+
return 'solana';
|
|
107
|
+
if ((0, utils_2.isSuiAddress)(address))
|
|
108
|
+
return 'sui';
|
|
109
|
+
return 'evm';
|
|
110
|
+
}
|
|
103
111
|
const REWARD_DISTRIBUTOR_ADDRESS = (chainId) => {
|
|
104
112
|
switch (chainId) {
|
|
105
113
|
case 43114:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../src.ts/core/helpers/vaults.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"vaults.js","sourceRoot":"","sources":["../../../src.ts/core/helpers/vaults.ts"],"names":[],"mappings":"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"}
|