@liquid-af/sdk 0.6.1 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/accounts/liquid-fees.d.ts +1 -1
- package/dist/accounts/liquid-fees.d.ts.map +1 -1
- package/dist/accounts/liquid-fees.js +2 -2
- package/dist/accounts/liquid-fees.js.map +1 -1
- package/dist/client.d.ts +7 -6
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +6 -6
- package/dist/client.js.map +1 -1
- package/dist/idl/liquid.d.ts +2581 -2490
- package/dist/idl/liquid.d.ts.map +1 -1
- package/dist/idl/liquid.json +2581 -2490
- package/dist/idl/liquid_events.d.ts +205 -1
- package/dist/idl/liquid_events.d.ts.map +1 -1
- package/dist/idl/liquid_events.json +205 -1
- package/dist/idl/liquid_fees.d.ts +121 -6
- package/dist/idl/liquid_fees.d.ts.map +1 -1
- package/dist/idl/liquid_fees.json +121 -6
- package/dist/idl/liquid_state.d.ts +72 -72
- package/dist/idl/liquid_state.d.ts.map +1 -1
- package/dist/idl/liquid_state.json +72 -72
- package/dist/idl/liquid_swap.d.ts +1022 -998
- package/dist/idl/liquid_swap.d.ts.map +1 -1
- package/dist/idl/liquid_swap.json +1022 -998
- package/dist/instructions/liquid-fees.d.ts +4 -2
- package/dist/instructions/liquid-fees.d.ts.map +1 -1
- package/dist/instructions/liquid-fees.js +12 -9
- package/dist/instructions/liquid-fees.js.map +1 -1
- package/dist/pda/index.d.ts.map +1 -1
- package/dist/pda/index.js +2 -2
- package/dist/pda/index.js.map +1 -1
- package/dist/pda/liquid-fees.d.ts +3 -2
- package/dist/pda/liquid-fees.d.ts.map +1 -1
- package/dist/pda/liquid-fees.js +4 -3
- package/dist/pda/liquid-fees.js.map +1 -1
- package/package.json +1 -1
- package/src/accounts/liquid-fees.ts +6 -1
- package/src/client.ts +21 -8
- package/src/idl/liquid.json +2581 -2490
- package/src/idl/liquid.ts +2581 -2490
- package/src/idl/liquid_events.json +205 -1
- package/src/idl/liquid_events.ts +205 -1
- package/src/idl/liquid_fees.json +121 -6
- package/src/idl/liquid_fees.ts +121 -6
- package/src/idl/liquid_state.json +72 -72
- package/src/idl/liquid_state.ts +72 -72
- package/src/idl/liquid_swap.json +1022 -998
- package/src/idl/liquid_swap.ts +1022 -998
- package/src/instructions/liquid-fees.ts +32 -10
- package/src/pda/index.ts +10 -2
- package/src/pda/liquid-fees.ts +4 -2
|
@@ -4,10 +4,10 @@ import type { FeeRecipient } from "../types.js";
|
|
|
4
4
|
export interface BuildUpdateFeeConfigParams {
|
|
5
5
|
authority: PublicKey;
|
|
6
6
|
tokenMint: PublicKey;
|
|
7
|
+
/** Quote mint used for PDA derivation and token fee vault verification. */
|
|
8
|
+
quoteMint: PublicKey;
|
|
7
9
|
recipients?: FeeRecipient[] | null;
|
|
8
10
|
newUpdateAuthority?: PublicKey | null;
|
|
9
|
-
/** Required when changing recipients to verify token fee vault is drained. */
|
|
10
|
-
quoteMint?: PublicKey;
|
|
11
11
|
config: LiquidConfig;
|
|
12
12
|
}
|
|
13
13
|
/**
|
|
@@ -36,6 +36,7 @@ export declare function buildRevokeFeeConfig(params: BuildRevokeFeeConfigParams)
|
|
|
36
36
|
export interface BuildDistributeFeesParams {
|
|
37
37
|
payer: PublicKey;
|
|
38
38
|
tokenMint: PublicKey;
|
|
39
|
+
quoteMint: PublicKey;
|
|
39
40
|
recipientVaults: PublicKey[];
|
|
40
41
|
config: LiquidConfig;
|
|
41
42
|
}
|
|
@@ -73,6 +74,7 @@ export declare function buildDistributeTokenFees(params: BuildDistributeTokenFee
|
|
|
73
74
|
export interface BuildClaimFeesParams {
|
|
74
75
|
recipient: PublicKey;
|
|
75
76
|
tokenMint: PublicKey;
|
|
77
|
+
quoteMint: PublicKey;
|
|
76
78
|
config: LiquidConfig;
|
|
77
79
|
}
|
|
78
80
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquid-fees.d.ts","sourceRoot":"","sources":["../../src/instructions/liquid-fees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAQhD,MAAM,WAAW,0BAA0B;IAC1C,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IACnC,kBAAkB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,
|
|
1
|
+
{"version":3,"file":"liquid-fees.d.ts","sourceRoot":"","sources":["../../src/instructions/liquid-fees.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,8 @@ export function buildUpdateFeeConfig(params) {
|
|
|
17
17
|
})) ?? null;
|
|
18
18
|
// When changing recipients, the token fee vault must be passed to verify it's drained
|
|
19
19
|
let tokenFeeVault = null;
|
|
20
|
-
if (recipients
|
|
21
|
-
const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
|
|
20
|
+
if (recipients) {
|
|
21
|
+
const [feeConfig] = getFeeConfigPDA(tokenMint, quoteMint, config.liquidFeesProgramId);
|
|
22
22
|
const [feeVault] = getFeeVaultPDA(feeConfig, config.liquidFeesProgramId);
|
|
23
23
|
tokenFeeVault = getAssociatedTokenAddressSync(quoteMint, feeVault, true);
|
|
24
24
|
}
|
|
@@ -27,9 +27,10 @@ export function buildUpdateFeeConfig(params) {
|
|
|
27
27
|
recipients: formattedRecipients,
|
|
28
28
|
newUpdateAuthority: newUpdateAuthority ?? null,
|
|
29
29
|
})
|
|
30
|
-
.
|
|
30
|
+
.accountsPartial({
|
|
31
31
|
authority,
|
|
32
32
|
tokenMint,
|
|
33
|
+
quoteMint,
|
|
33
34
|
tokenFeeVault,
|
|
34
35
|
})
|
|
35
36
|
.instruction();
|
|
@@ -45,7 +46,7 @@ export function buildRevokeFeeConfig(params) {
|
|
|
45
46
|
const { authority, tokenMint, quoteMint, config } = params;
|
|
46
47
|
const program = getCachedFeesProgram(config);
|
|
47
48
|
// Derive token fee vault ATA (fee_vault's ATA for quote_mint)
|
|
48
|
-
const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
|
|
49
|
+
const [feeConfig] = getFeeConfigPDA(tokenMint, quoteMint, config.liquidFeesProgramId);
|
|
49
50
|
const [feeVault] = getFeeVaultPDA(feeConfig, config.liquidFeesProgramId);
|
|
50
51
|
const tokenFeeVault = getAssociatedTokenAddressSync(quoteMint, feeVault, true);
|
|
51
52
|
return program.methods
|
|
@@ -53,6 +54,7 @@ export function buildRevokeFeeConfig(params) {
|
|
|
53
54
|
.accounts({
|
|
54
55
|
authority,
|
|
55
56
|
tokenMint,
|
|
57
|
+
quoteMint,
|
|
56
58
|
tokenFeeVault,
|
|
57
59
|
})
|
|
58
60
|
.instruction();
|
|
@@ -67,13 +69,14 @@ export function buildRevokeFeeConfig(params) {
|
|
|
67
69
|
* @returns Transaction instruction
|
|
68
70
|
*/
|
|
69
71
|
export function buildDistributeFees(params) {
|
|
70
|
-
const { payer, tokenMint, recipientVaults, config } = params;
|
|
72
|
+
const { payer, tokenMint, quoteMint, recipientVaults, config } = params;
|
|
71
73
|
const program = getCachedFeesProgram(config);
|
|
72
74
|
return program.methods
|
|
73
75
|
.distributeFees()
|
|
74
76
|
.accounts({
|
|
75
77
|
payer,
|
|
76
78
|
tokenMint,
|
|
79
|
+
quoteMint,
|
|
77
80
|
})
|
|
78
81
|
.remainingAccounts(recipientVaults.map((vault) => ({
|
|
79
82
|
pubkey: vault,
|
|
@@ -117,9 +120,9 @@ export function buildDistributeTokenFees(params) {
|
|
|
117
120
|
* @returns Transaction instruction
|
|
118
121
|
*/
|
|
119
122
|
export function buildClaimFees(params) {
|
|
120
|
-
const { recipient, tokenMint, config } = params;
|
|
123
|
+
const { recipient, tokenMint, quoteMint, config } = params;
|
|
121
124
|
const program = getCachedFeesProgram(config);
|
|
122
|
-
const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
|
|
125
|
+
const [feeConfig] = getFeeConfigPDA(tokenMint, quoteMint, config.liquidFeesProgramId);
|
|
123
126
|
return program.methods
|
|
124
127
|
.claimFees()
|
|
125
128
|
.accounts({
|
|
@@ -139,7 +142,7 @@ export function buildClaimFees(params) {
|
|
|
139
142
|
export function buildClaimTokenFees(params) {
|
|
140
143
|
const { recipient, tokenMint, quoteMint, config } = params;
|
|
141
144
|
const program = getCachedFeesProgram(config);
|
|
142
|
-
const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
|
|
145
|
+
const [feeConfig] = getFeeConfigPDA(tokenMint, quoteMint, config.liquidFeesProgramId);
|
|
143
146
|
return program.methods
|
|
144
147
|
.claimTokenFees()
|
|
145
148
|
.accounts({
|
|
@@ -176,7 +179,7 @@ export function buildInitializeGlobalConfig(params) {
|
|
|
176
179
|
* @returns Array of RecipientVaultPair for remaining accounts
|
|
177
180
|
*/
|
|
178
181
|
export function deriveRecipientVaultPairs(tokenMint, recipients, quoteMint, config) {
|
|
179
|
-
const [feeConfig] = getFeeConfigPDA(tokenMint, config.liquidFeesProgramId);
|
|
182
|
+
const [feeConfig] = getFeeConfigPDA(tokenMint, quoteMint, config.liquidFeesProgramId);
|
|
180
183
|
return recipients.map((recipient) => {
|
|
181
184
|
const [vaultPda] = getRecipientVaultPDA(feeConfig, recipient, config.liquidFeesProgramId);
|
|
182
185
|
const vaultAta = getAssociatedTokenAddressSync(quoteMint, vaultPda, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquid-fees.js","sourceRoot":"","sources":["../../src/instructions/liquid-fees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAGlE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EACN,eAAe,EACf,cAAc,EACd,oBAAoB,GACpB,MAAM,uBAAuB,CAAC;AAY/B;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CACnC,MAAkC;IAElC,MAAM,EACL,SAAS,EACT,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,SAAS,EACT,MAAM,GACN,GAAG,MAAM,CAAC;IACX,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GACxB,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,WAAW,EAAE,CAAC,CAAC,WAAW;KAC1B,CAAC,CAAC,IAAI,IAAI,CAAC;IAEb,sFAAsF;IACtF,IAAI,aAAa,GAAqB,IAAI,CAAC;IAC3C,IAAI,UAAU,
|
|
1
|
+
{"version":3,"file":"liquid-fees.js","sourceRoot":"","sources":["../../src/instructions/liquid-fees.ts"],"names":[],"mappings":"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"}
|
package/dist/pda/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pda/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,mBAAmB,EACnB,wBAAwB,EACxB,kBAAkB,EAClB,wBAAwB,GACxB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,EACd,oBAAoB,GACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,GACV,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAA6B,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAoB5E,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,SAAS,CAAC;IACxB,oBAAoB,EAAE,SAAS,CAAC;IAChC,aAAa,EAAE,SAAS,CAAC;IACzB,YAAY,EAAE,SAAS,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAClC,MAAM,SAAS,EACf,SAAS,SAAS,EAClB,QAAQ,YAAY,KAClB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/pda/index.ts"],"names":[],"mappings":"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"}
|
package/dist/pda/index.js
CHANGED
|
@@ -20,7 +20,7 @@ export const getAllBondingCurvePDAs = (mint, creator, config) => {
|
|
|
20
20
|
const [bondingCurveSolVault] = getBondingCurveSolVaultPDA(bondingCurve, config.liquidProgramId);
|
|
21
21
|
const [referralVault] = getReferralVaultPDA(creator, config.liquidProgramId);
|
|
22
22
|
const [buybackVault] = getBuybackVaultPDA(bondingCurve, config.liquidProgramId);
|
|
23
|
-
const [feeConfig] = getFeeConfigPDA(mint, config.liquidFeesProgramId);
|
|
23
|
+
const [feeConfig] = getFeeConfigPDA(mint, WSOL_MINT, config.liquidFeesProgramId);
|
|
24
24
|
const [feeVault] = getFeeVaultPDA(feeConfig, config.liquidFeesProgramId);
|
|
25
25
|
const [userProperties] = getUserPropertiesPDA(creator, config.liquidStateProgramId);
|
|
26
26
|
const [tokenVolume] = getTokenVolumePDA(mint, config.liquidStateProgramId);
|
|
@@ -51,7 +51,7 @@ export const getAllPoolPDAs = (baseMint, quoteMint, config) => {
|
|
|
51
51
|
const [observation] = getObservationPDA(poolState, config.liquidSwapProgramId);
|
|
52
52
|
const [ammConfig] = getSwapGlobalConfigPDA(config.liquidSwapProgramId);
|
|
53
53
|
const [ammAuthority] = getSwapAuthorityPDA(config.liquidSwapProgramId);
|
|
54
|
-
const [feeConfig] = getFeeConfigPDA(baseMint, config.liquidFeesProgramId);
|
|
54
|
+
const [feeConfig] = getFeeConfigPDA(baseMint, quoteMint, config.liquidFeesProgramId);
|
|
55
55
|
const [tokenVolume] = getTokenVolumePDA(baseMint, config.liquidStateProgramId);
|
|
56
56
|
return {
|
|
57
57
|
poolState,
|
package/dist/pda/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pda/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,mBAAmB,EACnB,wBAAwB,EACxB,kBAAkB,EAClB,wBAAwB,GACxB,MAAM,aAAa,CAAC;AAErB,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,EACf,qBAAqB,EACrB,cAAc,EACd,oBAAoB,GACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,UAAU,GACV,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,cAAc,EAAE,SAAS,EAAqB,MAAM,cAAc,CAAC;AAC5E,OAAO,EACN,kBAAkB,EAClB,0BAA0B,EAC1B,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,GACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EACN,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,mBAAmB,EACnB,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAc5E;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACrC,IAAe,EACf,OAAkB,EAClB,MAAoB,EACD,EAAE;IACrB,MAAM,CAAC,YAAY,CAAC,GAAG,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,CAAC,oBAAoB,CAAC,GAAG,0BAA0B,CACxD,YAAY,EACZ,MAAM,CAAC,eAAe,CACtB,CAAC;IACF,MAAM,CAAC,aAAa,CAAC,GAAG,mBAAmB,CAC1C,OAAO,EACP,MAAM,CAAC,eAAe,CACtB,CAAC;IACF,MAAM,CAAC,YAAY,CAAC,GAAG,kBAAkB,CACxC,YAAY,EACZ,MAAM,CAAC,eAAe,CACtB,CAAC;IACF,MAAM,CAAC,SAAS,CAAC,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pda/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
/**
|
|
3
|
-
* Derives the fee config PDA for a token mint.
|
|
3
|
+
* Derives the fee config PDA for a token mint and quote mint pair.
|
|
4
4
|
*
|
|
5
5
|
* @param tokenMint - Token mint address
|
|
6
|
+
* @param quoteMint - Quote token mint address (e.g., WSOL for native, USDC for stable)
|
|
6
7
|
* @param programId - Liquid Fees program ID
|
|
7
8
|
* @returns Tuple of [PDA address, bump seed]
|
|
8
9
|
*/
|
|
9
|
-
export declare const getFeeConfigPDA: (tokenMint: PublicKey, programId: PublicKey) => [PublicKey, number];
|
|
10
|
+
export declare const getFeeConfigPDA: (tokenMint: PublicKey, quoteMint: PublicKey, programId: PublicKey) => [PublicKey, number];
|
|
10
11
|
/**
|
|
11
12
|
* Derives the global config PDA for the liquid-fees program.
|
|
12
13
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquid-fees.d.ts","sourceRoot":"","sources":["../../src/pda/liquid-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C
|
|
1
|
+
{"version":3,"file":"liquid-fees.d.ts","sourceRoot":"","sources":["../../src/pda/liquid-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO5C;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAC3B,WAAW,SAAS,EACpB,WAAW,SAAS,EACpB,WAAW,SAAS,KAClB,CAAC,SAAS,EAAE,MAAM,CAKpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GACjC,WAAW,SAAS,KAClB,CAAC,SAAS,EAAE,MAAM,CAEpB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAC1B,WAAW,SAAS,EACpB,WAAW,SAAS,KAClB,CAAC,SAAS,EAAE,MAAM,CAKpB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,GAChC,WAAW,SAAS,EACpB,WAAW,SAAS,EACpB,WAAW,SAAS,KAClB,CAAC,SAAS,EAAE,MAAM,CAKpB,CAAC"}
|
package/dist/pda/liquid-fees.js
CHANGED
|
@@ -4,14 +4,15 @@ const SEED_FEE_VAULT = Buffer.from("fee_vault");
|
|
|
4
4
|
const SEED_GLOBAL_CONFIG = Buffer.from("global_config");
|
|
5
5
|
const SEED_RECIPIENT_VAULT = Buffer.from("recipient_vault");
|
|
6
6
|
/**
|
|
7
|
-
* Derives the fee config PDA for a token mint.
|
|
7
|
+
* Derives the fee config PDA for a token mint and quote mint pair.
|
|
8
8
|
*
|
|
9
9
|
* @param tokenMint - Token mint address
|
|
10
|
+
* @param quoteMint - Quote token mint address (e.g., WSOL for native, USDC for stable)
|
|
10
11
|
* @param programId - Liquid Fees program ID
|
|
11
12
|
* @returns Tuple of [PDA address, bump seed]
|
|
12
13
|
*/
|
|
13
|
-
export const getFeeConfigPDA = (tokenMint, programId) => {
|
|
14
|
-
return PublicKey.findProgramAddressSync([SEED_FEE_CONFIG, tokenMint.toBuffer()], programId);
|
|
14
|
+
export const getFeeConfigPDA = (tokenMint, quoteMint, programId) => {
|
|
15
|
+
return PublicKey.findProgramAddressSync([SEED_FEE_CONFIG, tokenMint.toBuffer(), quoteMint.toBuffer()], programId);
|
|
15
16
|
};
|
|
16
17
|
/**
|
|
17
18
|
* Derives the global config PDA for the liquid-fees program.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liquid-fees.js","sourceRoot":"","sources":["../../src/pda/liquid-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACxD,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAE5D
|
|
1
|
+
{"version":3,"file":"liquid-fees.js","sourceRoot":"","sources":["../../src/pda/liquid-fees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AACxD,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,SAAoB,EACpB,SAAoB,EACpB,SAAoB,EACE,EAAE;IACxB,OAAO,SAAS,CAAC,sBAAsB,CACtC,CAAC,eAAe,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,EAC7D,SAAS,CACT,CAAC;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACpC,SAAoB,EACE,EAAE;IACxB,OAAO,SAAS,CAAC,sBAAsB,CAAC,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC7B,SAAoB,EACpB,SAAoB,EACE,EAAE;IACxB,OAAO,SAAS,CAAC,sBAAsB,CACtC,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,EACtC,SAAS,CACT,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,SAAoB,EACpB,SAAoB,EACpB,SAAoB,EACE,EAAE;IACxB,OAAO,SAAS,CAAC,sBAAsB,CACtC,CAAC,oBAAoB,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,EAClE,SAAS,CACT,CAAC;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -14,9 +14,14 @@ import { getLiquidFeesProgram } from "../idl/index.js";
|
|
|
14
14
|
export async function fetchFeeConfig(
|
|
15
15
|
connection: Connection,
|
|
16
16
|
tokenMint: PublicKey,
|
|
17
|
+
quoteMint: PublicKey,
|
|
17
18
|
config: LiquidConfig,
|
|
18
19
|
) {
|
|
19
|
-
const [pda] = getFeeConfigPDA(
|
|
20
|
+
const [pda] = getFeeConfigPDA(
|
|
21
|
+
tokenMint,
|
|
22
|
+
quoteMint,
|
|
23
|
+
config.liquidFeesProgramId,
|
|
24
|
+
);
|
|
20
25
|
return fetchFeeConfigByAddress(connection, pda, config);
|
|
21
26
|
}
|
|
22
27
|
|
package/src/client.ts
CHANGED
|
@@ -666,10 +666,9 @@ export class LiquidClient {
|
|
|
666
666
|
buildUpdateFeeConfig(params: {
|
|
667
667
|
authority: PublicKey;
|
|
668
668
|
tokenMint: PublicKey;
|
|
669
|
+
quoteMint: PublicKey;
|
|
669
670
|
recipients?: FeeRecipient[] | null;
|
|
670
671
|
newUpdateAuthority?: PublicKey | null;
|
|
671
|
-
/** Required when changing recipients to verify token fee vault is drained. */
|
|
672
|
-
quoteMint?: PublicKey;
|
|
673
672
|
}): Promise<TransactionInstruction> {
|
|
674
673
|
return buildUpdateFeeConfig({ ...params, config: this.config });
|
|
675
674
|
}
|
|
@@ -687,6 +686,7 @@ export class LiquidClient {
|
|
|
687
686
|
buildDistributeFees(params: {
|
|
688
687
|
payer: PublicKey;
|
|
689
688
|
tokenMint: PublicKey;
|
|
689
|
+
quoteMint: PublicKey;
|
|
690
690
|
recipientVaults: PublicKey[];
|
|
691
691
|
}): Promise<TransactionInstruction> {
|
|
692
692
|
return buildDistributeFees({ ...params, config: this.config });
|
|
@@ -706,6 +706,7 @@ export class LiquidClient {
|
|
|
706
706
|
buildClaimFees(params: {
|
|
707
707
|
recipient: PublicKey;
|
|
708
708
|
tokenMint: PublicKey;
|
|
709
|
+
quoteMint: PublicKey;
|
|
709
710
|
}): Promise<TransactionInstruction> {
|
|
710
711
|
return buildClaimFees({ ...params, config: this.config });
|
|
711
712
|
}
|
|
@@ -811,9 +812,14 @@ export class LiquidClient {
|
|
|
811
812
|
);
|
|
812
813
|
}
|
|
813
814
|
|
|
814
|
-
/** Fetches the fee configuration for a token mint. */
|
|
815
|
-
fetchFeeConfig(tokenMint: PublicKey) {
|
|
816
|
-
return fetchFeeConfigFn(
|
|
815
|
+
/** Fetches the fee configuration for a token mint and quote mint pair. */
|
|
816
|
+
fetchFeeConfig(tokenMint: PublicKey, quoteMint: PublicKey) {
|
|
817
|
+
return fetchFeeConfigFn(
|
|
818
|
+
this.connection,
|
|
819
|
+
tokenMint,
|
|
820
|
+
quoteMint,
|
|
821
|
+
this.config,
|
|
822
|
+
);
|
|
817
823
|
}
|
|
818
824
|
|
|
819
825
|
/** Fetches a fee configuration by its PDA address directly. */
|
|
@@ -992,9 +998,16 @@ export class LiquidClient {
|
|
|
992
998
|
return getObservationPDA(poolState, this.config.liquidSwapProgramId);
|
|
993
999
|
}
|
|
994
1000
|
|
|
995
|
-
/** Derives the fee configuration PDA for a token mint. */
|
|
996
|
-
getFeeConfigPDA(
|
|
997
|
-
|
|
1001
|
+
/** Derives the fee configuration PDA for a token mint and quote mint pair. */
|
|
1002
|
+
getFeeConfigPDA(
|
|
1003
|
+
tokenMint: PublicKey,
|
|
1004
|
+
quoteMint: PublicKey,
|
|
1005
|
+
): [PublicKey, number] {
|
|
1006
|
+
return getFeeConfigPDA(
|
|
1007
|
+
tokenMint,
|
|
1008
|
+
quoteMint,
|
|
1009
|
+
this.config.liquidFeesProgramId,
|
|
1010
|
+
);
|
|
998
1011
|
}
|
|
999
1012
|
|
|
1000
1013
|
/** Derives the fee vault PDA for a fee configuration. */
|