proof-of-take-sdk 5.0.11 → 5.0.13

package/dist/instructions/joinSeason.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinSeason = joinSeason;
-exports.joinSeasonClassic = joinSeasonClassic;
+exports.createMoonpool = createMoonpool;
+exports.joinMoonpoolSeason = joinMoonpoolSeason;
+exports.joinSunpool = joinSunpool;
 exports.joinSeasonLaunchpad = joinSeasonLaunchpad;
-exports.joinSeasonAndInitialize = joinSeasonAndInitialize;
-exports.joinSeasonLaunchpadAndInitialize = joinSeasonLaunchpadAndInitialize;
+exports.joinSeasonClassic = joinSeasonClassic;
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
@@ -13,268 +13,319 @@ const pdas_1 = require("../utils/pdas");
 const constants_1 = require("../utils/constants");
 const programHelpers_1 = require("../utils/programHelpers");
 const signerHelpers_1 = require("../utils/signerHelpers");
-const optimistic_1 = require("../optimistic");
-const remainingAccounts_1 = require("../utils/remainingAccounts");
 /**
- * Join a season
- *
- * Signers: user + root admin (root admin pays for signup-rewards vault ATA creation when a referrer is present)
- * User pays for season (if needed) and membership accounts
- * Transfers active deposit into the season vault; the late-join escrow portion is converted into non-withdrawable join credit
+ * Create a new Moonpool and perform the first launchpad join.
  *
- * IMPORTANT: If providing a referrer, you MUST also provide referrerTier.
- * The referrerTier must match the tier the referrer actually joined the season with.
- * The referrer must have already joined the season before being used as a referrer.
+ * This instruction:
+ * - Creates a new launchpad_token_mint (SPL Token-2022)
+ * - Initializes the Moonpool
+ * - Initializes the Season (scoped to launchpad_token_mint)
+ * - Creates the first SeasonMembership
  *
- * @param options - Join season options
- * @returns Instructions, signers, PDAs, and optimistically created/updated accounts
+ * @param options - CreateMoonpool options
+ * @returns Instructions, signers, PDAs, and metadata with the generated keypair
  */
