@meteora-ag/dlmm 1.5.0-rc.1 → 1.5.0-rc.4

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as _coral_xyz_anchor from '@coral-xyz/anchor';
 import { BN, Program, IdlAccounts, ProgramAccount, IdlTypes, EventParser } from '@coral-xyz/anchor';
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, AccountMeta, TransactionInstruction, Connection, Cluster, Transaction, Keypair } from '@solana/web3.js';
+import { PublicKey, AccountMeta, Keypair, TransactionInstruction, Connection, Cluster, Transaction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { Mint } from '@solana/spl-token';
 import { AllAccountsMap } from '@coral-xyz/anchor/dist/cjs/program/namespace/types';
@@ -8952,6 +8952,7 @@ interface TInitializeMultiplePositionAndAddLiquidityParamsByStrategy {
     strategy: StrategyParameters;
     user: PublicKey;
     slippage?: number;
+    customKeyPairGenerator?: () => Promise<Keypair>;
 }
 interface BinLiquidity {
     binId: number;
@@ -9963,7 +9964,7 @@ declare class DLMM {
      *   - `addLiquidityIxs`: An array of `Transaction`s, each of which contains the instructions to add liquidity to a position.
      *   - `positionKeypairs`: An array of `Keypair`s, each of which is the keypair of a position.
      */
-    initializeMultiplePositionAndAddLiquidityByStrategy({ totalXAmount, totalYAmount, strategy, user, slippage, }: TInitializeMultiplePositionAndAddLiquidityParamsByStrategy): Promise<{
+    initializeMultiplePositionAndAddLiquidityByStrategy({ totalXAmount, totalYAmount, strategy, user, slippage, customKeyPairGenerator, }: TInitializeMultiplePositionAndAddLiquidityParamsByStrategy): Promise<{
         initPositionIxs: Transaction[];
         addLiquidityIxs: Transaction[];
         positionKeypairs: Keypair[];

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/dlmm/index.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/dlmm/index.ts
 var _anchor = require('@coral-xyz/anchor');
 
 
@@ -14417,7 +14417,9 @@ var DLMM = class {
       tokenBadgeX,
       tokenBadgeY
     ]);
-    const presetParameterState = await program.account.presetParameter2.fetch(presetParameter);
+    const presetParameterState = await program.account.presetParameter2.fetch(
+      presetParameter
+    );
     const existsPool = await this.getPairPubkeyIfExists(
       connection,
       tokenX,
@@ -15446,7 +15448,8 @@ var DLMM = class {
     totalYAmount,
     strategy,
     user,
-    slippage
+    slippage,
+    customKeyPairGenerator
   }) {
     const { maxBinId, minBinId } = strategy;
     const activeBin = await this.getActiveBin();
@@ -15473,7 +15476,7 @@ var DLMM = class {
     const initPositionIxs = [];
     const addLiquidityIxs = [];
     for (let i = 0; i < chunkedPositionBinRange.length; i++) {
-      const positionKeypair = _web3js.Keypair.generate();
+      const positionKeypair = await _asyncNullishCoalesce(await _optionalChain([customKeyPairGenerator, 'optionalCall', _78 => _78()]), async () => ( _web3js.Keypair.generate()));
       positionKeypairs.push(positionKeypair);
       const { lowerBinId, upperBinId } = chunkedPositionBinRange[i];
       let width = upperBinId - lowerBinId + 1;
@@ -15648,14 +15651,14 @@ var DLMM = class {
     return {
       initPositionIxs: initPositionIxs.map((ixs) => {
         return new (0, _web3js.Transaction)({
-          feePayer: this.lbPair.creator,
+          feePayer: user,
           blockhash,
           lastValidBlockHeight
         }).add(...ixs);
       }),
       addLiquidityIxs: addLiquidityIxs.map((ixs) => {
         return new (0, _web3js.Transaction)({
-          feePayer: this.lbPair.creator,
+          feePayer: user,
           blockhash,
           lastValidBlockHeight
         }).add(...ixs);
@@ -16103,7 +16106,9 @@ var DLMM = class {
     slippage
   }) {
     const maxActiveBinSlippage = slippage ? Math.ceil(slippage / (this.lbPair.binStep / 100)) : MAX_ACTIVE_BIN_SLIPPAGE;
-    const positionAccount = await this.program.account.positionV2.fetch(positionPubKey);
+    const positionAccount = await this.program.account.positionV2.fetch(
+      positionPubKey
+    );
     const { lowerBinId, upperBinId, binIds } = this.processXYAmountDistribution(xYAmountDistribution);
     if (lowerBinId < positionAccount.lowerBinId)
       throw new Error(
@@ -16623,7 +16628,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _78 => _78.binArrayBitmapExtension, 'optionalAccess', _79 => _79.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _79 => _79.binArrayBitmapExtension, 'optionalAccess', _80 => _80.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -16688,7 +16693,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _80 => _80.binArrayBitmapExtension, 'optionalAccess', _81 => _81.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _81 => _81.binArrayBitmapExtension, 'optionalAccess', _82 => _82.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -16785,7 +16790,7 @@ var DLMM = class {
         swapForY,
         activeId,
         this.lbPair,
-        _nullishCoalesce(_optionalChain([this, 'access', _82 => _82.binArrayBitmapExtension, 'optionalAccess', _83 => _83.account]), () => ( null)),
+        _nullishCoalesce(_optionalChain([this, 'access', _83 => _83.binArrayBitmapExtension, 'optionalAccess', _84 => _84.account]), () => ( null)),
         binArrays
       );
       if (binArrayAccountToSwap == null) {
@@ -16873,7 +16878,7 @@ var DLMM = class {
           swapForY,
           activeId,
           this.lbPair,
-          _nullishCoalesce(_optionalChain([this, 'access', _84 => _84.binArrayBitmapExtension, 'optionalAccess', _85 => _85.account]), () => ( null)),
+          _nullishCoalesce(_optionalChain([this, 'access', _85 => _85.binArrayBitmapExtension, 'optionalAccess', _86 => _86.account]), () => ( null)),
           binArrays
         );
         if (binArrayAccountToSwap == null) {
@@ -18216,7 +18221,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _86 => _86.binArrayBitmapExtension, 'optionalAccess', _87 => _87.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _87 => _87.binArrayBitmapExtension, 'optionalAccess', _88 => _88.account]), () => ( null))
     );
     if (toBinArrayIndex === null)
       return true;
@@ -18253,7 +18258,7 @@ var DLMM = class {
       swapForY,
       new (0, _anchor.BN)(activeBinId),
       this.lbPair,
-      _nullishCoalesce(_optionalChain([this, 'access', _88 => _88.binArrayBitmapExtension, 'optionalAccess', _89 => _89.account]), () => ( null))
+      _nullishCoalesce(_optionalChain([this, 'access', _89 => _89.binArrayBitmapExtension, 'optionalAccess', _90 => _90.account]), () => ( null))
     );
     const marketPriceBinArrayIndex = binIdToBinArrayIndex(
       new (0, _anchor.BN)(marketPriceBinId)
@@ -18289,7 +18294,7 @@ var DLMM = class {
     let binArrayBitmapExtension = null;
     if (binArrayBitMapExtensionPubkey) {
       binArrayBitmapExtension = binArrayBitMapExtensionPubkey;
-      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _90 => _90[0]])) {
+      if (!_optionalChain([binArrayAccounts, 'optionalAccess', _91 => _91[0]])) {
         const initializeBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accountsPartial({
           binArrayBitmapExtension: binArrayBitMapExtensionPubkey,
           funder: owner,
@@ -18298,10 +18303,10 @@ var DLMM = class {
         preInstructions.push(initializeBitmapExtensionIx);
       }
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _91 => _91[1]])) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _92 => _92[1]])) {
       fromBinArray = fromBinArrayPubkey;
     }
-    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _92 => _92[2]]) && !!toBinArrayIndex) {
+    if (!!_optionalChain([binArrayAccounts, 'optionalAccess', _93 => _93[2]]) && !!toBinArrayIndex) {
       toBinArray = toBinArrayPubkey;
     }
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
@@ -18807,7 +18812,7 @@ var DLMM = class {
         );
       })
     );
-    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _93 => _93.find, 'call', _94 => _94((binArray) => binArray != null), 'optionalAccess', _95 => _95.version]), () => ( 1));
+    const version = _nullishCoalesce(_optionalChain([binArrays, 'access', _94 => _94.find, 'call', _95 => _95((binArray) => binArray != null), 'optionalAccess', _96 => _96.version]), () => ( 1));
     return Array.from(
       enumerateBins(
         binsById,