flipmeme-sdk 1.2.14 → 1.2.16

package/dist/index.d.mts

@@ -20,6 +20,7 @@ interface SolanaConfig {
     provider: AnchorProvider;
     wallet: PublicKey;
     sendTransaction: (transaction: Transaction | VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<TransactionSignature>;
+    signAllTransactions: (txs: Array<Transaction | VersionedTransaction>) => Promise<Array<Transaction | VersionedTransaction>>;
 }
 interface CollectionParams {
     sessionId: string;

package/dist/index.d.ts

@@ -20,6 +20,7 @@ interface SolanaConfig {
     provider: AnchorProvider;
     wallet: PublicKey;
     sendTransaction: (transaction: Transaction | VersionedTransaction, connection: Connection, options?: SendTransactionOptions) => Promise<TransactionSignature>;
+    signAllTransactions: (txs: Array<Transaction | VersionedTransaction>) => Promise<Array<Transaction | VersionedTransaction>>;
 }
 interface CollectionParams {
     sessionId: string;

package/dist/index.js

@@ -174,37 +174,6 @@ var flipmeme_default = {
             ]
           }
         },
-        {
-          name: "collection_nft",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  99,
-                  111,
-                  108,
-                  108,
-                  101,
-                  99,
-                  116,
-                  105,
-                  111,
-                  110,
-                  95,
-                  110,
-                  102,
-                  116
-                ]
-              },
-              {
-                kind: "account",
-                path: "collection"
-              }
-            ]
-          }
-        },
         {
           name: "treasury",
           writable: true
@@ -1301,6 +1270,10 @@ var flipmeme_default = {
         {
           name: "base_uri",
           type: "string"
+        },
+        {
+          name: "nonce",
+          type: "u8"
         }
       ]
     },
