@meteora-ag/dynamic-bonding-curve-sdk 1.2.9-rc.2 → 1.2.9

package/dist/index.cjs

@@ -26,11 +26,11 @@ var MigrationOption = /* @__PURE__ */ ((MigrationOption2) => {
   MigrationOption2[MigrationOption2["MET_DAMM_V2"] = 1] = "MET_DAMM_V2";
   return MigrationOption2;
 })(MigrationOption || {});
-var BaseFeeMode = /* @__PURE__ */ ((BaseFeeMode3) => {
-  BaseFeeMode3[BaseFeeMode3["FeeSchedulerLinear"] = 0] = "FeeSchedulerLinear";
-  BaseFeeMode3[BaseFeeMode3["FeeSchedulerExponential"] = 1] = "FeeSchedulerExponential";
-  BaseFeeMode3[BaseFeeMode3["RateLimiter"] = 2] = "RateLimiter";
-  return BaseFeeMode3;
+var BaseFeeMode = /* @__PURE__ */ ((BaseFeeMode2) => {
+  BaseFeeMode2[BaseFeeMode2["FeeSchedulerLinear"] = 0] = "FeeSchedulerLinear";
+  BaseFeeMode2[BaseFeeMode2["FeeSchedulerExponential"] = 1] = "FeeSchedulerExponential";
+  BaseFeeMode2[BaseFeeMode2["RateLimiter"] = 2] = "RateLimiter";
+  return BaseFeeMode2;
 })(BaseFeeMode || {});
 var MigrationFeeOption = /* @__PURE__ */ ((MigrationFeeOption2) => {
   MigrationFeeOption2[MigrationFeeOption2["FixedBps25"] = 0] = "FixedBps25";
@@ -21951,7 +21951,6 @@ var PoolService = class extends DynamicBondingCurveProgram {
    * @returns A transaction that creates the config
    */
   async createConfigTx(configParam, config, feeClaimer, leftoverReceiver, quoteMint, payer) {
-    validateConfigParameters({ ...configParam, leftoverReceiver });
     return this.program.methods.createConfig(configParam).accountsPartial({
       config,
       feeClaimer,
@@ -22001,11 +22000,21 @@ var PoolService = class extends DynamicBondingCurveProgram {
    * @param payerAddress - The payer address
    * @returns Instructions for the first buy
    */
-  async swapBuyTx(firstBuyParam, baseMint, config, baseFeeMode, tokenType, quoteMint) {
-    const { buyer, buyAmount, minimumAmountOut, referralTokenAccount } = firstBuyParam;
+  async swapBuyTx(createConfigAndPoolWithFirstBuyParam, config, quoteMint) {
+    const { baseMint, poolCreator } = createConfigAndPoolWithFirstBuyParam.createPoolParam;
+    const { buyAmount, minimumAmountOut, referralTokenAccount } = createConfigAndPoolWithFirstBuyParam.swapBuyParam;
     validateSwapAmount(buyAmount);
+    let currentPoint;
+    if (createConfigAndPoolWithFirstBuyParam.activationType === 0 /* Slot */) {
+      const currentSlot = await this.connection.getSlot();
+      currentPoint = currentSlot;
+    } else {
+      const currentSlot = await this.connection.getSlot();
+      const currentTime = await this.connection.getBlockTime(currentSlot);
+      currentPoint = currentTime;
+    }
     const isRateLimiterApplied = checkRateLimiterApplied(
-      baseFeeMode,
+      createConfigAndPoolWithFirstBuyParam.poolFees.baseFee.baseFeeMode,
       false,
       new (0, _bnjs2.default)(0),
       new (0, _bnjs2.default)(0),
@@ -22016,7 +22025,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
       false,
       {
         baseMint,
-        poolType: tokenType
+        poolType: createConfigAndPoolWithFirstBuyParam.tokenType
       },
       {
         quoteMint,
@@ -22031,8 +22040,8 @@ var PoolService = class extends DynamicBondingCurveProgram {
       ataTokenB: outputTokenAccount,
       instructions: preInstructions
     } = await this.prepareTokenAccounts(
-      buyer,
-      buyer,
+      poolCreator,
+      poolCreator,
       inputMint,
       outputMint,
       inputTokenProgram,
@@ -22041,7 +22050,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
     if (inputMint.equals(_spltoken.NATIVE_MINT)) {
       preInstructions.push(
         ...wrapSOLInstruction(
-          buyer,
+          poolCreator,
           inputTokenAccount,
           BigInt(buyAmount.toString())
         )
@@ -22051,7 +22060,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
     if ([inputMint.toBase58(), outputMint.toBase58()].includes(
       _spltoken.NATIVE_MINT.toBase58()
     )) {
-      const unwrapIx = unwrapSOLInstruction(buyer, buyer);
+      const unwrapIx = unwrapSOLInstruction(poolCreator, poolCreator);
       unwrapIx && postInstructions.push(unwrapIx);
     }
     const remainingAccounts = isRateLimiterApplied ? [
@@ -22075,7 +22084,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
       referralTokenAccount,
       inputTokenAccount,
       outputTokenAccount,
-      payer: buyer,
+      payer: poolCreator,
       tokenBaseProgram: outputTokenProgram,
       tokenQuoteProgram: inputTokenProgram
     }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
@@ -22126,31 +22135,47 @@ var PoolService = class extends DynamicBondingCurveProgram {
       payer,
       ...configParam
     } = createConfigAndPoolParam;
+    const { baseMint, name, symbol, uri, poolCreator } = createConfigAndPoolParam.createPoolParam;
+    validateConfigParameters({ ...configParam, leftoverReceiver });
     const configKey = new (0, _web3js.PublicKey)(config);
     const quoteMintToken = new (0, _web3js.PublicKey)(quoteMint);
     const payerAddress = new (0, _web3js.PublicKey)(payer);
-    const feeClaimerAddress = new (0, _web3js.PublicKey)(feeClaimer);
-    const leftoverReceiverAddress = new (0, _web3js.PublicKey)(leftoverReceiver);
     const tx = new (0, _web3js.Transaction)();
-    const createConfigTx = await this.createConfigTx(
-      configParam,
-      configKey,
-      feeClaimerAddress,
-      leftoverReceiverAddress,
-      quoteMintToken,
-      payerAddress
-    );
-    tx.add(createConfigTx);
-    const createPoolTx = await this.createPoolTx(
-      {
-        ...createConfigAndPoolParam.preCreatePoolParam,
-        config: configKey,
-        payer: payerAddress
-      },
-      createConfigAndPoolParam.tokenType,
-      quoteMintToken
-    );
-    tx.add(createPoolTx);
+    const configTx = await this.program.methods.createConfig(configParam).accountsPartial({
+      config,
+      feeClaimer,
+      leftoverReceiver,
+      quoteMint,
+      payer
+    }).transaction();
+    tx.add(configTx);
+    const pool = deriveDbcPoolAddress(quoteMintToken, baseMint, configKey);
+    const baseVault = deriveDbcTokenVaultAddress(pool, baseMint);
+    const quoteVault = deriveDbcTokenVaultAddress(pool, quoteMintToken);
+    const baseParams = {
+      name,
+      symbol,
+      uri,
+      pool,
+      config: configKey,
+      payer: payerAddress,
+      poolCreator,
+      baseMint,
+      baseVault,
+      quoteVault,
+      quoteMint: quoteMintToken
+    };
+    if (createConfigAndPoolParam.tokenType === 0 /* SPL */) {
+      const mintMetadata = deriveMintMetadata(baseMint);
+      const poolTx = await this.initializeSplPool({
+        ...baseParams,
+        mintMetadata
+      });
+      tx.add(poolTx);
+    } else {
+      const poolTx = await this.initializeToken2022Pool(baseParams);
+      tx.add(poolTx);
+    }
     return tx;
   }
   /**
@@ -22167,6 +22192,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
       payer,
       ...configParam
     } = createConfigAndPoolWithFirstBuyParam;
+    validateConfigParameters({ ...configParam, leftoverReceiver });
     const configKey = new (0, _web3js.PublicKey)(config);
     const quoteMintToken = new (0, _web3js.PublicKey)(quoteMint);
     const payerAddress = new (0, _web3js.PublicKey)(payer);
@@ -22182,7 +22208,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
     );
     const createPoolTx = await this.createPoolTx(
       {
-        ...createConfigAndPoolWithFirstBuyParam.preCreatePoolParam,
+        ...createConfigAndPoolWithFirstBuyParam.createPoolParam,
         config: configKey,
         payer: payerAddress
       },
@@ -22190,11 +22216,8 @@ var PoolService = class extends DynamicBondingCurveProgram {
       quoteMintToken
     );
     const swapBuyTx = await this.swapBuyTx(
-      createConfigAndPoolWithFirstBuyParam.firstBuyParam,
-      createConfigAndPoolWithFirstBuyParam.preCreatePoolParam.baseMint,
+      createConfigAndPoolWithFirstBuyParam,
       configKey,
-      createConfigAndPoolWithFirstBuyParam.poolFees.baseFee.baseFeeMode,
-      createConfigAndPoolWithFirstBuyParam.tokenType,
       quoteMintToken
     );
     return {
@@ -22206,30 +22229,113 @@ var PoolService = class extends DynamicBondingCurveProgram {
   /**
    * Create a new pool and buy tokens
    * @param createPoolWithFirstBuyParam - The parameters for the pool and buy
-   * @returns An object containing the new pool transaction and swap buy transaction
+   * @returns A transaction that creates the pool and buys tokens
    */
   async createPoolWithFirstBuy(createPoolWithFirstBuyParam) {
     const { baseMint, config, name, symbol, uri, payer, poolCreator } = createPoolWithFirstBuyParam.createPoolParam;
-    const { buyer, buyAmount, minimumAmountOut, referralTokenAccount } = createPoolWithFirstBuyParam.firstBuyParam;
+    const { buyAmount, minimumAmountOut, referralTokenAccount } = createPoolWithFirstBuyParam;
     const poolConfigState = await this.state.getPoolConfig(config);
     const { quoteMint, tokenType } = poolConfigState;
-    const createPoolTx = await this.createPoolTx(
-      createPoolWithFirstBuyParam.createPoolParam,
-      tokenType,
-      quoteMint
-    );
-    const swapBuyTx = await this.swapBuyTx(
-      createPoolWithFirstBuyParam.firstBuyParam,
-      createPoolWithFirstBuyParam.createPoolParam.baseMint,
+    const pool = deriveDbcPoolAddress(quoteMint, baseMint, config);
+    const baseVault = deriveDbcTokenVaultAddress(pool, baseMint);
+    const quoteVault = deriveDbcTokenVaultAddress(pool, quoteMint);
+    const baseParams = {
+      name,
+      symbol,
+      uri,
+      pool,
       config,
-      poolConfigState.poolFees.baseFee.baseFeeMode,
-      tokenType,
+      payer,
+      poolCreator,
+      baseMint,
+      baseVault,
+      quoteVault,
       quoteMint
-    );
-    return {
-      createPoolTx,
-      swapBuyTx
     };
+    let tx;
+    if (tokenType === 0 /* SPL */) {
+      const mintMetadata = deriveMintMetadata(baseMint);
+      tx = await this.initializeSplPool({ ...baseParams, mintMetadata });
+    } else {
+      tx = await this.initializeToken2022Pool(baseParams);
+    }
+    validateSwapAmount(buyAmount);
+    let currentPoint;
+    if (poolConfigState.activationType === 0 /* Slot */) {
+      const currentSlot = await this.connection.getSlot();
+      currentPoint = new (0, _bnjs2.default)(currentSlot);
+    } else {
+      const currentSlot = await this.connection.getSlot();
+      const currentTime = await this.connection.getBlockTime(currentSlot);
+      currentPoint = new (0, _bnjs2.default)(currentTime);
+    }
+    const isRateLimiterApplied = checkRateLimiterApplied(
+      poolConfigState.poolFees.baseFee.baseFeeMode,
+      false,
+      new (0, _bnjs2.default)(0),
+      new (0, _bnjs2.default)(0),
+      new (0, _bnjs2.default)(0)
+    );
+    const { inputMint, outputMint, inputTokenProgram, outputTokenProgram } = this.prepareSwapParams(
+      false,
+      { baseMint, poolType: tokenType },
+      poolConfigState
+    );
+    const {
+      ataTokenA: inputTokenAccount,
+      ataTokenB: outputTokenAccount,
+      instructions: preInstructions
+    } = await this.prepareTokenAccounts(
+      poolCreator,
+      poolCreator,
+      inputMint,
+      outputMint,
+      inputTokenProgram,
+      outputTokenProgram
+    );
+    if (inputMint.equals(_spltoken.NATIVE_MINT)) {
+      preInstructions.push(
+        ...wrapSOLInstruction(
+          poolCreator,
+          inputTokenAccount,
+          BigInt(buyAmount.toString())
+        )
+      );
+    }
+    const postInstructions = [];
+    if ([inputMint.toBase58(), outputMint.toBase58()].includes(
+      _spltoken.NATIVE_MINT.toBase58()
+    )) {
+      const unwrapIx = unwrapSOLInstruction(poolCreator, poolCreator);
+      unwrapIx && postInstructions.push(unwrapIx);
+    }
+    const remainingAccounts = isRateLimiterApplied ? [
+      {
+        isSigner: false,
+        isWritable: false,
+        pubkey: _web3js.SYSVAR_INSTRUCTIONS_PUBKEY
+      }
+    ] : [];
+    const firstBuyTx = await this.program.methods.swap({
+      amountIn: buyAmount,
+      minimumAmountOut
+    }).accountsPartial({
+      baseMint,
+      quoteMint,
+      pool,
+      baseVault,
+      quoteVault,
+      config,
+      poolAuthority: this.poolAuthority,
+      referralTokenAccount,
+      inputTokenAccount,
+      outputTokenAccount,
+      payer: poolCreator,
+      tokenBaseProgram: outputTokenProgram,
+      tokenQuoteProgram: inputTokenProgram
+    }).remainingAccounts(remainingAccounts).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    tx.add(...firstBuyTx.instructions);
+    return tx;
   }
   /**
    * Swap between base and quote
@@ -22243,7 +22349,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
       throw new Error(`Pool not found: ${swapParam.pool.toString()}`);
     }
     const poolConfigState = await this.state.getPoolConfig(poolState.config);
-    const { amountIn, minimumAmountOut, swapBaseForQuote, owner, payer } = swapParam;
+    const { amountIn, minimumAmountOut, swapBaseForQuote, owner } = swapParam;
     validateSwapAmount(amountIn);
     let currentPoint;
     if (poolConfigState.activationType === 0 /* Slot */) {
@@ -22268,7 +22374,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
       instructions: preInstructions
     } = await this.prepareTokenAccounts(
       owner,
-      payer ? payer : owner,
+      owner,
       inputMint,
       outputMint,
       inputTokenProgram,
@@ -22347,11 +22453,6 @@ var PoolService = class extends DynamicBondingCurveProgram {
       currentPoint
     );
   }
-  /**
-   * Calculate the exact amount in for a swap (quote)
-   * @param swapQuoteExactInParam - The parameters for the swap
-   * @returns The exact amount in for the swap
-   */
   swapQuoteExactIn(swapQuoteExactInParam) {
     const { virtualPool, config, currentPoint } = swapQuoteExactInParam;
     const requiredQuoteAmount = calculateQuoteExactInAmount(