flipmeme-sdk 1.1.0 → 1.1.2

package/dist/index.d.mts

@@ -38,9 +38,14 @@ interface NFTTradingData {
     tokenURI: string;
     symbol?: string;
 }
+interface NFTMintData {
+    name: string;
+    tokenBaseUri: string;
+    symbol?: string;
+}
 interface ReserveToken {
     buy: NFTTradingData[] | null;
-    mintAndBuy: NFTTradingData[] | null;
+    mintAndBuy: NFTMintData[] | null;
 }
 interface BuyParams {
     collectionId: string;
@@ -128,7 +133,6 @@ declare class FlipmemeSDK {
             };
             creator: _solana_web3_js.PublicKey;
             totalSol: bn_js;
-            totalSupply: number;
             mintCount: number;
             id: number;
             sellerFeeBasisPoints: number;
@@ -137,11 +141,10 @@ declare class FlipmemeSDK {
             isPaused: number;
             bump: number;
             collectionNftBump: number;
-            padding: number[];
         };
         collectionAddress: _solana_web3_js.PublicKey;
     }>;
     getTransactionTest(signature: string): Promise<BuyResponse[]>;
 }
 
-export { BlockchainType, type BuyCreditParams, type BuyParams, type BuyResponse, type CollectionInfo, type CollectionParams, type CreateCollectionResponse, type EthereumConfig, FlipmemeSDK, type NFTTradingData, type ProfileSellParams, type ReserveToken, type SellParams, type SellResponse, type SolanaConfig, isEthereumConfig, isSolanaConfig };
+export { BlockchainType, type BuyCreditParams, type BuyParams, type BuyResponse, type CollectionInfo, type CollectionParams, type CreateCollectionResponse, type EthereumConfig, FlipmemeSDK, type NFTMintData, type NFTTradingData, type ProfileSellParams, type ReserveToken, type SellParams, type SellResponse, type SolanaConfig, isEthereumConfig, isSolanaConfig };

package/dist/index.d.ts

@@ -38,9 +38,14 @@ interface NFTTradingData {
     tokenURI: string;
     symbol?: string;
 }
+interface NFTMintData {
+    name: string;
+    tokenBaseUri: string;
+    symbol?: string;
+}
 interface ReserveToken {
     buy: NFTTradingData[] | null;
-    mintAndBuy: NFTTradingData[] | null;
+    mintAndBuy: NFTMintData[] | null;
 }
 interface BuyParams {
     collectionId: string;
@@ -128,7 +133,6 @@ declare class FlipmemeSDK {
             };
             creator: _solana_web3_js.PublicKey;
             totalSol: bn_js;
-            totalSupply: number;
             mintCount: number;
             id: number;
             sellerFeeBasisPoints: number;
@@ -137,11 +141,10 @@ declare class FlipmemeSDK {
             isPaused: number;
             bump: number;
             collectionNftBump: number;
-            padding: number[];
         };
         collectionAddress: _solana_web3_js.PublicKey;
     }>;
     getTransactionTest(signature: string): Promise<BuyResponse[]>;
 }
 
-export { BlockchainType, type BuyCreditParams, type BuyParams, type BuyResponse, type CollectionInfo, type CollectionParams, type CreateCollectionResponse, type EthereumConfig, FlipmemeSDK, type NFTTradingData, type ProfileSellParams, type ReserveToken, type SellParams, type SellResponse, type SolanaConfig, isEthereumConfig, isSolanaConfig };
+export { BlockchainType, type BuyCreditParams, type BuyParams, type BuyResponse, type CollectionInfo, type CollectionParams, type CreateCollectionResponse, type EthereumConfig, FlipmemeSDK, type NFTMintData, type NFTTradingData, type ProfileSellParams, type ReserveToken, type SellParams, type SellResponse, type SolanaConfig, isEthereumConfig, isSolanaConfig };

package/dist/index.js

@@ -1854,7 +1854,7 @@ var SOLANA = {
   TREASURY_ID_STR: "5VmcDuGTMMxFfcZB1W7AsARSbcswvM2wq7NENqaRV9eu",
   LP_PROVISIONER_ID_STR: "5VmcDuGTMMxFfcZB1W7AsARSbcswvM2wq7NENqaRV9eu",
   TOKEN_METADATA_PROGRAM_ID_STR: "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
-  EVENT_AUTHORITY_ID_STR: "5SiQmwXLRsPoW7oB8wUDmCsfeoHh62My3YYChG4FAGom",
+  EVENT_AUTHORITY_ID_STR: "GB1KPin8XL9kgMu4hTVxx6Gz6mb8ZM3K66TdBPNjAbqc",
   MPL_CORE_STR: "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d",
   ADMIN_FOR_CREDIT_BUY_STR: "9pFpgiw5MUcMX3Tdjt8KmvmdphfykPqo8QDLpk2fjhBo"
 };