@@ -2273,9 +2246,9 @@ var SOLANA_PUBKEYS = {
   RENT_TOKEN_ID: new import_web3.PublicKey(SOLANA.RENT_TOKEN_STR)
 };
 var SDK_SOLANA_CONFIG = {
-  MINT_CHUNK_SIZE: 4,
-  BUY_CHUNK_SIZE: 2,
-  SELL_CHUNK_SIZE: 2
+  MINT_CHUNK_SIZE: 1,
+  BUY_CHUNK_SIZE: 1,
+  SELL_CHUNK_SIZE: 1
 };
 var VALID_SIZE_PAIR = {
   3: { maxBufferSize: 8, maxDepth: 3 },
@@ -2645,8 +2618,8 @@ var SolanaConnector = class {
         name,
         tokenUri,
         totalSupply,
-        new import_bn2.default(1e5),
-        new import_bn2.default(1e7)
+        new import_bn2.default(1e7),
+        new import_bn2.default(1e9)
       ).accountsStrict({
         state: SOLANA_PUBKEYS.STATE_ID,
         collection: collectionPda2,
@@ -2710,29 +2683,28 @@ var SolanaConnector = class {
       if (!reserveToken || ((_a = reserveToken.mintAndBuy) == null ? void 0 : _a.length) === 0 && ((_b = reserveToken.buy) == null ? void 0 : _b.length) === 0) {
         throw new Error("No available token to buy");
       }
-      const lookupTableAccounts = yield this.getLookupTableAccounts(SOLANA_PUBKEYS.LOOKUP_TABLE);
-      console.log("========lookup Tables", lookupTableAccounts);
-      const instructionsChunks = [];
+      const lookupTableAccounts = yield this.getLookupTableAccounts(
+        SOLANA_PUBKEYS.LOOKUP_TABLE
+      );
+      let transactions = [];
       if ((_c = reserveToken.buy) == null ? void 0 : _c.length) {
         let assets = yield getAssetsInfo(reserveToken.buy, merkleTree);
         const sellTokens = (0, import_lodash2.sampleSize)(assets, reserveToken.buy.length);
-        console.log("=========", sellTokens);
         try {
-          const buyInstructionsChunks = yield this.getBuyInstructions(
+          const txs = yield this.getBuyInstructions(
             this.config.wallet,
             collectionId,
             merkleTree,
             sellTokens
           );
-          instructionsChunks.push(...buyInstructionsChunks);
-          console.log("=========", buyInstructionsChunks);
+          transactions.push(...txs);
         } catch (error) {
           console.error("Failed to getBuyInstructions", { error });
         }
       }
       if ((_d = reserveToken.mintAndBuy) == null ? void 0 : _d.length) {
         try {
-          const mintAndBuyInstructionsChunks = yield this.getMintAndBuyInstructions(
+          const txs = yield this.getMintAndBuyInstructions(
             this.config.wallet,
             collectionId,
             creatorAddress,
@@ -2740,37 +2712,21 @@ var SolanaConnector = class {
             baseUri,
             new import_web35.PublicKey(merkleTree)
           );
-          instructionsChunks.push(...mintAndBuyInstructionsChunks);
+          transactions.push(...txs);
         } catch (error) {
           console.error("Failed to getMintAndBuyInstructions", { error });
         }
       }
-      console.log("===instruction chunks===", instructionsChunks);
       let buyResponse = [];
-      for (const [instructions] of instructionsChunks) {
-        try {
-          const { signature, latestBlockhash } = yield this.sendTxn(instructions, lookupTableAccounts);
-          const confirmResult = yield this.config.provider.connection.confirmTransaction({
-            blockhash: latestBlockhash.blockhash,
-            lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-            signature
-          });
-          console.log("confirmResult", confirmResult);
-          let transactionData = yield this.config.provider.connection.getTransaction(signature, {
-            commitment: "confirmed",
-            maxSupportedTransactionVersion: 0
-          });
-          if (transactionData) {
-            let itemBuyResponse = yield analyzeBuyTransaction(
-              this.program,
-              transactionData
-            );
-            buyResponse.push(...itemBuyResponse);
-          }
-        } catch (e) {
-          console.error("Buy failed:", JSON.stringify(e));
-          throw e;
-        }
+      try {
+        const { signatures, latestBlockhash } = yield this.sendTxnForBatch(
+          transactions,
+          lookupTableAccounts
+        );
+        console.log("signatures", signatures);
+      } catch (e) {
+        console.error("Buy failed:", JSON.stringify(e));
+        throw e;
       }
       return buyResponse;
     });
@@ -2782,46 +2738,33 @@ var SolanaConnector = class {
         throw new Error("Program not initialized");
       }
       const { collectionId, ownedTokens, merkleTree } = params;
-      const lookupTableAccounts = yield this.getLookupTableAccounts(SOLANA_PUBKEYS.LOOKUP_TABLE);
+      const lookupTableAccounts = yield this.getLookupTableAccounts(
+        SOLANA_PUBKEYS.LOOKUP_TABLE
+      );
       let assets = yield getAssetsInfo(ownedTokens, merkleTree);
-      let instructionsChunks = [];
       const sellTokens = (0, import_lodash2.sampleSize)(assets, ownedTokens.length);
+      let transactions = [];
       try {
-        instructionsChunks = yield this.getSellInstructions(
+        const txs = yield this.getSellInstructions(
           this.config.wallet,
           collectionId,
           merkleTree,
           sellTokens
         );
+        transactions.push(...txs);
       } catch (error) {
         console.error("Failed to getSellInstructions", { error });
         throw error;
       }
       let sellResponse = [];
-      for (const [instructions, items] of instructionsChunks) {
-        try {
-          const { signature, latestBlockhash } = yield this.sendTxn(instructions, lookupTableAccounts);
-          const confirmResult = yield this.config.provider.connection.confirmTransaction({
-            blockhash: latestBlockhash.blockhash,
-            lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-            signature
-          });
-          console.log("confirmResult", confirmResult);
-          let transactionData = yield this.config.provider.connection.getTransaction(signature, {
-            commitment: "confirmed",
-            maxSupportedTransactionVersion: 0
-          });
-          if (transactionData) {
-            let itemSellResponse = yield analyzeSellTransaction(
-              this.program,
-              transactionData
-            );
-            sellResponse.push(...itemSellResponse);
-          }
-        } catch (e) {
-          console.error("Flip failed:", JSON.stringify(e), { items });
-          throw e;
-        }
+      try {
+        const { signatures, latestBlockhash } = yield this.sendTxnForBatch(
+          transactions,
+          lookupTableAccounts
+        );
+      } catch (e) {
+        console.error("Flip failed:", JSON.stringify(e));
+        throw e;
       }
       return sellResponse;
     });
@@ -2832,52 +2775,36 @@ var SolanaConnector = class {
       if (!this.program) {
         throw new Error("Program not initialized");
       }
-      let instructionsChunks = [];
-      const lookupTableAccounts = yield this.getLookupTableAccounts(SOLANA_PUBKEYS.LOOKUP_TABLE);
+      let transactions = [];
+      const lookupTableAccounts = yield this.getLookupTableAccounts(
+        SOLANA_PUBKEYS.LOOKUP_TABLE
+      );
       for (const collectionId in data.data) {
         const items = data.data[collectionId];
         try {
-          console.log("items", items);
-          console.log("collectionId", collectionId);
           let assets = yield getAssetsInfo(items.tokenIds, items.merkleTree);
           const sellTokens = (0, import_lodash2.sampleSize)(assets, items.tokenIds.length);
-          let instructionsChunksItem = yield this.getSellInstructions(
+          const txs = yield this.getSellInstructions(
             this.config.wallet,
             collectionId,
             items.merkleTree,
             sellTokens
           );
-          instructionsChunks.push(...instructionsChunksItem);
+          transactions.push(...txs);
         } catch (error) {
           console.error("Failed to getSellInstructions", { error });
           throw error;
         }
       }
       let sellResponse = [];
-      for (const [instructions, items] of instructionsChunks) {
-        try {
-          const { signature, latestBlockhash } = yield this.sendTxn(instructions, lookupTableAccounts);
-          const confirmResult = yield this.config.provider.connection.confirmTransaction({
-            blockhash: latestBlockhash.blockhash,
-            lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-            signature
-          });
-          console.log("confirmResult", confirmResult);
-          let transactionData = yield this.config.provider.connection.getTransaction(signature, {
-            commitment: "confirmed",
-            maxSupportedTransactionVersion: 0
-          });
-          if (transactionData) {
-            let itemSellResponse = yield analyzeSellTransaction(
-              this.program,
-              transactionData
-            );
-            sellResponse.push(...itemSellResponse);
-          }
-        } catch (e) {
-          console.error("Flip failed:", JSON.stringify(e), { items });
-          throw e;
-        }
+      try {
+        const { signatures, latestBlockhash } = yield this.sendTxnForBatch(
+          transactions,
+          lookupTableAccounts
+        );
+      } catch (e) {
+        console.error("Flip failed:", JSON.stringify(e));
+        throw e;
       }
       return sellResponse;
     });
@@ -3198,7 +3125,9 @@ var SolanaConnector = class {
         payerKey: this.config.wallet,
         recentBlockhash: latestBlockhash.blockhash,
         instructions
-      }).compileToV0Message(lookupTableAccounts == null ? [] : [lookupTableAccounts]);
+      }).compileToV0Message(
+        lookupTableAccounts == null ? [] : [lookupTableAccounts]
+      );
       const tx = new import_web35.VersionedTransaction(messageV0);
       const sim = yield this.config.provider.connection.simulateTransaction(tx);
       console.log("simulation result == ", sim);
@@ -3213,6 +3142,44 @@ var SolanaConnector = class {
       };
     });
   }
+  //useSenTxn.ts
+  sendTxnForBatch(transactions, lookupTableAccounts) {
+    return __async(this, null, function* () {
+      if (!this.program) {
+        console.error("Trade NFT failed: Insufficient data");
+        throw new Error("Trade NFT failed: Insufficient data");
+      }
+      const latestBlockhash = yield this.config.provider.connection.getLatestBlockhash("confirmed");
+      const payerKey = this.config.wallet;
+      const txs = transactions.map((tx) => {
+        const messageV0 = new import_web35.TransactionMessage({
+          payerKey,
+          recentBlockhash: latestBlockhash.blockhash,
+          instructions: tx.instructions
+        }).compileToV0Message(
+          lookupTableAccounts == null ? [] : [lookupTableAccounts]
+        );
+        return new import_web35.VersionedTransaction(messageV0);
+      });
+      const signedTxs = yield this.config.signAllTransactions(txs);
+      let signatures = yield Promise.all(
+        signedTxs.map((signedTx) => __async(this, null, function* () {
+          if (signedTx instanceof import_web35.VersionedTransaction) {
+            let signature = yield this.config.provider.connection.sendTransaction(
+              signedTx,
+              { skipPreflight: true, preflightCommitment: "confirmed" }
+            );
+            return signature;
+          }
+        }))
+      );
+      console.log("Promise signatures ===============", signatures);
+      return {
+        signatures,
+        latestBlockhash
+      };
+    });
+  }
   getBuyInstructions(userPublicKey, collectionId, merkleTree, tokens) {
     return __async(this, null, function* () {
       if (!this.program) {
@@ -3225,8 +3192,8 @@ var SolanaConnector = class {
       const canopyDepth = merkleTreeAcount.getCanopyDepth();
       const chunkSize = SDK_SOLANA_CONFIG.SELL_CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
-      const allInstructionSets = [];
-      const { treeConfigPda: treeConfigPda2, collectionPda: collectionPda2, nftHolderPda: nftHolderPda2, collectionNftPda: collectionNftPda2 } = yield getTradingAccounts(
+      const transactions = [];
+      const { treeConfigPda: treeConfigPda2, collectionPda: collectionPda2, nftHolderPda: nftHolderPda2 } = yield getTradingAccounts(
         collectionId,
         userPublicKey,
         this.program.programId,
@@ -3235,9 +3202,7 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(
-            25e4 * chunk.length
-          );
+          let transaction = yield this.setUpInstructions(14e5);
           for (const token of chunk) {
             const { compression, proof, root } = token;
             const proofPath = proof.map((node) => ({
@@ -3259,7 +3224,6 @@ var SolanaConnector = class {
               merkleTreeConfig: treeConfigPda2,
               merkleTree: new import_web35.PublicKey(merkleTree),
               collection: collectionPda2,
-              collectionNft: collectionNftPda2,
               treasury: SOLANA_PUBKEYS.TREASURY_ID,
               nftHolder: nftHolderPda2,
               buyer: userPublicKey,
@@ -3271,11 +3235,11 @@ var SolanaConnector = class {
               program: this.program.programId,
               eventAuthority: eventAuthority(this.program.programId)
             }).remainingAccounts(proofPath).instruction();
-            instructions.push(instruction);
+            transaction.add(instruction);
           }
-          allInstructionSets.push([instructions]);
+          transactions.push(transaction);
         }
-        return allInstructionSets;
+        return transactions;
       } catch (e) {
         console.log("ERRORR in getBuyInstructions", JSON.stringify(e));
         throw e;
@@ -3294,7 +3258,7 @@ var SolanaConnector = class {
       const canopyDepth = merkleTreeAcount.getCanopyDepth();
       const chunkSize = SDK_SOLANA_CONFIG.SELL_CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
-      const allInstructionSets = [];
+      const transactions = [];
       const { treeConfigPda: treeConfigPda2, collectionPda: collectionPda2, nftHolderPda: nftHolderPda2, collectionNftPda: collectionNftPda2 } = yield getTradingAccounts(
         collectionId,
         userPublicKey,
@@ -3304,9 +3268,7 @@ var SolanaConnector = class {
       );
       try {
         for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(
-            25e4 * chunk.length
-          );
+          let transaction = yield this.setUpInstructions(14e5);
           for (const token of chunk) {
             const { compression, proof, root } = token;
             const proofPath = proof.map((node) => ({
@@ -3339,11 +3301,11 @@ var SolanaConnector = class {
               program: this.program.programId,
               eventAuthority: eventAuthority(this.program.programId)
             }).remainingAccounts(proofPath).instruction();
-            instructions.push(instruction);
+            transaction.add(instruction);
           }
-          allInstructionSets.push([instructions, chunk]);
+          transactions.push(transaction);
         }
-        return allInstructionSets;
+        return transactions;
       } catch (e) {
         console.log("ERRORR in getBuyInstructions", JSON.stringify(e));
         throw e;
@@ -3363,7 +3325,7 @@ var SolanaConnector = class {
       }
       const chunkSize = SDK_SOLANA_CONFIG.MINT_CHUNK_SIZE;
       const tokenChunks = getTokenChunks(tokens, chunkSize);
-      const allInstructionSets = [];
+      const transactions = [];
       const {
         treeConfigPda: treeConfigPda2,
         treeCreator,
@@ -3382,9 +3344,12 @@ var SolanaConnector = class {
         creatorAddress
       );
       try {
-        for (const chunk of tokenChunks) {
-          const instructions = yield this.setUpInstructions(14e5);
-          const instruction = yield this.program.methods.mintAndBuy(chunk, baseUri).accountsStrict({
+        for (let index in tokenChunks) {
+          console.log("index value", index);
+          let chunk = tokenChunks[index];
+          let nounce = new Number(index);
+          let transaction = yield this.setUpInstructions(14e5);
+          const instruction = yield this.program.methods.mintAndBuy(chunk, baseUri, nounce.valueOf()).accountsStrict({
             state: SOLANA_PUBKEYS.STATE_ID,
             merkleTreeConfig: treeConfigPda2,
             treeCreatorOrDelegate: treeCreator,
@@ -3406,10 +3371,10 @@ var SolanaConnector = class {
             eventAuthority: eventAuthority(this.program.programId),
             program: this.program.programId
           }).instruction();
-          instructions.push(instruction);
-          allInstructionSets.push([instructions]);
+          transaction.add(instruction);
+          transactions.push(transaction);
         }
-        return allInstructionSets;
+        return transactions;
       } catch (e) {
         console.log("ERRORR in getMintAndBuyInstructions", JSON.stringify(e));
         throw e;
@@ -3430,7 +3395,7 @@ var SolanaConnector = class {
   setUpInstructions(computeUnits) {
     return __async(this, null, function* () {
       const microLamports = yield this.getPriorityFee();
-      const instructions = [];
+      let transaction;
       const modifyComputeUnits = import_web35.ComputeBudgetProgram.setComputeUnitLimit({
         units: computeUnits
       });
@@ -3438,8 +3403,8 @@ var SolanaConnector = class {
         microLamports
         // TODO: get value from Quicknote api
       });
-      instructions.push(modifyComputeUnits, addPriorityFee);
-      return instructions;
+      transaction = new import_web35.Transaction().add(modifyComputeUnits).add(addPriorityFee);
+      return transaction;
     });
   }
   /**