@meteora-ag/dynamic-bonding-curve-sdk 1.4.10 → 1.5.1

package/dist/index.js

@@ -83,29 +83,44 @@ var SwapMode = /* @__PURE__ */ ((SwapMode2) => {
 // src/constants.ts
 import BN from "bn.js";
 import { PublicKey } from "@solana/web3.js";
+var MAX_CURVE_POINT = 16;
 var OFFSET = 64;
-var U128_MAX = new BN("340282366920938463463374607431768211455");
-var U64_MAX = new BN("18446744073709551615");
-var U16_MAX = 65535;
-var MIN_SQRT_PRICE = new BN("4295048016");
-var MAX_SQRT_PRICE = new BN("79226673521066979257578248091");
 var RESOLUTION = 64;
 var ONE_Q64 = new BN(1).shln(RESOLUTION);
 var FEE_DENOMINATOR = 1e9;
+var MAX_BASIS_POINT = 1e4;
+var U16_MAX = 65535;
+var U64_MAX = new BN("18446744073709551615");
+var U128_MAX = new BN("340282366920938463463374607431768211455");
+var MIN_SQRT_PRICE = new BN("4295048016");
+var MAX_SQRT_PRICE = new BN("79226673521066979257578248091");
 var MIN_FEE_BPS = 25;
 var MAX_FEE_BPS = 9900;
 var MIN_FEE_NUMERATOR = 25e5;
 var MAX_FEE_NUMERATOR = 99e7;
-var BASIS_POINT_MAX = 1e4;
-var MAX_CURVE_POINT = 16;
-var PARTNER_SURPLUS_SHARE = 80;
+var MAX_RATE_LIMITER_DURATION_IN_SECONDS = 43200;
+var MAX_RATE_LIMITER_DURATION_IN_SLOTS = 108e3;
+var DYNAMIC_FEE_FILTER_PERIOD_DEFAULT = 10;
+var DYNAMIC_FEE_DECAY_PERIOD_DEFAULT = 120;
+var DYNAMIC_FEE_REDUCTION_FACTOR_DEFAULT = 5e3;
+var DYNAMIC_FEE_SCALING_FACTOR = new BN(1e11);
+var DYNAMIC_FEE_ROUNDING_OFFSET = new BN(99999999999);
+var BIN_STEP_BPS_DEFAULT = 1;
+var BIN_STEP_BPS_U128_DEFAULT = new BN("1844674407370955");
+var MAX_PRICE_CHANGE_PERCENTAGE_DEFAULT = 20;
+var PROTOCOL_FEE_PERCENT = 20;
+var HOST_FEE_PERCENT = 20;
 var SWAP_BUFFER_PERCENTAGE = 25;
 var MAX_MIGRATION_FEE_PERCENTAGE = 99;
 var MAX_CREATOR_MIGRATION_FEE_PERCENTAGE = 100;
-var MAX_RATE_LIMITER_DURATION_IN_SECONDS = 43200;
-var MAX_RATE_LIMITER_DURATION_IN_SLOTS = 108e3;
-var SLOT_DURATION = 400;
-var TIMESTAMP_DURATION = 1e3;
+var MIN_LOCKED_LIQUIDITY_BPS = 1e3;
+var SECONDS_PER_DAY = 86400;
+var MAX_LOCK_DURATION_IN_SECONDS = 63072e3;
+var PROTOCOL_POOL_CREATION_FEE_PERCENT = 10;
+var MIN_POOL_CREATION_FEE = 1e6;
+var MAX_POOL_CREATION_FEE = 1e11;
+var MIN_MIGRATED_POOL_FEE_BPS = 10;
+var MAX_MIGRATED_POOL_FEE_BPS = 1e3;
 var DYNAMIC_BONDING_CURVE_PROGRAM_ID = new PublicKey(
   "dbcij3LWUppWqq96dh6gJWwBifmcGfLSB5D4DuSMaqN"
 );
@@ -127,17 +142,6 @@ var LOCKER_PROGRAM_ID = new PublicKey(
 var BASE_ADDRESS = new PublicKey(
   "HWzXGcGHy4tcpYfaRDCyLNzXqBTv3E6BttpCH2vJxArv"
 );
-var DYNAMIC_FEE_FILTER_PERIOD_DEFAULT = 10;
-var DYNAMIC_FEE_DECAY_PERIOD_DEFAULT = 120;
-var DYNAMIC_FEE_REDUCTION_FACTOR_DEFAULT = 5e3;
-var MAX_DYNAMIC_FEE_PERCENTAGE = 20;
-var DYNAMIC_FEE_SCALING_FACTOR = new BN(1e11);
-var DYNAMIC_FEE_ROUNDING_OFFSET = new BN(99999999999);
-var BIN_STEP_BPS_DEFAULT = 1;
-var BIN_STEP_BPS_U128_DEFAULT = new BN("1844674407370955");
-var MAX_PRICE_CHANGE_BPS_DEFAULT = 1500;
-var MIN_MIGRATED_POOL_FEE_BPS = 10;
-var MAX_MIGRATED_POOL_FEE_BPS = 1e3;
 var DAMM_V1_MIGRATION_FEE_ADDRESS = [
   new PublicKey("8f848CEy8eY6PhJ3VcemtBDzPPSD4Vq7aJczLZ3o8MmX"),
   // FixedBps25
@@ -168,6 +172,13 @@ var DAMM_V2_MIGRATION_FEE_ADDRESS = [
   new PublicKey("A8gMrEPJkacWkcb3DGwtJwTe16HktSEfvwtuDh2MCtck")
   // Customizable
 ];
+var DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS = {
+  vestingPercentage: 0,
+  bpsPerPeriod: 0,
+  numberOfPeriods: 0,
+  cliffDurationFromMigrationTime: 0,
+  totalDuration: 0
+};
 
 // src/helpers/common.ts
 import BN6 from "bn.js";
@@ -512,10 +523,10 @@ function convertDecimalToBN(value) {
   return new BN5(value.floor().toFixed());
 }
 function bpsToFeeNumerator(bps) {
-  return new BN5(bps * FEE_DENOMINATOR).divn(BASIS_POINT_MAX);
+  return new BN5(bps * FEE_DENOMINATOR).divn(MAX_BASIS_POINT);
 }
 function feeNumeratorToBps(feeNumerator) {
-  return feeNumerator.muln(BASIS_POINT_MAX).div(new BN5(FEE_DENOMINATOR)).toNumber();
+  return feeNumerator.muln(MAX_BASIS_POINT).div(new BN5(FEE_DENOMINATOR)).toNumber();
 }
 
 // src/helpers/token.ts
@@ -717,7 +728,7 @@ function getTotalTokenSupply(swapBaseAmount, migrationBaseThreshold, lockedVesti
     }
     return totalAmount;
   } catch (error) {
-    throw new Error("Math overflow");
+    throw new Error(`Math overflow: ${error}`);
   }
 }
 function getPriceFromSqrtPrice(sqrtPrice, tokenBaseDecimal, tokenQuoteDecimal) {
@@ -1054,6 +1065,11 @@ function getFeeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode
       `startingBaseFeeBps (${startingBaseFeeBps} bps) exceeds maximum allowed value of ${MAX_FEE_BPS} bps`
     );
   }
+  if (endingBaseFeeBps < MIN_FEE_BPS) {
+    throw new Error(
+      `endingBaseFeeBps (${endingBaseFeeBps} bps) is less than minimum allowed value of ${MIN_FEE_BPS} bps`
+    );
+  }
   if (endingBaseFeeBps > startingBaseFeeBps) {
     throw new Error(
       "endingBaseFeeBps bps must be less than or equal to startingBaseFeeBps bps"
@@ -1074,7 +1090,7 @@ function getFeeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode
   } else {
     const ratio = minBaseFeeNumerator.toNumber() / maxBaseFeeNumerator.toNumber();
     const decayBase = Math.pow(ratio, 1 / numberOfPeriod);
-    reductionFactor = new BN6(BASIS_POINT_MAX * (1 - decayBase));
+    reductionFactor = new BN6(MAX_BASIS_POINT * (1 - decayBase));
   }
   return {
     cliffFeeNumerator: maxBaseFeeNumerator,
@@ -1086,16 +1102,16 @@ function getFeeSchedulerParams(startingBaseFeeBps, endingBaseFeeBps, baseFeeMode
 }
 function calculateFeeSchedulerEndingBaseFeeBps(cliffFeeNumerator, numberOfPeriod, periodFrequency, reductionFactor, baseFeeMode) {
   if (numberOfPeriod === 0 || periodFrequency === 0) {
-    return cliffFeeNumerator / FEE_DENOMINATOR * BASIS_POINT_MAX;
+    return cliffFeeNumerator / FEE_DENOMINATOR * MAX_BASIS_POINT;
   }
   let baseFeeNumerator;
   if (baseFeeMode == 0 /* FeeSchedulerLinear */) {
     baseFeeNumerator = cliffFeeNumerator - numberOfPeriod * reductionFactor;
   } else {
-    const decayRate = 1 - reductionFactor / BASIS_POINT_MAX;
+    const decayRate = 1 - reductionFactor / MAX_BASIS_POINT;
     baseFeeNumerator = cliffFeeNumerator * Math.pow(decayRate, numberOfPeriod);
   }
-  return Math.max(0, baseFeeNumerator / FEE_DENOMINATOR * BASIS_POINT_MAX);
+  return Math.max(0, baseFeeNumerator / FEE_DENOMINATOR * MAX_BASIS_POINT);
 }
 function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxLimiterDuration, tokenQuoteDecimal, activationType) {
   const cliffFeeNumerator = bpsToFeeNumerator(baseFeeBps);
@@ -1108,6 +1124,11 @@ function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxL
       `Base fee (${baseFeeBps} bps) exceeds maximum allowed value of ${MAX_FEE_BPS} bps`
     );
   }
+  if (baseFeeBps < MIN_FEE_BPS) {
+    throw new Error(
+      `Base fee (${baseFeeBps} bps) is less than minimum allowed value of ${MIN_FEE_BPS} bps`
+    );
+  }
   if (feeIncrementBps > MAX_FEE_BPS) {
     throw new Error(
       `Fee increment (${feeIncrementBps} bps) exceeds maximum allowed value of ${MAX_FEE_BPS} bps`
@@ -1144,21 +1165,21 @@ function getRateLimiterParams(baseFeeBps, feeIncrementBps, referenceAmount, maxL
     baseFeeMode: 2 /* RateLimiter */
   };
 }
-function getDynamicFeeParams(baseFeeBps, maxPriceChangeBps = MAX_PRICE_CHANGE_BPS_DEFAULT) {
-  if (maxPriceChangeBps > MAX_PRICE_CHANGE_BPS_DEFAULT) {
+function getDynamicFeeParams(baseFeeBps, maxPriceChangePercentage = MAX_PRICE_CHANGE_PERCENTAGE_DEFAULT) {
+  if (maxPriceChangePercentage > MAX_PRICE_CHANGE_PERCENTAGE_DEFAULT) {
     throw new Error(
-      `maxPriceChangeBps (${maxPriceChangeBps} bps) must be less than or equal to ${MAX_PRICE_CHANGE_BPS_DEFAULT}`
+      `maxPriceChangePercentage (${maxPriceChangePercentage}%) must be less than or equal to ${MAX_PRICE_CHANGE_PERCENTAGE_DEFAULT}`
     );
   }
-  const priceRatio = maxPriceChangeBps / BASIS_POINT_MAX + 1;
+  const priceRatio = maxPriceChangePercentage / MAX_BASIS_POINT + 1;
   const sqrtPriceRatioQ64 = new BN6(
     Decimal2.sqrt(priceRatio.toString()).mul(Decimal2.pow(2, 64)).floor().toFixed()
   );
   const deltaBinId = sqrtPriceRatioQ64.sub(ONE_Q64).div(BIN_STEP_BPS_U128_DEFAULT).muln(2);
-  const maxVolatilityAccumulator = new BN6(deltaBinId.muln(BASIS_POINT_MAX));
+  const maxVolatilityAccumulator = new BN6(deltaBinId.muln(MAX_BASIS_POINT));
   const squareVfaBin = maxVolatilityAccumulator.mul(new BN6(BIN_STEP_BPS_DEFAULT)).pow(new BN6(2));
   const baseFeeNumerator = new BN6(bpsToFeeNumerator(baseFeeBps));
-  const maxDynamicFeeNumerator = baseFeeNumerator.muln(20).divn(100);
+  const maxDynamicFeeNumerator = baseFeeNumerator.muln(maxPriceChangePercentage).divn(100);
   const vFee = maxDynamicFeeNumerator.mul(new BN6(1e11)).sub(new BN6(99999999999));
   const variableFeeControl = vFee.div(squareVfaBin);
   return {
@@ -1228,6 +1249,69 @@ function getLockedVestingParams(totalLockedVestingAmount, numberOfVestingPeriod,
     )
   };
 }
+var getLiquidityVestingInfoParams = (vestingPercentage, bpsPerPeriod, numberOfPeriods, cliffDurationFromMigrationTime, totalDuration) => {
+  if (vestingPercentage < 0 || vestingPercentage > 100) {
+    throw new Error("vestingPercentage must be between 0 and 100");
+  }
+  if (vestingPercentage === 0) {
+    if (bpsPerPeriod !== 0 || numberOfPeriods !== 0 || cliffDurationFromMigrationTime !== 0 || totalDuration !== 0) {
+      throw new Error(
+        "If vestingPercentage is 0, all other parameters must be 0"
+      );
+    }
+    return {
+      vestingPercentage: 0,
+      bpsPerPeriod: 0,
+      numberOfPeriods: 0,
+      cliffDurationFromMigrationTime: 0,
+      frequency: 0
+    };
+  }
+  if (bpsPerPeriod < 0 || bpsPerPeriod > MAX_BASIS_POINT) {
+    throw new Error(`bpsPerPeriod must be between 0 and ${MAX_BASIS_POINT}`);
+  }
+  if (numberOfPeriods <= 0) {
+    throw new Error(
+      "numberOfPeriods must be greater than zero when vestingPercentage > 0"
+    );
+  }
+  if (cliffDurationFromMigrationTime < 0) {
+    throw new Error("cliffDurationFromMigrationTime must be >= 0");
+  }
+  if (totalDuration <= 0) {
+    throw new Error("totalDuration must be greater than zero");
+  }
+  const frequency = totalDuration / numberOfPeriods;
+  if (frequency <= 0) {
+    throw new Error(
+      "frequency must be greater than zero (totalDuration / numberOfPeriods must be > 0)"
+    );
+  }
+  const totalBps = bpsPerPeriod * numberOfPeriods;
+  if (totalBps > MAX_BASIS_POINT) {
+    throw new Error(
+      `Total BPS (bpsPerPeriod * numberOfPeriods = ${totalBps}) must not exceed ${MAX_BASIS_POINT}`
+    );
+  }
+  const totalVestingDuration = cliffDurationFromMigrationTime + numberOfPeriods * frequency;
+  if (totalVestingDuration > MAX_LOCK_DURATION_IN_SECONDS) {
+    throw new Error(
+      `Total vesting duration (${totalVestingDuration}s) must not exceed ${MAX_LOCK_DURATION_IN_SECONDS}s (2 years)`
+    );
+  }
+  if (cliffDurationFromMigrationTime === 0 && numberOfPeriods === 0) {
+    throw new Error(
+      "If cliffDurationFromMigrationTime is 0, numberOfPeriods must be > 0"
+    );
+  }
+  return {
+    vestingPercentage,
+    bpsPerPeriod,
+    numberOfPeriods,
+    cliffDurationFromMigrationTime,
+    frequency: Math.round(frequency)
+  };
+};
 var getTwoCurve = (migrationSqrtPrice, midSqrtPrice, initialSqrtPrice, swapAmount, migrationQuoteThreshold) => {
   const p0 = new Decimal2(initialSqrtPrice.toString());
   const p1 = new Decimal2(midSqrtPrice.toString());
@@ -1368,8 +1452,72 @@ async function prepareSwapAmountParam(amount, mintAddress, connection) {
   const mintTokenDecimals = await getTokenDecimals(connection, mintAddress);
   return convertToLamports(amount, mintTokenDecimals);
 }
+function getVestingLockedLiquidityBpsAtNSeconds(vestingInfo, nSeconds) {
+  if (!vestingInfo || vestingInfo.vestingPercentage === 0) {
+    return 0;
+  }
+  const totalLiquidity = U128_MAX;
+  const totalVestedLiquidity = totalLiquidity.mul(new BN6(vestingInfo.vestingPercentage)).div(new BN6(100));
+  const bpsPerPeriod = vestingInfo.bpsPerPeriod;
+  const numberOfPeriods = vestingInfo.numberOfPeriods;
+  const frequency = vestingInfo.frequency;
+  const cliffDuration = vestingInfo.cliffDurationFromMigrationTime;
+  const totalBpsAfterCliff = bpsPerPeriod * numberOfPeriods;
+  const totalVestingLiquidityAfterCliff = totalVestedLiquidity.mul(new BN6(totalBpsAfterCliff)).div(new BN6(MAX_BASIS_POINT));
+  let liquidityPerPeriod = new BN6(0);
+  let adjustedFrequency = frequency;
+  let adjustedNumberOfPeriods = numberOfPeriods;
+  let adjustedCliffDuration = cliffDuration;
+  if (numberOfPeriods > 0) {
+    liquidityPerPeriod = totalVestingLiquidityAfterCliff.div(
+      new BN6(numberOfPeriods)
+    );
+  }
+  if (liquidityPerPeriod.isZero()) {
+    adjustedNumberOfPeriods = 0;
+    adjustedFrequency = 0;
+    adjustedCliffDuration = Math.max(cliffDuration, 1);
+  }
+  const cliffUnlockLiquidity = totalVestedLiquidity.sub(
+    liquidityPerPeriod.mul(new BN6(adjustedNumberOfPeriods))
+  );
+  const cliffPoint = new BN6(adjustedCliffDuration);
+  const currentPoint = new BN6(nSeconds);
+  let unlockedLiquidity = new BN6(0);
+  if (currentPoint.gte(cliffPoint)) {
+    unlockedLiquidity = cliffUnlockLiquidity;
+    if (adjustedFrequency > 0 && adjustedNumberOfPeriods > 0) {
+      const timeAfterCliff = currentPoint.sub(cliffPoint);
+      const periodsElapsed = timeAfterCliff.div(new BN6(adjustedFrequency)).toNumber();
+      const actualPeriodsElapsed = Math.min(
+        periodsElapsed,
+        adjustedNumberOfPeriods
+      );
+      unlockedLiquidity = unlockedLiquidity.add(
+        liquidityPerPeriod.mul(new BN6(actualPeriodsElapsed))
+      );
+    }
+  }
+  const lockedLiquidity = totalVestedLiquidity.sub(unlockedLiquidity);
+  const liquidityLockedBps = lockedLiquidity.mul(new BN6(MAX_BASIS_POINT)).div(totalLiquidity);
+  return liquidityLockedBps.toNumber();
+}
+function calculateLockedLiquidityBpsAtTime(partnerPermanentLockedLiquidityPercentage, creatorPermanentLockedLiquidityPercentage, partnerLiquidityVestingInfo, creatorLiquidityVestingInfo, elapsedSeconds) {
+  const partnerVestedLockedLiquidityBps = getVestingLockedLiquidityBpsAtNSeconds(
+    partnerLiquidityVestingInfo,
+    elapsedSeconds
+  );
+  const creatorVestedLockedLiquidityBps = getVestingLockedLiquidityBpsAtNSeconds(
+    creatorLiquidityVestingInfo,
+    elapsedSeconds
+  );
+  const partnerPermanentLockedLiquidityBps = partnerPermanentLockedLiquidityPercentage * 100;
+  const creatorPermanentLockedLiquidityBps = creatorPermanentLockedLiquidityPercentage * 100;
+  const totalLockedLiquidityBpsAtNSeconds = partnerVestedLockedLiquidityBps + partnerPermanentLockedLiquidityBps + creatorVestedLockedLiquidityBps + creatorPermanentLockedLiquidityBps;
+  return totalLockedLiquidityBpsAtNSeconds;
+}
 
-// src/helpers/accounts.ts
+// src/helpers/pda.ts
 import { PublicKey as PublicKey5 } from "@solana/web3.js";
 var SEED = Object.freeze({
   POOL_AUTHORITY: "pool_authority",
@@ -1628,6 +1776,12 @@ function deriveBaseKeyForLocker(virtualPool) {
     DYNAMIC_BONDING_CURVE_PROGRAM_ID
   )[0];
 }
+function deriveDammV2PositionVestingAccount(position) {
+  return PublicKey5.findProgramAddressSync(
+    [Buffer.from("position_vesting"), position.toBuffer()],
+    DYNAMIC_BONDING_CURVE_PROGRAM_ID
+  )[0];
+}
 
 // src/helpers/validation.ts
 import BN13 from "bn.js";
@@ -1893,7 +2047,7 @@ function getFeeNumeratorOnExponentialFeeScheduler(cliffFeeNumerator, reductionFa
   if (period === 0) {
     return cliffFeeNumerator;
   }
-  const basisPointMax = new BN8(BASIS_POINT_MAX);
+  const basisPointMax = new BN8(MAX_BASIS_POINT);
   const ONE_Q642 = new BN8(1).shln(64);
   const bps = SafeMath.div(SafeMath.shl(reductionFactor, 64), basisPointMax);
   const base = SafeMath.sub(ONE_Q642, bps);
@@ -1979,7 +2133,7 @@ var FeeScheduler = class {
     this.reductionFactor = reductionFactor;
     this.feeSchedulerMode = feeSchedulerMode;
   }
-  validate(collectFeeMode, activationType) {
+  validate() {
     return validateFeeScheduler(
       this.numberOfPeriod,
       this.periodFrequency,
@@ -2072,13 +2226,13 @@ function toNumerator(bps, feeDenominator) {
     const numerator = mulDiv(
       bps,
       feeDenominator,
-      new BN11(BASIS_POINT_MAX),
+      new BN11(MAX_BASIS_POINT),
       1 /* Down */
     );
     return numerator;
   } catch (error) {
     throw new Error(
-      "Type cast failed or calculation overflow in toNumerator"
+      `Type cast failed or calculation overflow in toNumerator ${error}`
     );
   }
 }
@@ -2168,14 +2322,14 @@ function getFeeOnAmount(tradeFeeNumerator, amount, poolFees, hasReferral) {
   );
   const protocolFee = mulDiv(
     tradingFee,
-    new BN11(poolFees.protocolFeePercent),
+    new BN11(PROTOCOL_FEE_PERCENT),
     new BN11(100),
     1 /* Down */
   );
   const updatedTradingFee = SafeMath.sub(tradingFee, protocolFee);
   const referralFee = hasReferral ? mulDiv(
     protocolFee,
-    new BN11(poolFees.referralFeePercent),
+    new BN11(HOST_FEE_PERCENT),
     new BN11(100),
     1 /* Down */
   ) : new BN11(0);
@@ -2210,14 +2364,14 @@ function getIncludedFeeAmount(tradeFeeNumerator, excludedFeeAmount) {
 function splitFees(poolFees, feeAmount, hasReferral) {
   const protocolFee = mulDiv(
     feeAmount,
-    new BN11(poolFees.protocolFeePercent),
+    new BN11(PROTOCOL_FEE_PERCENT),
     new BN11(100),
     1 /* Down */
   );
   const tradingFee = SafeMath.sub(feeAmount, protocolFee);
   const referralFee = hasReferral ? mulDiv(
     protocolFee,
-    new BN11(poolFees.referralFeePercent),
+    new BN11(HOST_FEE_PERCENT),
     new BN11(100),
     1 /* Down */
   ) : new BN11(0);
@@ -2472,6 +2626,13 @@ function calculateBaseToQuoteFromAmountIn(configState, currentSqrtPrice, amountI
       amountLeft: new BN12(0)
     };
   }
+  if (currentSqrtPrice.eq(configState.sqrtStartPrice)) {
+    return {
+      outputAmount: new BN12(0),
+      nextSqrtPrice: currentSqrtPrice,
+      amountLeft: amountIn
+    };
+  }
   let totalOutputAmount = new BN12(0);
   let currentSqrtPriceLocal = currentSqrtPrice;
   let amountLeft = amountIn;
@@ -2524,12 +2685,24 @@ function calculateBaseToQuoteFromAmountIn(configState, currentSqrtPrice, amountI
     }
   }
   if (!amountLeft.isZero()) {
-    const nextSqrtPrice = getNextSqrtPriceFromInput(
+    let nextSqrtPrice = getNextSqrtPriceFromInput(
       currentSqrtPriceLocal,
       configState.curve[0].liquidity,
       amountLeft,
       true
     );
+    if (nextSqrtPrice.lt(configState.sqrtStartPrice)) {
+      nextSqrtPrice = configState.sqrtStartPrice;
+      const amountIn2 = getDeltaAmountBaseUnsigned(
+        nextSqrtPrice,
+        currentSqrtPriceLocal,
+        configState.curve[0].liquidity,
+        0 /* Up */
+      );
+      amountLeft = SafeMath.sub(amountLeft, amountIn2);
+    } else {
+      amountLeft = new BN12(0);
+    }
     const outputAmount = getDeltaAmountQuoteUnsigned(
       nextSqrtPrice,
       currentSqrtPriceLocal,
@@ -2540,9 +2713,9 @@ function calculateBaseToQuoteFromAmountIn(configState, currentSqrtPrice, amountI
     currentSqrtPriceLocal = nextSqrtPrice;
   }
   return {
+    amountLeft,
     outputAmount: totalOutputAmount,
-    nextSqrtPrice: currentSqrtPriceLocal,
-    amountLeft: new BN12(0)
+    nextSqrtPrice: currentSqrtPriceLocal
   };
 }
 function calculateQuoteToBaseFromAmountIn(configState, currentSqrtPrice, amountIn, stopSqrtPrice) {
@@ -3051,8 +3224,8 @@ function validateMigrationFeeOption(migrationFeeOption, migrationOption) {
 function validateTokenDecimals(tokenDecimal) {
   return tokenDecimal >= 6 /* SIX */ && tokenDecimal <= 9 /* NINE */;
 }
-function validateLPPercentages(partnerLpPercentage, partnerLockedLpPercentage, creatorLpPercentage, creatorLockedLpPercentage) {
-  const totalLPPercentage = partnerLpPercentage + partnerLockedLpPercentage + creatorLpPercentage + creatorLockedLpPercentage;
+function validateLPPercentages(partnerLiquidityPercentage, partnerPermanentLockedLiquidityPercentage, creatorLiquidityPercentage, creatorPermanentLockedLiquidityPercentage, partnerVestingPercentage, creatorVestingPercentage) {
+  const totalLPPercentage = partnerLiquidityPercentage + partnerPermanentLockedLiquidityPercentage + creatorLiquidityPercentage + creatorPermanentLockedLiquidityPercentage + partnerVestingPercentage + creatorVestingPercentage;
   return totalLPPercentage === 100;
 }
 function validateCurve(curve, sqrtStartPrice) {
@@ -3112,6 +3285,35 @@ function validateTokenUpdateAuthorityOptions(option) {
     4 /* PartnerUpdateAndMintAuthority */
   ].includes(option);
 }
+function validatePoolCreationFee(poolCreationFee) {
+  if (poolCreationFee.eq(new BN13(0))) {
+    return true;
+  }
+  return poolCreationFee.gte(new BN13(MIN_POOL_CREATION_FEE)) && poolCreationFee.lte(new BN13(MAX_POOL_CREATION_FEE));
+}
+function validateLiquidityVestingInfo(vestingInfo) {
+  const isZero = vestingInfo.vestingPercentage === 0 && vestingInfo.bpsPerPeriod === 0 && vestingInfo.numberOfPeriods === 0 && vestingInfo.cliffDurationFromMigrationTime === 0 && vestingInfo.frequency === 0;
+  if (isZero) {
+    return true;
+  }
+  if (vestingInfo.vestingPercentage < 0 || vestingInfo.vestingPercentage > 100) {
+    return false;
+  }
+  if (vestingInfo.vestingPercentage > 0 && vestingInfo.frequency === 0) {
+    return false;
+  }
+  return true;
+}
+function validateMinimumLockedLiquidity(partnerPermanentLockedLiquidityPercentage, creatorPermanentLockedLiquidityPercentage, partnerLiquidityVestingInfo, creatorLiquidityVestingInfo) {
+  const lockedBpsAtDay1 = calculateLockedLiquidityBpsAtTime(
+    partnerPermanentLockedLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
+    SECONDS_PER_DAY
+  );
+  return lockedBpsAtDay1 >= MIN_LOCKED_LIQUIDITY_BPS;
+}
 function validateMigratedPoolFee(migratedPoolFee, migrationOption, migrationFeeOption) {
   const isEmpty = () => {
     return migratedPoolFee.collectFeeMode === 0 && migratedPoolFee.dynamicFee === 0 && migratedPoolFee.poolFeeBps === 0;
@@ -3175,17 +3377,72 @@ function validateConfigParameters(configParam) {
   if (!validateMigrationFee(configParam.migrationFee)) {
     throw new Error("Invalid migration fee");
   }
+  if (configParam.creatorTradingFeePercentage < 0 || configParam.creatorTradingFeePercentage > 100) {
+    throw new Error(
+      "Creator trading fee percentage must be between 0 and 100"
+    );
+  }
   if (!validateTokenDecimals(configParam.tokenDecimal)) {
     throw new Error("Token decimal must be between 6 and 9");
   }
+  const partnerVestingPercentage = configParam.partnerLiquidityVestingInfo?.vestingPercentage ?? 0;
+  const creatorVestingPercentage = configParam.creatorLiquidityVestingInfo?.vestingPercentage ?? 0;
   if (!validateLPPercentages(
-    configParam.partnerLpPercentage,
-    configParam.partnerLockedLpPercentage,
-    configParam.creatorLpPercentage,
-    configParam.creatorLockedLpPercentage
+    configParam.partnerLiquidityPercentage,
+    configParam.partnerPermanentLockedLiquidityPercentage,
+    configParam.creatorLiquidityPercentage,
+    configParam.creatorPermanentLockedLiquidityPercentage,
+    partnerVestingPercentage,
+    creatorVestingPercentage
   )) {
     throw new Error("Sum of LP percentages must equal 100");
   }
+  if (!validatePoolCreationFee(configParam.poolCreationFee)) {
+    throw new Error(
+      `Pool creation fee must be 0 or between ${MIN_POOL_CREATION_FEE} and ${MAX_POOL_CREATION_FEE} lamports`
+    );
+  }
+  if (configParam.migrationOption === 0 /* MET_DAMM */) {
+    const isPartnerVestingZero = !configParam.partnerLiquidityVestingInfo || configParam.partnerLiquidityVestingInfo.vestingPercentage === 0 && configParam.partnerLiquidityVestingInfo.bpsPerPeriod === 0 && configParam.partnerLiquidityVestingInfo.numberOfPeriods === 0 && configParam.partnerLiquidityVestingInfo.cliffDurationFromMigrationTime === 0 && configParam.partnerLiquidityVestingInfo.frequency === 0;
+    const isCreatorVestingZero = !configParam.creatorLiquidityVestingInfo || configParam.creatorLiquidityVestingInfo.vestingPercentage === 0 && configParam.creatorLiquidityVestingInfo.bpsPerPeriod === 0 && configParam.creatorLiquidityVestingInfo.numberOfPeriods === 0 && configParam.creatorLiquidityVestingInfo.cliffDurationFromMigrationTime === 0 && configParam.creatorLiquidityVestingInfo.frequency === 0;
+    if (!isPartnerVestingZero || !isCreatorVestingZero) {
+      throw new Error(
+        "Liquidity vesting is not supported for MeteoraDamm migration"
+      );
+    }
+  } else if (configParam.migrationOption === 1 /* MET_DAMM_V2 */) {
+    if (configParam.partnerLiquidityVestingInfo) {
+      if (!validateLiquidityVestingInfo(
+        configParam.partnerLiquidityVestingInfo
+      )) {
+        throw new Error("Invalid partner liquidity vesting info");
+      }
+    }
+    if (configParam.creatorLiquidityVestingInfo) {
+      if (!validateLiquidityVestingInfo(
+        configParam.creatorLiquidityVestingInfo
+      )) {
+        throw new Error("Invalid creator liquidity vesting info");
+      }
+    }
+  }
+  if (!validateMinimumLockedLiquidity(
+    configParam.partnerPermanentLockedLiquidityPercentage,
+    configParam.creatorPermanentLockedLiquidityPercentage,
+    configParam.partnerLiquidityVestingInfo,
+    configParam.creatorLiquidityVestingInfo
+  )) {
+    const lockedBpsAtDay1 = calculateLockedLiquidityBpsAtTime(
+      configParam.partnerPermanentLockedLiquidityPercentage,
+      configParam.creatorPermanentLockedLiquidityPercentage,
+      configParam.partnerLiquidityVestingInfo,
+      configParam.creatorLiquidityVestingInfo,
+      SECONDS_PER_DAY
+    );
+    throw new Error(
+      `Invalid migration locked liquidity. At least ${MIN_LOCKED_LIQUIDITY_BPS} BPS (10%) must be locked at day 1. Current locked liquidity at day 1: ${lockedBpsAtDay1} BPS. Consider increasing permanent locked liquidity percentage or extending vesting duration/cliff.`
+    );
+  }
   if (configParam.migrationQuoteThreshold.lte(new BN13(0))) {
     throw new Error("Migration quote threshold must be greater than 0");
   }
@@ -3215,7 +3472,7 @@ function validateConfigParameters(configParam) {
         throw new Error("Invalid vesting parameters");
       }
     } catch (error) {
-      throw new Error("Invalid vesting parameters");
+      throw new Error(`Invalid vesting parameters ${error}`);
     }
   }
   if (configParam.tokenSupply) {
@@ -3280,7 +3537,7 @@ async function validateBalance(connection, owner, inputMint, amountIn, inputToke
       }
     } catch (error) {
       throw new Error(
-        `Failed to fetch token balance or token account doesn't exist`
+        `Failed to fetch token balance or token account doesn't exist ${error}`
       );
     }
   }
@@ -3317,26 +3574,30 @@ import BN14 from "bn.js";
 function buildCurve(buildCurveParam) {
   const {
     totalTokenSupply,
-    percentageSupplyOnMigration,
-    migrationQuoteThreshold,
-    migrationOption,
+    tokenType,
     tokenBaseDecimal,
     tokenQuoteDecimal,
+    tokenUpdateAuthority,
+    lockedVestingParams,
+    leftover,
+    baseFeeParams,
     dynamicFeeEnabled,
     activationType,
     collectFeeMode,
-    migrationFeeOption,
-    tokenType,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
     creatorTradingFeePercentage,
-    leftover,
-    tokenUpdateAuthority,
+    poolCreationFee,
+    migrationOption,
+    migrationFeeOption,
     migrationFee,
-    baseFeeParams,
-    migratedPoolFee
+    partnerPermanentLockedLiquidityPercentage,
+    partnerLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    partnerLiquidityVestingInfoParams,
+    creatorLiquidityVestingInfoParams,
+    migratedPoolFee,
+    percentageSupplyOnMigration,
+    migrationQuoteThreshold
   } = buildCurveParam;
   const baseFee = getBaseFeeParams(
     baseFeeParams,
@@ -3349,7 +3610,7 @@ function buildCurve(buildCurveParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -3358,6 +3619,40 @@ function buildCurve(buildCurveParam) {
     cliffDurationFromMigrationTime,
     tokenBaseDecimal
   );
+  const partnerVestingParams = partnerLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: partnerVestingPercentage,
+    bpsPerPeriod: partnerBpsPerPeriod,
+    numberOfPeriods: partnerNumberOfPeriods,
+    cliffDurationFromMigrationTime: partnerCliffDurationFromMigrationTime,
+    totalDuration: partnerTotalDuration
+  } = partnerVestingParams;
+  const partnerLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    partnerVestingPercentage,
+    partnerBpsPerPeriod,
+    partnerNumberOfPeriods,
+    partnerCliffDurationFromMigrationTime,
+    partnerTotalDuration
+  );
+  const creatorVestingParams = creatorLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: creatorVestingPercentage,
+    bpsPerPeriod: creatorBpsPerPeriod,
+    numberOfPeriods: creatorNumberOfPeriods,
+    cliffDurationFromMigrationTime: creatorCliffDurationFromMigrationTime,
+    totalDuration: creatorTotalDuration
+  } = creatorVestingParams;
+  const creatorLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    creatorVestingPercentage,
+    creatorBpsPerPeriod,
+    creatorNumberOfPeriods,
+    creatorCliffDurationFromMigrationTime,
+    creatorTotalDuration
+  );
+  const poolCreationFeeInLamports = convertToLamports(
+    poolCreationFee,
+    9 /* NINE */
+  );
   const migratedPoolFeeParams = getMigratedPoolFeeParams(
     migrationOption,
     migrationFeeOption,
@@ -3429,16 +3724,16 @@ function buildCurve(buildCurveParam) {
         baseFeeParams.baseFeeMode === 2 /* RateLimiter */ ? baseFeeParams.rateLimiterParam.baseFeeBps : baseFeeParams.feeSchedulerParam.endingFeeBps
       ) : null
     },
-    activationType,
     collectFeeMode,
     migrationOption,
+    activationType,
     tokenType,
     tokenDecimal: tokenBaseDecimal,
+    partnerLiquidityPercentage,
+    partnerPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
     migrationQuoteThreshold: migrationQuoteThresholdInLamport,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
     sqrtStartPrice,
     lockedVesting,
     migrationFeeOption,
@@ -3454,6 +3749,9 @@ function buildCurve(buildCurveParam) {
       dynamicFee: migratedPoolFeeParams.dynamicFee,
       poolFeeBps: migratedPoolFeeParams.poolFeeBps
     },
+    poolCreationFee: poolCreationFeeInLamports,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
     padding: [],
     curve
   };
@@ -3461,12 +3759,13 @@ function buildCurve(buildCurveParam) {
 }
 function buildCurveWithMarketCap(buildCurveWithMarketCapParam) {
   const {
-    initialMarketCap,
-    migrationMarketCap,
     totalTokenSupply,
     tokenBaseDecimal,
+    lockedVestingParams,
+    leftover,
     migrationFee,
-    leftover
+    initialMarketCap,
+    migrationMarketCap
   } = buildCurveWithMarketCapParam;
   const {
     totalLockedVestingAmount,
@@ -3474,7 +3773,7 @@ function buildCurveWithMarketCap(buildCurveWithMarketCapParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveWithMarketCapParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -3516,27 +3815,31 @@ function buildCurveWithMarketCap(buildCurveWithMarketCapParam) {
 function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
   const {
     totalTokenSupply,
-    initialMarketCap,
-    migrationMarketCap,
-    percentageSupplyOnMigration,
-    migrationOption,
+    tokenType,
     tokenBaseDecimal,
     tokenQuoteDecimal,
-    creatorTradingFeePercentage,
-    collectFeeMode,
+    tokenUpdateAuthority,
     leftover,
-    tokenType,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
-    activationType,
+    lockedVestingParams,
+    baseFeeParams,
     dynamicFeeEnabled,
+    activationType,
+    collectFeeMode,
+    creatorTradingFeePercentage,
+    poolCreationFee,
+    migrationOption,
     migrationFeeOption,
     migrationFee,
-    tokenUpdateAuthority,
-    baseFeeParams,
-    migratedPoolFee
+    partnerPermanentLockedLiquidityPercentage,
+    partnerLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    partnerLiquidityVestingInfoParams,
+    creatorLiquidityVestingInfoParams,
+    migratedPoolFee,
+    initialMarketCap,
+    migrationMarketCap,
+    percentageSupplyOnMigration
   } = buildCurveWithTwoSegmentsParam;
   const baseFee = getBaseFeeParams(
     baseFeeParams,
@@ -3549,7 +3852,7 @@ function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveWithTwoSegmentsParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -3558,6 +3861,40 @@ function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
     cliffDurationFromMigrationTime,
     tokenBaseDecimal
   );
+  const partnerVestingParams = partnerLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: partnerVestingPercentage,
+    bpsPerPeriod: partnerBpsPerPeriod,
+    numberOfPeriods: partnerNumberOfPeriods,
+    cliffDurationFromMigrationTime: partnerCliffDurationFromMigrationTime,
+    totalDuration: partnerTotalDuration
+  } = partnerVestingParams;
+  const partnerLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    partnerVestingPercentage,
+    partnerBpsPerPeriod,
+    partnerNumberOfPeriods,
+    partnerCliffDurationFromMigrationTime,
+    partnerTotalDuration
+  );
+  const creatorVestingParams = creatorLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: creatorVestingPercentage,
+    bpsPerPeriod: creatorBpsPerPeriod,
+    numberOfPeriods: creatorNumberOfPeriods,
+    cliffDurationFromMigrationTime: creatorCliffDurationFromMigrationTime,
+    totalDuration: creatorTotalDuration
+  } = creatorVestingParams;
+  const creatorLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    creatorVestingPercentage,
+    creatorBpsPerPeriod,
+    creatorNumberOfPeriods,
+    creatorCliffDurationFromMigrationTime,
+    creatorTotalDuration
+  );
+  const poolCreationFeeInLamports = convertToLamports(
+    poolCreationFee,
+    9 /* NINE */
+  );
   const migratedPoolFeeParams = getMigratedPoolFeeParams(
     migrationOption,
     migrationFeeOption,
@@ -3660,10 +3997,10 @@ function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
     tokenType,
     tokenDecimal: tokenBaseDecimal,
     migrationQuoteThreshold: migrationQuoteThresholdInLamport,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
+    partnerLiquidityPercentage,
+    partnerPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
     sqrtStartPrice,
     lockedVesting,
     migrationFeeOption,
@@ -3677,6 +4014,9 @@ function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
       dynamicFee: migratedPoolFeeParams.dynamicFee,
       poolFeeBps: migratedPoolFeeParams.poolFeeBps
     },
+    poolCreationFee: poolCreationFeeInLamports,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
     padding: [],
     curve,
     tokenUpdateAuthority,
@@ -3687,28 +4027,32 @@ function buildCurveWithTwoSegments(buildCurveWithTwoSegmentsParam) {
 function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
   const {
     totalTokenSupply,
-    initialMarketCap,
-    migrationMarketCap,
-    midPrice,
-    percentageSupplyOnMigration,
-    migrationOption,
+    tokenType,
     tokenBaseDecimal,
     tokenQuoteDecimal,
-    creatorTradingFeePercentage,
-    collectFeeMode,
+    tokenUpdateAuthority,
+    lockedVestingParams,
     leftover,
-    tokenType,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
-    activationType,
+    baseFeeParams,
     dynamicFeeEnabled,
+    activationType,
+    collectFeeMode,
+    creatorTradingFeePercentage,
+    poolCreationFee,
+    migrationOption,
     migrationFeeOption,
     migrationFee,
-    tokenUpdateAuthority,
-    baseFeeParams,
-    migratedPoolFee
+    partnerPermanentLockedLiquidityPercentage,
+    partnerLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    partnerLiquidityVestingInfoParams,
+    creatorLiquidityVestingInfoParams,
+    migratedPoolFee,
+    initialMarketCap,
+    migrationMarketCap,
+    midPrice,
+    percentageSupplyOnMigration
   } = buildCurveWithMidPriceParam;
   const baseFee = getBaseFeeParams(
     baseFeeParams,
@@ -3721,7 +4065,7 @@ function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveWithMidPriceParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -3730,6 +4074,40 @@ function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
     cliffDurationFromMigrationTime,
     tokenBaseDecimal
   );
+  const partnerVestingParams = partnerLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: partnerVestingPercentage,
+    bpsPerPeriod: partnerBpsPerPeriod,
+    numberOfPeriods: partnerNumberOfPeriods,
+    cliffDurationFromMigrationTime: partnerCliffDurationFromMigrationTime,
+    totalDuration: partnerTotalDuration
+  } = partnerVestingParams;
+  const partnerLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    partnerVestingPercentage,
+    partnerBpsPerPeriod,
+    partnerNumberOfPeriods,
+    partnerCliffDurationFromMigrationTime,
+    partnerTotalDuration
+  );
+  const creatorVestingParams = creatorLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: creatorVestingPercentage,
+    bpsPerPeriod: creatorBpsPerPeriod,
+    numberOfPeriods: creatorNumberOfPeriods,
+    cliffDurationFromMigrationTime: creatorCliffDurationFromMigrationTime,
+    totalDuration: creatorTotalDuration
+  } = creatorVestingParams;
+  const creatorLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    creatorVestingPercentage,
+    creatorBpsPerPeriod,
+    creatorNumberOfPeriods,
+    creatorCliffDurationFromMigrationTime,
+    creatorTotalDuration
+  );
+  const poolCreationFeeInLamports = convertToLamports(
+    poolCreationFee,
+    9 /* NINE */
+  );
   const migratedPoolFeeParams = getMigratedPoolFeeParams(
     migrationOption,
     migrationFeeOption,
@@ -3819,10 +4197,10 @@ function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
     tokenType,
     tokenDecimal: tokenBaseDecimal,
     migrationQuoteThreshold: migrationQuoteThresholdInLamport,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
+    partnerLiquidityPercentage,
+    partnerPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
     sqrtStartPrice,
     lockedVesting,
     migrationFeeOption,
@@ -3836,6 +4214,9 @@ function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
       dynamicFee: migratedPoolFeeParams.dynamicFee,
       poolFeeBps: migratedPoolFeeParams.poolFeeBps
     },
+    poolCreationFee: poolCreationFeeInLamports,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
     padding: [],
     curve,
     tokenUpdateAuthority,
@@ -3846,27 +4227,31 @@ function buildCurveWithMidPrice(buildCurveWithMidPriceParam) {
 function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
   const {
     totalTokenSupply,
-    migrationOption,
+    tokenType,
     tokenBaseDecimal,
     tokenQuoteDecimal,
+    tokenUpdateAuthority,
+    lockedVestingParams,
+    leftover,
+    baseFeeParams,
     dynamicFeeEnabled,
     activationType,
     collectFeeMode,
-    migrationFeeOption,
-    tokenType,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
     creatorTradingFeePercentage,
-    leftover,
+    poolCreationFee,
+    migrationOption,
+    migrationFeeOption,
+    migrationFee,
+    partnerPermanentLockedLiquidityPercentage,
+    partnerLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    partnerLiquidityVestingInfoParams,
+    creatorLiquidityVestingInfoParams,
+    migratedPoolFee,
     initialMarketCap,
     migrationMarketCap,
-    liquidityWeights,
-    migrationFee,
-    tokenUpdateAuthority,
-    baseFeeParams,
-    migratedPoolFee
+    liquidityWeights
   } = buildCurveWithLiquidityWeightsParam;
   const baseFee = getBaseFeeParams(
     baseFeeParams,
@@ -3879,7 +4264,7 @@ function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveWithLiquidityWeightsParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -3888,6 +4273,40 @@ function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
     cliffDurationFromMigrationTime,
     tokenBaseDecimal
   );
+  const partnerVestingParams = partnerLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: partnerVestingPercentage,
+    bpsPerPeriod: partnerBpsPerPeriod,
+    numberOfPeriods: partnerNumberOfPeriods,
+    cliffDurationFromMigrationTime: partnerCliffDurationFromMigrationTime,
+    totalDuration: partnerTotalDuration
+  } = partnerVestingParams;
+  const partnerLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    partnerVestingPercentage,
+    partnerBpsPerPeriod,
+    partnerNumberOfPeriods,
+    partnerCliffDurationFromMigrationTime,
+    partnerTotalDuration
+  );
+  const creatorVestingParams = creatorLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: creatorVestingPercentage,
+    bpsPerPeriod: creatorBpsPerPeriod,
+    numberOfPeriods: creatorNumberOfPeriods,
+    cliffDurationFromMigrationTime: creatorCliffDurationFromMigrationTime,
+    totalDuration: creatorTotalDuration
+  } = creatorVestingParams;
+  const creatorLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    creatorVestingPercentage,
+    creatorBpsPerPeriod,
+    creatorNumberOfPeriods,
+    creatorCliffDurationFromMigrationTime,
+    creatorTotalDuration
+  );
+  const poolCreationFeeInLamports = convertToLamports(
+    poolCreationFee,
+    9 /* NINE */
+  );
   const migratedPoolFeeParams = getMigratedPoolFeeParams(
     migrationOption,
     migrationFeeOption,
@@ -3991,10 +4410,10 @@ function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
     tokenType,
     tokenDecimal: tokenBaseDecimal,
     migrationQuoteThreshold: migrationQuoteThresholdInLamport,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
+    partnerLiquidityPercentage,
+    partnerPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
     sqrtStartPrice: pMin,
     lockedVesting,
     migrationFeeOption,
@@ -4008,6 +4427,9 @@ function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
       dynamicFee: migratedPoolFeeParams.dynamicFee,
       poolFeeBps: migratedPoolFeeParams.poolFeeBps
     },
+    poolCreationFee: poolCreationFeeInLamports,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
     padding: [],
     curve,
     migrationFee,
@@ -4018,25 +4440,29 @@ function buildCurveWithLiquidityWeights(buildCurveWithLiquidityWeightsParam) {
 function buildCurveWithCustomSqrtPrices(buildCurveWithCustomSqrtPricesParam) {
   const {
     totalTokenSupply,
-    migrationOption,
+    tokenType,
     tokenBaseDecimal,
     tokenQuoteDecimal,
+    tokenUpdateAuthority,
+    lockedVestingParams,
+    leftover,
+    baseFeeParams,
     dynamicFeeEnabled,
     activationType,
     collectFeeMode,
-    migrationFeeOption,
-    tokenType,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
     creatorTradingFeePercentage,
-    leftover,
-    sqrtPrices,
+    poolCreationFee,
+    migrationOption,
+    migrationFeeOption,
     migrationFee,
-    tokenUpdateAuthority,
-    baseFeeParams,
-    migratedPoolFee
+    partnerPermanentLockedLiquidityPercentage,
+    partnerLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    partnerLiquidityVestingInfoParams,
+    creatorLiquidityVestingInfoParams,
+    migratedPoolFee,
+    sqrtPrices
   } = buildCurveWithCustomSqrtPricesParam;
   let { liquidityWeights } = buildCurveWithCustomSqrtPricesParam;
   if (sqrtPrices.length < 2) {
@@ -4066,7 +4492,7 @@ function buildCurveWithCustomSqrtPrices(buildCurveWithCustomSqrtPricesParam) {
     cliffUnlockAmount,
     totalVestingDuration,
     cliffDurationFromMigrationTime
-  } = buildCurveWithCustomSqrtPricesParam.lockedVestingParam;
+  } = lockedVestingParams;
   const lockedVesting = getLockedVestingParams(
     totalLockedVestingAmount,
     numberOfVestingPeriod,
@@ -4075,6 +4501,40 @@ function buildCurveWithCustomSqrtPrices(buildCurveWithCustomSqrtPricesParam) {
     cliffDurationFromMigrationTime,
     tokenBaseDecimal
   );
+  const partnerVestingParams = partnerLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: partnerVestingPercentage,
+    bpsPerPeriod: partnerBpsPerPeriod,
+    numberOfPeriods: partnerNumberOfPeriods,
+    cliffDurationFromMigrationTime: partnerCliffDurationFromMigrationTime,
+    totalDuration: partnerTotalDuration
+  } = partnerVestingParams;
+  const partnerLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    partnerVestingPercentage,
+    partnerBpsPerPeriod,
+    partnerNumberOfPeriods,
+    partnerCliffDurationFromMigrationTime,
+    partnerTotalDuration
+  );
+  const creatorVestingParams = creatorLiquidityVestingInfoParams ?? DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS;
+  const {
+    vestingPercentage: creatorVestingPercentage,
+    bpsPerPeriod: creatorBpsPerPeriod,
+    numberOfPeriods: creatorNumberOfPeriods,
+    cliffDurationFromMigrationTime: creatorCliffDurationFromMigrationTime,
+    totalDuration: creatorTotalDuration
+  } = creatorVestingParams;
+  const creatorLiquidityVestingInfo = getLiquidityVestingInfoParams(
+    creatorVestingPercentage,
+    creatorBpsPerPeriod,
+    creatorNumberOfPeriods,
+    creatorCliffDurationFromMigrationTime,
+    creatorTotalDuration
+  );
+  const poolCreationFeeInLamports = convertToLamports(
+    poolCreationFee,
+    9 /* NINE */
+  );
   const migratedPoolFeeParams = getMigratedPoolFeeParams(
     migrationOption,
     migrationFeeOption,
@@ -4157,10 +4617,10 @@ function buildCurveWithCustomSqrtPrices(buildCurveWithCustomSqrtPricesParam) {
     tokenType,
     tokenDecimal: tokenBaseDecimal,
     migrationQuoteThreshold: migrationQuoteThresholdInLamport,
-    partnerLpPercentage,
-    creatorLpPercentage,
-    partnerLockedLpPercentage,
-    creatorLockedLpPercentage,
+    partnerLiquidityPercentage,
+    partnerPermanentLockedLiquidityPercentage,
+    creatorLiquidityPercentage,
+    creatorPermanentLockedLiquidityPercentage,
     sqrtStartPrice: pMin,
     lockedVesting,
     migrationFeeOption,
@@ -4174,6 +4634,9 @@ function buildCurveWithCustomSqrtPrices(buildCurveWithCustomSqrtPricesParam) {
       dynamicFee: migratedPoolFeeParams.dynamicFee,
       poolFeeBps: migratedPoolFeeParams.poolFeeBps
     },
+    poolCreationFee: poolCreationFeeInLamports,
+    partnerLiquidityVestingInfo,
+    creatorLiquidityVestingInfo,
     padding: [],
     curve,
     migrationFee,
@@ -4190,7 +4653,7 @@ var idl_default = {
   address: "dbcij3LWUppWqq96dh6gJWwBifmcGfLSB5D4DuSMaqN",
   metadata: {
     name: "dynamic_bonding_curve",
-    version: "0.1.7",
+    version: "0.1.8",
     spec: "0.1.0",
     description: "Created with Anchor"
   },
@@ -4267,10 +4730,7 @@ var idl_default = {
         },
         {
           name: "creator",
-          signer: true,
-          relations: [
-            "pool"
-          ]
+          signer: true
         },
         {
           name: "token_base_program",
@@ -4329,16 +4789,16 @@ var idl_default = {
       ]
     },
     {
-      name: "claim_pool_creation_fee",
+      name: "claim_legacy_pool_creation_fee",
       discriminator: [
-        246,
-        51,
-        18,
-        222,
-        80,
-        42,
-        236,
-        205
+        96,
+        11,
+        187,
+        225,
+        54,
+        117,
+        161,
+        134
       ],
       accounts: [
         {
@@ -4352,14 +4812,11 @@ var idl_default = {
           ]
         },
         {
-          name: "operator",
+          name: "signer",
           docs: [
             "Operator"
           ],
-          signer: true,
-          relations: [
-            "claim_fee_operator"
-          ]
+          signer: true
         },
         {
           name: "treasury",
@@ -4405,6 +4862,72 @@ var idl_default = {
       ],
       args: []
     },
+    {
+      name: "claim_partner_pool_creation_fee",
+      discriminator: [
+        250,
+        238,
+        26,
+        4,
+        139,
+        10,
+        101,
+        248
+      ],
+      accounts: [
+        {
+          name: "config",
+          relations: [
+            "pool"
+          ]
+        },
+        {
+          name: "pool",
+          writable: true
+        },
+        {
+          name: "fee_claimer",
+          signer: true
+        },
+        {
+          name: "fee_receiver",
+          writable: true
+        },
+        {
+          name: "event_authority",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  95,
+                  95,
+                  101,
+                  118,
+                  101,
+                  110,
+                  116,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "program"
+        }
+      ],
+      args: []
+    },
     {
       name: "claim_protocol_fee",
       discriminator: [
@@ -4663,14 +5186,11 @@ var idl_default = {
           ]
         },
         {
-          name: "operator",
+          name: "signer",
           docs: [
-            "Operator"
+            "Signer"
           ],
-          signer: true,
-          relations: [
-            "claim_fee_operator"
-          ]
+          signer: true
         },
         {
           name: "token_base_program",
@@ -4719,6 +5239,82 @@ var idl_default = {
       ],
       args: []
     },
+    {
+      name: "claim_protocol_pool_creation_fee",
+      discriminator: [
+        114,
+        205,
+        83,
+        188,
+        240,
+        153,
+        25,
+        54
+      ],
+      accounts: [
+        {
+          name: "config",
+          relations: [
+            "pool"
+          ]
+        },
+        {
+          name: "pool",
+          writable: true
+        },
+        {
+          name: "claim_fee_operator",
+          docs: [
+            "Claim fee operator"
+          ]
+        },
+        {
+          name: "signer",
+          docs: [
+            "Operator"
+          ],
+          signer: true
+        },
+        {
+          name: "treasury",
+          writable: true,
+          address: "4EWqcx3aNZmMetCnxwLYwyNjan6XLGp3Ca2W316vrSjv"
+        },
+        {
+          name: "event_authority",
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  95,
+                  95,
+                  101,
+                  118,
+                  101,
+                  110,
+                  116,
+                  95,
+                  97,
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
+        },
+        {
+          name: "program"
+        }
+      ],
+      args: []
+    },
     {
       name: "claim_trading_fee",
       discriminator: [
@@ -4800,10 +5396,7 @@ var idl_default = {
         },
         {
           name: "fee_claimer",
-          signer: true,
-          relations: [
-            "config"
-          ]
+          signer: true
         },
         {
           name: "token_base_program",
@@ -4862,16 +5455,16 @@ var idl_default = {
       ]
     },
     {
-      name: "close_claim_fee_operator",
+      name: "close_claim_protocol_fee_operator",
       discriminator: [
-        38,
-        134,
-        82,
-        216,
-        95,
-        124,
-        17,
-        99
+        8,
+        41,
+        87,
+        35,
+        80,
+        48,
+        121,
+        26
       ],
       accounts: [
         {
@@ -4883,7 +5476,7 @@ var idl_default = {
           writable: true
         },
         {
-          name: "admin",
+          name: "signer",
           signer: true
         },
         {
@@ -4922,19 +5515,16 @@ var idl_default = {
       args: []
     },
     {
-      name: "create_claim_fee_operator",
-      docs: [
-        "ADMIN FUNCTIONS_ ///"
-      ],
+      name: "create_claim_protocol_fee_operator",
       discriminator: [
-        169,
-        62,
-        207,
-        107,
-        58,
-        187,
-        162,
-        109
+        51,
+        19,
+        150,
+        252,
+        105,
+        157,
+        48,
+        91
       ],
       accounts: [
         {
@@ -4969,7 +5559,11 @@ var idl_default = {
           name: "operator"
         },
         {
-          name: "admin",
+          name: "signer",
+          signer: true
+        },
+        {
+          name: "payer",
           writable: true,
           signer: true
         },
@@ -5392,10 +5986,7 @@ var idl_default = {
         },
         {
           name: "creator",
-          signer: true,
-          relations: [
-            "virtual_pool"
-          ]
+          signer: true
         },
         {
           name: "payer",
@@ -5511,10 +6102,7 @@ var idl_default = {
         },
         {
           name: "creator",
-          signer: true,
-          relations: [
-            "virtual_pool"
-          ]
+          signer: true
         },
         {
           name: "token_quote_program",
@@ -6549,7 +7137,8 @@ var idl_default = {
         },
         {
           name: "first_position_nft_mint",
-          writable: true
+          writable: true,
+          signer: true
         },
         {
           name: "first_position_nft_account",
@@ -6562,6 +7151,7 @@ var idl_default = {
         {
           name: "second_position_nft_mint",
           writable: true,
+          signer: true,
           optional: true
         },
         {
@@ -6849,10 +7439,7 @@ var idl_default = {
         },
         {
           name: "fee_claimer",
-          signer: true,
-          relations: [
-            "config"
-          ]
+          signer: true
         },
         {
           name: "token_quote_program",
@@ -7034,6 +7621,19 @@ var idl_default = {
             "config"
           ]
         },
+        {
+          name: "claim_fee_operator",
+          docs: [
+            "Claim fee operator"
+          ]
+        },
+        {
+          name: "signer",
+          docs: [
+            "Signer"
+          ],
+          signer: true
+        },
         {
           name: "token_quote_program",
           docs: [
@@ -7403,10 +8003,7 @@ var idl_default = {
         },
         {
           name: "creator",
-          signer: true,
-          relations: [
-            "virtual_pool"
-          ]
+          signer: true
         },
         {
           name: "new_creator"
@@ -7427,51 +8024,21 @@ var idl_default = {
                   116,
                   95,
                   97,
-                  117,
-                  116,
-                  104,
-                  111,
-                  114,
-                  105,
-                  116,
-                  121
-                ]
-              }
-            ]
-          }
-        },
-        {
-          name: "program"
-        }
-      ],
-      args: []
-    },
-    {
-      name: "withdraw_lamports_from_pool_authority",
-      discriminator: [
-        20,
-        185,
-        242,
-        240,
-        129,
-        24,
-        212,
-        194
-      ],
-      accounts: [
-        {
-          name: "pool_authority",
-          writable: true,
-          address: "FhVo3mqL8PW5pH5U2CN4XE33DokiyZnUwuGpH2hmHLuM"
-        },
-        {
-          name: "receiver",
-          writable: true,
-          address: "4EWqcx3aNZmMetCnxwLYwyNjan6XLGp3Ca2W316vrSjv"
+                  117,
+                  116,
+                  104,
+                  111,
+                  114,
+                  105,
+                  116,
+                  121
+                ]
+              }
+            ]
+          }
         },
         {
-          name: "system_program",
-          address: "11111111111111111111111111111111"
+          name: "program"
         }
       ],
       args: []
@@ -7999,6 +8566,19 @@ var idl_default = {
         37
       ]
     },
+    {
+      name: "EvtPartnerClaimPoolCreationFee",
+      discriminator: [
+        174,
+        223,
+        44,
+        150,
+        145,
+        98,
+        89,
+        195
+      ]
+    },
     {
       name: "EvtPartnerMetadata",
       discriminator: [
@@ -8385,6 +8965,31 @@ var idl_default = {
       code: 6050,
       name: "AccountInvariantViolation",
       msg: "Account invariant violation"
+    },
+    {
+      code: 6051,
+      name: "InvalidPoolCreationFee",
+      msg: "Invalid pool creation fee"
+    },
+    {
+      code: 6052,
+      name: "PoolCreationFeeHasBeenClaimed",
+      msg: "Pool creation fee has been claimed"
+    },
+    {
+      code: 6053,
+      name: "Unauthorized",
+      msg: "Not permit to do this action"
+    },
+    {
+      code: 6054,
+      name: "ZeroPoolCreationFee",
+      msg: "Pool creation fee is zero"
+    },
+    {
+      code: 6055,
+      name: "InvalidMigrationLockedLiquidity",
+      msg: "Invalid migration locked liquidity"
     }
   ],
   types: [
@@ -8570,19 +9175,19 @@ var idl_default = {
             type: "u8"
           },
           {
-            name: "partner_lp_percentage",
+            name: "partner_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "partner_locked_lp_percentage",
+            name: "partner_permanent_locked_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "creator_lp_percentage",
+            name: "creator_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "creator_locked_lp_percentage",
+            name: "creator_permanent_locked_liquidity_percentage",
             type: "u8"
           },
           {
@@ -8639,6 +9244,29 @@ var idl_default = {
               }
             }
           },
+          {
+            name: "pool_creation_fee",
+            docs: [
+              "pool creation fee in SOL lamports value"
+            ],
+            type: "u64"
+          },
+          {
+            name: "partner_liquidity_vesting_info",
+            type: {
+              defined: {
+                name: "LiquidityVestingInfoParams"
+              }
+            }
+          },
+          {
+            name: "creator_liquidity_vesting_info",
+            type: {
+              defined: {
+                name: "LiquidityVestingInfoParams"
+              }
+            }
+          },
           {
             name: "padding",
             docs: [
@@ -8646,8 +9274,8 @@ var idl_default = {
             ],
             type: {
               array: [
-                "u64",
-                7
+                "u8",
+                22
               ]
             }
           },
@@ -8850,7 +9478,7 @@ var idl_default = {
             type: "pubkey"
           },
           {
-            name: "treasury",
+            name: "receiver",
             type: "pubkey"
           },
           {
@@ -8987,19 +9615,19 @@ var idl_default = {
             type: "u8"
           },
           {
-            name: "partner_locked_lp_percentage",
+            name: "partner_permanent_locked_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "partner_lp_percentage",
+            name: "partner_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "creator_locked_lp_percentage",
+            name: "creator_permanent_locked_liquidity_percentage",
             type: "u8"
           },
           {
-            name: "creator_lp_percentage",
+            name: "creator_liquidity_percentage",
             type: "u8"
           },
           {
@@ -9171,6 +9799,26 @@ var idl_default = {
         ]
       }
     },
+    {
+      name: "EvtPartnerClaimPoolCreationFee",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "pool",
+            type: "pubkey"
+          },
+          {
+            name: "partner",
+            type: "pubkey"
+          },
+          {
+            name: "creation_fee",
+            type: "u64"
+          }
+        ]
+      }
+    },
     {
       name: "EvtPartnerMetadata",
       docs: [
@@ -9473,6 +10121,79 @@ var idl_default = {
         ]
       }
     },
+    {
+      name: "LiquidityVestingInfo",
+      serialization: "bytemuck",
+      repr: {
+        kind: "c"
+      },
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "is_initialized",
+            type: "u8"
+          },
+          {
+            name: "vesting_percentage",
+            type: "u8"
+          },
+          {
+            name: "_padding",
+            type: {
+              array: [
+                "u8",
+                2
+              ]
+            }
+          },
+          {
+            name: "bps_per_period",
+            type: "u16"
+          },
+          {
+            name: "number_of_periods",
+            type: "u16"
+          },
+          {
+            name: "frequency",
+            type: "u32"
+          },
+          {
+            name: "cliff_duration_from_migration_time",
+            type: "u32"
+          }
+        ]
+      }
+    },
+    {
+      name: "LiquidityVestingInfoParams",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "vesting_percentage",
+            type: "u8"
+          },
+          {
+            name: "bps_per_period",
+            type: "u16"
+          },
+          {
+            name: "number_of_periods",
+            type: "u16"
+          },
+          {
+            name: "cliff_duration_from_migration_time",
+            type: "u32"
+          },
+          {
+            name: "frequency",
+            type: "u32"
+          }
+        ]
+      }
+    },
     {
       name: "LockEscrow",
       docs: [
@@ -9603,7 +10324,7 @@ var idl_default = {
           {
             name: "padding_0",
             docs: [
-              "!!! BE CAREFUL to use tomestone field, previous is pool creator"
+              "!!! BE CAREFUL to use tombstone field, previous is pool creator"
             ],
             type: {
               array: [
@@ -9627,30 +10348,30 @@ var idl_default = {
             type: "pubkey"
           },
           {
-            name: "partner_locked_lp",
+            name: "partner_locked_liquidity",
             docs: [
-              "partner locked lp"
+              "partner locked liquidity"
             ],
             type: "u64"
           },
           {
-            name: "partner_lp",
+            name: "partner_liquidity",
             docs: [
-              "partner lp"
+              "partner liquidity"
             ],
             type: "u64"
           },
           {
-            name: "creator_locked_lp",
+            name: "creator_locked_liquidity",
             docs: [
-              "creator locked lp"
+              "creator locked liquidity"
             ],
             type: "u64"
           },
           {
-            name: "creator_lp",
+            name: "creator_liquidity",
             docs: [
-              "creator lp"
+              "creator liquidity"
             ],
             type: "u64"
           },
@@ -9664,28 +10385,28 @@ var idl_default = {
           {
             name: "creator_locked_status",
             docs: [
-              "flag to check whether lp is locked for creator"
+              "flag to check whether liquidity token is locked for creator"
             ],
             type: "u8"
           },
           {
             name: "partner_locked_status",
             docs: [
-              "flag to check whether lp is locked for partner"
+              "flag to check whether liquidity token is locked for partner"
             ],
             type: "u8"
           },
           {
             name: "creator_claim_status",
             docs: [
-              "flag to check whether creator has claimed lp token"
+              "flag to check whether creator has claimed liquidity token"
             ],
             type: "u8"
           },
           {
             name: "partner_claim_status",
             docs: [
-              "flag to check whether partner has claimed lp token"
+              "flag to check whether partner has claimed liquidity token"
             ],
             type: "u8"
           },
@@ -9832,6 +10553,41 @@ var idl_default = {
               }
             }
           },
+          {
+            name: "partner_liquidity_vesting_info",
+            type: {
+              defined: {
+                name: "LiquidityVestingInfo"
+              }
+            }
+          },
+          {
+            name: "creator_liquidity_vesting_info",
+            type: {
+              defined: {
+                name: "LiquidityVestingInfo"
+              }
+            }
+          },
+          {
+            name: "padding_0",
+            docs: [
+              "Padding for future use"
+            ],
+            type: {
+              array: [
+                "u8",
+                14
+              ]
+            }
+          },
+          {
+            name: "padding_1",
+            docs: [
+              "Previously was protocol and referral fee percent. Beware of tombstone."
+            ],
+            type: "u16"
+          },
           {
             name: "collect_fee_mode",
             docs: [
@@ -9882,30 +10638,30 @@ var idl_default = {
             type: "u8"
           },
           {
-            name: "partner_locked_lp_percentage",
+            name: "partner_permanent_locked_liquidity_percentage",
             docs: [
-              "partner locked lp percentage"
+              "partner locked liquidity percentage"
             ],
             type: "u8"
           },
           {
-            name: "partner_lp_percentage",
+            name: "partner_liquidity_percentage",
             docs: [
-              "partner lp percentage"
+              "partner liquidity percentage"
             ],
             type: "u8"
           },
           {
-            name: "creator_locked_lp_percentage",
+            name: "creator_permanent_locked_liquidity_percentage",
             docs: [
               "creator post migration fee percentage"
             ],
             type: "u8"
           },
           {
-            name: "creator_lp_percentage",
+            name: "creator_liquidity_percentage",
             docs: [
-              "creator lp percentage"
+              "creator liquidity percentage"
             ],
             type: "u8"
           },
@@ -9952,10 +10708,7 @@ var idl_default = {
             type: "u8"
           },
           {
-            name: "_padding_0",
-            docs: [
-              "padding 0"
-            ],
+            name: "padding_2",
             type: {
               array: [
                 "u8",
@@ -10045,10 +10798,17 @@ var idl_default = {
             type: {
               array: [
                 "u8",
-                12
+                4
               ]
             }
           },
+          {
+            name: "pool_creation_fee",
+            docs: [
+              "pool creation fee in lamports value"
+            ],
+            type: "u64"
+          },
           {
             name: "_padding_2",
             docs: [
@@ -10168,32 +10928,6 @@ var idl_default = {
                 name: "DynamicFeeConfig"
               }
             }
-          },
-          {
-            name: "padding_0",
-            type: {
-              array: [
-                "u64",
-                5
-              ]
-            }
-          },
-          {
-            name: "padding_1",
-            type: {
-              array: [
-                "u8",
-                6
-              ]
-            }
-          },
-          {
-            name: "protocol_fee_percent",
-            type: "u8"
-          },
-          {
-            name: "referral_fee_percent",
-            type: "u8"
           }
         ]
       }
@@ -10569,16 +11303,29 @@ var idl_default = {
             ],
             type: "u64"
           },
+          {
+            name: "legacy_creation_fee_bits",
+            docs: [
+              "legacy creation fee bits, we dont use this now"
+            ],
+            type: "u8"
+          },
           {
             name: "creation_fee_bits",
+            docs: [
+              "pool creation fee claim status"
+            ],
             type: "u8"
           },
           {
             name: "_padding_0",
+            docs: [
+              "Padding for further use"
+            ],
             type: {
               array: [
                 "u8",
-                7
+                6
               ]
             }
           },
@@ -24864,6 +25611,25 @@ var MigrationService = class extends DynamicBondingCurveProgram {
     );
     const tokenBaseProgram = poolConfigState.tokenType == 0 ? TOKEN_PROGRAM_ID3 : TOKEN_2022_PROGRAM_ID2;
     const tokenQuoteProgram = poolConfigState.quoteTokenFlag == 0 ? TOKEN_PROGRAM_ID3 : TOKEN_2022_PROGRAM_ID2;
+    const firstPositionVestingAddress = deriveDammV2PositionVestingAccount(firstPosition);
+    const secondPositionVestingAddress = deriveDammV2PositionVestingAccount(secondPosition);
+    const remainingAccounts = [
+      {
+        isSigner: false,
+        isWritable: false,
+        pubkey: dammConfig
+      },
+      {
+        isSigner: false,
+        isWritable: true,
+        pubkey: firstPositionVestingAddress
+      },
+      {
+        isSigner: false,
+        isWritable: true,
+        pubkey: secondPositionVestingAddress
+      }
+    ];
     const tx = await this.program.methods.migrationDammV2().accountsStrict({
       virtualPool,
       migrationMetadata,
@@ -24890,15 +25656,9 @@ var MigrationService = class extends DynamicBondingCurveProgram {
       token2022Program: TOKEN_2022_PROGRAM_ID2,
       systemProgram: SystemProgram3.programId,
       dammEventAuthority
-    }).remainingAccounts([
-      {
-        isSigner: false,
-        isWritable: false,
-        pubkey: dammConfig
-      }
-    ]).transaction();
+    }).remainingAccounts(remainingAccounts).transaction();
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
-      units: 5e5
+      units: 6e5
     });
     tx.add(modifyComputeUnits);
     return {
@@ -25349,6 +26109,33 @@ var PartnerService = class extends DynamicBondingCurveProgram {
     }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
     return transaction;
   }
+  /**
+   * Claim partner pool creation fee
+   * @param params - The claim partner pool creation fee parameters
+   * @returns A claim partner pool creation fee transaction
+   */
+  async claimPartnerPoolCreationFee(params) {
+    const { virtualPool, feeReceiver } = params;
+    const virtualPoolState = await this.state.getPool(virtualPool);
+    if (!virtualPoolState) {
+      throw new Error(`Pool not found: ${virtualPool.toString()}`);
+    }
+    const config = virtualPoolState.config;
+    const configState = await this.state.getPoolConfig(
+      virtualPoolState.config
+    );
+    if (!configState) {
+      throw new Error(`Pool config not found for virtual pool`);
+    }
+    const feeClaimer = configState.feeClaimer;
+    const transaction = await this.program.methods.claimPartnerPoolCreationFee().accountsPartial({
+      config,
+      pool: virtualPool,
+      feeClaimer,
+      feeReceiver
+    }).transaction();
+    return transaction;
+  }
 };
 
 // src/services/pool.ts
@@ -26690,7 +27477,6 @@ var DynamicBondingCurveClient = class _DynamicBondingCurveClient {
 export {
   ActivationType,
   BASE_ADDRESS,
-  BASIS_POINT_MAX,
   BIN_STEP_BPS_DEFAULT,
   BIN_STEP_BPS_U128_DEFAULT,
   BaseFeeMode,
@@ -26700,6 +27486,7 @@ export {
   DAMM_V1_PROGRAM_ID,
   DAMM_V2_MIGRATION_FEE_ADDRESS,
   DAMM_V2_PROGRAM_ID,
+  DEFAULT_LIQUIDITY_VESTING_INFO_PARAMS,
   DYNAMIC_BONDING_CURVE_PROGRAM_ID,
   DYNAMIC_FEE_DECAY_PERIOD_DEFAULT,
   DYNAMIC_FEE_FILTER_PERIOD_DEFAULT,
@@ -26713,39 +27500,44 @@ export {
   FEE_DENOMINATOR,
   FeeRateLimiter,
   FeeScheduler,
+  HOST_FEE_PERCENT,
   LOCKER_PROGRAM_ID,
+  MAX_BASIS_POINT,
   MAX_CREATOR_MIGRATION_FEE_PERCENTAGE,
   MAX_CURVE_POINT,
-  MAX_DYNAMIC_FEE_PERCENTAGE,
   MAX_FEE_BPS,
   MAX_FEE_NUMERATOR,
+  MAX_LOCK_DURATION_IN_SECONDS,
   MAX_MIGRATED_POOL_FEE_BPS,
   MAX_MIGRATION_FEE_PERCENTAGE,
-  MAX_PRICE_CHANGE_BPS_DEFAULT,
+  MAX_POOL_CREATION_FEE,
+  MAX_PRICE_CHANGE_PERCENTAGE_DEFAULT,
   MAX_RATE_LIMITER_DURATION_IN_SECONDS,
   MAX_RATE_LIMITER_DURATION_IN_SLOTS,
   MAX_SQRT_PRICE,
   METAPLEX_PROGRAM_ID,
   MIN_FEE_BPS,
   MIN_FEE_NUMERATOR,
+  MIN_LOCKED_LIQUIDITY_BPS,
   MIN_MIGRATED_POOL_FEE_BPS,
+  MIN_POOL_CREATION_FEE,
   MIN_SQRT_PRICE,
   MigrationFeeOption,
   MigrationOption,
   MigrationService,
   OFFSET,
   ONE_Q64,
-  PARTNER_SURPLUS_SHARE,
+  PROTOCOL_FEE_PERCENT,
+  PROTOCOL_POOL_CREATION_FEE_PERCENT,
   PartnerService,
   PoolService,
   RESOLUTION,
   Rounding,
-  SLOT_DURATION,
+  SECONDS_PER_DAY,
   SWAP_BUFFER_PERCENTAGE,
   SafeMath,
   StateService,
   SwapMode,
-  TIMESTAMP_DURATION,
   TokenDecimal,
   TokenType,
   TokenUpdateAuthorityOption,
@@ -26765,6 +27557,7 @@ export {
   calculateBaseToQuoteFromAmountIn,
   calculateBaseToQuoteFromAmountOut,
   calculateFeeSchedulerEndingBaseFeeBps,
+  calculateLockedLiquidityBpsAtTime,
   calculateQuoteToBaseFromAmountIn,
   calculateQuoteToBaseFromAmountOut,
   checkRateLimiterApplied,
@@ -26793,6 +27586,7 @@ export {
   deriveDammV2MigrationMetadataAddress,
   deriveDammV2PoolAddress,
   deriveDammV2PoolAuthority,
+  deriveDammV2PositionVestingAccount,
   deriveDammV2TokenVaultAddress,
   deriveDbcEventAuthority,
   deriveDbcPoolAddress,
@@ -26844,6 +27638,7 @@ export {
   getInitialLiquidityFromDeltaBase,
   getInitialLiquidityFromDeltaQuote,
   getLiquidity,
+  getLiquidityVestingInfoParams,
   getLockedVestingParams,
   getMaxBaseFeeNumerator,
   getMaxIndex,
@@ -26887,6 +27682,7 @@ export {
   getTotalVestingAmount,
   getTwoCurve,
   getVariableFeeNumerator,
+  getVestingLockedLiquidityBpsAtNSeconds,
   isDefaultLockedVesting,
   isDynamicFeeEnabled,
   isNativeSol,
@@ -26915,10 +27711,13 @@ export {
   validateFeeRateLimiter,
   validateFeeScheduler,
   validateLPPercentages,
+  validateLiquidityVestingInfo,
   validateMigratedPoolFee,
   validateMigrationAndTokenType,
   validateMigrationFee,
   validateMigrationFeeOption,
+  validateMinimumLockedLiquidity,
+  validatePoolCreationFee,
   validatePoolFees,
   validateSwapAmount,
   validateTokenDecimals,