@metaplex-foundation/genesis 0.12.5 → 0.13.0-beta.1

package/dist/src/raydium.d.ts

@@ -13,7 +13,7 @@ export declare const RAYDIUM_AMM_CONFIG_DEVNET: PublicKey<"9zSzfkYy6awexsHvmggeH
 export declare const RAYDIUM_AMM_CONFIG_MAINNET: PublicKey<"D4FPEruKEHrG5TenZ2mpDGEfu1iUvTiqBxvpU8HLBvC2">;
 /**
  * Return type for deriveRaydiumPDAs function
- * Contains all accounts needed for Raydium pool graduation
+ * Contains all accounts needed for Raydium pool graduation (V1)
  */
 export interface RaydiumPoolAccounts {
     poolState: PublicKey;
@@ -29,12 +29,49 @@ export interface RaydiumPoolAccounts {
     token1Mint: PublicKey;
     isProjectMintToken0: boolean;
 }
+/**
+ * Contains all accounts needed for Raydium pool graduation (V2)
+ * Uses V2 naming conventions (baseVault/quoteVault instead of mintVault/solVault)
+ */
+export interface RaydiumPoolAccountsV2 {
+    poolState: PublicKey;
+    poolAuthority: PublicKey;
+    lpMint: PublicKey;
+    baseVault: PublicKey;
+    quoteVault: PublicKey;
+    observationState: PublicKey;
+    ammConfig: PublicKey;
+    raydiumProgram: PublicKey;
+    createPoolFee: PublicKey;
+    token0Mint: PublicKey;
+    token1Mint: PublicKey;
+    isProjectMintToken0: boolean;
+}
 /**
  * Derives all Raydium PDAs with correct token ordering for graduateToRaydiumV1
  * Handles the lexicographic ordering requirement (token_0 < token_1)
  *
  * @param umi - Umi instance
  * @param projectMint - The project's token mint
- * @param env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
+ * @param options - Optional configuration
+ * @param options.solMint - The SOL/quote token mint (defaults to wSOL)
+ * @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
+ */
+export declare function deriveRaydiumPDAs(umi: Umi, projectMint: PublicKey, options?: {
+    solMint?: PublicKey;
+    env?: 'mainnet' | 'devnet';
+}): RaydiumPoolAccounts;
+/**
+ * Derives Raydium pool PDAs for V2 with property names matching V2 instruction accounts.
+ * This is a convenience wrapper around deriveRaydiumPDAs that maps vault names to V2 conventions.
+ *
+ * @param umi - Umi instance
+ * @param baseMint - The base token mint (project mint)
+ * @param options - Optional configuration
+ * @param options.quoteMint - The quote token mint (defaults to wSOL)
+ * @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
  */
-export declare function deriveRaydiumPDAs(umi: Umi, projectMint: PublicKey, env?: 'mainnet' | 'devnet'): RaydiumPoolAccounts;
+export declare function deriveRaydiumPDAsV2(umi: Umi, baseMint: PublicKey, options?: {
+    quoteMint?: PublicKey;
+    env?: 'mainnet' | 'devnet';
+}): RaydiumPoolAccountsV2;

package/dist/src/raydium.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deriveRaydiumPDAs = exports.RAYDIUM_AMM_CONFIG_MAINNET = exports.RAYDIUM_AMM_CONFIG_DEVNET = exports.NATIVE_SOL_MINT = exports.findObservationStatePda = exports.findTokenVaultPda = exports.findLpMintPda = exports.findPoolStatePda = exports.findAuthorityPda = exports.CREATE_POOL_FEE_RECEIVER_MAINNET = exports.CREATE_POOL_FEE_RECEIVER_DEVNET = exports.RAYDIUM_CP_SWAP_PROGRAM_ID_MAINNET = exports.RAYDIUM_CP_SWAP_PROGRAM_ID_DEVNET = void 0;
+exports.deriveRaydiumPDAsV2 = exports.deriveRaydiumPDAs = exports.RAYDIUM_AMM_CONFIG_MAINNET = exports.RAYDIUM_AMM_CONFIG_DEVNET = exports.NATIVE_SOL_MINT = exports.findObservationStatePda = exports.findTokenVaultPda = exports.findLpMintPda = exports.findPoolStatePda = exports.findAuthorityPda = exports.CREATE_POOL_FEE_RECEIVER_MAINNET = exports.CREATE_POOL_FEE_RECEIVER_DEVNET = exports.RAYDIUM_CP_SWAP_PROGRAM_ID_MAINNET = exports.RAYDIUM_CP_SWAP_PROGRAM_ID_DEVNET = void 0;
 const umi_1 = require("@metaplex-foundation/umi");
 const serializers_1 = require("@metaplex-foundation/umi/serializers");
 // Raydium CP-Swap Program IDs
@@ -78,29 +78,33 @@ function comparePublicKeysLexicographically(a, b) {
  *
  * @param umi - Umi instance
  * @param projectMint - The project's token mint
- * @param env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
+ * @param options - Optional configuration
+ * @param options.solMint - The SOL/quote token mint (defaults to wSOL)
+ * @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
  */
-function deriveRaydiumPDAs(umi, projectMint, env = 'mainnet') {
+function deriveRaydiumPDAs(umi, projectMint, options = {}) {
+    const solMint = options.solMint ?? exports.NATIVE_SOL_MINT;
+    const env = options.env ?? 'mainnet';
     // Select the appropriate program ID and AMM config based on environment
     const programId = env === 'mainnet'
         ? exports.RAYDIUM_CP_SWAP_PROGRAM_ID_MAINNET
         : exports.RAYDIUM_CP_SWAP_PROGRAM_ID_DEVNET;
     const ammConfig = env === 'mainnet' ? exports.RAYDIUM_AMM_CONFIG_MAINNET : exports.RAYDIUM_AMM_CONFIG_DEVNET;
     // Validate inputs
-    if (projectMint === exports.NATIVE_SOL_MINT) {
-        throw new Error('Project mint cannot be the same as native SOL mint');
+    if (projectMint === solMint) {
+        throw new Error('Token mints cannot be the same');
     }
     // Determine token ordering based on lexicographic comparison of bytes
-    const isProjectMintToken0 = comparePublicKeysLexicographically(projectMint, exports.NATIVE_SOL_MINT);
-    const token0Mint = isProjectMintToken0 ? projectMint : exports.NATIVE_SOL_MINT;
-    const token1Mint = isProjectMintToken0 ? exports.NATIVE_SOL_MINT : projectMint;
+    const isProjectMintToken0 = comparePublicKeysLexicographically(projectMint, solMint);
+    const token0Mint = isProjectMintToken0 ? projectMint : solMint;
+    const token1Mint = isProjectMintToken0 ? solMint : projectMint;
     // Derive pool state with correct token ordering
     const poolState = findPoolStatePda(umi, programId, ammConfig, token0Mint, token1Mint);
     // Derive all dependent PDAs
     const poolAuthority = findAuthorityPda(umi, programId);
     const lpMint = findLpMintPda(umi, programId, poolState);
     const mintVault = findTokenVaultPda(umi, programId, poolState, projectMint);
-    const solVault = findTokenVaultPda(umi, programId, poolState, exports.NATIVE_SOL_MINT);
+    const solVault = findTokenVaultPda(umi, programId, poolState, solMint);
     const observationState = findObservationStatePda(umi, programId, poolState);
     // Select the appropriate create pool fee receiver based on environment
     const createPoolFee = env === 'mainnet'
@@ -125,4 +129,37 @@ function deriveRaydiumPDAs(umi, projectMint, env = 'mainnet') {
     };
 }
 exports.deriveRaydiumPDAs = deriveRaydiumPDAs;
+/**
+ * Derives Raydium pool PDAs for V2 with property names matching V2 instruction accounts.
+ * This is a convenience wrapper around deriveRaydiumPDAs that maps vault names to V2 conventions.
+ *
+ * @param umi - Umi instance
+ * @param baseMint - The base token mint (project mint)
+ * @param options - Optional configuration
+ * @param options.quoteMint - The quote token mint (defaults to wSOL)
+ * @param options.env - Environment ('mainnet' or 'devnet'), defaults to 'mainnet'
+ */
+function deriveRaydiumPDAsV2(umi, baseMint, options = {}) {
+    // Map V2 options to V1 options
+    const pdas = deriveRaydiumPDAs(umi, baseMint, {
+        solMint: options.quoteMint,
+        env: options.env,
+    });
+    return {
+        poolState: pdas.poolState,
+        ammConfig: pdas.ammConfig,
+        poolAuthority: pdas.poolAuthority,
+        lpMint: pdas.lpMint,
+        baseVault: pdas.mintVault,
+        quoteVault: pdas.solVault,
+        createPoolFee: pdas.createPoolFee,
+        observationState: pdas.observationState,
+        raydiumProgram: pdas.raydiumProgram,
+        // Include token ordering info for reference
+        token0Mint: pdas.token0Mint,
+        token1Mint: pdas.token1Mint,
+        isProjectMintToken0: pdas.isProjectMintToken0,
+    };
+}
+exports.deriveRaydiumPDAsV2 = deriveRaydiumPDAsV2;
 //# sourceMappingURL=raydium.js.map

package/dist/src/raydium.js.map

@@ -1 +1 @@
-{"version":3,"file":"raydium.js","sourceRoot":"","sources":["../../src/raydium.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"raydium.js","sourceRoot":"","sources":["../../src/raydium.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaplex-foundation/genesis",
-  "version": "0.12.5",
+  "version": "0.13.0-beta.1",
   "description": "The Metaplex Genesis Program",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -60,7 +60,7 @@
   "scripts": {
     "build": "rimraf dist && tsc -p tsconfig.json",
     "build:docs": "typedoc",
-    "test": "ava --timeout=10m test/tests test/feeTests test/penaltyTests",
+    "test": "ava --timeout=10m test/testsV1 test/testsV2 test/feeTests test/penaltyTests",
     "test:one": "ava --timeout=10m",
     "bench": "rm -f output.json && ava ./dist/bench/*.js --serial --no-worker-threads --timeout=10000",
     "lint": "eslint --ext js,ts,tsx src",

package/dist/src/generated/instructions/feeOverride.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"feeOverride.js","sourceRoot":"","sources":["../../../../src/generated/instructions/feeOverride.ts"],"names":[],"mappings":"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"}