@whetstone-research/doppler-sdk 1.0.8 → 1.0.9

package/dist/solana/index.js

@@ -1,5 +1,5 @@
-import { transferAdminArgsCodec, swapExactInArgsCodec, sortPositionsByShares, sortPoolsByReserves, setSentinelArgsCodec, setRouteArgsCodec, setFeesArgsCodec, removeLiquidityArgsCodec, ratioToNumber, quoteToNumeraireArgsCodec, q64ToNumber, q64Mul, q64Div, positionDataCodec, poolExists, poolDataCodec, oracleStateDataCodec, oracleConsultArgsCodec, observationCodec, numberToQ64, minBigInt, maxBigInt, isqrt, isOracleStale, initializePoolArgsCodec, initializeOracleArgsCodec, initializeConfigArgsCodec, getTvl, getSwapQuoteExactOut, getSwapQuote, getSpotPrice1, getSpotPrice0, getRemoveLiquidityQuote, getPositionValue, getPositionAddressFromParams, getPoolByMints, getPoolAddressFromMints, getPendingFees, getOracleSpotPrices, getOracleForPool, getOracleDeviation, getOracleBufferStats, getOracleAge, getOracleAddressFromPool, getK, getAddLiquidityQuote, filterPoolsByMint, filterActivePositions, fetchUserPositions, fetchPositionsBatch, fetchPositionByParams, fetchPosition, fetchPoolsBatch, fetchPoolPositions, fetchPool, fetchOraclesBatch, fetchOracle, fetchAllPools, encodeTransferAdminArgs, encodeSwapExactInArgs, encodeSetSentinelArgs, encodeSetRouteArgs, encodeSetFeesArgs, encodeRemoveLiquidityArgs, encodeQuoteToNumeraireArgs, encodeOracleConsultArgs, encodeInstructionData, encodeInitializePoolArgs, encodeInitializeOracleArgs, encodeInitializeConfigArgs, encodeCreatePositionArgs, encodeCollectProtocolFeesArgs, encodeCollectFeesArgs, encodeAddLiquidityArgs, decodePosition, decodePool, decodeOracleState, decodeAmmConfig, createPositionArgsCodec, createCollectFeesInstruction, consultTwap, computePrice1Q64, computePrice0Q64, comparePoolAndOraclePrices, collectProtocolFeesArgsCodec, collectFeesArgsCodec, ceilDiv, calculateTwapNumber, calculateTwap, calculateAccruedFees, ammConfigDataCodec, addLiquidityArgsCodec, MAX_FEE_AMOUNT } from '../chunk-BSHIMMA4.js';
-import { sortMints, getSwapAddresses, getProtocolPositionAddress, getPositionAddress, getPoolInitAddresses, getPoolAuthorityAddress, getPoolAddress, getOracleAddress, getLiquidityAddresses, getConfigAddress, CPMM_PROGRAM_ID, areMintsOrdered, TOKEN_METADATA_PROGRAM_ID, SF_BEFORE_SWAP, SF_BEFORE_REMOVE_LIQ, SF_BEFORE_ADD_LIQ, SF_AFTER_SWAP, SF_AFTER_REMOVE_LIQ, SF_AFTER_ADD_LIQ, SENTINEL_NO_CHANGE, SEED_PROTOCOL_POSITION, SEED_POSITION, SEED_POOL, SEED_ORACLE, SEED_CONFIG, SEED_AUTHORITY, Q64_ONE, MAX_SENTINEL_ALLOWLIST, MAX_ORACLE_OBSERVATIONS, INSTRUCTION_DISCRIMINATORS, BPS_DENOM, ACCOUNT_VERSION, ACCOUNT_DISCRIMINATORS, SYSTEM_PROGRAM_ADDRESS, TOKEN_PROGRAM_ADDRESS } from '../chunk-J57ROY36.js';
+import { transferAdminArgsCodec, swapExactInArgsCodec, sortPositionsByShares, sortPoolsByReserves, setSentinelArgsCodec, setRouteArgsCodec, setFeesArgsCodec, removeLiquidityArgsCodec, ratioToNumber, quoteToNumeraireArgsCodec, q64ToNumber, q64Mul, q64Div, positionDataCodec, poolExists, poolDataCodec, oracleStateDataCodec, oracleConsultArgsCodec, observationCodec, numberToQ64, minBigInt, maxBigInt, isqrt, isOracleStale, initializePoolArgsCodec, initializeOracleArgsCodec, initializeConfigArgsCodec, getTvl, getSwapQuoteExactOut, getSwapQuote, getSpotPrice1, getSpotPrice0, getRemoveLiquidityQuote, getPositionValue, getPositionAddressFromParams, getPoolByMints, getPoolAddressFromMints, getPendingFees, getOracleSpotPrices, getOracleForPool, getOracleDeviation, getOracleBufferStats, getOracleAge, getOracleAddressFromPool, getK, getAddLiquidityQuote, filterPoolsByMint, filterActivePositions, fetchUserPositions, fetchPositionsBatch, fetchPositionByParams, fetchPosition, fetchPoolsBatch, fetchPoolPositions, fetchPool, fetchOraclesBatch, fetchOracle, fetchAllPools, encodeTransferAdminArgs, encodeSwapExactInArgs, encodeSetSentinelArgs, encodeSetRouteArgs, encodeSetFeesArgs, encodeRemoveLiquidityArgs, encodeQuoteToNumeraireArgs, encodeOracleConsultArgs, encodeInstructionData, encodeInitializePoolArgs, encodeInitializeOracleArgs, encodeInitializeConfigArgs, encodeCreatePositionArgs, encodeCollectProtocolFeesArgs, encodeCollectFeesArgs, encodeAddLiquidityArgs, decodePosition, decodePool, decodeOracleState, decodeAmmConfig, createPositionArgsCodec, createCollectFeesInstruction, consultTwap, computePrice1Q64, computePrice0Q64, comparePoolAndOraclePrices, collectProtocolFeesArgsCodec, collectFeesArgsCodec, ceilDiv, calculateTwapNumber, calculateTwap, calculateAccruedFees, ammConfigDataCodec, addLiquidityArgsCodec, MAX_FEE_AMOUNT } from '../chunk-RF4NM4ES.js';
+import { sortMints, getSwapAddresses, getProtocolPositionAddress, getPositionAddress, getPoolVault1Address, getPoolVault0Address, getPoolInitAddresses, getPoolAuthorityAddress, getPoolAddress, getOracleAddress, getLiquidityAddresses, getConfigAddress, CPMM_PROGRAM_ID, areMintsOrdered, TOKEN_METADATA_PROGRAM_ID, SF_BEFORE_SWAP, SF_BEFORE_REMOVE_LIQ, SF_BEFORE_ADD_LIQ, SF_AFTER_SWAP, SF_AFTER_REMOVE_LIQ, SF_AFTER_ADD_LIQ, SENTINEL_NO_CHANGE, SEED_PROTOCOL_POSITION, SEED_POSITION, SEED_POOL, SEED_ORACLE, SEED_CONFIG, SEED_AUTHORITY, Q64_ONE, MAX_SENTINEL_ALLOWLIST, MAX_ORACLE_OBSERVATIONS, INSTRUCTION_DISCRIMINATORS, BPS_DENOM, ACCOUNT_VERSION, ACCOUNT_DISCRIMINATORS, SYSTEM_PROGRAM_ADDRESS, TOKEN_PROGRAM_ADDRESS, SYSVAR_INSTRUCTIONS_ADDRESS } from '../chunk-YWZCHTXQ.js';
 import { __export } from '../chunk-PZ5AY32C.js';
 import { getAddressCodec, getProgramDerivedAddress, AccountRole, getStructCodec, getU64Codec, getU128Codec, getBooleanCodec, getU8Codec, address, transformEncoder, getStructEncoder, fixEncoderSize, getAddressEncoder, getU8Encoder, getArrayEncoder, getBytesEncoder, getStructDecoder, fixDecoderSize, getAddressDecoder, getU8Decoder, getArrayDecoder, getBytesDecoder, combineCodec, getU64Encoder, getU16Encoder, addEncoderSizePrefix, getU32Encoder, getUtf8Encoder, getU64Decoder, getU16Decoder, addDecoderSizePrefix, getU32Decoder, getUtf8Decoder, getOptionEncoder, getU128Encoder, getOptionDecoder, getU128Decoder, getBooleanEncoder, getBooleanDecoder, mergeBytes, isProgramError, decodeAccount, assertAccountExists, fetchEncodedAccount, assertAccountsExist, fetchEncodedAccounts, SolanaError, SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS, containsBytes, SOLANA_ERROR__PROGRAM_CLIENTS__FAILED_TO_IDENTIFY_ACCOUNT, SOLANA_ERROR__PROGRAM_CLIENTS__FAILED_TO_IDENTIFY_INSTRUCTION, SOLANA_ERROR__PROGRAM_CLIENTS__UNRECOGNIZED_INSTRUCTION_TYPE, assertIsInstructionWithAccounts } from '@solana/kit';
 import { getAccountMetaFactory, addSelfPlanAndSendFunctions, addSelfFetchFunctions, getAddressFromResolvedInstructionAccount } from '@solana/program-client-core';
