@metaplex-foundation/genesis 0.13.0-beta.0 → 0.13.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/generated/instructions/swapVaultToBondingCurveV2.d.ts +0 -2
- package/dist/src/generated/instructions/swapVaultToBondingCurveV2.js +6 -11
- package/dist/src/generated/instructions/swapVaultToBondingCurveV2.js.map +1 -1
- package/dist/src/raydium.d.ts +18 -4
- package/dist/src/raydium.js +24 -10
- package/dist/src/raydium.js.map +1 -1
- package/package.json +1 -1
|
@@ -35,8 +35,6 @@ export type SwapVaultToBondingCurveV2InstructionAccounts = {
|
|
|
35
35
|
actionsAuthority: Signer;
|
|
36
36
|
/** The recipient of the base tokens */
|
|
37
37
|
recipient: PublicKey | Pda;
|
|
38
|
-
/** Backend authorization signer for vault bucket */
|
|
39
|
-
vaultBucketBackendSigner?: Signer;
|
|
40
38
|
/** Backend authorization signer for bonding curve bucket */
|
|
41
39
|
bondingCurveBucketBackendSigner?: Signer;
|
|
42
40
|
/** The fee wallet's quote token account */
|
|
@@ -103,38 +103,33 @@ function swapVaultToBondingCurveV2(context, input) {
|
|
|
103
103
|
isWritable: false,
|
|
104
104
|
value: input.recipient ?? null,
|
|
105
105
|
},
|
|
106
|
-
vaultBucketBackendSigner: {
|
|
107
|
-
index: 13,
|
|
108
|
-
isWritable: false,
|
|
109
|
-
value: input.vaultBucketBackendSigner ?? null,
|
|
110
|
-
},
|
|
111
106
|
bondingCurveBucketBackendSigner: {
|
|
112
|
-
index:
|
|
107
|
+
index: 13,
|
|
113
108
|
isWritable: false,
|
|
114
109
|
value: input.bondingCurveBucketBackendSigner ?? null,
|
|
115
110
|
},
|
|
116
111
|
feeQuoteTokenAccount: {
|
|
117
|
-
index:
|
|
112
|
+
index: 14,
|
|
118
113
|
isWritable: true,
|
|
119
114
|
value: input.feeQuoteTokenAccount ?? null,
|
|
120
115
|
},
|
|
121
116
|
baseTokenProgram: {
|
|
122
|
-
index:
|
|
117
|
+
index: 15,
|
|
123
118
|
isWritable: false,
|
|
124
119
|
value: input.baseTokenProgram ?? null,
|
|
125
120
|
},
|
|
126
121
|
quoteTokenProgram: {
|
|
127
|
-
index:
|
|
122
|
+
index: 16,
|
|
128
123
|
isWritable: false,
|
|
129
124
|
value: input.quoteTokenProgram ?? null,
|
|
130
125
|
},
|
|
131
126
|
associatedTokenProgram: {
|
|
132
|
-
index:
|
|
127
|
+
index: 17,
|
|
133
128
|
isWritable: false,
|
|
134
129
|
value: input.associatedTokenProgram ?? null,
|
|
135
130
|
},
|
|
136
131
|
systemProgram: {
|
|
137
|
-
index:
|
|
132
|
+
index: 18,
|
|
138
133
|
isWritable: false,
|
|
139
134
|
value: input.systemProgram ?? null,
|
|
140
135
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swapVaultToBondingCurveV2.js","sourceRoot":"","sources":["../../../../src/generated/instructions/swapVaultToBondingCurveV2.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,kEAA0E;AAC1E,kDAQkC;AAClC,sEAQ8C;AAC9C,0CAKqB;AACrB,sCAOmB;
|
|
1
|
+
{"version":3,"file":"swapVaultToBondingCurveV2.js","sourceRoot":"","sources":["../../../../src/generated/instructions/swapVaultToBondingCurveV2.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,kEAA0E;AAC1E,kDAQkC;AAClC,sEAQ8C;AAC9C,0CAKqB;AACrB,sCAOmB;AAgEnB,SAAgB,qDAAqD;IAInE,OAAO,IAAA,2BAAa,EAKlB,IAAA,oBAAM,EACJ;QACE,CAAC,eAAe,EAAE,IAAA,gBAAE,GAAE,CAAC;QACvB,CAAC,kBAAkB,EAAE,IAAA,gBAAE,GAAE,CAAC;QAC1B,CAAC,cAAc,EAAE,IAAA,iBAAG,GAAE,CAAC;QACvB,CAAC,yBAAyB,EAAE,IAAA,gBAAE,GAAE,CAAC;QACjC,CAAC,SAAS,EAAE,IAAA,mBAAK,EAAC,IAAA,gBAAE,GAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,sBAAsB,EAAE,IAAA,iBAAG,GAAE,CAAC;QAC/B,CAAC,SAAS,EAAE,IAAA,iBAAG,GAAE,CAAC;KACnB,EACD,EAAE,WAAW,EAAE,0CAA0C,EAAE,CAC5D,EACD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,GAAG,KAAK;QACR,aAAa,EAAE,EAAE;QACjB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,IAAI,CAAC;QAC7C,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,CAAC;QACrC,uBAAuB,EAAE,KAAK,CAAC,uBAAuB,IAAI,CAAC;QAC3D,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACpC,CAAC,CAIH,CAAC;AACJ,CAAC;AAjCD,sHAiCC;AAQD,eAAe;AACf,SAAgB,yBAAyB,CACvC,OAAsD,EACtD,KAC0C;IAE1C,cAAc;IACd,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAC7C,SAAS,EACT,8CAA8C,CAC/C,CAAC;IAEF,YAAY;IACZ,MAAM,gBAAgB,GAAG;QACvB,cAAc,EAAE;YACd,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI;SACpC;QACD,WAAW,EAAE;YACX,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI;SACjC;QACD,kBAAkB,EAAE;YAClB,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,kBAAkB,IAAI,IAAI;SACxC;QACD,QAAQ,EAAE;YACR,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;SAC9B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;SAC/B;QACD,uBAAuB,EAAE;YACvB,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,uBAAuB,IAAI,IAAI;SAC7C;QACD,yBAAyB,EAAE;YACzB,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,yBAAyB,IAAI,IAAI;SAC/C;QACD,4BAA4B,EAAE;YAC5B,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,4BAA4B,IAAI,IAAI;SAClD;QACD,mCAAmC,EAAE;YACnC,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,mCAAmC,IAAI,IAAI;SACzD;QACD,UAAU,EAAE;YACV,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI;SAChC;QACD,KAAK,EAAE;YACL,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;SAC3B;QACD,gBAAgB,EAAE;YAChB,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,gBAAgB,IAAI,IAAI;SACtC;QACD,SAAS,EAAE;YACT,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;SAC/B;QACD,+BAA+B,EAAE;YAC/B,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,+BAA+B,IAAI,IAAI;SACrD;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,IAAe;YAC3B,KAAK,EAAE,KAAK,CAAC,oBAAoB,IAAI,IAAI;SAC1C;QACD,gBAAgB,EAAE;YAChB,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,gBAAgB,IAAI,IAAI;SACtC;QACD,iBAAiB,EAAE;YACjB,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,iBAAiB,IAAI,IAAI;SACvC;QACD,sBAAsB,EAAE;YACtB,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,sBAAsB,IAAI,IAAI;SAC5C;QACD,aAAa,EAAE;YACb,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAgB;YAC5B,KAAK,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI;SACnC;KACoC,CAAC;IAExC,aAAa;IACb,MAAM,YAAY,GAA6C,EAAE,GAAG,KAAK,EAAE,CAAC;IAE5E,kBAAkB;IAClB,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE;QAC9B,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC;KAC/B;IACD,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,EAAE;QAC1C,gBAAgB,CAAC,cAAc,CAAC,KAAK,GAAG,IAAA,kCAAuB,EAAC,OAAO,EAAE;YACvE,QAAQ,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC1D,YAAY,EAAE,IAAA,mBAAU,EAAC,YAAY,CAAC,YAAY,CAAC;SACpD,CAAC,CAAC;KACJ;IACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;QAClC,YAAY,CAAC,gBAAgB,GAAG,CAAC,CAAC;KACnC;IACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,EAAE;QACvC,gBAAgB,CAAC,WAAW,CAAC,KAAK,GAAG,IAAA,+BAAoB,EAAC,OAAO,EAAE;YACjE,cAAc,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC;YACtE,WAAW,EAAE,IAAA,mBAAU,EAAC,YAAY,CAAC,gBAAgB,CAAC;SACvD,CAAC,CAAC;KACJ;IACD,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE;QACzC,YAAY,CAAC,uBAAuB,GAAG,CAAC,CAAC;KAC1C;IACD,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,EAAE;QAC9C,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,GAAG,IAAA,sCAA2B,EACrE,OAAO,EACP;YACE,cAAc,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC;YACtE,WAAW,EAAE,IAAA,mBAAU,EAAC,YAAY,CAAC,uBAAuB,CAAC;SAC9D,CACF,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,EAAE;QACrC,gBAAgB,CAAC,SAAS,CAAC,KAAK,GAAG,IAAA,eAAS,EAC1C,6CAA6C,CAC9C,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,KAAK,EAAE;QACnD,gBAAgB,CAAC,uBAAuB,CAAC,KAAK,GAAG,IAAA,oCAAsB,EACrE,OAAO,EACP;YACE,IAAI,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtD,KAAK,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC;SAC9D,CACF,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,KAAK,EAAE;QACrD,gBAAgB,CAAC,yBAAyB,CAAC,KAAK,GAAG,IAAA,oCAAsB,EACvE,OAAO,EACP;YACE,IAAI,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtD,KAAK,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC;SACzD,CACF,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CAAC,KAAK,EAAE;QACxD,gBAAgB,CAAC,4BAA4B,CAAC,KAAK;YACjD,IAAA,oCAAsB,EAAC,OAAO,EAAE;gBAC9B,IAAI,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC;gBACvD,KAAK,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC;aAC3D,CAAC,CAAC;KACN;IACD,IAAI,CAAC,gBAAgB,CAAC,mCAAmC,CAAC,KAAK,EAAE;QAC/D,gBAAgB,CAAC,mCAAmC,CAAC,KAAK;YACxD,IAAA,oCAAsB,EAAC,OAAO,EAAE;gBAC9B,IAAI,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC;gBACvD,KAAK,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC;aAClE,CAAC,CAAC;KACN;IACD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,EAAE;QACtC,gBAAgB,CAAC,UAAU,CAAC,KAAK,GAAG,IAAA,gCAAqB,EAAC,OAAO,EAAE;YACjE,MAAM,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC;YAC3D,SAAS,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC;SAC7D,CAAC,CAAC;KACJ;IACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE;QACjC,gBAAgB,CAAC,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KAC9C;IACD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,EAAE;QAChD,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,GAAG,IAAA,oCAAsB,EAClE,OAAO,EACP;YACE,IAAI,EAAE,IAAA,wBAAe,EAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC;YACvD,KAAK,EAAE,IAAA,eAAS,EAAC,8CAA8C,CAAC;SACjE,CACF,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,EAAE;QAC5C,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,GAAG,IAAA,eAAS,EACjD,6CAA6C,CAC9C,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,EAAE;QAC7C,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAA,eAAS,EAClD,6CAA6C,CAC9C,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,KAAK,EAAE;QAClD,gBAAgB,CAAC,sBAAsB,CAAC,KAAK,GAAG,IAAA,eAAS,EACvD,8CAA8C,CAC/C,CAAC;KACH;IACD,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK,EAAE;QACzC,gBAAgB,CAAC,aAAa,CAAC,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAClE,WAAW,EACX,kCAAkC,CACnC,CAAC;QACF,gBAAgB,CAAC,aAAa,CAAC,UAAU,GAAG,KAAK,CAAC;KACnD;IAED,qBAAqB;IACrB,MAAM,eAAe,GAAsB,MAAM,CAAC,MAAM,CACtD,gBAAgB,CACjB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAEpC,oBAAoB;IACpB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,kCAAyB,EAC/C,eAAe,EACf,WAAW,EACX,SAAS,CACV,CAAC;IAEF,QAAQ;IACR,MAAM,IAAI,GACR,qDAAqD,EAAE,CAAC,SAAS,CAC/D,YAA4D,CAC7D,CAAC;IAEJ,0BAA0B;IAC1B,MAAM,mBAAmB,GAAG,CAAC,CAAC;IAE9B,OAAO,IAAA,wBAAkB,EAAC;QACxB,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE;KACzE,CAAC,CAAC;AACL,CAAC;AAtPD,8DAsPC"}
|
package/dist/src/raydium.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export declare const RAYDIUM_AMM_CONFIG_DEVNET: PublicKey<"9zSzfkYy6awexsHvmggeH
|
|
|
13
13
|
export declare const RAYDIUM_AMM_CONFIG_MAINNET: PublicKey<"D4FPEruKEHrG5TenZ2mpDGEfu1iUvTiqBxvpU8HLBvC2">;
|
|
14
14
|
/**
|
|
15
15
|
* Return type for deriveRaydiumPDAs function
|
|
16
|
-
* Contains all accounts needed for Raydium pool graduation
|
|
16
|
+
* Contains all accounts needed for Raydium pool graduation (V1)
|
|
17
17
|
*/
|
|
18
18
|
export interface RaydiumPoolAccounts {
|
|
19
19
|
poolState: PublicKey;
|
|
@@ -53,11 +53,25 @@ export interface RaydiumPoolAccountsV2 {
|
|
|
53
53
|
*
|
|
54
54
|
* @param umi - Umi instance
|
|
55
55
|
* @param projectMint - The project's token mint
|
|
56
|
-
* @param
|
|
56
|
+
* @param options - Optional configuration
|
|
57
|
+
* @param options.solMint - The SOL/quote token mint (defaults to wSOL)
|
|
58
|
+
* @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
|
|
57
59
|
*/
|
|
58
|
-
export declare function deriveRaydiumPDAs(umi: Umi, projectMint: PublicKey,
|
|
60
|
+
export declare function deriveRaydiumPDAs(umi: Umi, projectMint: PublicKey, options?: {
|
|
61
|
+
solMint?: PublicKey;
|
|
62
|
+
env?: 'mainnet' | 'devnet';
|
|
63
|
+
}): RaydiumPoolAccounts;
|
|
59
64
|
/**
|
|
60
65
|
* Derives Raydium pool PDAs for V2 with property names matching V2 instruction accounts.
|
|
61
66
|
* This is a convenience wrapper around deriveRaydiumPDAs that maps vault names to V2 conventions.
|
|
67
|
+
*
|
|
68
|
+
* @param umi - Umi instance
|
|
69
|
+
* @param baseMint - The base token mint (project mint)
|
|
70
|
+
* @param options - Optional configuration
|
|
71
|
+
* @param options.quoteMint - The quote token mint (defaults to wSOL)
|
|
72
|
+
* @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
|
|
62
73
|
*/
|
|
63
|
-
export declare function deriveRaydiumPDAsV2(umi: Umi,
|
|
74
|
+
export declare function deriveRaydiumPDAsV2(umi: Umi, baseMint: PublicKey, options?: {
|
|
75
|
+
quoteMint?: PublicKey;
|
|
76
|
+
env?: 'mainnet' | 'devnet';
|
|
77
|
+
}): RaydiumPoolAccountsV2;
|
package/dist/src/raydium.js
CHANGED
|
@@ -78,29 +78,33 @@ function comparePublicKeysLexicographically(a, b) {
|
|
|
78
78
|
*
|
|
79
79
|
* @param umi - Umi instance
|
|
80
80
|
* @param projectMint - The project's token mint
|
|
81
|
-
* @param
|
|
81
|
+
* @param options - Optional configuration
|
|
82
|
+
* @param options.solMint - The SOL/quote token mint (defaults to wSOL)
|
|
83
|
+
* @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
|
|
82
84
|
*/
|
|
83
|
-
function deriveRaydiumPDAs(umi, projectMint,
|
|
85
|
+
function deriveRaydiumPDAs(umi, projectMint, options = {}) {
|
|
86
|
+
const solMint = options.solMint ?? exports.NATIVE_SOL_MINT;
|
|
87
|
+
const env = options.env ?? 'mainnet';
|
|
84
88
|
// Select the appropriate program ID and AMM config based on environment
|
|
85
89
|
const programId = env === 'mainnet'
|
|
86
90
|
? exports.RAYDIUM_CP_SWAP_PROGRAM_ID_MAINNET
|
|
87
91
|
: exports.RAYDIUM_CP_SWAP_PROGRAM_ID_DEVNET;
|
|
88
92
|
const ammConfig = env === 'mainnet' ? exports.RAYDIUM_AMM_CONFIG_MAINNET : exports.RAYDIUM_AMM_CONFIG_DEVNET;
|
|
89
93
|
// Validate inputs
|
|
90
|
-
if (projectMint ===
|
|
91
|
-
throw new Error('
|
|
94
|
+
if (projectMint === solMint) {
|
|
95
|
+
throw new Error('Token mints cannot be the same');
|
|
92
96
|
}
|
|
93
97
|
// Determine token ordering based on lexicographic comparison of bytes
|
|
94
|
-
const isProjectMintToken0 = comparePublicKeysLexicographically(projectMint,
|
|
95
|
-
const token0Mint = isProjectMintToken0 ? projectMint :
|
|
96
|
-
const token1Mint = isProjectMintToken0 ?
|
|
98
|
+
const isProjectMintToken0 = comparePublicKeysLexicographically(projectMint, solMint);
|
|
99
|
+
const token0Mint = isProjectMintToken0 ? projectMint : solMint;
|
|
100
|
+
const token1Mint = isProjectMintToken0 ? solMint : projectMint;
|
|
97
101
|
// Derive pool state with correct token ordering
|
|
98
102
|
const poolState = findPoolStatePda(umi, programId, ammConfig, token0Mint, token1Mint);
|
|
99
103
|
// Derive all dependent PDAs
|
|
100
104
|
const poolAuthority = findAuthorityPda(umi, programId);
|
|
101
105
|
const lpMint = findLpMintPda(umi, programId, poolState);
|
|
102
106
|
const mintVault = findTokenVaultPda(umi, programId, poolState, projectMint);
|
|
103
|
-
const solVault = findTokenVaultPda(umi, programId, poolState,
|
|
107
|
+
const solVault = findTokenVaultPda(umi, programId, poolState, solMint);
|
|
104
108
|
const observationState = findObservationStatePda(umi, programId, poolState);
|
|
105
109
|
// Select the appropriate create pool fee receiver based on environment
|
|
106
110
|
const createPoolFee = env === 'mainnet'
|
|
@@ -128,9 +132,19 @@ exports.deriveRaydiumPDAs = deriveRaydiumPDAs;
|
|
|
128
132
|
/**
|
|
129
133
|
* Derives Raydium pool PDAs for V2 with property names matching V2 instruction accounts.
|
|
130
134
|
* This is a convenience wrapper around deriveRaydiumPDAs that maps vault names to V2 conventions.
|
|
135
|
+
*
|
|
136
|
+
* @param umi - Umi instance
|
|
137
|
+
* @param baseMint - The base token mint (project mint)
|
|
138
|
+
* @param options - Optional configuration
|
|
139
|
+
* @param options.quoteMint - The quote token mint (defaults to wSOL)
|
|
140
|
+
* @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
|
|
131
141
|
*/
|
|
132
|
-
function deriveRaydiumPDAsV2(umi,
|
|
133
|
-
|
|
142
|
+
function deriveRaydiumPDAsV2(umi, baseMint, options = {}) {
|
|
143
|
+
// Map V2 options to V1 options
|
|
144
|
+
const pdas = deriveRaydiumPDAs(umi, baseMint, {
|
|
145
|
+
solMint: options.quoteMint,
|
|
146
|
+
env: options.env,
|
|
147
|
+
});
|
|
134
148
|
return {
|
|
135
149
|
poolState: pdas.poolState,
|
|
136
150
|
ammConfig: pdas.ammConfig,
|
package/dist/src/raydium.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"raydium.js","sourceRoot":"","sources":["../../src/raydium.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"raydium.js","sourceRoot":"","sources":["../../src/raydium.ts"],"names":[],"mappings":"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"}
|