-async function joinSeason(options) {
+async function createMoonpool(options) {
     const program = (0, programHelpers_1.getProgram)(options.connection);
-    const tokenMint = options.tokenMint ?? constants_1.MIZD_TOKEN_MINT;
-    const launchpad = options.launchpad ?? false;
-    // Determine launchpadTokenMint FIRST (before deriving PDAs)
-    // For BOTH launchpad and classic mode, Season/SeasonMembership PDAs are scoped to launchpadTokenMint
-    let launchpadTokenMintKeypair;
-    let launchpadTokenMintPubkey;
-    if (launchpad) {
-        // If forceNewLaunchpadMint is set, skip on-chain checks and always generate a new keypair
-        if (options.forceNewLaunchpadMint) {
-            launchpadTokenMintKeypair = web3_js_1.Keypair.generate();
-            launchpadTokenMintPubkey = launchpadTokenMintKeypair.publicKey;
-            console.log("[joinSeason] forceNewLaunchpadMint=true - generated new launchpad mint keypair:", launchpadTokenMintPubkey.toString());
-        }
-        else {
-            // For non-force mode, we need an existing launchpadTokenMint to find the moonpool
-            // Check currentAccounts first (for LiteSVM or optimistic updates)
-            let moonpoolData = options.currentAccounts?.moonpool ?? null;
-            if (moonpoolData && !moonpoolData.launchpadTokenMint.equals(web3_js_1.PublicKey.default)) {
-                // Use the launchpadTokenMint from the provided moonpool data
-                launchpadTokenMintPubkey = moonpoolData.launchpadTokenMint;
-                console.log("[joinSeason] Using launchpadTokenMint from currentAccounts:", launchpadTokenMintPubkey.toString());
-            }
-            else {
-                // No moonpool data provided - this is a first join scenario
-                // Generate a keypair for the mint (the mint will be created on-chain)
-                launchpadTokenMintKeypair = web3_js_1.Keypair.generate();
-                launchpadTokenMintPubkey = launchpadTokenMintKeypair.publicKey;
-                console.log("[joinSeason] First join - generated launchpad mint keypair:", launchpadTokenMintPubkey.toString());
-            }
-        }
+    // Validate required fields
+    if (!options.starFlagPrompt || options.starFlagPrompt.length === 0) {
+        throw new Error("starFlagPrompt is required when creating a new Moonpool");
     }
-    else {
-        // Classic mode: use the launchpad token mint PDA derived from tokenMint
-        // The on-chain program expects launchpad_token_mint.key() for Season/SeasonMembership PDAs
-        const [launchpadMintPda] = (0, pdas_1.getLaunchpadTokenMintPda)(tokenMint);
-        launchpadTokenMintPubkey = launchpadMintPda;
+    if (options.starFlagPrompt.length > 33) {
+        throw new Error("starFlagPrompt cannot exceed 33 characters");
+    }
+    if (!options.symbol || options.symbol.length === 0) {
+        throw new Error("symbol is required when creating a new Moonpool");
+    }
+    if (options.symbol.length > 4) {
+        throw new Error("symbol cannot exceed 4 characters");
     }
-    // Derive PDAs with launchpadTokenMint for BOTH modes
-    // Season/SeasonMembership PDAs are always scoped to launchpadTokenMint
+    // Generate a new keypair for the launchpad token mint
+    const launchpadTokenMintKeypair = web3_js_1.Keypair.generate();
+    const launchpadTokenMintPubkey = launchpadTokenMintKeypair.publicKey;
+    console.log("[createMoonpool] Generated new launchpad mint keypair:", launchpadTokenMintPubkey.toString());
+    // Derive PDAs with the new launchpadTokenMint
     const pdasBase = pdaManager_1.PDAManager.deriveJoinSeasonPdas({
         user: options.user,
         seasonNumber: options.seasonNumber,
         tier: options.tier,
-        tokenMint,
+        tokenMint: constants_1.MIZD_TOKEN_MINT,
         launchpadTokenMint: launchpadTokenMintPubkey,
     });
-    // Derive Moonpool and Treasury PDAs using the launchpadTokenMint
+    // Derive Moonpool and Treasury PDAs
     const [moonpoolPda] = (0, pdas_1.getMoonpoolPda)(launchpadTokenMintPubkey);
     const [moonpoolTreasuryPda] = (0, pdas_1.getMoonpoolTreasuryPda)(launchpadTokenMintPubkey);
-    const rootAdminTokenAccount = launchpad
-        ? null
-        : (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, constants_1.ADMIN_PUBLIC_KEY);
-    const userMizdAta = launchpad
-        ? null
-        : (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, options.user);
-    // Join credit PDA + its vault ATA (owner is off-curve PDA, so allowOwnerOffCurve=true).
-    const userJoinCreditVault = launchpad
-        ? null
-        : (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, pdasBase.userJoinCredit, true);
     const pdas = {
-        ...pdasBase,
+        seasonSettings: pdasBase.seasonSettings,
+        season: pdasBase.season,
+        seasonMembership: pdasBase.seasonMembership,
         moonpool: moonpoolPda,
         moonpoolTreasury: moonpoolTreasuryPda,
         launchpadTokenMint: launchpadTokenMintPubkey,
-        userJoinCreditVault: userJoinCreditVault ?? web3_js_1.PublicKey.default,
     };
+    const referrer = options.referrer ?? web3_js_1.PublicKey.default;
     const accounts = {
         seasonSettings: pdas.seasonSettings,
         season: pdas.season,
         seasonMembership: pdas.seasonMembership,
-        // SECURITY: Pool accounts are now MANDATORY (non-optional) to prevent bypassing
-        // the mode check. The on-chain program validates pool state to ensure
-        // subsequent seasons use the same mode (launchpad/classic) as the first season.
         moonpool: moonpoolPda,
         moonpoolTreasury: moonpoolTreasuryPda,
-        launchpadTokenMint: pdas.launchpadTokenMint,
-        sunpool: pdas.sunpool,
-        seasonDepositVault: launchpad ? null : pdas.seasonDepositVault,
-        userJoinCredit: launchpad ? null : pdas.userJoinCredit,
-        userJoinCreditVault: launchpad ? null : userJoinCreditVault,
-        mizdMint: constants_1.MIZD_TOKEN_MINT,
-        tokenMint,
+        launchpadTokenMint: launchpadTokenMintPubkey,
         rootAdmin: constants_1.ADMIN_PUBLIC_KEY,
-        rootAdminTokenAccount,
-        // Always pass the canonical ATA; it may not exist yet (created on-chain with root admin as payer).
-        userTokenAccount: userMizdAta,
         user: options.user,
-        associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         token2022Program: spl_token_1.TOKEN_2022_PROGRAM_ID,
         systemProgram: web3_js_1.SystemProgram.programId,
     };
-    const referrer = options.referrer ?? web3_js_1.PublicKey.default;
-    const hasReferrer = !referrer.equals(web3_js_1.PublicKey.default);
-    // Validate: if referrer is provided, referrerTier must also be provided
-    if (hasReferrer && options.referrerTier === undefined) {
-        throw new Error("referrerTier is required when referrer is provided");
-    }
-    const remainingAccounts = hasReferrer
-        ? (0, remainingAccounts_1.getJoinSeasonRemainingAccounts)({
-            seasonNumber: options.seasonNumber,
-            tier: options.tier,
-            referrer,
-            referrerTier: options.referrerTier,
-            tokenMint,
-        })
-        : [];
-    const methodBuilder = program.methods
-        // Anchor expects BN for u64 args.
-        // referrerTier defaults to 0 if no referrer (ignored on-chain)
-        .joinSeason(options.seasonNumber, options.tier, referrer, options.referrerTier ?? 0, options.star ?? false, launchpad, options.maxSolInLamports ?? new anchor_1.BN(0), options.expectedSolInLamports ?? new anchor_1.BN(0), options.maxSlippageBps ?? 0, options.starFlagPrompt ?? "", options.symbol ?? "", options.forceNewLaunchpadMint ?? false)
-        .accounts(accounts);
-    if (remainingAccounts.length > 0) {
-        methodBuilder.remainingAccounts(remainingAccounts);
-    }
-    const instruction = await methodBuilder.instruction();
-    // For star joins, make the transaction fully sponsored: force the fee payer to be the root admin.
-    // This prevents clients from accidentally using an unfunded/nonexistent fee payer account.
+    const instruction = await program.methods
+        .createMoonpool(options.seasonNumber, options.tier, referrer, options.star ?? false, options.maxSolInLamports ?? new anchor_1.BN(0), options.expectedSolInLamports ?? new anchor_1.BN(0), options.maxSlippageBps ?? 0, options.starFlagPrompt, options.symbol)
+        .accounts(accounts)
+        .instruction();
+    // For star joins, root admin pays
     const feePayer = options.star ? constants_1.ADMIN_PUBLIC_KEY : (0, signerHelpers_1.getDefaultFeePayer)(options.feePayer);
-    // Build signers array
-    const signersList = [(0, signerHelpers_1.asAdminSigner)(constants_1.ADMIN_PUBLIC_KEY), (0, signerHelpers_1.asUserSigner)(options.user)];
-    // Add launchpad token mint keypair as signer if it exists (either provided or auto-generated)
-    if (launchpad && launchpadTokenMintKeypair) {
-        signersList.push({
-            publicKey: launchpadTokenMintKeypair.publicKey,
-            role: "payer", // Use 'payer' role for the mint keypair
-        });
-    }
+    // Build signers array - must include the launchpad mint keypair
+    const signersList = [
+        (0, signerHelpers_1.asAdminSigner)(constants_1.ADMIN_PUBLIC_KEY),
+        (0, signerHelpers_1.asUserSigner)(options.user),
+        { publicKey: launchpadTokenMintKeypair.publicKey, role: "payer" },
+    ];
     const signers = (0, signerHelpers_1.buildSigners)(signersList, feePayer);
-    // OPTIMISTIC UPDATES
-    const curr = options.currentAccounts || {};
-    const now = (0, optimistic_1.getCurrentTimestamp)(options.now);
-    let newSeasonMembership;
-    let updatedSeason;
-    if (curr.seasonSettings) {
-        const optimistic = (0, optimistic_1.computeJoinSeasonOptimistic)({
-            user: options.user,
-            seasonNumber: options.seasonNumber,
-            tier: options.tier,
-            referrer: options.referrer ?? web3_js_1.PublicKey.default,
-            tokenMint,
-            now,
-            star: options.star ?? false,
-            seasonSettings: curr.seasonSettings,
-            ...(curr.season ? { season: curr.season } : {}),
-        });
-        if (optimistic.kind === "skip") {
-            return {
-                instructions: [instruction],
-                signers,
-                pdas,
-            };
-        }
-        newSeasonMembership = optimistic.newSeasonMembership;
-        updatedSeason = optimistic.updatedSeason;
-    }
     return {
         instructions: [instruction],
         signers,
         pdas,
-        ...(curr.seasonSettings || updatedSeason || newSeasonMembership
-            ? {
-                updatedAccounts: {
-                    ...(curr.seasonSettings && { seasonSettings: curr.seasonSettings }),
-                    ...(updatedSeason && { season: updatedSeason }),
-                    ...(newSeasonMembership && {
-                        seasonMembership: newSeasonMembership,
-                    }),
-                },
-            }
-            : {}),
-        ...(launchpadTokenMintKeypair
-            ? {
-                meta: {
-                    launchpadTokenMintKeypair,
-                },
-            }
-            : {}),
+        metadata: {
+            launchpadTokenMintKeypair,
+        },
     };
 }
 /**
- * Convenience wrapper: classic (non-launchpad) joinSeason.
- * - Keeps the existing MIZD-based join behavior.
- * - App code never passes nullable optional accounts.
+ * Join an existing Moonpool season.
+ *
+ * This instruction:
+ * - Requires Moonpool to already exist
+ * - Lazily initializes Season if needed (for new seasons with existing Moonpool)
+ * - Creates new SeasonMembership
+ *
+ * @param options - JoinMoonpoolSeason options
+ * @returns Instructions, signers, and PDAs
  */
-async function joinSeasonClassic(options) {
-    // IMPORTANT: With `exactOptionalPropertyTypes`, we must OMIT optional props (not set them to `undefined`).
-    return joinSeason({ ...options, launchpad: false });
+async function joinMoonpoolSeason(options) {
+    const program = (0, programHelpers_1.getProgram)(options.connection);
+    const launchpadTokenMintPubkey = options.launchpadTokenMint;
+    console.log("[joinMoonpoolSeason] Using existing launchpadTokenMint:", launchpadTokenMintPubkey.toString());
+    // Derive PDAs with the existing launchpadTokenMint
+    const pdasBase = pdaManager_1.PDAManager.deriveJoinSeasonPdas({
+        user: options.user,
+        seasonNumber: options.seasonNumber,
+        tier: options.tier,
+        tokenMint: constants_1.MIZD_TOKEN_MINT,
+        launchpadTokenMint: launchpadTokenMintPubkey,
+    });
+    // Derive Moonpool and Treasury PDAs
+    const [moonpoolPda] = (0, pdas_1.getMoonpoolPda)(launchpadTokenMintPubkey);
+    const [moonpoolTreasuryPda] = (0, pdas_1.getMoonpoolTreasuryPda)(launchpadTokenMintPubkey);
+    const pdas = {
+        seasonSettings: pdasBase.seasonSettings,
+        season: pdasBase.season,
+        seasonMembership: pdasBase.seasonMembership,
+        moonpool: moonpoolPda,
+        moonpoolTreasury: moonpoolTreasuryPda,
+        launchpadTokenMint: launchpadTokenMintPubkey,
+    };
+    const referrer = options.referrer ?? web3_js_1.PublicKey.default;
+    const accounts = {
+        seasonSettings: pdas.seasonSettings,
+        season: pdas.season,
+        seasonMembership: pdas.seasonMembership,
+        moonpool: moonpoolPda,
+        moonpoolTreasury: moonpoolTreasuryPda,
+        launchpadTokenMint: launchpadTokenMintPubkey,
+        rootAdmin: constants_1.ADMIN_PUBLIC_KEY,
+        user: options.user,
+        token2022Program: spl_token_1.TOKEN_2022_PROGRAM_ID,
+        systemProgram: web3_js_1.SystemProgram.programId,
+    };
+    const instruction = await program.methods
+        .joinMoonpoolSeason(options.seasonNumber, options.tier, referrer, options.star ?? false, options.maxSolInLamports ?? new anchor_1.BN(0), options.expectedSolInLamports ?? new anchor_1.BN(0), options.maxSlippageBps ?? 0)
+        .accounts(accounts)
+        .instruction();
+    // For star joins, root admin pays
+    const feePayer = options.star ? constants_1.ADMIN_PUBLIC_KEY : (0, signerHelpers_1.getDefaultFeePayer)(options.feePayer);
+    // Build signers array
+    const signersList = [
+        (0, signerHelpers_1.asAdminSigner)(constants_1.ADMIN_PUBLIC_KEY),
+        (0, signerHelpers_1.asUserSigner)(options.user),
+    ];
+    const signers = (0, signerHelpers_1.buildSigners)(signersList, feePayer);
+    return {
+        instructions: [instruction],
+        signers,
+        pdas,
+    };
 }
 /**
- * Convenience wrapper: launchpad joinSeason.
- * - Uses SOL in + virtual token escrow.
- * - App code never passes nullable optional accounts.
+ * Join a Sunpool season (classic mode with MIZD).
+ *
+ * This instruction:
+ * - Lazily initializes Sunpool if needed
+ * - Lazily initializes Season if needed
+ * - Creates SeasonMembership
+ * - Handles MIZD token transfers and join credit
+ *
+ * @param options - JoinSunpool options
+ * @returns Instructions, signers, and PDAs
  */
-async function joinSeasonLaunchpad(options) {
-    // IMPORTANT: With `exactOptionalPropertyTypes`, we must OMIT optional props (not set them to `undefined`).
-    const { maxSolInLamports, expectedSolInLamports, maxSlippageBps, ...rest } = options;
-    return joinSeason({
-        ...rest,
-        launchpad: true,
-        ...(maxSolInLamports ? { maxSolInLamports } : {}),
-        ...(expectedSolInLamports ? { expectedSolInLamports } : {}),
-        ...(typeof maxSlippageBps === "number" ? { maxSlippageBps } : {}),
+async function joinSunpool(options) {
+    const program = (0, programHelpers_1.getProgram)(options.connection);
+    const tokenMint = options.tokenMint ?? constants_1.MIZD_TOKEN_MINT;
+    console.log("[joinSunpool] Classic mode join with tokenMint:", tokenMint.toString());
+    // Derive PDAs - for Sunpool, use tokenMint for PDA derivation
+    const pdasBase = pdaManager_1.PDAManager.deriveJoinSeasonPdas({
+        user: options.user,
+        seasonNumber: options.seasonNumber,
+        tier: options.tier,
+        tokenMint,
+        launchpadTokenMint: tokenMint, // Sunpool uses tokenMint for Season/Membership PDAs
     });
+    // Derive Sunpool PDA
+    const [sunpoolPda] = (0, pdas_1.getSunpoolPda)(tokenMint);
+    // User join credit vault ATA
+    const userJoinCreditVault = (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, pdasBase.userJoinCredit, true);
+    // Token accounts
+    const rootAdminTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, constants_1.ADMIN_PUBLIC_KEY);
+    const userMizdAta = (0, spl_token_1.getAssociatedTokenAddressSync)(constants_1.MIZD_TOKEN_MINT, options.user);
+    const pdas = {
+        seasonSettings: pdasBase.seasonSettings,
+        season: pdasBase.season,
+        seasonMembership: pdasBase.seasonMembership,
+        sunpool: sunpoolPda,
+        seasonDepositVault: pdasBase.seasonDepositVault,
+        userJoinCredit: pdasBase.userJoinCredit,
+        userJoinCreditVault,
+    };
+    const referrer = options.referrer ?? web3_js_1.PublicKey.default;
+    const hasReferrer = !referrer.equals(web3_js_1.PublicKey.default);
+    // Validate referrer tier
+    if (hasReferrer && options.referrerTier === undefined) {
+        throw new Error("referrerTier is required when referrer is provided");
+    }
+    const accounts = {
+        seasonSettings: pdas.seasonSettings,
+        season: pdas.season,
+        seasonMembership: pdas.seasonMembership,
+        sunpool: sunpoolPda,
+        seasonDepositVault: pdas.seasonDepositVault,
+        userJoinCredit: pdas.userJoinCredit,
+        userJoinCreditVault,
+        mizdMint: constants_1.MIZD_TOKEN_MINT,
+        tokenMint,
+        rootAdmin: constants_1.ADMIN_PUBLIC_KEY,
+        rootAdminTokenAccount,
+        userTokenAccount: userMizdAta,
+        user: options.user,
+        associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
+        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        systemProgram: web3_js_1.SystemProgram.programId,
+    };
+    const instruction = await program.methods
+        .joinSunpool(options.seasonNumber, options.tier, referrer, options.referrerTier ?? 0, options.star ?? false, options.starFlagPrompt ?? "", options.symbol ?? "")
+        .accounts(accounts)
+        .instruction();
+    // For star joins, root admin pays
+    const feePayer = options.star ? constants_1.ADMIN_PUBLIC_KEY : (0, signerHelpers_1.getDefaultFeePayer)(options.feePayer);
+    // Build signers array
+    const signersList = [
+        (0, signerHelpers_1.asAdminSigner)(constants_1.ADMIN_PUBLIC_KEY),
+        (0, signerHelpers_1.asUserSigner)(options.user),
+    ];
+    const signers = (0, signerHelpers_1.buildSigners)(signersList, feePayer);
+    return {
+        instructions: [instruction],
+        signers,
+        pdas,
+    };
 }
 /**
- * Join season AND initialize it (first joiner).
- * Use this when you know the season doesn't exist yet.
+ * Convenience wrapper for launchpad mode joins.
+ *
+ * This function automatically determines whether to call:
+ * - createMoonpool (if forceNewLaunchpadMint=true or no existing moonpool)
+ * - joinMoonpoolSeason (if joining an existing moonpool)
  *
- * @param options - Options with REQUIRED starFlagPrompt
- * @throws Error if starFlagPrompt is empty or exceeds 33 characters
+ * @param options - Join options
+ * @returns Instructions, signers, PDAs, and metadata
  */
-async function joinSeasonAndInitialize(options) {
-    // Validate starFlagPrompt
-    if (!options.starFlagPrompt || options.starFlagPrompt.length === 0) {
-        throw new Error("starFlagPrompt is required when initializing a new season");
+async function joinSeasonLaunchpad(options) {
+    // Determine if we're creating a new Moonpool or joining an existing one
+    const shouldCreateNewMoonpool = options.forceNewLaunchpadMint ||
+        !options.currentAccounts?.moonpool ||
+        options.currentAccounts.moonpool.launchpadTokenMint?.equals(web3_js_1.PublicKey.default);
+    if (shouldCreateNewMoonpool) {
+        // Creating a new Moonpool - starFlagPrompt and symbol are required
+        if (!options.starFlagPrompt) {
+            throw new Error("starFlagPrompt is required when creating a new Moonpool");
+        }
+        if (!options.symbol) {
+            throw new Error("symbol is required when creating a new Moonpool");
+        }
+        return createMoonpool({
+            connection: options.connection,
+            user: options.user,
+            seasonNumber: options.seasonNumber,
+            tier: options.tier,
+            starFlagPrompt: options.starFlagPrompt,
+            symbol: options.symbol,
+            ...(options.referrer !== undefined && { referrer: options.referrer }),
+            ...(options.star !== undefined && { star: options.star }),
+            ...(options.maxSolInLamports !== undefined && { maxSolInLamports: options.maxSolInLamports }),
+            ...(options.expectedSolInLamports !== undefined && { expectedSolInLamports: options.expectedSolInLamports }),
+            ...(options.maxSlippageBps !== undefined && { maxSlippageBps: options.maxSlippageBps }),
+            ...(options.now !== undefined && { now: options.now }),
+            ...(options.feePayer !== undefined && { feePayer: options.feePayer }),
+            ...(options.currentAccounts !== undefined && { currentAccounts: options.currentAccounts }),
+        });
     }
-    if (options.starFlagPrompt.length > 33) {
-        throw new Error("starFlagPrompt cannot exceed 33 characters");
+    else {
+        // Joining an existing Moonpool
+        const launchpadTokenMint = options.currentAccounts.moonpool.launchpadTokenMint;
+        return joinMoonpoolSeason({
+            connection: options.connection,
+            user: options.user,
+            seasonNumber: options.seasonNumber,
+            launchpadTokenMint,
+            tier: options.tier,
+            ...(options.referrer !== undefined && { referrer: options.referrer }),
+            ...(options.star !== undefined && { star: options.star }),
+            ...(options.maxSolInLamports !== undefined && { maxSolInLamports: options.maxSolInLamports }),
+            ...(options.expectedSolInLamports !== undefined && { expectedSolInLamports: options.expectedSolInLamports }),
+            ...(options.maxSlippageBps !== undefined && { maxSlippageBps: options.maxSlippageBps }),
+            ...(options.now !== undefined && { now: options.now }),
+            ...(options.feePayer !== undefined && { feePayer: options.feePayer }),
+            ...(options.currentAccounts !== undefined && { currentAccounts: options.currentAccounts }),
+        });
     }
-    return joinSeason(options);
 }
 /**
- * Join season AND initialize it in launchpad mode (first joiner).
- * Use this when you know the season doesn't exist yet and want launchpad mode.
+ * Convenience wrapper for classic (non-launchpad) mode joins.
+ * Routes to joinSunpool instruction.
  *
- * @param options - Options with REQUIRED starFlagPrompt
- * @throws Error if starFlagPrompt is empty or exceeds 33 characters
+ * @param options - Join options
+ * @returns Instructions, signers, and PDAs
  */
-async function joinSeasonLaunchpadAndInitialize(options) {
-    // Validate starFlagPrompt
-    if (!options.starFlagPrompt || options.starFlagPrompt.length === 0) {
-        throw new Error("starFlagPrompt is required when initializing a new season");
-    }
-    if (options.starFlagPrompt.length > 33) {
-        throw new Error("starFlagPrompt cannot exceed 33 characters");
-    }
-    const { maxSolInLamports, expectedSolInLamports, maxSlippageBps, ...rest } = options;
-    return joinSeason({
-        ...rest,
-        launchpad: true,
-        ...(maxSolInLamports ? { maxSolInLamports } : {}),
-        ...(expectedSolInLamports ? { expectedSolInLamports } : {}),
-        ...(typeof maxSlippageBps === "number" ? { maxSlippageBps } : {}),
+async function joinSeasonClassic(options) {
+    return joinSunpool({
+        connection: options.connection,
+        user: options.user,
+        seasonNumber: options.seasonNumber,
+        tier: options.tier,
+        ...(options.tokenMint !== undefined && { tokenMint: options.tokenMint }),
+        ...(options.referrer !== undefined && { referrer: options.referrer }),
+        ...(options.referrerTier !== undefined && { referrerTier: options.referrerTier }),
+        ...(options.star !== undefined && { star: options.star }),
+        ...(options.starFlagPrompt !== undefined && { starFlagPrompt: options.starFlagPrompt }),
+        ...(options.symbol !== undefined && { symbol: options.symbol }),
+        ...(options.now !== undefined && { now: options.now }),
+        ...(options.feePayer !== undefined && { feePayer: options.feePayer }),
+        ...(options.currentAccounts !== undefined && { currentAccounts: options.currentAccounts }),
     });
 }
-// getTierPenaltyPerWindow imported from ../utils/tierPenalty