@meteora-ag/dlmm 1.7.2 → 1.7.3

package/dist/index.mjs

@@ -14125,7 +14125,7 @@ var DLMM = class {
     return program.account.lbPair.all();
   }
   /**
-   * Retrieves the public key of a LB pair if it exists.
+   * Retrieves the public key of a LB pair if it exists. This function expect the RPC have getProgramAccounts RPC method enabled.
    * @param connection The connection to the Solana cluster.
    * @param tokenX The mint address of token X.
    * @param tokenY The mint address of token Y.
@@ -14137,57 +14137,54 @@ var DLMM = class {
    */
   static async getPairPubkeyIfExists(connection, tokenX, tokenY, binStep, baseFactor, baseFeePowerFactor, opt) {
     const program = createProgram(connection, opt);
-    try {
-      const [lbPair2Key] = deriveLbPair2(
-        tokenX,
-        tokenY,
-        binStep,
-        baseFactor,
-        program.programId
-      );
-      const account2 = await program.account.lbPair.fetchNullable(lbPair2Key);
-      if (account2)
-        return lbPair2Key;
-      const [lbPairKey] = deriveLbPair(
-        tokenX,
-        tokenY,
-        binStep,
-        program.programId
+    const [lbPair2Key] = deriveLbPair2(
+      tokenX,
+      tokenY,
+      binStep,
+      baseFactor,
+      program.programId
+    );
+    const account2 = await program.account.lbPair.fetchNullable(lbPair2Key);
+    if (account2 && account2.parameters.baseFeePowerFactor == baseFeePowerFactor.toNumber()) {
+      return lbPair2Key;
+    }
+    const [lbPairKey] = deriveLbPair(
+      tokenX,
+      tokenY,
+      binStep,
+      program.programId
+    );
+    const account = await program.account.lbPair.fetchNullable(lbPairKey);
+    if (account && account.parameters.baseFactor === baseFactor.toNumber() && account.parameters.baseFeePowerFactor === baseFeePowerFactor.toNumber()) {
+      return lbPairKey;
+    }
+    const presetParametersWithIndex = await program.account.presetParameter2.all([
+      presetParameter2BinStepFilter(binStep),
+      presetParameter2BaseFactorFilter(baseFactor),
+      presetParameter2BaseFeePowerFactor(baseFeePowerFactor)
+    ]);
+    if (presetParametersWithIndex.length > 0) {
+      const possibleLbPairKeys = presetParametersWithIndex.map((account3) => {
+        return deriveLbPairWithPresetParamWithIndexKey(
+          account3.publicKey,
+          tokenX,
+          tokenY,
+          program.programId
+        )[0];
+      });
+      const accounts = await chunkedGetMultipleAccountInfos(
+        program.provider.connection,
+        possibleLbPairKeys
       );
-      const account = await program.account.lbPair.fetchNullable(lbPairKey);
-      if (account && account.parameters.baseFactor === baseFactor.toNumber()) {
-        return lbPairKey;
-      }
-      const presetParametersWithIndex = await program.account.presetParameter2.all([
-        presetParameter2BinStepFilter(binStep),
-        presetParameter2BaseFactorFilter(baseFactor),
-        presetParameter2BaseFeePowerFactor(baseFeePowerFactor)
-      ]);
-      if (presetParametersWithIndex.length > 0) {
-        const possibleLbPairKeys = presetParametersWithIndex.map((account3) => {
-          return deriveLbPairWithPresetParamWithIndexKey(
-            account3.publicKey,
-            tokenX,
-            tokenY,
-            program.programId
-          )[0];
-        });
-        const accounts = await chunkedGetMultipleAccountInfos(
-          program.provider.connection,
-          possibleLbPairKeys
-        );
-        for (let i = 0; i < possibleLbPairKeys.length; i++) {
-          const pairKey = possibleLbPairKeys[i];
-          const account3 = accounts[i];
-          if (account3) {
-            return pairKey;
-          }
+      for (let i = 0; i < possibleLbPairKeys.length; i++) {
+        const pairKey = possibleLbPairKeys[i];
+        const account3 = accounts[i];
+        if (account3) {
+          return pairKey;
         }
       }
-      return null;
-    } catch (error) {
-      return null;
     }
+    return null;
   }
   static async getCustomizablePermissionlessLbPairIfExists(connection, tokenX, tokenY, opt) {
     const program = createProgram(connection, opt);
@@ -15141,7 +15138,7 @@ var DLMM = class {
       tokenY,
       new BN21(presetParameterState.binStep),
       new BN21(presetParameterState.baseFactor),
-      new BN21(presetParameterState.baseFactor),
+      new BN21(presetParameterState.baseFeePowerFactor),
       {
         cluster: opt?.cluster,
         programId: opt?.programId