@crypticdot/defituna-client 2.0.14 → 2.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts +26 -26
- package/dist/index.d.ts +26 -26
- package/dist/index.js +52 -52
- package/dist/index.mjs +52 -52
- package/package.json +2 -2
package/dist/index.d.mts
CHANGED
|
@@ -277,7 +277,7 @@ type TunaConfig = {
|
|
|
277
277
|
version: number;
|
|
278
278
|
/** Bump seed for the vaults config account. */
|
|
279
279
|
bump: number;
|
|
280
|
-
/** Current update authority address for both the
|
|
280
|
+
/** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
|
|
281
281
|
adminAuthority: Address;
|
|
282
282
|
/** Fee recipient address. */
|
|
283
283
|
feeRecipient: Address;
|
|
@@ -307,7 +307,7 @@ type TunaConfigArgs = {
|
|
|
307
307
|
version: number;
|
|
308
308
|
/** Bump seed for the vaults config account. */
|
|
309
309
|
bump: number;
|
|
310
|
-
/** Current update authority address for both the
|
|
310
|
+
/** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
|
|
311
311
|
adminAuthority: Address;
|
|
312
312
|
/** Fee recipient address. */
|
|
313
313
|
feeRecipient: Address;
|
|
@@ -2230,7 +2230,7 @@ declare function parseDepositInstruction<TProgram extends string, TAccountMetas
|
|
|
2230
2230
|
|
|
2231
2231
|
declare const LIQUIDATE_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
|
|
2232
2232
|
declare function getLiquidatePositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
|
|
2233
|
-
type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string,
|
|
2233
|
+
type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
|
|
2234
2234
|
TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
|
|
2235
2235
|
TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
|
|
2236
2236
|
TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
|
|
@@ -2246,8 +2246,8 @@ type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PR
|
|
|
2246
2246
|
TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
|
|
2247
2247
|
TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
|
|
2248
2248
|
TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
|
|
2249
|
-
|
|
2250
|
-
|
|
2249
|
+
TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
|
|
2250
|
+
TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
|
|
2251
2251
|
TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
|
|
2252
2252
|
TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
|
|
2253
2253
|
TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
|
|
@@ -2268,7 +2268,7 @@ type LiquidatePositionFusionInstructionDataArgs = {
|
|
|
2268
2268
|
declare function getLiquidatePositionFusionInstructionDataEncoder(): Encoder<LiquidatePositionFusionInstructionDataArgs>;
|
|
2269
2269
|
declare function getLiquidatePositionFusionInstructionDataDecoder(): Decoder<LiquidatePositionFusionInstructionData>;
|
|
2270
2270
|
declare function getLiquidatePositionFusionInstructionDataCodec(): Codec<LiquidatePositionFusionInstructionDataArgs, LiquidatePositionFusionInstructionData>;
|
|
2271
|
-
type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string,
|
|
2271
|
+
type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
|
|
2272
2272
|
/**
|
|
2273
2273
|
*
|
|
2274
2274
|
* TUNA accounts
|
|
@@ -2289,8 +2289,8 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
|
|
|
2289
2289
|
tunaPositionAta: Address<TAccountTunaPositionAta>;
|
|
2290
2290
|
tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
|
|
2291
2291
|
tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
|
|
2292
|
-
|
|
2293
|
-
|
|
2292
|
+
feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
|
|
2293
|
+
feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
|
|
2294
2294
|
pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
|
|
2295
2295
|
pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
|
|
2296
2296
|
/**
|
|
@@ -2305,9 +2305,9 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
|
|
|
2305
2305
|
withdrawPercent: LiquidatePositionFusionInstructionDataArgs['withdrawPercent'];
|
|
2306
2306
|
remainingAccountsInfo: LiquidatePositionFusionInstructionDataArgs['remainingAccountsInfo'];
|
|
2307
2307
|
};
|
|
2308
|
-
declare function getLiquidatePositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string,
|
|
2308
|
+
declare function getLiquidatePositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
|
|
2309
2309
|
programAddress?: TProgramAddress;
|
|
2310
|
-
}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB,
|
|
2310
|
+
}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
|
|
2311
2311
|
type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
|
|
2312
2312
|
programAddress: Address<TProgram>;
|
|
2313
2313
|
accounts: {
|
|
@@ -2331,8 +2331,8 @@ type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof T
|
|
|
2331
2331
|
tunaPositionAta: TAccountMetas[12];
|
|
2332
2332
|
tunaPositionAtaA: TAccountMetas[13];
|
|
2333
2333
|
tunaPositionAtaB: TAccountMetas[14];
|
|
2334
|
-
|
|
2335
|
-
|
|
2334
|
+
feeRecipientAtaA: TAccountMetas[15];
|
|
2335
|
+
feeRecipientAtaB: TAccountMetas[16];
|
|
2336
2336
|
pythOraclePriceFeedA: TAccountMetas[17];
|
|
2337
2337
|
pythOraclePriceFeedB: TAccountMetas[18];
|
|
2338
2338
|
/**
|
|
@@ -2359,7 +2359,7 @@ declare function parseLiquidatePositionFusionInstruction<TProgram extends string
|
|
|
2359
2359
|
|
|
2360
2360
|
declare const LIQUIDATE_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
|
|
2361
2361
|
declare function getLiquidatePositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
|
|
2362
|
-
type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string,
|
|
2362
|
+
type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
|
|
2363
2363
|
TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
|
|
2364
2364
|
TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
|
|
2365
2365
|
TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
|
|
@@ -2373,8 +2373,8 @@ type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROG
|
|
|
2373
2373
|
TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
|
|
2374
2374
|
TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
|
|
2375
2375
|
TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
|
|
2376
|
-
|
|
2377
|
-
|
|
2376
|
+
TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
|
|
2377
|
+
TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
|
|
2378
2378
|
TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
|
|
2379
2379
|
TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
|
|
2380
2380
|
TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
|
|
@@ -2397,7 +2397,7 @@ type LiquidatePositionOrcaInstructionDataArgs = {
|
|
|
2397
2397
|
declare function getLiquidatePositionOrcaInstructionDataEncoder(): Encoder<LiquidatePositionOrcaInstructionDataArgs>;
|
|
2398
2398
|
declare function getLiquidatePositionOrcaInstructionDataDecoder(): Decoder<LiquidatePositionOrcaInstructionData>;
|
|
2399
2399
|
declare function getLiquidatePositionOrcaInstructionDataCodec(): Codec<LiquidatePositionOrcaInstructionDataArgs, LiquidatePositionOrcaInstructionData>;
|
|
2400
|
-
type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string,
|
|
2400
|
+
type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
|
|
2401
2401
|
/**
|
|
2402
2402
|
*
|
|
2403
2403
|
* TUNA accounts
|
|
@@ -2416,8 +2416,8 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
|
|
|
2416
2416
|
tunaPositionAta: Address<TAccountTunaPositionAta>;
|
|
2417
2417
|
tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
|
|
2418
2418
|
tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
|
|
2419
|
-
|
|
2420
|
-
|
|
2419
|
+
feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
|
|
2420
|
+
feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
|
|
2421
2421
|
pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
|
|
2422
2422
|
pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
|
|
2423
2423
|
/**
|
|
@@ -2434,9 +2434,9 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
|
|
|
2434
2434
|
withdrawPercent: LiquidatePositionOrcaInstructionDataArgs['withdrawPercent'];
|
|
2435
2435
|
remainingAccountsInfo: LiquidatePositionOrcaInstructionDataArgs['remainingAccountsInfo'];
|
|
2436
2436
|
};
|
|
2437
|
-
declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string,
|
|
2437
|
+
declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
|
|
2438
2438
|
programAddress?: TProgramAddress;
|
|
2439
|
-
}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB,
|
|
2439
|
+
}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
|
|
2440
2440
|
type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
|
|
2441
2441
|
programAddress: Address<TProgram>;
|
|
2442
2442
|
accounts: {
|
|
@@ -2458,8 +2458,8 @@ type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUN
|
|
|
2458
2458
|
tunaPositionAta: TAccountMetas[10];
|
|
2459
2459
|
tunaPositionAtaA: TAccountMetas[11];
|
|
2460
2460
|
tunaPositionAtaB: TAccountMetas[12];
|
|
2461
|
-
|
|
2462
|
-
|
|
2461
|
+
feeRecipientAtaA: TAccountMetas[13];
|
|
2462
|
+
feeRecipientAtaB: TAccountMetas[14];
|
|
2463
2463
|
pythOraclePriceFeedA: TAccountMetas[15];
|
|
2464
2464
|
pythOraclePriceFeedB: TAccountMetas[16];
|
|
2465
2465
|
/**
|
|
@@ -4741,11 +4741,11 @@ declare function createVaultInstructions(authority: TransactionSigner, mint: Acc
|
|
|
4741
4741
|
declare function depositInstructions(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, mintAddress: Address, amount: bigint): Promise<IInstruction[]>;
|
|
4742
4742
|
declare function depositInstruction(authority: TransactionSigner, mint: Account<Mint>, amount: bigint): Promise<IInstruction>;
|
|
4743
4743
|
|
|
4744
|
-
declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4745
|
-
declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4744
|
+
declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4745
|
+
declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4746
4746
|
|
|
4747
|
-
declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4748
|
-
declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4747
|
+
declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4748
|
+
declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4749
4749
|
|
|
4750
4750
|
declare function openPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenPositionOrcaInstructionDataArgs): Promise<IInstruction>;
|
|
4751
4751
|
|
package/dist/index.d.ts
CHANGED
|
@@ -277,7 +277,7 @@ type TunaConfig = {
|
|
|
277
277
|
version: number;
|
|
278
278
|
/** Bump seed for the vaults config account. */
|
|
279
279
|
bump: number;
|
|
280
|
-
/** Current update authority address for both the
|
|
280
|
+
/** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
|
|
281
281
|
adminAuthority: Address;
|
|
282
282
|
/** Fee recipient address. */
|
|
283
283
|
feeRecipient: Address;
|
|
@@ -307,7 +307,7 @@ type TunaConfigArgs = {
|
|
|
307
307
|
version: number;
|
|
308
308
|
/** Bump seed for the vaults config account. */
|
|
309
309
|
bump: number;
|
|
310
|
-
/** Current update authority address for both the
|
|
310
|
+
/** Current update authority address for both the TunaConfig and the Vault PDAs themselves - can be updated. */
|
|
311
311
|
adminAuthority: Address;
|
|
312
312
|
/** Fee recipient address. */
|
|
313
313
|
feeRecipient: Address;
|
|
@@ -2230,7 +2230,7 @@ declare function parseDepositInstruction<TProgram extends string, TAccountMetas
|
|
|
2230
2230
|
|
|
2231
2231
|
declare const LIQUIDATE_POSITION_FUSION_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
|
|
2232
2232
|
declare function getLiquidatePositionFusionDiscriminatorBytes(): ReadonlyUint8Array;
|
|
2233
|
-
type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string,
|
|
2233
|
+
type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountFusionammProgram extends string | IAccountMeta<string> = string, TAccountFusionPool extends string | IAccountMeta<string> = string, TAccountFusionPosition extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
|
|
2234
2234
|
TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
|
|
2235
2235
|
TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
|
|
2236
2236
|
TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
|
|
@@ -2246,8 +2246,8 @@ type LiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PR
|
|
|
2246
2246
|
TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
|
|
2247
2247
|
TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
|
|
2248
2248
|
TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
|
|
2249
|
-
|
|
2250
|
-
|
|
2249
|
+
TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
|
|
2250
|
+
TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
|
|
2251
2251
|
TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
|
|
2252
2252
|
TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
|
|
2253
2253
|
TAccountFusionammProgram extends string ? ReadonlyAccount<TAccountFusionammProgram> : TAccountFusionammProgram,
|
|
@@ -2268,7 +2268,7 @@ type LiquidatePositionFusionInstructionDataArgs = {
|
|
|
2268
2268
|
declare function getLiquidatePositionFusionInstructionDataEncoder(): Encoder<LiquidatePositionFusionInstructionDataArgs>;
|
|
2269
2269
|
declare function getLiquidatePositionFusionInstructionDataDecoder(): Decoder<LiquidatePositionFusionInstructionData>;
|
|
2270
2270
|
declare function getLiquidatePositionFusionInstructionDataCodec(): Codec<LiquidatePositionFusionInstructionDataArgs, LiquidatePositionFusionInstructionData>;
|
|
2271
|
-
type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string,
|
|
2271
|
+
type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountFusionammProgram extends string = string, TAccountFusionPool extends string = string, TAccountFusionPosition extends string = string, TAccountMemoProgram extends string = string> = {
|
|
2272
2272
|
/**
|
|
2273
2273
|
*
|
|
2274
2274
|
* TUNA accounts
|
|
@@ -2289,8 +2289,8 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
|
|
|
2289
2289
|
tunaPositionAta: Address<TAccountTunaPositionAta>;
|
|
2290
2290
|
tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
|
|
2291
2291
|
tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
|
|
2292
|
-
|
|
2293
|
-
|
|
2292
|
+
feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
|
|
2293
|
+
feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
|
|
2294
2294
|
pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
|
|
2295
2295
|
pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
|
|
2296
2296
|
/**
|
|
@@ -2305,9 +2305,9 @@ type LiquidatePositionFusionInput<TAccountAuthority extends string = string, TAc
|
|
|
2305
2305
|
withdrawPercent: LiquidatePositionFusionInstructionDataArgs['withdrawPercent'];
|
|
2306
2306
|
remainingAccountsInfo: LiquidatePositionFusionInstructionDataArgs['remainingAccountsInfo'];
|
|
2307
2307
|
};
|
|
2308
|
-
declare function getLiquidatePositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string,
|
|
2308
|
+
declare function getLiquidatePositionFusionInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountFusionammProgram extends string, TAccountFusionPool extends string, TAccountFusionPosition extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionFusionInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>, config?: {
|
|
2309
2309
|
programAddress?: TProgramAddress;
|
|
2310
|
-
}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB,
|
|
2310
|
+
}): LiquidatePositionFusionInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountFusionammProgram, TAccountFusionPool, TAccountFusionPosition, TAccountMemoProgram>;
|
|
2311
2311
|
type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
|
|
2312
2312
|
programAddress: Address<TProgram>;
|
|
2313
2313
|
accounts: {
|
|
@@ -2331,8 +2331,8 @@ type ParsedLiquidatePositionFusionInstruction<TProgram extends string = typeof T
|
|
|
2331
2331
|
tunaPositionAta: TAccountMetas[12];
|
|
2332
2332
|
tunaPositionAtaA: TAccountMetas[13];
|
|
2333
2333
|
tunaPositionAtaB: TAccountMetas[14];
|
|
2334
|
-
|
|
2335
|
-
|
|
2334
|
+
feeRecipientAtaA: TAccountMetas[15];
|
|
2335
|
+
feeRecipientAtaB: TAccountMetas[16];
|
|
2336
2336
|
pythOraclePriceFeedA: TAccountMetas[17];
|
|
2337
2337
|
pythOraclePriceFeedB: TAccountMetas[18];
|
|
2338
2338
|
/**
|
|
@@ -2359,7 +2359,7 @@ declare function parseLiquidatePositionFusionInstruction<TProgram extends string
|
|
|
2359
2359
|
|
|
2360
2360
|
declare const LIQUIDATE_POSITION_ORCA_DISCRIMINATOR: Uint8Array<ArrayBuffer>;
|
|
2361
2361
|
declare function getLiquidatePositionOrcaDiscriminatorBytes(): ReadonlyUint8Array;
|
|
2362
|
-
type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string,
|
|
2362
|
+
type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountAuthority extends string | IAccountMeta<string> = string, TAccountTunaConfig extends string | IAccountMeta<string> = string, TAccountMintA extends string | IAccountMeta<string> = string, TAccountMintB extends string | IAccountMeta<string> = string, TAccountMarket extends string | IAccountMeta<string> = string, TAccountVaultA extends string | IAccountMeta<string> = string, TAccountVaultB extends string | IAccountMeta<string> = string, TAccountVaultAAta extends string | IAccountMeta<string> = string, TAccountVaultBAta extends string | IAccountMeta<string> = string, TAccountTunaPosition extends string | IAccountMeta<string> = string, TAccountTunaPositionAta extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaA extends string | IAccountMeta<string> = string, TAccountTunaPositionAtaB extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaA extends string | IAccountMeta<string> = string, TAccountFeeRecipientAtaB extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedA extends string | IAccountMeta<string> = string, TAccountPythOraclePriceFeedB extends string | IAccountMeta<string> = string, TAccountWhirlpoolProgram extends string | IAccountMeta<string> = string, TAccountWhirlpool extends string | IAccountMeta<string> = string, TAccountOrcaPosition extends string | IAccountMeta<string> = string, TAccountTokenProgramA extends string | IAccountMeta<string> = string, TAccountTokenProgramB extends string | IAccountMeta<string> = string, TAccountMemoProgram extends string | IAccountMeta<string> = string, TRemainingAccounts extends readonly IAccountMeta<string>[] = []> = IInstruction<TProgram> & IInstructionWithData<Uint8Array> & IInstructionWithAccounts<[
|
|
2363
2363
|
TAccountAuthority extends string ? WritableSignerAccount<TAccountAuthority> & IAccountSignerMeta<TAccountAuthority> : TAccountAuthority,
|
|
2364
2364
|
TAccountTunaConfig extends string ? ReadonlyAccount<TAccountTunaConfig> : TAccountTunaConfig,
|
|
2365
2365
|
TAccountMintA extends string ? ReadonlyAccount<TAccountMintA> : TAccountMintA,
|
|
@@ -2373,8 +2373,8 @@ type LiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROG
|
|
|
2373
2373
|
TAccountTunaPositionAta extends string ? WritableAccount<TAccountTunaPositionAta> : TAccountTunaPositionAta,
|
|
2374
2374
|
TAccountTunaPositionAtaA extends string ? WritableAccount<TAccountTunaPositionAtaA> : TAccountTunaPositionAtaA,
|
|
2375
2375
|
TAccountTunaPositionAtaB extends string ? WritableAccount<TAccountTunaPositionAtaB> : TAccountTunaPositionAtaB,
|
|
2376
|
-
|
|
2377
|
-
|
|
2376
|
+
TAccountFeeRecipientAtaA extends string ? WritableAccount<TAccountFeeRecipientAtaA> : TAccountFeeRecipientAtaA,
|
|
2377
|
+
TAccountFeeRecipientAtaB extends string ? WritableAccount<TAccountFeeRecipientAtaB> : TAccountFeeRecipientAtaB,
|
|
2378
2378
|
TAccountPythOraclePriceFeedA extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedA> : TAccountPythOraclePriceFeedA,
|
|
2379
2379
|
TAccountPythOraclePriceFeedB extends string ? ReadonlyAccount<TAccountPythOraclePriceFeedB> : TAccountPythOraclePriceFeedB,
|
|
2380
2380
|
TAccountWhirlpoolProgram extends string ? ReadonlyAccount<TAccountWhirlpoolProgram> : TAccountWhirlpoolProgram,
|
|
@@ -2397,7 +2397,7 @@ type LiquidatePositionOrcaInstructionDataArgs = {
|
|
|
2397
2397
|
declare function getLiquidatePositionOrcaInstructionDataEncoder(): Encoder<LiquidatePositionOrcaInstructionDataArgs>;
|
|
2398
2398
|
declare function getLiquidatePositionOrcaInstructionDataDecoder(): Decoder<LiquidatePositionOrcaInstructionData>;
|
|
2399
2399
|
declare function getLiquidatePositionOrcaInstructionDataCodec(): Codec<LiquidatePositionOrcaInstructionDataArgs, LiquidatePositionOrcaInstructionData>;
|
|
2400
|
-
type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string,
|
|
2400
|
+
type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAccountTunaConfig extends string = string, TAccountMintA extends string = string, TAccountMintB extends string = string, TAccountMarket extends string = string, TAccountVaultA extends string = string, TAccountVaultB extends string = string, TAccountVaultAAta extends string = string, TAccountVaultBAta extends string = string, TAccountTunaPosition extends string = string, TAccountTunaPositionAta extends string = string, TAccountTunaPositionAtaA extends string = string, TAccountTunaPositionAtaB extends string = string, TAccountFeeRecipientAtaA extends string = string, TAccountFeeRecipientAtaB extends string = string, TAccountPythOraclePriceFeedA extends string = string, TAccountPythOraclePriceFeedB extends string = string, TAccountWhirlpoolProgram extends string = string, TAccountWhirlpool extends string = string, TAccountOrcaPosition extends string = string, TAccountTokenProgramA extends string = string, TAccountTokenProgramB extends string = string, TAccountMemoProgram extends string = string> = {
|
|
2401
2401
|
/**
|
|
2402
2402
|
*
|
|
2403
2403
|
* TUNA accounts
|
|
@@ -2416,8 +2416,8 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
|
|
|
2416
2416
|
tunaPositionAta: Address<TAccountTunaPositionAta>;
|
|
2417
2417
|
tunaPositionAtaA: Address<TAccountTunaPositionAtaA>;
|
|
2418
2418
|
tunaPositionAtaB: Address<TAccountTunaPositionAtaB>;
|
|
2419
|
-
|
|
2420
|
-
|
|
2419
|
+
feeRecipientAtaA: Address<TAccountFeeRecipientAtaA>;
|
|
2420
|
+
feeRecipientAtaB: Address<TAccountFeeRecipientAtaB>;
|
|
2421
2421
|
pythOraclePriceFeedA: Address<TAccountPythOraclePriceFeedA>;
|
|
2422
2422
|
pythOraclePriceFeedB: Address<TAccountPythOraclePriceFeedB>;
|
|
2423
2423
|
/**
|
|
@@ -2434,9 +2434,9 @@ type LiquidatePositionOrcaInput<TAccountAuthority extends string = string, TAcco
|
|
|
2434
2434
|
withdrawPercent: LiquidatePositionOrcaInstructionDataArgs['withdrawPercent'];
|
|
2435
2435
|
remainingAccountsInfo: LiquidatePositionOrcaInstructionDataArgs['remainingAccountsInfo'];
|
|
2436
2436
|
};
|
|
2437
|
-
declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string,
|
|
2437
|
+
declare function getLiquidatePositionOrcaInstruction<TAccountAuthority extends string, TAccountTunaConfig extends string, TAccountMintA extends string, TAccountMintB extends string, TAccountMarket extends string, TAccountVaultA extends string, TAccountVaultB extends string, TAccountVaultAAta extends string, TAccountVaultBAta extends string, TAccountTunaPosition extends string, TAccountTunaPositionAta extends string, TAccountTunaPositionAtaA extends string, TAccountTunaPositionAtaB extends string, TAccountFeeRecipientAtaA extends string, TAccountFeeRecipientAtaB extends string, TAccountPythOraclePriceFeedA extends string, TAccountPythOraclePriceFeedB extends string, TAccountWhirlpoolProgram extends string, TAccountWhirlpool extends string, TAccountOrcaPosition extends string, TAccountTokenProgramA extends string, TAccountTokenProgramB extends string, TAccountMemoProgram extends string, TProgramAddress extends Address = typeof TUNA_PROGRAM_ADDRESS>(input: LiquidatePositionOrcaInput<TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>, config?: {
|
|
2438
2438
|
programAddress?: TProgramAddress;
|
|
2439
|
-
}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB,
|
|
2439
|
+
}): LiquidatePositionOrcaInstruction<TProgramAddress, TAccountAuthority, TAccountTunaConfig, TAccountMintA, TAccountMintB, TAccountMarket, TAccountVaultA, TAccountVaultB, TAccountVaultAAta, TAccountVaultBAta, TAccountTunaPosition, TAccountTunaPositionAta, TAccountTunaPositionAtaA, TAccountTunaPositionAtaB, TAccountFeeRecipientAtaA, TAccountFeeRecipientAtaB, TAccountPythOraclePriceFeedA, TAccountPythOraclePriceFeedB, TAccountWhirlpoolProgram, TAccountWhirlpool, TAccountOrcaPosition, TAccountTokenProgramA, TAccountTokenProgramB, TAccountMemoProgram>;
|
|
2440
2440
|
type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUNA_PROGRAM_ADDRESS, TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[]> = {
|
|
2441
2441
|
programAddress: Address<TProgram>;
|
|
2442
2442
|
accounts: {
|
|
@@ -2458,8 +2458,8 @@ type ParsedLiquidatePositionOrcaInstruction<TProgram extends string = typeof TUN
|
|
|
2458
2458
|
tunaPositionAta: TAccountMetas[10];
|
|
2459
2459
|
tunaPositionAtaA: TAccountMetas[11];
|
|
2460
2460
|
tunaPositionAtaB: TAccountMetas[12];
|
|
2461
|
-
|
|
2462
|
-
|
|
2461
|
+
feeRecipientAtaA: TAccountMetas[13];
|
|
2462
|
+
feeRecipientAtaB: TAccountMetas[14];
|
|
2463
2463
|
pythOraclePriceFeedA: TAccountMetas[15];
|
|
2464
2464
|
pythOraclePriceFeedB: TAccountMetas[16];
|
|
2465
2465
|
/**
|
|
@@ -4741,11 +4741,11 @@ declare function createVaultInstructions(authority: TransactionSigner, mint: Acc
|
|
|
4741
4741
|
declare function depositInstructions(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, mintAddress: Address, amount: bigint): Promise<IInstruction[]>;
|
|
4742
4742
|
declare function depositInstruction(authority: TransactionSigner, mint: Account<Mint>, amount: bigint): Promise<IInstruction>;
|
|
4743
4743
|
|
|
4744
|
-
declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4745
|
-
declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4744
|
+
declare function liquidatePositionOrcaInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4745
|
+
declare function liquidatePositionOrcaInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<Whirlpool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4746
4746
|
|
|
4747
|
-
declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4748
|
-
declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4747
|
+
declare function liquidatePositionFusionInstructions(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, whirlpool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction[]>;
|
|
4748
|
+
declare function liquidatePositionFusionInstruction(authority: TransactionSigner, tunaPosition: Account<TunaPosition>, tunaConfig: Account<TunaConfig>, mintA: Account<Mint>, mintB: Account<Mint>, vaultA: Account<Vault>, vaultB: Account<Vault>, fusionPool: Account<FusionPool>, withdrawPercent: number): Promise<IInstruction>;
|
|
4749
4749
|
|
|
4750
4750
|
declare function openPositionOrcaInstruction(rpc: Rpc<GetAccountInfoApi & GetMultipleAccountsApi>, authority: TransactionSigner, positionMint: TransactionSigner, whirlpoolAddress: Address, args: OpenPositionOrcaInstructionDataArgs): Promise<IInstruction>;
|
|
4751
4751
|
|
package/dist/index.js
CHANGED
|
@@ -3627,12 +3627,12 @@ function getLiquidatePositionFusionInstruction(input, config) {
|
|
|
3627
3627
|
value: input.tunaPositionAtaB ?? null,
|
|
3628
3628
|
isWritable: true
|
|
3629
3629
|
},
|
|
3630
|
-
|
|
3631
|
-
value: input.
|
|
3630
|
+
feeRecipientAtaA: {
|
|
3631
|
+
value: input.feeRecipientAtaA ?? null,
|
|
3632
3632
|
isWritable: true
|
|
3633
3633
|
},
|
|
3634
|
-
|
|
3635
|
-
value: input.
|
|
3634
|
+
feeRecipientAtaB: {
|
|
3635
|
+
value: input.feeRecipientAtaB ?? null,
|
|
3636
3636
|
isWritable: true
|
|
3637
3637
|
},
|
|
3638
3638
|
pythOraclePriceFeedA: {
|
|
@@ -3671,8 +3671,8 @@ function getLiquidatePositionFusionInstruction(input, config) {
|
|
|
3671
3671
|
getAccountMeta(accounts.tunaPositionAta),
|
|
3672
3672
|
getAccountMeta(accounts.tunaPositionAtaA),
|
|
3673
3673
|
getAccountMeta(accounts.tunaPositionAtaB),
|
|
3674
|
-
getAccountMeta(accounts.
|
|
3675
|
-
getAccountMeta(accounts.
|
|
3674
|
+
getAccountMeta(accounts.feeRecipientAtaA),
|
|
3675
|
+
getAccountMeta(accounts.feeRecipientAtaB),
|
|
3676
3676
|
getAccountMeta(accounts.pythOraclePriceFeedA),
|
|
3677
3677
|
getAccountMeta(accounts.pythOraclePriceFeedB),
|
|
3678
3678
|
getAccountMeta(accounts.fusionammProgram),
|
|
@@ -3715,8 +3715,8 @@ function parseLiquidatePositionFusionInstruction(instruction) {
|
|
|
3715
3715
|
tunaPositionAta: getNextAccount(),
|
|
3716
3716
|
tunaPositionAtaA: getNextAccount(),
|
|
3717
3717
|
tunaPositionAtaB: getNextAccount(),
|
|
3718
|
-
|
|
3719
|
-
|
|
3718
|
+
feeRecipientAtaA: getNextAccount(),
|
|
3719
|
+
feeRecipientAtaB: getNextAccount(),
|
|
3720
3720
|
pythOraclePriceFeedA: getNextAccount(),
|
|
3721
3721
|
pythOraclePriceFeedB: getNextAccount(),
|
|
3722
3722
|
fusionammProgram: getNextAccount(),
|
|
@@ -3795,12 +3795,12 @@ function getLiquidatePositionOrcaInstruction(input, config) {
|
|
|
3795
3795
|
value: input.tunaPositionAtaB ?? null,
|
|
3796
3796
|
isWritable: true
|
|
3797
3797
|
},
|
|
3798
|
-
|
|
3799
|
-
value: input.
|
|
3798
|
+
feeRecipientAtaA: {
|
|
3799
|
+
value: input.feeRecipientAtaA ?? null,
|
|
3800
3800
|
isWritable: true
|
|
3801
3801
|
},
|
|
3802
|
-
|
|
3803
|
-
value: input.
|
|
3802
|
+
feeRecipientAtaB: {
|
|
3803
|
+
value: input.feeRecipientAtaB ?? null,
|
|
3804
3804
|
isWritable: true
|
|
3805
3805
|
},
|
|
3806
3806
|
pythOraclePriceFeedA: {
|
|
@@ -3839,8 +3839,8 @@ function getLiquidatePositionOrcaInstruction(input, config) {
|
|
|
3839
3839
|
getAccountMeta(accounts.tunaPositionAta),
|
|
3840
3840
|
getAccountMeta(accounts.tunaPositionAtaA),
|
|
3841
3841
|
getAccountMeta(accounts.tunaPositionAtaB),
|
|
3842
|
-
getAccountMeta(accounts.
|
|
3843
|
-
getAccountMeta(accounts.
|
|
3842
|
+
getAccountMeta(accounts.feeRecipientAtaA),
|
|
3843
|
+
getAccountMeta(accounts.feeRecipientAtaB),
|
|
3844
3844
|
getAccountMeta(accounts.pythOraclePriceFeedA),
|
|
3845
3845
|
getAccountMeta(accounts.pythOraclePriceFeedB),
|
|
3846
3846
|
getAccountMeta(accounts.whirlpoolProgram),
|
|
@@ -3883,8 +3883,8 @@ function parseLiquidatePositionOrcaInstruction(instruction) {
|
|
|
3883
3883
|
tunaPositionAta: getNextAccount(),
|
|
3884
3884
|
tunaPositionAtaA: getNextAccount(),
|
|
3885
3885
|
tunaPositionAtaB: getNextAccount(),
|
|
3886
|
-
|
|
3887
|
-
|
|
3886
|
+
feeRecipientAtaA: getNextAccount(),
|
|
3887
|
+
feeRecipientAtaB: getNextAccount(),
|
|
3888
3888
|
pythOraclePriceFeedA: getNextAccount(),
|
|
3889
3889
|
pythOraclePriceFeedB: getNextAccount(),
|
|
3890
3890
|
whirlpoolProgram: getNextAccount(),
|
|
@@ -8735,27 +8735,28 @@ var import_whirlpools_client7 = require("@orca-so/whirlpools-client");
|
|
|
8735
8735
|
var import_kit67 = require("@solana/kit");
|
|
8736
8736
|
var import_memo8 = require("@solana-program/memo");
|
|
8737
8737
|
var import_token_202214 = require("@solana-program/token-2022");
|
|
8738
|
-
async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8738
|
+
async function liquidatePositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8739
8739
|
const instructions = [];
|
|
8740
|
-
const
|
|
8740
|
+
const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
|
|
8741
8741
|
void 0,
|
|
8742
8742
|
authority,
|
|
8743
8743
|
mintA.address,
|
|
8744
|
-
|
|
8744
|
+
tunaConfig.data.feeRecipient,
|
|
8745
8745
|
mintA.programAddress
|
|
8746
8746
|
);
|
|
8747
|
-
instructions.push(...
|
|
8748
|
-
const
|
|
8747
|
+
instructions.push(...createFeeRecipientAtaAInstructions.init);
|
|
8748
|
+
const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
|
|
8749
8749
|
void 0,
|
|
8750
8750
|
authority,
|
|
8751
8751
|
mintB.address,
|
|
8752
|
-
|
|
8752
|
+
tunaConfig.data.feeRecipient,
|
|
8753
8753
|
mintB.programAddress
|
|
8754
8754
|
);
|
|
8755
|
-
instructions.push(...
|
|
8755
|
+
instructions.push(...createFeeRecipientAtaBInstructions.init);
|
|
8756
8756
|
const ix = await liquidatePositionOrcaInstruction(
|
|
8757
8757
|
authority,
|
|
8758
8758
|
tunaPosition,
|
|
8759
|
+
tunaConfig,
|
|
8759
8760
|
mintA,
|
|
8760
8761
|
mintB,
|
|
8761
8762
|
vaultA,
|
|
@@ -8764,12 +8765,11 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
|
|
|
8764
8765
|
withdrawPercent
|
|
8765
8766
|
);
|
|
8766
8767
|
instructions.push(ix);
|
|
8767
|
-
instructions.push(...
|
|
8768
|
-
instructions.push(...
|
|
8768
|
+
instructions.push(...createFeeRecipientAtaAInstructions.cleanup);
|
|
8769
|
+
instructions.push(...createFeeRecipientAtaBInstructions.cleanup);
|
|
8769
8770
|
return instructions;
|
|
8770
8771
|
}
|
|
8771
|
-
async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8772
|
-
const tunaConfigAddress = (await getTunaConfigAddress())[0];
|
|
8772
|
+
async function liquidatePositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8773
8773
|
const positionMint = tunaPosition.data.positionMint;
|
|
8774
8774
|
const marketAddress = (await getMarketAddress(whirlpool.address))[0];
|
|
8775
8775
|
const orcaPositionAddress = (await (0, import_whirlpools_client7.getPositionAddress)(positionMint))[0];
|
|
@@ -8799,13 +8799,13 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
|
|
|
8799
8799
|
mint: mintB.address,
|
|
8800
8800
|
tokenProgram: mintB.programAddress
|
|
8801
8801
|
}))[0];
|
|
8802
|
-
const
|
|
8803
|
-
owner:
|
|
8802
|
+
const feeRecipientAtaA = (await (0, import_token_202214.findAssociatedTokenPda)({
|
|
8803
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8804
8804
|
mint: mintA.address,
|
|
8805
8805
|
tokenProgram: mintA.programAddress
|
|
8806
8806
|
}))[0];
|
|
8807
|
-
const
|
|
8808
|
-
owner:
|
|
8807
|
+
const feeRecipientAtaB = (await (0, import_token_202214.findAssociatedTokenPda)({
|
|
8808
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8809
8809
|
mint: mintB.address,
|
|
8810
8810
|
tokenProgram: mintB.programAddress
|
|
8811
8811
|
}))[0];
|
|
@@ -8851,14 +8851,14 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
|
|
|
8851
8851
|
vaultB: vaultB.address,
|
|
8852
8852
|
vaultBAta,
|
|
8853
8853
|
authority,
|
|
8854
|
-
tunaConfig:
|
|
8854
|
+
tunaConfig: tunaConfig.address,
|
|
8855
8855
|
tunaPositionAta,
|
|
8856
8856
|
tunaPositionAtaA,
|
|
8857
8857
|
tunaPositionAtaB,
|
|
8858
8858
|
orcaPosition: orcaPositionAddress,
|
|
8859
8859
|
tunaPosition: tunaPosition.address,
|
|
8860
|
-
|
|
8861
|
-
|
|
8860
|
+
feeRecipientAtaA,
|
|
8861
|
+
feeRecipientAtaB,
|
|
8862
8862
|
whirlpool: whirlpool.address,
|
|
8863
8863
|
whirlpoolProgram: import_whirlpools_client7.WHIRLPOOL_PROGRAM_ADDRESS,
|
|
8864
8864
|
tokenProgramA: mintA.programAddress,
|
|
@@ -8876,27 +8876,28 @@ var import_fusionamm_client7 = require("@crypticdot/fusionamm-client");
|
|
|
8876
8876
|
var import_kit68 = require("@solana/kit");
|
|
8877
8877
|
var import_memo9 = require("@solana-program/memo");
|
|
8878
8878
|
var import_token_202215 = require("@solana-program/token-2022");
|
|
8879
|
-
async function liquidatePositionFusionInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8879
|
+
async function liquidatePositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8880
8880
|
const instructions = [];
|
|
8881
|
-
const
|
|
8881
|
+
const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
|
|
8882
8882
|
void 0,
|
|
8883
8883
|
authority,
|
|
8884
8884
|
mintA.address,
|
|
8885
|
-
|
|
8885
|
+
tunaConfig.data.feeRecipient,
|
|
8886
8886
|
mintA.programAddress
|
|
8887
8887
|
);
|
|
8888
|
-
instructions.push(...
|
|
8889
|
-
const
|
|
8888
|
+
instructions.push(...createFeeRecipientAtaAInstructions.init);
|
|
8889
|
+
const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
|
|
8890
8890
|
void 0,
|
|
8891
8891
|
authority,
|
|
8892
8892
|
mintB.address,
|
|
8893
|
-
|
|
8893
|
+
tunaConfig.data.feeRecipient,
|
|
8894
8894
|
mintB.programAddress
|
|
8895
8895
|
);
|
|
8896
|
-
instructions.push(...
|
|
8896
|
+
instructions.push(...createFeeRecipientAtaBInstructions.init);
|
|
8897
8897
|
const ix = await liquidatePositionFusionInstruction(
|
|
8898
8898
|
authority,
|
|
8899
8899
|
tunaPosition,
|
|
8900
|
+
tunaConfig,
|
|
8900
8901
|
mintA,
|
|
8901
8902
|
mintB,
|
|
8902
8903
|
vaultA,
|
|
@@ -8905,12 +8906,11 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
|
|
|
8905
8906
|
withdrawPercent
|
|
8906
8907
|
);
|
|
8907
8908
|
instructions.push(ix);
|
|
8908
|
-
instructions.push(...
|
|
8909
|
-
instructions.push(...
|
|
8909
|
+
instructions.push(...createFeeRecipientAtaAInstructions.cleanup);
|
|
8910
|
+
instructions.push(...createFeeRecipientAtaBInstructions.cleanup);
|
|
8910
8911
|
return instructions;
|
|
8911
8912
|
}
|
|
8912
|
-
async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
|
|
8913
|
-
const tunaConfigAddress = (await getTunaConfigAddress())[0];
|
|
8913
|
+
async function liquidatePositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
|
|
8914
8914
|
const positionMint = tunaPosition.data.positionMint;
|
|
8915
8915
|
const marketAddress = (await getMarketAddress(fusionPool.address))[0];
|
|
8916
8916
|
const fusionPositionAddress = (await (0, import_fusionamm_client7.getPositionAddress)(positionMint))[0];
|
|
@@ -8939,13 +8939,13 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
|
|
|
8939
8939
|
mint: mintB.address,
|
|
8940
8940
|
tokenProgram: mintB.programAddress
|
|
8941
8941
|
}))[0];
|
|
8942
|
-
const
|
|
8943
|
-
owner:
|
|
8942
|
+
const feeRecipientAtaA = (await (0, import_token_202215.findAssociatedTokenPda)({
|
|
8943
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8944
8944
|
mint: mintA.address,
|
|
8945
8945
|
tokenProgram: mintA.programAddress
|
|
8946
8946
|
}))[0];
|
|
8947
|
-
const
|
|
8948
|
-
owner:
|
|
8947
|
+
const feeRecipientAtaB = (await (0, import_token_202215.findAssociatedTokenPda)({
|
|
8948
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8949
8949
|
mint: mintB.address,
|
|
8950
8950
|
tokenProgram: mintB.programAddress
|
|
8951
8951
|
}))[0];
|
|
@@ -8989,14 +8989,14 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
|
|
|
8989
8989
|
vaultB: vaultB.address,
|
|
8990
8990
|
vaultBAta,
|
|
8991
8991
|
authority,
|
|
8992
|
-
tunaConfig:
|
|
8992
|
+
tunaConfig: tunaConfig.address,
|
|
8993
8993
|
tunaPositionAta,
|
|
8994
8994
|
tunaPositionAtaA,
|
|
8995
8995
|
tunaPositionAtaB,
|
|
8996
8996
|
fusionPosition: fusionPositionAddress,
|
|
8997
8997
|
tunaPosition: tunaPosition.address,
|
|
8998
|
-
|
|
8999
|
-
|
|
8998
|
+
feeRecipientAtaA,
|
|
8999
|
+
feeRecipientAtaB,
|
|
9000
9000
|
fusionPool: fusionPool.address,
|
|
9001
9001
|
fusionammProgram: import_fusionamm_client7.FUSIONAMM_PROGRAM_ADDRESS,
|
|
9002
9002
|
tokenProgramA: mintA.programAddress,
|
package/dist/index.mjs
CHANGED
|
@@ -3393,12 +3393,12 @@ function getLiquidatePositionFusionInstruction(input, config) {
|
|
|
3393
3393
|
value: input.tunaPositionAtaB ?? null,
|
|
3394
3394
|
isWritable: true
|
|
3395
3395
|
},
|
|
3396
|
-
|
|
3397
|
-
value: input.
|
|
3396
|
+
feeRecipientAtaA: {
|
|
3397
|
+
value: input.feeRecipientAtaA ?? null,
|
|
3398
3398
|
isWritable: true
|
|
3399
3399
|
},
|
|
3400
|
-
|
|
3401
|
-
value: input.
|
|
3400
|
+
feeRecipientAtaB: {
|
|
3401
|
+
value: input.feeRecipientAtaB ?? null,
|
|
3402
3402
|
isWritable: true
|
|
3403
3403
|
},
|
|
3404
3404
|
pythOraclePriceFeedA: {
|
|
@@ -3437,8 +3437,8 @@ function getLiquidatePositionFusionInstruction(input, config) {
|
|
|
3437
3437
|
getAccountMeta(accounts.tunaPositionAta),
|
|
3438
3438
|
getAccountMeta(accounts.tunaPositionAtaA),
|
|
3439
3439
|
getAccountMeta(accounts.tunaPositionAtaB),
|
|
3440
|
-
getAccountMeta(accounts.
|
|
3441
|
-
getAccountMeta(accounts.
|
|
3440
|
+
getAccountMeta(accounts.feeRecipientAtaA),
|
|
3441
|
+
getAccountMeta(accounts.feeRecipientAtaB),
|
|
3442
3442
|
getAccountMeta(accounts.pythOraclePriceFeedA),
|
|
3443
3443
|
getAccountMeta(accounts.pythOraclePriceFeedB),
|
|
3444
3444
|
getAccountMeta(accounts.fusionammProgram),
|
|
@@ -3481,8 +3481,8 @@ function parseLiquidatePositionFusionInstruction(instruction) {
|
|
|
3481
3481
|
tunaPositionAta: getNextAccount(),
|
|
3482
3482
|
tunaPositionAtaA: getNextAccount(),
|
|
3483
3483
|
tunaPositionAtaB: getNextAccount(),
|
|
3484
|
-
|
|
3485
|
-
|
|
3484
|
+
feeRecipientAtaA: getNextAccount(),
|
|
3485
|
+
feeRecipientAtaB: getNextAccount(),
|
|
3486
3486
|
pythOraclePriceFeedA: getNextAccount(),
|
|
3487
3487
|
pythOraclePriceFeedB: getNextAccount(),
|
|
3488
3488
|
fusionammProgram: getNextAccount(),
|
|
@@ -3572,12 +3572,12 @@ function getLiquidatePositionOrcaInstruction(input, config) {
|
|
|
3572
3572
|
value: input.tunaPositionAtaB ?? null,
|
|
3573
3573
|
isWritable: true
|
|
3574
3574
|
},
|
|
3575
|
-
|
|
3576
|
-
value: input.
|
|
3575
|
+
feeRecipientAtaA: {
|
|
3576
|
+
value: input.feeRecipientAtaA ?? null,
|
|
3577
3577
|
isWritable: true
|
|
3578
3578
|
},
|
|
3579
|
-
|
|
3580
|
-
value: input.
|
|
3579
|
+
feeRecipientAtaB: {
|
|
3580
|
+
value: input.feeRecipientAtaB ?? null,
|
|
3581
3581
|
isWritable: true
|
|
3582
3582
|
},
|
|
3583
3583
|
pythOraclePriceFeedA: {
|
|
@@ -3616,8 +3616,8 @@ function getLiquidatePositionOrcaInstruction(input, config) {
|
|
|
3616
3616
|
getAccountMeta(accounts.tunaPositionAta),
|
|
3617
3617
|
getAccountMeta(accounts.tunaPositionAtaA),
|
|
3618
3618
|
getAccountMeta(accounts.tunaPositionAtaB),
|
|
3619
|
-
getAccountMeta(accounts.
|
|
3620
|
-
getAccountMeta(accounts.
|
|
3619
|
+
getAccountMeta(accounts.feeRecipientAtaA),
|
|
3620
|
+
getAccountMeta(accounts.feeRecipientAtaB),
|
|
3621
3621
|
getAccountMeta(accounts.pythOraclePriceFeedA),
|
|
3622
3622
|
getAccountMeta(accounts.pythOraclePriceFeedB),
|
|
3623
3623
|
getAccountMeta(accounts.whirlpoolProgram),
|
|
@@ -3660,8 +3660,8 @@ function parseLiquidatePositionOrcaInstruction(instruction) {
|
|
|
3660
3660
|
tunaPositionAta: getNextAccount(),
|
|
3661
3661
|
tunaPositionAtaA: getNextAccount(),
|
|
3662
3662
|
tunaPositionAtaB: getNextAccount(),
|
|
3663
|
-
|
|
3664
|
-
|
|
3663
|
+
feeRecipientAtaA: getNextAccount(),
|
|
3664
|
+
feeRecipientAtaB: getNextAccount(),
|
|
3665
3665
|
pythOraclePriceFeedA: getNextAccount(),
|
|
3666
3666
|
pythOraclePriceFeedB: getNextAccount(),
|
|
3667
3667
|
whirlpoolProgram: getNextAccount(),
|
|
@@ -8918,27 +8918,28 @@ import { getOracleAddress as getOracleAddress3, getPositionAddress as getPositio
|
|
|
8918
8918
|
import { AccountRole as AccountRole8 } from "@solana/kit";
|
|
8919
8919
|
import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS8 } from "@solana-program/memo";
|
|
8920
8920
|
import { findAssociatedTokenPda as findAssociatedTokenPda14, TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS11 } from "@solana-program/token-2022";
|
|
8921
|
-
async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8921
|
+
async function liquidatePositionOrcaInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8922
8922
|
const instructions = [];
|
|
8923
|
-
const
|
|
8923
|
+
const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
|
|
8924
8924
|
void 0,
|
|
8925
8925
|
authority,
|
|
8926
8926
|
mintA.address,
|
|
8927
|
-
|
|
8927
|
+
tunaConfig.data.feeRecipient,
|
|
8928
8928
|
mintA.programAddress
|
|
8929
8929
|
);
|
|
8930
|
-
instructions.push(...
|
|
8931
|
-
const
|
|
8930
|
+
instructions.push(...createFeeRecipientAtaAInstructions.init);
|
|
8931
|
+
const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
|
|
8932
8932
|
void 0,
|
|
8933
8933
|
authority,
|
|
8934
8934
|
mintB.address,
|
|
8935
|
-
|
|
8935
|
+
tunaConfig.data.feeRecipient,
|
|
8936
8936
|
mintB.programAddress
|
|
8937
8937
|
);
|
|
8938
|
-
instructions.push(...
|
|
8938
|
+
instructions.push(...createFeeRecipientAtaBInstructions.init);
|
|
8939
8939
|
const ix = await liquidatePositionOrcaInstruction(
|
|
8940
8940
|
authority,
|
|
8941
8941
|
tunaPosition,
|
|
8942
|
+
tunaConfig,
|
|
8942
8943
|
mintA,
|
|
8943
8944
|
mintB,
|
|
8944
8945
|
vaultA,
|
|
@@ -8947,12 +8948,11 @@ async function liquidatePositionOrcaInstructions(authority, tunaPosition, mintA,
|
|
|
8947
8948
|
withdrawPercent
|
|
8948
8949
|
);
|
|
8949
8950
|
instructions.push(ix);
|
|
8950
|
-
instructions.push(...
|
|
8951
|
-
instructions.push(...
|
|
8951
|
+
instructions.push(...createFeeRecipientAtaAInstructions.cleanup);
|
|
8952
|
+
instructions.push(...createFeeRecipientAtaBInstructions.cleanup);
|
|
8952
8953
|
return instructions;
|
|
8953
8954
|
}
|
|
8954
|
-
async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8955
|
-
const tunaConfigAddress = (await getTunaConfigAddress())[0];
|
|
8955
|
+
async function liquidatePositionOrcaInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
8956
8956
|
const positionMint = tunaPosition.data.positionMint;
|
|
8957
8957
|
const marketAddress = (await getMarketAddress(whirlpool.address))[0];
|
|
8958
8958
|
const orcaPositionAddress = (await getPositionAddress11(positionMint))[0];
|
|
@@ -8982,13 +8982,13 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
|
|
|
8982
8982
|
mint: mintB.address,
|
|
8983
8983
|
tokenProgram: mintB.programAddress
|
|
8984
8984
|
}))[0];
|
|
8985
|
-
const
|
|
8986
|
-
owner:
|
|
8985
|
+
const feeRecipientAtaA = (await findAssociatedTokenPda14({
|
|
8986
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8987
8987
|
mint: mintA.address,
|
|
8988
8988
|
tokenProgram: mintA.programAddress
|
|
8989
8989
|
}))[0];
|
|
8990
|
-
const
|
|
8991
|
-
owner:
|
|
8990
|
+
const feeRecipientAtaB = (await findAssociatedTokenPda14({
|
|
8991
|
+
owner: tunaConfig.data.feeRecipient,
|
|
8992
8992
|
mint: mintB.address,
|
|
8993
8993
|
tokenProgram: mintB.programAddress
|
|
8994
8994
|
}))[0];
|
|
@@ -9034,14 +9034,14 @@ async function liquidatePositionOrcaInstruction(authority, tunaPosition, mintA,
|
|
|
9034
9034
|
vaultB: vaultB.address,
|
|
9035
9035
|
vaultBAta,
|
|
9036
9036
|
authority,
|
|
9037
|
-
tunaConfig:
|
|
9037
|
+
tunaConfig: tunaConfig.address,
|
|
9038
9038
|
tunaPositionAta,
|
|
9039
9039
|
tunaPositionAtaA,
|
|
9040
9040
|
tunaPositionAtaB,
|
|
9041
9041
|
orcaPosition: orcaPositionAddress,
|
|
9042
9042
|
tunaPosition: tunaPosition.address,
|
|
9043
|
-
|
|
9044
|
-
|
|
9043
|
+
feeRecipientAtaA,
|
|
9044
|
+
feeRecipientAtaB,
|
|
9045
9045
|
whirlpool: whirlpool.address,
|
|
9046
9046
|
whirlpoolProgram: WHIRLPOOL_PROGRAM_ADDRESS6,
|
|
9047
9047
|
tokenProgramA: mintA.programAddress,
|
|
@@ -9059,27 +9059,28 @@ import { FUSIONAMM_PROGRAM_ADDRESS as FUSIONAMM_PROGRAM_ADDRESS6, getPositionAdd
|
|
|
9059
9059
|
import { AccountRole as AccountRole9 } from "@solana/kit";
|
|
9060
9060
|
import { MEMO_PROGRAM_ADDRESS as MEMO_PROGRAM_ADDRESS9 } from "@solana-program/memo";
|
|
9061
9061
|
import { findAssociatedTokenPda as findAssociatedTokenPda15, TOKEN_2022_PROGRAM_ADDRESS as TOKEN_2022_PROGRAM_ADDRESS12 } from "@solana-program/token-2022";
|
|
9062
|
-
async function liquidatePositionFusionInstructions(authority, tunaPosition, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
9062
|
+
async function liquidatePositionFusionInstructions(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, whirlpool, withdrawPercent) {
|
|
9063
9063
|
const instructions = [];
|
|
9064
|
-
const
|
|
9064
|
+
const createFeeRecipientAtaAInstructions = await getCreateAtaInstructions(
|
|
9065
9065
|
void 0,
|
|
9066
9066
|
authority,
|
|
9067
9067
|
mintA.address,
|
|
9068
|
-
|
|
9068
|
+
tunaConfig.data.feeRecipient,
|
|
9069
9069
|
mintA.programAddress
|
|
9070
9070
|
);
|
|
9071
|
-
instructions.push(...
|
|
9072
|
-
const
|
|
9071
|
+
instructions.push(...createFeeRecipientAtaAInstructions.init);
|
|
9072
|
+
const createFeeRecipientAtaBInstructions = await getCreateAtaInstructions(
|
|
9073
9073
|
void 0,
|
|
9074
9074
|
authority,
|
|
9075
9075
|
mintB.address,
|
|
9076
|
-
|
|
9076
|
+
tunaConfig.data.feeRecipient,
|
|
9077
9077
|
mintB.programAddress
|
|
9078
9078
|
);
|
|
9079
|
-
instructions.push(...
|
|
9079
|
+
instructions.push(...createFeeRecipientAtaBInstructions.init);
|
|
9080
9080
|
const ix = await liquidatePositionFusionInstruction(
|
|
9081
9081
|
authority,
|
|
9082
9082
|
tunaPosition,
|
|
9083
|
+
tunaConfig,
|
|
9083
9084
|
mintA,
|
|
9084
9085
|
mintB,
|
|
9085
9086
|
vaultA,
|
|
@@ -9088,12 +9089,11 @@ async function liquidatePositionFusionInstructions(authority, tunaPosition, mint
|
|
|
9088
9089
|
withdrawPercent
|
|
9089
9090
|
);
|
|
9090
9091
|
instructions.push(ix);
|
|
9091
|
-
instructions.push(...
|
|
9092
|
-
instructions.push(...
|
|
9092
|
+
instructions.push(...createFeeRecipientAtaAInstructions.cleanup);
|
|
9093
|
+
instructions.push(...createFeeRecipientAtaBInstructions.cleanup);
|
|
9093
9094
|
return instructions;
|
|
9094
9095
|
}
|
|
9095
|
-
async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
|
|
9096
|
-
const tunaConfigAddress = (await getTunaConfigAddress())[0];
|
|
9096
|
+
async function liquidatePositionFusionInstruction(authority, tunaPosition, tunaConfig, mintA, mintB, vaultA, vaultB, fusionPool, withdrawPercent) {
|
|
9097
9097
|
const positionMint = tunaPosition.data.positionMint;
|
|
9098
9098
|
const marketAddress = (await getMarketAddress(fusionPool.address))[0];
|
|
9099
9099
|
const fusionPositionAddress = (await getPositionAddress12(positionMint))[0];
|
|
@@ -9122,13 +9122,13 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
|
|
|
9122
9122
|
mint: mintB.address,
|
|
9123
9123
|
tokenProgram: mintB.programAddress
|
|
9124
9124
|
}))[0];
|
|
9125
|
-
const
|
|
9126
|
-
owner:
|
|
9125
|
+
const feeRecipientAtaA = (await findAssociatedTokenPda15({
|
|
9126
|
+
owner: tunaConfig.data.feeRecipient,
|
|
9127
9127
|
mint: mintA.address,
|
|
9128
9128
|
tokenProgram: mintA.programAddress
|
|
9129
9129
|
}))[0];
|
|
9130
|
-
const
|
|
9131
|
-
owner:
|
|
9130
|
+
const feeRecipientAtaB = (await findAssociatedTokenPda15({
|
|
9131
|
+
owner: tunaConfig.data.feeRecipient,
|
|
9132
9132
|
mint: mintB.address,
|
|
9133
9133
|
tokenProgram: mintB.programAddress
|
|
9134
9134
|
}))[0];
|
|
@@ -9172,14 +9172,14 @@ async function liquidatePositionFusionInstruction(authority, tunaPosition, mintA
|
|
|
9172
9172
|
vaultB: vaultB.address,
|
|
9173
9173
|
vaultBAta,
|
|
9174
9174
|
authority,
|
|
9175
|
-
tunaConfig:
|
|
9175
|
+
tunaConfig: tunaConfig.address,
|
|
9176
9176
|
tunaPositionAta,
|
|
9177
9177
|
tunaPositionAtaA,
|
|
9178
9178
|
tunaPositionAtaB,
|
|
9179
9179
|
fusionPosition: fusionPositionAddress,
|
|
9180
9180
|
tunaPosition: tunaPosition.address,
|
|
9181
|
-
|
|
9182
|
-
|
|
9181
|
+
feeRecipientAtaA,
|
|
9182
|
+
feeRecipientAtaB,
|
|
9183
9183
|
fusionPool: fusionPool.address,
|
|
9184
9184
|
fusionammProgram: FUSIONAMM_PROGRAM_ADDRESS6,
|
|
9185
9185
|
tokenProgramA: mintA.programAddress,
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@crypticdot/defituna-client",
|
|
3
3
|
"description": "Typescript client to interact with DefiTuna's on-chain program.",
|
|
4
|
-
"version": "2.0.
|
|
4
|
+
"version": "2.0.16",
|
|
5
5
|
"private": false,
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"rimraf": "^6.0.1",
|
|
53
53
|
"vitest": "^3.1.1",
|
|
54
54
|
"solana-bankrun": "^0.4.0",
|
|
55
|
-
"@crypticdot/defituna-program": "2.0.
|
|
55
|
+
"@crypticdot/defituna-program": "2.0.5"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "node ./codama.mjs && tsup src/index.ts --format cjs,esm --dts",
|