@meteora-ag/dlmm 1.0.35 → 1.0.36-rc.1

package/dist/index.mjs

@@ -6922,7 +6922,7 @@ var DLMM = class {
     );
     return program.account.lbPair.all();
   }
-  static async checkPoolExists(connection, tokenX, tokenY, binStep, baseFactor, opt) {
+  static async isPoolExisted(connection, tokenX, tokenY, binStep, baseFactor, opt) {
     const cluster = opt?.cluster || "mainnet-beta";
     const provider = new AnchorProvider(
       connection,
@@ -6931,15 +6931,29 @@ var DLMM = class {
     );
     const program = new Program(IDL, LBCLMM_PROGRAM_IDS[cluster], provider);
     try {
-      const [lbPairKey] = deriveLbPair2(
+      const [lbPair2Key] = deriveLbPair2(
         tokenX,
         tokenY,
         binStep,
         baseFactor,
         program.programId
       );
-      await program.account.lbPair.fetch(lbPairKey);
-      return true;
+      const account2 = await program.account.lbPair.fetchNullable(lbPair2Key);
+      if (account2)
+        return lbPair2Key;
+      const [lbPairKey] = deriveLbPair(
+        tokenX,
+        tokenY,
+        binStep,
+        program.programId
+      );
+      const account = await program.account.lbPair.fetchNullable(lbPairKey);
+      if (!account) {
+        return false;
+      }
+      if (account.parameters.baseFactor === baseFactor.toNumber()) {
+        return lbPairKey;
+      }
     } catch {
       return false;
     }
@@ -7629,6 +7643,16 @@ var DLMM = class {
       AnchorProvider.defaultOptions()
     );
     const program = new Program(IDL, LBCLMM_PROGRAM_IDS[opt.cluster], provider);
+    const existsPool = await this.isPoolExisted(
+      connection,
+      tokenX,
+      tokenY,
+      binStep,
+      baseFactor
+    );
+    if (existsPool) {
+      throw new Error("Pool already exists");
+    }
     const [lbPair] = deriveLbPair2(
       tokenX,
       tokenY,