flipmeme-sdk 1.2.0 → 1.2.1

package/dist/index.d.mts

@@ -44,7 +44,7 @@ interface NFTMintData {
 }
 interface ReserveToken {
     buy: NFTTradingData[] | null;
-    mintAndBuy: NFTMintData[] | null;
+    mintAndBuy: string[] | null;
 }
 interface BuyParams {
     merkleTree: PublicKey;
@@ -54,12 +54,10 @@ interface BuyParams {
     quantity: number;
     baseUri: string;
     reserveToken: ReserveToken | null;
-    notify: any | undefined;
 }
 interface BuyResponse {
     buyer: string;
     collectionAddress: string;
-    nftAddress: string;
     tokenId: string;
     tokenName?: string;
     tokenUri?: string;

package/dist/index.d.ts

@@ -44,7 +44,7 @@ interface NFTMintData {
 }
 interface ReserveToken {
     buy: NFTTradingData[] | null;
-    mintAndBuy: NFTMintData[] | null;
+    mintAndBuy: string[] | null;
 }
 interface BuyParams {
     merkleTree: PublicKey;
@@ -54,12 +54,10 @@ interface BuyParams {
     quantity: number;
     baseUri: string;
     reserveToken: ReserveToken | null;
-    notify: any | undefined;
 }
 interface BuyResponse {
     buyer: string;
     collectionAddress: string;
-    nftAddress: string;
     tokenId: string;
     tokenName?: string;
     tokenUri?: string;

package/dist/index.js

@@ -2296,7 +2296,7 @@ var SOLANA_PUBKEYS = {
   RENT_TOKEN_ID: new import_web3.PublicKey(SOLANA.RENT_TOKEN_STR)
 };
 var SDK_SOLANA_CONFIG = {
-  CHUNK_SIZE: 3
+  CHUNK_SIZE: 5
 };
 var VALID_SIZE_PAIR = {
   3: { maxBufferSize: 8, maxDepth: 3 },
@@ -2465,7 +2465,6 @@ function analyzeBuyTransaction(program, transactionData) {
           buyResponse.push({
             buyer: decodedData.data.buyer.toString(),
             collectionAddress: decodedData.data.collection.toString(),
-            nftAddress: decodedData.data.nft.toString(),
             tokenId: decodedData.data.tokenId.toString(),
             tokenName: decodedData.data.name.toString(),
             tokenUri: decodedData.data.uri.toString(),
@@ -2482,7 +2481,6 @@ function analyzeBuyTransaction(program, transactionData) {
           buyResponse.push({
             buyer: decodedData.data.buyer.toString(),
             collectionAddress: decodedData.data.collection.toString(),
-            nftAddress: decodedData.data.nft.toString(),
             tokenId: decodedData.data.tokenId.toString(),
             price: decodedData.data.price.toString(),
             nextPrice: decodedData.data.nextPrice.toString(),
@@ -2683,7 +2681,7 @@ var SolanaConnector = class {
   //useBuy.ts
   buy(params) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d;
       if (!this.program) {
         throw new Error("Program not initialized");
       }
@@ -2693,13 +2691,12 @@ var SolanaConnector = class {
         creatorAddress,
         quantity,
         reserveToken,
-        merkleTree
+        merkleTree,
+        baseUri
       } = params;
       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 successTxns = [];
-      const faildTradingItem = [];
       const instructionsChunks = [];
       if ((_c = reserveToken.buy) == null ? void 0 : _c.length) {
         try {
@@ -2710,24 +2707,22 @@ var SolanaConnector = class {
           );
           instructionsChunks.push(...buyInstructionsChunks);
         } catch (error) {
-          faildTradingItem.push(...reserveToken.buy);
-          (_d = params.notify) == null ? void 0 : _d.onFailed(faildTradingItem, quantity);
           console.error("Failed to getBuyInstructions", { error });
         }
       }
       const faildMinting = [];
-      if ((_e = reserveToken.mintAndBuy) == null ? void 0 : _e.length) {
+      if ((_d = reserveToken.mintAndBuy) == null ? void 0 : _d.length) {
         try {
           const mintAndBuyInstructionsChunks = yield this.getMintAndBuyInstructions(
             this.config.wallet,
             collectionId,
             creatorAddress,
             reserveToken.mintAndBuy,
+            baseUri,
             merkleTree
           );
           instructionsChunks.push(...mintAndBuyInstructionsChunks);
         } catch (error) {
-          (_f = params.notify) == null ? void 0 : _f.onFailed(faildMinting, quantity);
           console.error("Failed to getMintAndBuyInstructions", { error });
         }
       }
@@ -2736,12 +2731,6 @@ var SolanaConnector = class {
       for (const [instructions, items] of instructionsChunks) {
         try {
           const { signature, latestBlockhash } = yield this.sendTxn(instructions);
-          successTxns.push({ items, signature });
-          (_g = params.notify) == null ? void 0 : _g.onSuccess(
-            successTxns.map((txn) => txn.items).flat(),
-            quantity,
-            signature
-          );
           const confirmResult = yield this.config.provider.connection.confirmTransaction({
             blockhash: latestBlockhash.blockhash,
             lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
@@ -3140,7 +3129,7 @@ var SolanaConnector = class {
       }
     });
   }
-  getMintAndBuyInstructions(userPublicKey, collectionId, creatorAddress, tokens, merkleTree) {
+  getMintAndBuyInstructions(userPublicKey, collectionId, creatorAddress, tokens, baseUri, merkleTree) {
     return __async(this, null, function* () {
       if (!this.program) {
         throw new Error("Program not initialized");
@@ -3169,40 +3158,30 @@ var SolanaConnector = class {
         for (const chunk of tokenChunks) {
           const instructions = yield this.setUpInstructions(14e5);
           let data = [];
-          for (const token of chunk) {
-            const { name, tokenBaseUri } = token;
-            const instruction = yield this.program.methods.mintAndBuy(
-              ["test1", "test2", "test3", "test4", "test5"],
-              tokenBaseUri
-            ).accountsStrict({
-              state: SOLANA_PUBKEYS.STATE_ID,
-              merkleTreeConfig: treeConfigPda2,
-              treeCreatorOrDelegate: treeCreator,
-              nftHolder: nftHolderPda2,
-              merkleTree,
-              collection: collectionPda2,
-              collectionNft: collectionNftPda2,
-              collectionMint: collectionMintPda2,
-              collectionMetadata: collectionMetaDataPda,
-              collectionEdition: collectionEditionPda,
-              bubblegumSigner,
-              logWrapper: SOLANA_PUBKEYS.SPL_NOOP_ID,
-              compressionProgram: SOLANA_PUBKEYS.SPL_ACCOUNT_COMPRESSION_ID,
-              tokenMetadataProgram: SOLANA_PUBKEYS.TOKEN_METADATA_PROGRAM_ID,
-              mplBubblegumProgram: SOLANA_PUBKEYS.MPL_BUBBLEGUM_ID,
-              treasury: SOLANA_PUBKEYS.TREASURY_ID,
-              buyer: userPublicKey,
-              systemProgram: import_web34.SystemProgram.programId,
-              eventAuthority: eventAuthority(this.program.programId),
-              program: this.program.programId
-            }).instruction();
-            instructions.push(instruction);
-            data.push({
-              name,
-              tokenURI: `test`,
-              tokenId: 1
-            });
-          }
+          const instruction = yield this.program.methods.mintAndBuy(chunk, baseUri).accountsStrict({
+            state: SOLANA_PUBKEYS.STATE_ID,
+            merkleTreeConfig: treeConfigPda2,
+            treeCreatorOrDelegate: treeCreator,
+            nftHolder: nftHolderPda2,
+            merkleTree,
+            collection: collectionPda2,
+            collectionNft: collectionNftPda2,
+            collectionMint: collectionMintPda2,
+            collectionMetadata: collectionMetaDataPda,
+            collectionEdition: collectionEditionPda,
+            bubblegumSigner,
+            logWrapper: SOLANA_PUBKEYS.SPL_NOOP_ID,
+            compressionProgram: SOLANA_PUBKEYS.SPL_ACCOUNT_COMPRESSION_ID,
+            tokenMetadataProgram: SOLANA_PUBKEYS.TOKEN_METADATA_PROGRAM_ID,
+            mplBubblegumProgram: SOLANA_PUBKEYS.MPL_BUBBLEGUM_ID,
+            treasury: SOLANA_PUBKEYS.TREASURY_ID,
+            buyer: userPublicKey,
+            systemProgram: import_web34.SystemProgram.programId,
+            eventAuthority: eventAuthority(this.program.programId),
+            program: this.program.programId
+          }).instruction();
+          instructions.push(instruction);
+          data.push(...chunk);
           allInstructionSets.push([instructions, data]);
         }
         return allInstructionSets;