@@ -125,6 +125,8 @@ __export(cpmm_exports, {
   getPoolAuthorityAddress: () => getPoolAuthorityAddress,
   getPoolByMints: () => getPoolByMints,
   getPoolInitAddresses: () => getPoolInitAddresses,
+  getPoolVault0Address: () => getPoolVault0Address,
+  getPoolVault1Address: () => getPoolVault1Address,
   getPositionAddress: () => getPositionAddress,
   getPositionAddressFromParams: () => getPositionAddressFromParams,
   getPositionValue: () => getPositionValue,
@@ -508,23 +510,30 @@ function createInitializePoolInstruction(accounts, args, programId = CPMM_PROGRA
     token0Mint,
     token1Mint,
     payer,
+    token0Program,
+    token1Program,
     tokenProgram = TOKEN_PROGRAM_ADDRESS,
     systemProgram = SYSTEM_PROGRAM_ADDRESS,
-    rent
+    rent,
+    migrationAuthority
   } = accounts;
+  const resolvedToken0Program = token0Program ?? tokenProgram;
+  const resolvedToken1Program = token1Program ?? tokenProgram;
   const keys = [
     { address: config, role: AccountRole.READONLY },
     { address: pool, role: AccountRole.WRITABLE },
     { address: protocolPosition, role: AccountRole.WRITABLE },
     { address: authority, role: AccountRole.READONLY },
-    createSignerAccountMeta(vault0, AccountRole.WRITABLE_SIGNER),
-    createSignerAccountMeta(vault1, AccountRole.WRITABLE_SIGNER),
+    { address: vault0, role: AccountRole.WRITABLE },
+    { address: vault1, role: AccountRole.WRITABLE },
     { address: token0Mint, role: AccountRole.READONLY },
     { address: token1Mint, role: AccountRole.READONLY },
     createSignerAccountMeta(payer, AccountRole.WRITABLE_SIGNER),
-    { address: tokenProgram, role: AccountRole.READONLY },
+    { address: resolvedToken0Program, role: AccountRole.READONLY },
+    { address: resolvedToken1Program, role: AccountRole.READONLY },
     { address: systemProgram, role: AccountRole.READONLY },
-    { address: rent, role: AccountRole.READONLY }
+    { address: rent, role: AccountRole.READONLY },
+    createSignerAccountMeta(migrationAuthority, AccountRole.READONLY_SIGNER)
   ];
   const data = encodeInstructionData(
     INSTRUCTION_DISCRIMINATORS.initializePool,
@@ -711,10 +720,15 @@ function createSwapExactInInstruction(accounts, args, programId = CPMM_PROGRAM_I
     userIn,
     userOut,
     user,
+    token0Program,
+    token1Program,
     tokenProgram = TOKEN_PROGRAM_ADDRESS,
+    instructionsSysvar = SYSVAR_INSTRUCTIONS_ADDRESS,
     oracle,
     remainingAccounts = []
   } = accounts;
+  const resolvedToken0Program = token0Program ?? tokenProgram;
+  const resolvedToken1Program = token1Program ?? tokenProgram;
   const keys = [
     { address: config, role: AccountRole.READONLY },
     { address: pool, role: AccountRole.WRITABLE },
@@ -726,7 +740,9 @@ function createSwapExactInInstruction(accounts, args, programId = CPMM_PROGRAM_I
     { address: userIn, role: AccountRole.WRITABLE },
     { address: userOut, role: AccountRole.WRITABLE },
     { address: user, role: AccountRole.READONLY_SIGNER },
-    { address: tokenProgram, role: AccountRole.READONLY }
+    { address: resolvedToken0Program, role: AccountRole.READONLY },
+    { address: resolvedToken1Program, role: AccountRole.READONLY },
+    { address: instructionsSysvar, role: AccountRole.READONLY }
   ];
   if (oracle) {
     keys.push({ address: oracle, role: AccountRole.WRITABLE });
@@ -763,6 +779,10 @@ function createSwapInstruction(params) {
     oracle,
     remainingAccounts,
     updateOracle = false,
+    token0Program,
+    token1Program,
+    tokenProgram,
+    instructionsSysvar,
     programId = CPMM_PROGRAM_ID
   } = params;
   const [vaultIn, vaultOut] = direction === 0 ? [vault0, vault1] : [vault1, vault0];
@@ -779,6 +799,10 @@ function createSwapInstruction(params) {
       userIn,
       userOut,
       user,
+      token0Program,
+      token1Program,
+      tokenProgram,
+      instructionsSysvar,
       oracle,
       remainingAccounts
     },
@@ -1101,7 +1125,6 @@ __export(initializer_exports, {
   SF_AFTER_SWAP: () => SF_AFTER_SWAP2,
   SF_BEFORE_SWAP: () => SF_BEFORE_SWAP2,
   computeRemainingAccountsHash: () => computeRemainingAccountsHash,
-  createAbortLaunchInstruction: () => createAbortLaunchInstruction,
   createCurveSwapExactInInstruction: () => createCurveSwapExactInInstruction,
   createInitializeConfigInstruction: () => createInitializeConfigInstruction2,
   createInitializeLaunchInstruction: () => createInitializeLaunchInstruction,
@@ -1149,9 +1172,9 @@ var CPMM_SENTINEL_PROGRAM_ID = address(
 var PREDICTION_SENTINEL_PROGRAM_ID = address(
   "7QcQDANJVC17Jgc6KjjeagSkm2zAphgHVPK5agJzyihB"
 );
-var SEED_CONFIG2 = "config_v3";
-var SEED_LAUNCH = "launch_v3";
-var SEED_LAUNCH_AUTHORITY = "launch_authority_v3";
+var SEED_CONFIG2 = "config";
+var SEED_LAUNCH = "launch";
+var SEED_LAUNCH_AUTHORITY = "launch_authority";
 var EMPTY_REMAINING_ACCOUNTS_HASH = new Uint8Array([
   232,
   231,
@@ -1269,8 +1292,6 @@ var INITIALIZER_INSTRUCTION_DISCRIMINATORS = {
     12,
     205
   ]),
-  // SHA256("global:abort_launch")[0:8]
-  abortLaunch: new Uint8Array([44, 112, 192, 235, 227, 61, 179, 7]),
   // SHA256("global:preview_swap_exact_in")[0:8]
   previewSwapExactIn: new Uint8Array([
     50,
@@ -1774,13 +1795,15 @@ function createInitializeConfigInstruction2(accounts, args, programId = INITIALI
     admin,
     config,
     programData,
-    systemProgram = SYSTEM_PROGRAM_ADDRESS
+    systemProgram = SYSTEM_PROGRAM_ADDRESS,
+    instructionsSysvar = SYSVAR_INSTRUCTIONS_ADDRESS
   } = accounts;
   const keys = [
     createSignerAccountMeta2(admin, AccountRole.WRITABLE_SIGNER),
     { address: config, role: AccountRole.WRITABLE },
     { address: programData, role: AccountRole.READONLY },
-    { address: systemProgram, role: AccountRole.READONLY }
+    { address: systemProgram, role: AccountRole.READONLY },
+    { address: instructionsSysvar, role: AccountRole.READONLY }
   ];
   const data = new Uint8Array(
     getInitializeConfigInstructionDataEncoder().encode(args)
@@ -1831,6 +1854,7 @@ var CPMM_MIGRATOR_PROGRAM_ID = address(
   "7WMUTNC41eMCo6eGH5Sy2xbgE3AycvLbFPo95AU9CSUd"
 );
 var SEED_STATE = "state";
+var SEED_MIGRATION_AUTHORITY = "migration_authority";
 var MAX_RECIPIENTS = 2;
 var CPMM_MIGRATOR_INSTRUCTION_DISCRIMINATORS = {
   // SHA256("global:register_launch")[0:8]
@@ -1868,6 +1892,12 @@ async function getCpmmMigratorStateAddress(launch, programId = CPMM_MIGRATOR_PRO
     seeds: [textEncoder3.encode(SEED_STATE), addressCodec3.encode(launch)]
   });
 }
+async function getCpmmMigrationAuthorityAddress(programId = CPMM_MIGRATOR_PROGRAM_ID) {
+  return getProgramDerivedAddress({
+    programAddress: programId,
+    seeds: [textEncoder3.encode(SEED_MIGRATION_AUTHORITY)]
+  });
+}
 var CLAIM_RECEIPT_DISCRIMINATOR = new Uint8Array([
   223,
   233,
@@ -1955,7 +1985,7 @@ function getEntryEncoder() {
   return transformEncoder(
     getStructEncoder([
       ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
-      ["oracle", getAddressEncoder()],
+      ["market", getAddressEncoder()],
       ["entryId", fixEncoderSize(getBytesEncoder(), 32)],
       ["baseMint", getAddressEncoder()],
       ["contribution", getU64Encoder()],
@@ -1969,7 +1999,7 @@ function getEntryEncoder() {
 function getEntryDecoder() {
   return getStructDecoder([
     ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
-    ["oracle", getAddressDecoder()],
+    ["market", getAddressDecoder()],
     ["entryId", fixDecoderSize(getBytesDecoder(), 32)],
     ["baseMint", getAddressDecoder()],
     ["contribution", getU64Decoder()],
@@ -2027,7 +2057,7 @@ function getEntryByMintEncoder() {
   return transformEncoder(
     getStructEncoder([
       ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
-      ["oracle", getAddressEncoder()],
+      ["market", getAddressEncoder()],
       ["baseMint", getAddressEncoder()],
       ["entryId", fixEncoderSize(getBytesEncoder(), 32)],
       ["bump", getU8Encoder()],
@@ -2039,7 +2069,7 @@ function getEntryByMintEncoder() {
 function getEntryByMintDecoder() {
   return getStructDecoder([
     ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
-    ["oracle", getAddressDecoder()],
+    ["market", getAddressDecoder()],
     ["baseMint", getAddressDecoder()],
     ["entryId", fixDecoderSize(getBytesDecoder(), 32)],
     ["bump", getU8Decoder()],
@@ -2302,6 +2332,11 @@ function getLaunchEncoder2() {
       ["migratorProgram", getAddressEncoder()],
       ["migratorInitCalldata", getCalldataBufEncoder2()],
       ["migratorMigrateCalldata", getCalldataBufEncoder2()],
+      ["curveKind", getU8Encoder()],
+      ["swapLock", getU8Encoder()],
+      ["pad4", fixEncoderSize(getBytesEncoder(), 6)],
+      ["curveParams", getCalldataBufEncoder2()],
+      ["quoteDeposited", getU64Encoder()],
       ["reserved", fixEncoderSize(getBytesEncoder(), 64)]
     ]),
     (value) => ({ ...value, discriminator: LAUNCH_DISCRIMINATOR2 })
@@ -2339,6 +2374,11 @@ function getLaunchDecoder2() {
     ["migratorProgram", getAddressDecoder()],
     ["migratorInitCalldata", getCalldataBufDecoder2()],
     ["migratorMigrateCalldata", getCalldataBufDecoder2()],
+    ["curveKind", getU8Decoder()],
+    ["swapLock", getU8Decoder()],
+    ["pad4", fixDecoderSize(getBytesDecoder(), 6)],
+    ["curveParams", getCalldataBufDecoder2()],
+    ["quoteDeposited", getU64Decoder()],
     ["reserved", fixDecoderSize(getBytesDecoder(), 64)]
   ]);
 }
@@ -2370,7 +2410,7 @@ async function fetchAllMaybeLaunch(rpc, addresses, config) {
   return maybeAccounts.map((maybeAccount) => decodeLaunch(maybeAccount));
 }
 function getLaunchSize() {
-  return 1214;
+  return 1488;
 }
 var MARKET_DISCRIMINATOR = new Uint8Array([
   219,
@@ -2615,6 +2655,42 @@ async function getClaimInstructionAsync(input, config) {
       ]
     });
   }
+  if (!accounts.entryByMint.value) {
+    accounts.entryByMint.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        getBytesEncoder().encode(
+          new Uint8Array([
+            101,
+            110,
+            116,
+            114,
+            121,
+            95,
+            98,
+            121,
+            95,
+            109,
+            105,
+            110,
+            116
+          ])
+        ),
+        getAddressEncoder().encode(
+          getAddressFromResolvedInstructionAccount(
+            "market",
+            accounts.market.value
+          )
+        ),
+        getAddressEncoder().encode(
+          getAddressFromResolvedInstructionAccount(
+            "winnerMint",
+            accounts.winnerMint.value
+          )
+        )
+      ]
+    });
+  }
   if (!accounts.receipt.value) {
     accounts.receipt.value = await getProgramDerivedAddress({
       programAddress,
@@ -2805,7 +2881,14 @@ async function getMigrateEntryInstructionAsync(input, config) {
     baseVault: { value: input.baseVault ?? null, isWritable: true },
     quoteVault: { value: input.quoteVault ?? null, isWritable: true },
     payer: { value: input.payer ?? null, isWritable: true },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    baseTokenProgram: {
+      value: input.baseTokenProgram ?? null,
+      isWritable: false
+    },
+    quoteTokenProgram: {
+      value: input.quoteTokenProgram ?? null,
+      isWritable: false
+    },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     rent: { value: input.rent ?? null, isWritable: false },
     oracle: { value: input.oracle ?? null, isWritable: false },
@@ -2820,9 +2903,6 @@ async function getMigrateEntryInstructionAsync(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
@@ -2839,6 +2919,12 @@ async function getMigrateEntryInstructionAsync(input, config) {
             "oracle",
             accounts.oracle.value
           )
+        ),
+        getAddressEncoder().encode(
+          getAddressFromResolvedInstructionAccount(
+            "quoteMint",
+            accounts.quoteMint.value
+          )
         )
       ]
     });
@@ -2899,8 +2985,8 @@ async function getMigrateEntryInstructionAsync(input, config) {
         ),
         getAddressEncoder().encode(
           getAddressFromResolvedInstructionAccount(
-            "oracle",
-            accounts.oracle.value
+            "market",
+            accounts.market.value
           )
         ),
         getAddressEncoder().encode(
@@ -2923,7 +3009,8 @@ async function getMigrateEntryInstructionAsync(input, config) {
       getAccountMeta("baseVault", accounts.baseVault),
       getAccountMeta("quoteVault", accounts.quoteVault),
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("tokenProgram", accounts.tokenProgram),
+      getAccountMeta("baseTokenProgram", accounts.baseTokenProgram),
+      getAccountMeta("quoteTokenProgram", accounts.quoteTokenProgram),
       getAccountMeta("systemProgram", accounts.systemProgram),
       getAccountMeta("rent", accounts.rent),
       getAccountMeta("oracle", accounts.oracle),
@@ -2956,7 +3043,14 @@ function getMigrateEntryInstruction(input, config) {
     baseVault: { value: input.baseVault ?? null, isWritable: true },
     quoteVault: { value: input.quoteVault ?? null, isWritable: true },
     payer: { value: input.payer ?? null, isWritable: true },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    baseTokenProgram: {
+      value: input.baseTokenProgram ?? null,
+      isWritable: false
+    },
+    quoteTokenProgram: {
+      value: input.quoteTokenProgram ?? null,
+      isWritable: false
+    },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     rent: { value: input.rent ?? null, isWritable: false },
     oracle: { value: input.oracle ?? null, isWritable: false },
@@ -2971,9 +3065,6 @@ function getMigrateEntryInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
@@ -2991,7 +3082,8 @@ function getMigrateEntryInstruction(input, config) {
       getAccountMeta("baseVault", accounts.baseVault),
       getAccountMeta("quoteVault", accounts.quoteVault),
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("tokenProgram", accounts.tokenProgram),
+      getAccountMeta("baseTokenProgram", accounts.baseTokenProgram),
+      getAccountMeta("quoteTokenProgram", accounts.quoteTokenProgram),
       getAccountMeta("systemProgram", accounts.systemProgram),
       getAccountMeta("rent", accounts.rent),
       getAccountMeta("oracle", accounts.oracle),
@@ -3008,12 +3100,12 @@ function getMigrateEntryInstruction(input, config) {
   });
 }
 function parseMigrateEntryInstruction(instruction) {
-  if (instruction.accounts.length < 17) {
+  if (instruction.accounts.length < 18) {
     throw new SolanaError(
       SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS,
       {
         actualAccountMetas: instruction.accounts.length,
-        expectedAccountMetas: 17
+        expectedAccountMetas: 18
       }
     );
   }
@@ -3034,7 +3126,8 @@ function parseMigrateEntryInstruction(instruction) {
       baseVault: getNextAccount(),
       quoteVault: getNextAccount(),
       payer: getNextAccount(),
-      tokenProgram: getNextAccount(),
+      baseTokenProgram: getNextAccount(),
+      quoteTokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),
       rent: getNextAccount(),
       oracle: getNextAccount(),
@@ -3185,7 +3278,14 @@ async function getRegisterEntryInstructionAsync(input, config) {
     baseVault: { value: input.baseVault ?? null, isWritable: false },
     quoteVault: { value: input.quoteVault ?? null, isWritable: false },
     payer: { value: input.payer ?? null, isWritable: true },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    baseTokenProgram: {
+      value: input.baseTokenProgram ?? null,
+      isWritable: false
+    },
+    quoteTokenProgram: {
+      value: input.quoteTokenProgram ?? null,
+      isWritable: false
+    },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     rent: { value: input.rent ?? null, isWritable: false },
     oracle: { value: input.oracle ?? null, isWritable: false },
@@ -3200,9 +3300,6 @@ async function getRegisterEntryInstructionAsync(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
@@ -3219,6 +3316,12 @@ async function getRegisterEntryInstructionAsync(input, config) {
             "oracle",
             accounts.oracle.value
           )
+        ),
+        getAddressEncoder().encode(
+          getAddressFromResolvedInstructionAccount(
+            "quoteMint",
+            accounts.quoteMint.value
+          )
         )
       ]
     });
@@ -3295,8 +3398,8 @@ async function getRegisterEntryInstructionAsync(input, config) {
         ),
         getAddressEncoder().encode(
           getAddressFromResolvedInstructionAccount(
-            "oracle",
-            accounts.oracle.value
+            "market",
+            accounts.market.value
           )
         ),
         getAddressEncoder().encode(
@@ -3319,7 +3422,8 @@ async function getRegisterEntryInstructionAsync(input, config) {
       getAccountMeta("baseVault", accounts.baseVault),
       getAccountMeta("quoteVault", accounts.quoteVault),
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("tokenProgram", accounts.tokenProgram),
+      getAccountMeta("baseTokenProgram", accounts.baseTokenProgram),
+      getAccountMeta("quoteTokenProgram", accounts.quoteTokenProgram),
       getAccountMeta("systemProgram", accounts.systemProgram),
       getAccountMeta("rent", accounts.rent),
       getAccountMeta("oracle", accounts.oracle),
@@ -3352,7 +3456,14 @@ function getRegisterEntryInstruction(input, config) {
     baseVault: { value: input.baseVault ?? null, isWritable: false },
     quoteVault: { value: input.quoteVault ?? null, isWritable: false },
     payer: { value: input.payer ?? null, isWritable: true },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    baseTokenProgram: {
+      value: input.baseTokenProgram ?? null,
+      isWritable: false
+    },
+    quoteTokenProgram: {
+      value: input.quoteTokenProgram ?? null,
+      isWritable: false
+    },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
     rent: { value: input.rent ?? null, isWritable: false },
     oracle: { value: input.oracle ?? null, isWritable: false },
@@ -3367,9 +3478,6 @@ function getRegisterEntryInstruction(input, config) {
   };
   const accounts = originalAccounts;
   const args = { ...input };
-  if (!accounts.tokenProgram.value) {
-    accounts.tokenProgram.value = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-  }
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = "11111111111111111111111111111111";
   }
@@ -3387,7 +3495,8 @@ function getRegisterEntryInstruction(input, config) {
       getAccountMeta("baseVault", accounts.baseVault),
       getAccountMeta("quoteVault", accounts.quoteVault),
       getAccountMeta("payer", accounts.payer),
-      getAccountMeta("tokenProgram", accounts.tokenProgram),
+      getAccountMeta("baseTokenProgram", accounts.baseTokenProgram),
+      getAccountMeta("quoteTokenProgram", accounts.quoteTokenProgram),
       getAccountMeta("systemProgram", accounts.systemProgram),
       getAccountMeta("rent", accounts.rent),
       getAccountMeta("oracle", accounts.oracle),
@@ -3404,12 +3513,12 @@ function getRegisterEntryInstruction(input, config) {
   });
 }
 function parseRegisterEntryInstruction(instruction) {
-  if (instruction.accounts.length < 17) {
+  if (instruction.accounts.length < 18) {
     throw new SolanaError(
       SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS,
       {
         actualAccountMetas: instruction.accounts.length,
-        expectedAccountMetas: 17
+        expectedAccountMetas: 18
       }
     );
   }
@@ -3430,7 +3539,8 @@ function parseRegisterEntryInstruction(instruction) {
       baseVault: getNextAccount(),
       quoteVault: getNextAccount(),
       payer: getNextAccount(),
-      tokenProgram: getNextAccount(),
+      baseTokenProgram: getNextAccount(),
+      quoteTokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),
       rent: getNextAccount(),
       oracle: getNextAccount(),
@@ -3653,10 +3763,14 @@ function predictionMigratorProgram() {
 }
 var addressCodec4 = getAddressCodec();
 var textEncoder4 = new TextEncoder();
-async function getPredictionMarketAddress(oracleState, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
+async function getPredictionMarketAddress(oracleState, quoteMint, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
   return getProgramDerivedAddress({
     programAddress: programId,
-    seeds: [textEncoder4.encode("market"), addressCodec4.encode(oracleState)]
+    seeds: [
+      textEncoder4.encode("market"),
+      addressCodec4.encode(oracleState),
+      addressCodec4.encode(quoteMint)
+    ]
   });
 }
 async function getPredictionMarketAuthorityAddress(market, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
@@ -3674,22 +3788,18 @@ async function getPredictionPotVaultAddress(market, programId = PREDICTION_MIGRA
     seeds: [textEncoder4.encode("pot_vault"), addressCodec4.encode(market)]
   });
 }
-async function getPredictionEntryAddress(oracleState, entryId, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
+async function getPredictionEntryAddress(market, entryId, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
   return getProgramDerivedAddress({
     programAddress: programId,
-    seeds: [
-      textEncoder4.encode("entry"),
-      addressCodec4.encode(oracleState),
-      entryId
-    ]
+    seeds: [textEncoder4.encode("entry"), addressCodec4.encode(market), entryId]
   });
 }
-async function getPredictionEntryByMintAddress(oracleState, mint, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
+async function getPredictionEntryByMintAddress(market, mint, programId = PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
   return getProgramDerivedAddress({
     programAddress: programId,
     seeds: [
       textEncoder4.encode("entry_by_mint"),
-      addressCodec4.encode(oracleState),
+      addressCodec4.encode(market),
       addressCodec4.encode(mint)
     ]
   });
@@ -3725,7 +3835,6 @@ var ALT_INDEX = {
   [TOKEN_METADATA_PROGRAM_ID]: 4,
   [CPMM_MIGRATOR_PROGRAM_ID]: 5,
   So11111111111111111111111111111111111111112: 6,
-  // index 7 = config PDA — resolved at call time from accounts.config
   [PREDICTION_MIGRATOR_PROGRAM_ADDRESS]: 8
 };
 function validateInitializeLaunchCurveParams(args) {
@@ -3751,10 +3860,13 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
     payer,
     authority,
     migratorProgram,
-    tokenProgram = TOKEN_PROGRAM_ADDRESS,
+    baseTokenProgram = TOKEN_PROGRAM_ADDRESS,
+    quoteTokenProgram = TOKEN_PROGRAM_ADDRESS,
     systemProgram = SYSTEM_PROGRAM_ADDRESS,
     rent,
     metadataAccount,
+    metadataProgram = TOKEN_METADATA_PROGRAM_ID,
+    instructionsSysvar = SYSVAR_INSTRUCTIONS_ADDRESS,
     addressLookupTable: alt
   } = accounts;
   const withMetadata = Boolean(
@@ -3765,7 +3877,7 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
       "metadataName is set but metadataAccount was not provided. Derive it with await initializer.getTokenMetadataAddress(baseMintAddress)."
     );
   }
-  const altIndexMap = alt ? { ...ALT_INDEX, [config]: 7 } : {};
+  const altIndexMap = alt ? ALT_INDEX : {};
   function staticOrLookup(addr, role) {
     if (alt && altIndexMap[addr] !== void 0) {
       return {
@@ -3793,13 +3905,18 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
   if (migratorProgram) {
     keys.push(staticOrLookup(migratorProgram, AccountRole.READONLY));
   }
-  keys.push(staticOrLookup(tokenProgram, AccountRole.READONLY));
+  keys.push(staticOrLookup(baseTokenProgram, AccountRole.READONLY));
+  keys.push(staticOrLookup(quoteTokenProgram, AccountRole.READONLY));
   keys.push(staticOrLookup(systemProgram, AccountRole.READONLY));
   keys.push(staticOrLookup(rent, AccountRole.READONLY));
   if (withMetadata) {
     keys.push({ address: metadataAccount, role: AccountRole.WRITABLE });
-    keys.push(staticOrLookup(TOKEN_METADATA_PROGRAM_ID, AccountRole.READONLY));
+    keys.push(staticOrLookup(metadataProgram, AccountRole.READONLY));
+  } else {
+    keys.push({ address: programId, role: AccountRole.READONLY });
+    keys.push({ address: programId, role: AccountRole.READONLY });
   }
+  keys.push({ address: instructionsSysvar, role: AccountRole.READONLY });
   const encoderArgs = {
     ...args,
     allowBuy: args.allowBuy ? 1 : 0,
@@ -3810,19 +3927,25 @@ async function createInitializeLaunchInstruction(accounts, args, programId = INI
     getInitializeLaunchInstructionDataEncoder().encode(encoderArgs)
   );
   if (migratorProgram === CPMM_MIGRATOR_PROGRAM_ID) {
+    if (!accounts.cpmmConfig) {
+      throw new Error(
+        "cpmmConfig is required when migratorProgram is CPMM_MIGRATOR_PROGRAM_ID"
+      );
+    }
     const [cpmmMigratorState] = await getCpmmMigratorStateAddress(launch);
     keys.push({ address: cpmmMigratorState, role: AccountRole.WRITABLE });
+    keys.push({ address: accounts.cpmmConfig, role: AccountRole.READONLY });
   }
   if (migratorProgram === PREDICTION_MIGRATOR_PROGRAM_ADDRESS) {
     const oracleState = args.namespace;
     const entryId = args.launchId;
     const baseMintAddress = isTransactionSigner5(baseMint) ? baseMint.address : baseMint;
-    const [market] = await getPredictionMarketAddress(oracleState);
+    const [market] = await getPredictionMarketAddress(oracleState, quoteMint);
     const [potVault] = await getPredictionPotVaultAddress(market);
     const [marketAuthority] = await getPredictionMarketAuthorityAddress(market);
-    const [entry] = await getPredictionEntryAddress(oracleState, entryId);
+    const [entry] = await getPredictionEntryAddress(market, entryId);
     const [entryByMint] = await getPredictionEntryByMintAddress(
-      oracleState,
+      market,
       baseMintAddress
     );
     keys.push({ address: oracleState, role: AccountRole.READONLY });
@@ -3856,7 +3979,9 @@ function createCurveSwapExactInInstruction(accounts, args, programId = INITIALIZ
     quoteMint,
     user,
     sentinelProgram = SYSTEM_PROGRAM_ADDRESS,
-    tokenProgram = TOKEN_PROGRAM_ADDRESS
+    baseTokenProgram = TOKEN_PROGRAM_ADDRESS,
+    quoteTokenProgram = TOKEN_PROGRAM_ADDRESS,
+    instructionsSysvar = SYSVAR_INSTRUCTIONS_ADDRESS
   } = accounts;
   const keys = [
     { address: config, role: AccountRole.READONLY },
@@ -3873,7 +3998,9 @@ function createCurveSwapExactInInstruction(accounts, args, programId = INITIALIZ
     // slot (token_program follows it).  Always emit it — use SYSTEM_PROGRAM_ADDRESS as the
     // no-op placeholder when no real sentinel is configured.
     { address: sentinelProgram, role: AccountRole.READONLY },
-    { address: tokenProgram, role: AccountRole.READONLY }
+    { address: baseTokenProgram, role: AccountRole.READONLY },
+    { address: quoteTokenProgram, role: AccountRole.READONLY },
+    { address: instructionsSysvar, role: AccountRole.READONLY }
   ];
   const data = new Uint8Array(
     getCurveSwapExactInInstructionDataEncoder().encode(args)
@@ -3900,9 +4027,11 @@ function createMigrateLaunchInstruction(accounts, programId = INITIALIZER_PROGRA
     quoteVault,
     migratorProgram,
     payer,
-    tokenProgram = TOKEN_PROGRAM_ADDRESS,
+    baseTokenProgram = TOKEN_PROGRAM_ADDRESS,
+    quoteTokenProgram = TOKEN_PROGRAM_ADDRESS,
     systemProgram = SYSTEM_PROGRAM_ADDRESS,
-    rent
+    rent,
+    instructionsSysvar = SYSVAR_INSTRUCTIONS_ADDRESS
   } = accounts;
   const keys = [
     { address: config, role: AccountRole.READONLY },
@@ -3914,52 +4043,17 @@ function createMigrateLaunchInstruction(accounts, programId = INITIALIZER_PROGRA
     { address: quoteVault, role: AccountRole.WRITABLE },
     { address: migratorProgram, role: AccountRole.READONLY },
     createSignerAccountMeta5(payer, AccountRole.WRITABLE_SIGNER),
-    { address: tokenProgram, role: AccountRole.READONLY },
+    { address: baseTokenProgram, role: AccountRole.READONLY },
+    { address: quoteTokenProgram, role: AccountRole.READONLY },
     { address: systemProgram, role: AccountRole.READONLY },
-    { address: rent, role: AccountRole.READONLY }
+    { address: rent, role: AccountRole.READONLY },
+    { address: instructionsSysvar, role: AccountRole.READONLY }
   ];
   const data = encodeInstructionData(
     INITIALIZER_INSTRUCTION_DISCRIMINATORS.migrateLaunch
   );
   return { programAddress: programId, accounts: keys, data };
 }
-function isTransactionSigner8(value) {
-  return typeof value === "object" && value !== null && "address" in value && "signTransactions" in value;
-}
-function createAccountMeta3(value, role) {
-  if (isTransactionSigner8(value)) {
-    return { address: value.address, role, signer: value };
-  }
-  return { address: value, role };
-}
-function createAbortLaunchInstruction(accounts, programId = INITIALIZER_PROGRAM_ID) {
-  const {
-    config,
-    launch,
-    launchAuthority,
-    baseVault,
-    quoteVault,
-    authority,
-    authorityBaseAccount,
-    baseMint,
-    tokenProgram = TOKEN_PROGRAM_ADDRESS
-  } = accounts;
-  const keys = [
-    { address: config, role: AccountRole.READONLY },
-    { address: launch, role: AccountRole.WRITABLE },
-    { address: launchAuthority, role: AccountRole.READONLY },
-    { address: baseVault, role: AccountRole.WRITABLE },
-    { address: quoteVault, role: AccountRole.READONLY },
-    createAccountMeta3(authority, AccountRole.READONLY_SIGNER),
-    { address: authorityBaseAccount, role: AccountRole.WRITABLE },
-    { address: baseMint, role: AccountRole.READONLY },
-    { address: tokenProgram, role: AccountRole.READONLY }
-  ];
-  const data = encodeInstructionData(
-    INITIALIZER_INSTRUCTION_DISCRIMINATORS.abortLaunch
-  );
-  return { programAddress: programId, accounts: keys, data };
-}
 var previewSwapExactInResultCodec = getStructCodec([
   ["amountOut", getU64Codec()],
   ["feePaid", getU64Codec()]
@@ -4133,10 +4227,12 @@ __export(cpmmMigrator_exports, {
   CPMM_MIGRATOR_INSTRUCTION_DISCRIMINATORS: () => CPMM_MIGRATOR_INSTRUCTION_DISCRIMINATORS,
   CPMM_MIGRATOR_PROGRAM_ID: () => CPMM_MIGRATOR_PROGRAM_ID,
   MAX_RECIPIENTS: () => MAX_RECIPIENTS,
+  SEED_MIGRATION_AUTHORITY: () => SEED_MIGRATION_AUTHORITY,
   SEED_STATE: () => SEED_STATE,
   encodeMigrateCalldata: () => encodeMigrateCalldata,
   encodeRegisterLaunchCalldata: () => encodeRegisterLaunchCalldata,
   fetchCpmmMigratorState: () => fetchCpmmMigratorState,
+  getCpmmMigrationAuthorityAddress: () => getCpmmMigrationAuthorityAddress,
   getCpmmMigratorStateAddress: () => getCpmmMigratorStateAddress,
   getCpmmMigratorStateCodec: () => getCpmmMigratorStateCodec,
   getCpmmMigratorStateDecoder: () => getCpmmMigratorStateDecoder,