@@ -1873,7 +1873,7 @@ var SDK_SOLANA_CONFIG = {
 // src/solana/index.ts
 var import_web34 = require("@solana/web3.js");
 var import_bytes = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
-var import_bn = require("bn.js");
+var import_bn = __toESM(require("bn.js"));
 
 // src/solana/accounts.ts
 var import_web32 = require("@solana/web3.js");
@@ -2116,8 +2116,8 @@ var SolanaConnector = class {
         name,
         tokenUri,
         totalSupply,
-        new import_bn.BN(1e7),
-        new import_bn.BN(1e9)
+        new import_bn.default(1e7),
+        new import_bn.default(1e9)
       ).accounts({
         state: SOLANA_PUBKEYS.STATE_ID,
         //@ts-ignore
@@ -2165,7 +2165,7 @@ var SolanaConnector = class {
   //useBuy.ts
   buy(params) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g;
       if (!this.program) {
         throw new Error("Program not initialized");
       }
@@ -2183,7 +2183,7 @@ var SolanaConnector = class {
         SOLANA_PUBKEYS.STATE_ID
       );
       const successTxns = [];
-      const failedItems = [];
+      const faildTradingItem = [];
       const instructionsChunks = [];
       if ((_c = reserveToken.buy) == null ? void 0 : _c.length) {
         try {
@@ -2194,12 +2194,15 @@ var SolanaConnector = class {
           );
           instructionsChunks.push(...buyInstructionsChunks);
         } catch (error) {
-          failedItems.push(...reserveToken.buy);
-          (_d = params.notify) == null ? void 0 : _d.onFailed(failedItems, quantity);
+          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) {
+        let collectionInfo = yield this.getCollectionInfo(collectionId);
+        let firstTokenId = collectionInfo.collectionInfo.mintCount;
         try {
           const mintAndBuyInstructionsChunks = yield this.getMintAndBuyInstructions(
             this.config.wallet,
@@ -2207,12 +2210,12 @@ var SolanaConnector = class {
             collectionSymbol,
             creatorAddress,
             reserveToken.mintAndBuy,
-            stateAccount
+            stateAccount,
+            firstTokenId
           );
           instructionsChunks.push(...mintAndBuyInstructionsChunks);
         } catch (error) {
-          failedItems.push(...reserveToken.mintAndBuy);
-          (_f = params.notify) == null ? void 0 : _f.onFailed(failedItems, quantity);
+          (_f = params.notify) == null ? void 0 : _f.onFailed(faildMinting, quantity);
           console.error("Failed to getMintAndBuyInstructions", { error });
         }
       }
@@ -2245,8 +2248,6 @@ var SolanaConnector = class {
             buyResponse.push(...itemBuyResponse);
           }
         } catch (e) {
-          failedItems.push(...items);
-          (_h = params.notify) == null ? void 0 : _h.onFailed(failedItems, quantity);
           console.error("Buy failed:", JSON.stringify(e), { items });
           throw e;
         }
@@ -2373,19 +2374,6 @@ var SolanaConnector = class {
       );
     });
   }
-  //for testing
-  getStateInfo() {
-    return __async(this, null, function* () {
-      if (!this.program) {
-        throw new Error("Program not initialized");
-      }
-      const state = yield this.program.account.state.fetch(
-        SOLANA_PUBKEYS.STATE_ID
-      );
-      return state;
-    });
-  }
-  //for testing
   getCollectionInfo(collectionId) {
     return __async(this, null, function* () {
       if (!this.program) {
@@ -2401,6 +2389,18 @@ var SolanaConnector = class {
       return { collectionInfo, collectionAddress };
     });
   }
+  //for testing
+  getStateInfo() {
+    return __async(this, null, function* () {
+      if (!this.program) {
+        throw new Error("Program not initialized");
+      }
+      const state = yield this.program.account.state.fetch(
+        SOLANA_PUBKEYS.STATE_ID
+      );
+      return state;
+    });
+  }
   //useSenTxn.ts
   sendTxn(instructions) {
     return __async(this, null, function* () {
@@ -2521,7 +2521,7 @@ var SolanaConnector = class {
       }
     });
   }
-  getMintAndBuyInstructions(userPublicKey, collectionId, collectionSymbol, creatorAddress, tokens, stateAccount) {
+  getMintAndBuyInstructions(userPublicKey, collectionId, collectionSymbol, creatorAddress, tokens, stateAccount, firstTokenId) {
     return __async(this, null, function* () {
       if (!this.program) {
         throw new Error("Program not initialized");
@@ -2535,15 +2535,17 @@ var SolanaConnector = class {
         this.program.programId,
         creatorAddress
       );
+      let tokenId = firstTokenId;
       try {
         for (const chunk of tokenChunks) {
           const instructions = yield this.setUpInstructions(
             35e4 * chunk.length
           );
+          let data = [];
           for (const token of chunk) {
-            const { name, tokenURI, tokenId } = token;
+            const { name, tokenBaseUri } = token;
             const { nftPda: nftPda2, collectionPda: collectionPda2, nftHolderPda: nftHolderPda2, collectionNftPda: collectionNftPda2 } = yield getNftAccounts(tokenId);
-            const instruction = yield this.program.methods.mintAndBuy(name, tokenURI).accountsStrict({
+            const instruction = yield this.program.methods.mintAndBuy(name, `${tokenBaseUri}/${tokenId}.json`).accountsStrict({
               state: SOLANA_PUBKEYS.STATE_ID,
               treasury: stateAccount.treasury,
               buyer: userPublicKey,
@@ -2557,8 +2559,14 @@ var SolanaConnector = class {
               eventAuthority: SOLANA_PUBKEYS.EVENT_AUTHORITY_ID
             }).instruction();
             instructions.push(instruction);
+            data.push({
+              name,
+              tokenURI: `${tokenBaseUri}/${tokenId}.json`,
+              tokenId
+            });
+            tokenId++;
           }
-          allInstructionSets.push([instructions, chunk]);
+          allInstructionSets.push([instructions, data]);
         }
         return allInstructionSets;
       } catch (e) {